From abb1996c4e211f2463695e764f03bd7daaad0ff2 Mon Sep 17 00:00:00 2001 From: Joshua Filby Date: Wed, 21 Mar 2018 17:29:28 -0500 Subject: [PATCH] refactor: rename widgetSettings to clientVarps --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 +- .../net/runelite/client/plugins/devtools/SettingsTracker.java | 4 ++-- .../src/main/java/net/runelite/mixins/RSClientMixin.java | 4 ++-- .../src/main/java/net/runelite/mixins/VarbitMixin.java | 4 ++-- runescape-api/src/main/java/net/runelite/rs/api/RSClient.java | 4 ++-- 5 files changed, 9 insertions(+), 9 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 a7ba3ab1b4..325ab44c09 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -154,7 +154,7 @@ public interface Client extends GameEngine int[] getSettings(); - int[] getWidgetSettings(); + 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 5ef459e6ca..c27cb5cc82 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 @@ -47,14 +47,14 @@ public class SettingsTracker if (clientSettings == null || widgetSettings == null) { clientSettings = copy(client.getSettings()); - widgetSettings = copy(client.getWidgetSettings()); + widgetSettings = copy(client.getVarps()); log.info("Snapshotted client and widget settings"); return; } int[] newClientSettings = client.getSettings(); - int[] newWidgetSettings = client.getWidgetSettings(); + int[] newWidgetSettings = client.getVarps(); for (int i = 0; i < Math.min(clientSettings.length, newClientSettings.length); ++i) { 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 a792fce35a..8969c900b8 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -233,8 +233,8 @@ public abstract class RSClientMixin implements RSClient @Override public int getSetting(Setting setting) { - int[] settings = getSettings(); - return settings[setting.getId()]; + int[] varps = getVarps(); + return varps[setting.getId()]; } @Inject diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java index c0f8812606..95eddf75a2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java @@ -64,8 +64,8 @@ public abstract class VarbitMixin implements RSClient varbitCache.put(varbitId, v); } - int[] settings = getSettings(); - int value = settings[v.getIndex()]; + int[] varps = getVarps(); + int value = varps[v.getIndex()]; int lsb = v.getLeastSignificantBit(); int msb = v.getMostSignificantBit(); int mask = (1 << ((msb - lsb) + 1)) - 1; 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 95dc51eaea..4298504df4 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 @@ -81,9 +81,9 @@ public interface RSClient extends RSGameEngine, Client @Override int[] getSettings(); - @Import("widgetSettings") + @Import("clientVarps") @Override - int[] getWidgetSettings(); + int[] getVarps(); @Import("energy") @Override