From 8ee3de283c9a11f1abf427fd527f5a869a34ebf4 Mon Sep 17 00:00:00 2001 From: Joshua Filby Date: Wed, 21 Mar 2018 17:36:31 -0500 Subject: [PATCH] refactor: remove unnecessary Client#getSettings(), use Client#getVarps() These two methods would return the same values for a majority (if not all) of the time. The backing arrays for both of these are synchronized when the server sends the packet to set a varp value. --- .../main/java/net/runelite/api/Client.java | 2 -- .../plugins/devtools/SettingsTracker.java | 22 ++----------------- .../java/net/runelite/rs/api/RSClient.java | 4 ---- 3 files changed, 2 insertions(+), 26 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 325ab44c09..674108949f 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -152,8 +152,6 @@ public interface Client extends GameEngine int[][] getXteaKeys(); - int[] getSettings(); - int[] getVarps(); int getSetting(Setting setting); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SettingsTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SettingsTracker.java index c27cb5cc82..14b00db629 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SettingsTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SettingsTracker.java @@ -34,7 +34,6 @@ public class SettingsTracker { private final Client client; - private int[] clientSettings; private int[] widgetSettings; public SettingsTracker(Client client) @@ -44,32 +43,16 @@ public class SettingsTracker public void snapshot(ActionEvent e) { - if (clientSettings == null || widgetSettings == null) + if (widgetSettings == null) { - clientSettings = copy(client.getSettings()); widgetSettings = copy(client.getVarps()); log.info("Snapshotted client and widget settings"); return; } - int[] newClientSettings = client.getSettings(); int[] newWidgetSettings = client.getVarps(); - for (int i = 0; i < Math.min(clientSettings.length, newClientSettings.length); ++i) - { - int before = clientSettings[i]; - int after = newClientSettings[i]; - - if (before == after) - { - continue; - } - - log.info("Client setting index {} has changed from {} to {}: {} -> {}", - i, before, after, prettyPrintInt(before), prettyPrintInt(after)); - } - for (int i = 0; i < Math.min(widgetSettings.length, newWidgetSettings.length); ++i) { int before = widgetSettings[i]; @@ -84,13 +67,12 @@ public class SettingsTracker i, before, after, prettyPrintInt(before), prettyPrintInt(after)); } - clientSettings = copy(newClientSettings); widgetSettings = copy(newWidgetSettings); } public void clear(ActionEvent e) { - clientSettings = widgetSettings = null; + widgetSettings = null; } private static int[] copy(int[] array) 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 7c9a43b6bd..bcebd5fa7a 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 @@ -77,10 +77,6 @@ public interface RSClient extends RSGameEngine, Client @Override byte[][][] getTileSettings(); - @Import("serverVarps") - @Override - int[] getSettings(); - @Import("clientVarps") @Override int[] getVarps();