Merge pull request #1036 from Joshua-F/refactor/rename-vars

Rename widgetSettings and settings
This commit is contained in:
Adam
2018-03-22 08:49:16 -04:00
committed by GitHub
7 changed files with 16 additions and 40 deletions

View File

@@ -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
@@ -634,7 +634,7 @@ public abstract class RSClientMixin implements RSClient
eventBus.post(offerChangedEvent);
}
@FieldHook("settings")
@FieldHook("clientVarps")
@Inject
public static void settingsChanged(int idx)
{

View File

@@ -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;