ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

refactor: rename widgetSettings to clientVarps

Browse Source
This commit is contained in:
Joshua Filby
2018-03-21 17:29:28 -05:00
parent da0f86f165
commit abb1996c4e
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -154,7 +154,7 @@ public interface Client extends GameEngine
int[] getSettings(); int[] getSettings();
int[] getWidgetSettings(); int[] getVarps();
int getSetting(Setting setting); int getSetting(Setting setting);

4
runelite-client/src/main/java/net/runelite/client/plugins/devtools/SettingsTracker.java
View File

@@ -47,14 +47,14 @@ public class SettingsTracker
if (clientSettings == null || widgetSettings == null) if (clientSettings == null || widgetSettings == null)
{ {
clientSettings = copy(client.getSettings()); clientSettings = copy(client.getSettings());
widgetSettings = copy(client.getWidgetSettings()); widgetSettings = copy(client.getVarps());
log.info("Snapshotted client and widget settings"); log.info("Snapshotted client and widget settings");
return; return;
} }
int[] newClientSettings = client.getSettings(); int[] newClientSettings = client.getSettings();
int[] newWidgetSettings = client.getWidgetSettings(); int[] newWidgetSettings = client.getVarps();
for (int i = 0; i < Math.min(clientSettings.length, newClientSettings.length); ++i) for (int i = 0; i < Math.min(clientSettings.length, newClientSettings.length); ++i)
{ {

4
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -233,8 +233,8 @@ public abstract class RSClientMixin implements RSClient
@Override @Override
public int getSetting(Setting setting) public int getSetting(Setting setting)
{ {
int[] settings = getSettings(); int[] varps = getVarps();
return settings[setting.getId()]; return varps[setting.getId()];
} }
@Inject @Inject

4
runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java
View File

@@ -64,8 +64,8 @@ public abstract class VarbitMixin implements RSClient
varbitCache.put(varbitId, v); varbitCache.put(varbitId, v);
} }
int[] settings = getSettings(); int[] varps = getVarps();
int value = settings[v.getIndex()]; int value = varps[v.getIndex()];
int lsb = v.getLeastSignificantBit(); int lsb = v.getLeastSignificantBit();
int msb = v.getMostSignificantBit(); int msb = v.getMostSignificantBit();
int mask = (1 << ((msb - lsb) + 1)) - 1; int mask = (1 << ((msb - lsb) + 1)) - 1;

4
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -81,9 +81,9 @@ public interface RSClient extends RSGameEngine, Client
@Override @Override
int[] getSettings(); int[] getSettings();
@Import("widgetSettings") @Import("clientVarps")
@Override @Override
int[] getWidgetSettings(); int[] getVarps();
@Import("energy") @Import("energy")
@Override @Override