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

Merge pull request #2199 from Abextm/varpbsad

Browse Source 
Refactor Vars
This commit is contained in:
Adam
2018-04-30 20:21:30 -04:00
committed by GitHub
parent e648c426a2 efa67d7c93
commit 618c16adca
39 changed files with 122 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,11 +164,13 @@ public interface Client extends GameEngine
int[] getVarps();
Varcs getVarcs();
int getVar(VarPlayer varPlayer);
int getSetting(Setting setting);
int getVar(Varbits varbit);
int getSetting(Varbits varbit);
int getVar(VarClientInt varClientInt);
String getVar(VarClientStr varClientStr);
@VisibleForDevtools
void setSetting(Varbits varbit, int value);

2
runelite-api/src/main/java/net/runelite/api/Setting.java → runelite-api/src/main/java/net/runelite/api/VarPlayer.java
View File

@@ -29,7 +29,7 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public enum Setting
public enum VarPlayer
{
ATTACK_STYLE(43),

32
runelite-api/src/main/java/net/runelite/api/Varcs.java
View File

@@ -1,32 +0,0 @@
/*
* Copyright (c) 2018, Tomas Slusny <slusnucky@gmail.com>
* 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 Varcs
{
int getIntVar(VarClientInt var);
String getStrVar(VarClientStr var);
}

4
runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
View File

@@ -69,7 +69,7 @@ public class ChatMessageManager
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
int setting = clientProvider.get().getSetting(Varbits.TRANSPARENT_CHATBOX);
int setting = clientProvider.get().getVar(Varbits.TRANSPARENT_CHATBOX);
if (transparencyVarbit != setting)
{
@@ -140,7 +140,7 @@ public class ChatMessageManager
}
final Client client = clientProvider.get();
final boolean transparent = client.isResized() && client.getSetting(Varbits.TRANSPARENT_CHATBOX) != 0;
final boolean transparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) != 0;
final Set<ChatColor> chatColors = colorCache.get(target.getType());
// If we do not have any colors cached, simply set clean message

4
runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java
View File

@@ -34,7 +34,6 @@ import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.VarClientStr;
import net.runelite.api.Varcs;
import net.runelite.api.events.CommandExecuted;
import net.runelite.api.events.ScriptCallbackEvent;
@@ -62,8 +61,7 @@ public class CommandManager
}
Client client = clientProvider.get();
Varcs varcs = client.getVarcs();
String typedText = varcs.getStrVar(VarClientStr.CHATBOX_TYPED_TEXT).substring(2); // strip ::
String typedText = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT).substring(2); // strip ::
log.debug("Command: {}", typedText);

30
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
View File

@@ -35,7 +35,7 @@ import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Setting;
import net.runelite.api.VarPlayer;
import net.runelite.api.Skill;
import net.runelite.api.Varbits;
import net.runelite.api.events.ConfigChanged;
@@ -100,9 +100,9 @@ public class AttackStylesPlugin extends Plugin
updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
updateAttackStyle(
client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE),
client.getSetting(Setting.ATTACK_STYLE),
client.getSetting(Varbits.DEFENSIVE_CASTING_MODE));
client.getVar(Varbits.EQUIPPED_WEAPON_TYPE),
client.getVar(VarPlayer.ATTACK_STYLE),
client.getVar(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(false);
processWidgets();
}
@@ -173,11 +173,11 @@ public class AttackStylesPlugin extends Plugin
@Subscribe
public void onAttackStyleChange(VarbitChanged event)
{
if (attackStyleVarbit == -1 || attackStyleVarbit != client.getSetting(Setting.ATTACK_STYLE))
if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE))
{
attackStyleVarbit = client.getSetting(Setting.ATTACK_STYLE);
updateAttackStyle(client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE), attackStyleVarbit,
client.getSetting(Varbits.DEFENSIVE_CASTING_MODE));
attackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE);
updateAttackStyle(client.getVar(Varbits.EQUIPPED_WEAPON_TYPE), attackStyleVarbit,
client.getVar(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(false);
}
}
@@ -185,11 +185,11 @@ public class AttackStylesPlugin extends Plugin
@Subscribe
public void onEquippedWeaponTypeChange(VarbitChanged event)
{
if (equippedWeaponTypeVarbit == -1 || equippedWeaponTypeVarbit != client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE))
if (equippedWeaponTypeVarbit == -1 || equippedWeaponTypeVarbit != client.getVar(Varbits.EQUIPPED_WEAPON_TYPE))
{
equippedWeaponTypeVarbit = client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE);
updateAttackStyle(equippedWeaponTypeVarbit, client.getSetting(Setting.ATTACK_STYLE),
client.getSetting(Varbits.DEFENSIVE_CASTING_MODE));
equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE);
updateAttackStyle(equippedWeaponTypeVarbit, client.getVar(VarPlayer.ATTACK_STYLE),
client.getVar(Varbits.DEFENSIVE_CASTING_MODE));
updateWarning(true);
}
}
@@ -197,10 +197,10 @@ public class AttackStylesPlugin extends Plugin
@Subscribe
public void onCastingModeChange(VarbitChanged event)
{
if (castingModeVarbit == -1 || castingModeVarbit != client.getSetting(Varbits.DEFENSIVE_CASTING_MODE))
if (castingModeVarbit == -1 || castingModeVarbit != client.getVar(Varbits.DEFENSIVE_CASTING_MODE))
{
castingModeVarbit = client.getSetting(Varbits.DEFENSIVE_CASTING_MODE);
updateAttackStyle(client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE), client.getSetting(Setting.ATTACK_STYLE),
castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE);
updateAttackStyle(client.getVar(Varbits.EQUIPPED_WEAPON_TYPE), client.getVar(VarPlayer.ATTACK_STYLE),
castingModeVarbit);
updateWarning(false);
}

4
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
View File

@@ -90,7 +90,7 @@ public class BarbarianAssaultPlugin extends Plugin
@Subscribe
public void onGameTick(GameTick event)
{
if (client.getSetting(Varbits.IN_GAME_BA) == 1 &&
if (client.getVar(Varbits.IN_GAME_BA) == 1 &&
overlay.getCurrentRound() == null &&
client.getLocalPlayer() != null)
{
@@ -115,7 +115,7 @@ public class BarbarianAssaultPlugin extends Plugin
@Subscribe
public void onVarbitChange(VarbitChanged event)
{
int inGame = client.getSetting(Varbits.IN_GAME_BA);
int inGame = client.getVar(Varbits.IN_GAME_BA);
if (inGameBit != inGame && inGameBit == 1)
{

2
runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
View File

@@ -70,7 +70,7 @@ public class BarrowsBrotherSlainOverlay extends Overlay
for (BarrowsBrothers brother : BarrowsBrothers.values())
{
String slain = client.getSetting(brother.getKilledVarbit()) > 0 ? "✓" : "";
String slain = client.getVar(brother.getKilledVarbit()) > 0 ? "✓" : "";
panelComponent.getLines().add(new PanelComponent.Line(
brother.getName(),
Color.WHITE,

2
runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
View File

@@ -178,7 +178,7 @@ class BarrowsOverlay extends Overlay
graphics.setColor(Color.black);
graphics.drawString(brotherLetter, minimapText.getX() + 1, minimapText.getY() + 1);
if (client.getSetting(brother.getKilledVarbit()) > 0)
if (client.getVar(brother.getKilledVarbit()) > 0)
{
graphics.setColor(config.deadBrotherLocColor());
}

2
runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
View File

@@ -68,7 +68,7 @@ class BlastFurnaceCofferOverlay extends Overlay
panelComponent.getLines().add(new PanelComponent.Line(
"Coffer:",
StackFormatter.quantityToStackSize(client.getSetting(BLAST_FURNACE_COFFER)) + " gp"
StackFormatter.quantityToStackSize(client.getVar(BLAST_FURNACE_COFFER)) + " gp"
));
}
return panelComponent.render(graphics);

2
runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
View File

@@ -63,7 +63,7 @@ class BlastFurnaceOverlay extends Overlay
for (BarsOres varbit : BarsOres.values())
{
int amount = client.getSetting(varbit.getVarbit());
int amount = client.getVar(varbit.getVarbit());
if (amount == 0)
{

6
runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
View File

@@ -127,19 +127,19 @@ public class DailyTasksPlugin extends Plugin
private boolean checkCanCollectHerbBox()
{
int value = client.getSetting(Varbits.DAILY_HERB_BOX);
int value = client.getVar(Varbits.DAILY_HERB_BOX);
return value < 15; // < 15 can claim
}
private boolean checkCanCollectStaves()
{
int value = client.getSetting(Varbits.DAILY_STAVES);
int value = client.getVar(Varbits.DAILY_STAVES);
return value == 0; // 1 = can't claim
}
private boolean checkCanCollectEssence()
{
int value = client.getSetting(Varbits.DAILY_ESSENCE);
int value = client.getVar(Varbits.DAILY_ESSENCE);
return value == 0; // 1 = can't claim
}

16
runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java
View File

@@ -43,7 +43,7 @@ public class DevToolsPanel extends PluginPanel
private final Client client;
private final DevToolsPlugin plugin;
private final SettingsTracker settingsTracker;
private final VarTracker varTracker;
private WidgetInspector widgetInspector;
@@ -55,7 +55,7 @@ public class DevToolsPanel extends PluginPanel
this.plugin = plugin;
this.widgetInspector = widgetInspector;
settingsTracker = new SettingsTracker(client);
varTracker = new VarTracker(client);
add(createOptionsPanel());
}
@@ -139,13 +139,13 @@ public class DevToolsPanel extends PluginPanel
final JPanel boundsDebugPanel = createBoundsDebugMultiButton();
container.add(boundsDebugPanel);
final JButton settingsSnapshotBtn = new JButton("Get Settings");
settingsSnapshotBtn.addActionListener(settingsTracker::snapshot);
container.add(settingsSnapshotBtn);
final JButton varSnapshotBtn = new JButton("Snapshot Vars");
varSnapshotBtn.addActionListener(varTracker::snapshot);
container.add(varSnapshotBtn);
final JButton settingsClearBtn = new JButton("Clear Settings");
settingsClearBtn.addActionListener(settingsTracker::clear);
container.add(settingsClearBtn);
final JButton varClearBtn = new JButton("Clear Vars");
varClearBtn.addActionListener(varTracker::clear);
container.add(varClearBtn);
final JButton renderLocationBtn = new JButton("Location");
renderLocationBtn.addActionListener(e ->

26
runelite-client/src/main/java/net/runelite/client/plugins/devtools/SettingsTracker.java → runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarTracker.java
View File

@@ -30,49 +30,49 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
@Slf4j
public class SettingsTracker
public class VarTracker
{
private final Client client;
private int[] widgetSettings;
private int[] varPs;
public SettingsTracker(Client client)
public VarTracker(Client client)
{
this.client = client;
}
public void snapshot(ActionEvent e)
{
if (widgetSettings == null)
if (varPs == null)
{
widgetSettings = copy(client.getVarps());
varPs = copy(client.getVarps());
log.info("Snapshotted client and widget settings");
log.info("Snapshotted VarPs");
return;
}
int[] newWidgetSettings = client.getVarps();
int[] newVarPs = client.getVarps();
for (int i = 0; i < Math.min(widgetSettings.length, newWidgetSettings.length); ++i)
for (int i = 0; i < Math.min(varPs.length, newVarPs.length); ++i)
{
int before = widgetSettings[i];
int after = newWidgetSettings[i];
int before = varPs[i];
int after = newVarPs[i];
if (before == after)
{
continue;
}
log.info("Widget setting index {} has changed from {} to {}: {} -> {}",
log.info("VarP index {} has changed from {} to {}: {} -> {}",
i, before, after, prettyPrintInt(before), prettyPrintInt(after));
}
widgetSettings = copy(newWidgetSettings);
varPs = copy(newVarPs);
}
public void clear(ActionEvent e)
{
widgetSettings = null;
varPs = null;
}
private static int[] copy(int[] array)

2
runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
View File

@@ -126,7 +126,7 @@ public class XpDropPlugin extends Plugin
private void resetTextColor(Widget widget)
{
int defaultColorIdx = client.getSetting(Varbits.EXPERIENCE_DROP_COLOR);
int defaultColorIdx = client.getVar(Varbits.EXPERIENCE_DROP_COLOR);
int defaultColor = DefaultColors.values()[defaultColorIdx].getColor().getRGB();
widget.setTextColor(defaultColor);
}

4
runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
View File

@@ -73,8 +73,8 @@ public class FairyRingPlugin extends Plugin
String destination;
try
{
FairyRings fairyRingDestination = getFairyRingDestination(client.getSetting(Varbits.FAIRY_RING_DIAL_ADCB),
client.getSetting(Varbits.FAIRY_RIGH_DIAL_ILJK), client.getSetting(Varbits.FAIRY_RING_DIAL_PSRQ));
FairyRings fairyRingDestination = getFairyRingDestination(client.getVar(Varbits.FAIRY_RING_DIAL_ADCB),
client.getVar(Varbits.FAIRY_RIGH_DIAL_ILJK), client.getVar(Varbits.FAIRY_RING_DIAL_PSRQ));
destination = fairyRingDestination.getDestination();
}
catch (IllegalArgumentException ex)

4
runelite-client/src/main/java/net/runelite/client/plugins/farmingtracker/FarmingTrackerPlugin.java
View File

@@ -137,7 +137,7 @@ public class FarmingTrackerPlugin extends Plugin
{
String group = FarmingTrackerConfig.KEY_NAME + "." + client.getUsername();
String autoweed = Integer.toString(client.getSetting(Varbits.AUTOWEED));
String autoweed = Integer.toString(client.getVar(Varbits.AUTOWEED));
if (!autoweed.equals(configManager.getConfiguration(group, FarmingTrackerConfig.AUTOWEED)))
{
configManager.setConfiguration(group, FarmingTrackerConfig.AUTOWEED, autoweed);
@@ -156,7 +156,7 @@ public class FarmingTrackerPlugin extends Plugin
{
// Write the config value if it doesn't match what is current, or it is more than 5 minutes old
String key = Integer.toString(varbit.getId());
String strVarbit = Integer.toString(client.getSetting(varbit));
String strVarbit = Integer.toString(client.getVar(varbit));
String storedValue = configManager.getConfiguration(group, key);
if (storedValue != null)
{

6
runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
View File

@@ -160,7 +160,7 @@ public class HerbiboarPlugin extends Plugin
for (HerbiboarTrail trail : HerbiboarTrail.values())
{
int trailId = trail.getTrailId();
int value = client.getSetting(trail.getVarbit());
int value = client.getVar(trail.getVarbit());
if (value > 0)
{
@@ -175,7 +175,7 @@ public class HerbiboarPlugin extends Plugin
}
// Get finish data
finishId = client.getSetting(Varbits.HB_FINISH);
finishId = client.getVar(Varbits.HB_FINISH);
if (finishId > 0 && currentTrail != null)
{
shownTrails.add(currentTrail.getTrailId());
@@ -184,7 +184,7 @@ public class HerbiboarPlugin extends Plugin
currentPath = -1;
}
int started = client.getSetting(Varbits.HB_STARTED);
int started = client.getVar(Varbits.HB_STARTED);
if (currentPath == -1 && finishId == 0 && started == 0)
{
resetTrailData();

8
runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java
View File

@@ -41,10 +41,10 @@ public class SpicyStew implements Effect
/*
* Spice boosts listed in the colour order of [Spicy stew -> Smell]
*/
int redBoost = spiceBoostOf(client.getSetting(Varbits.SPICY_STEW_RED_SPICES));
int yellowBoost = spiceBoostOf(client.getSetting(Varbits.SPICY_STEW_YELLOW_SPICES));
int orangeBoost = spiceBoostOf(client.getSetting(Varbits.SPICY_STEW_ORANGE_SPICES));
int brownBoost = spiceBoostOf(client.getSetting(Varbits.SPICY_STEW_BROWN_SPICES));
int redBoost = spiceBoostOf(client.getVar(Varbits.SPICY_STEW_RED_SPICES));
int yellowBoost = spiceBoostOf(client.getVar(Varbits.SPICY_STEW_YELLOW_SPICES));
int orangeBoost = spiceBoostOf(client.getVar(Varbits.SPICY_STEW_ORANGE_SPICES));
int brownBoost = spiceBoostOf(client.getVar(Varbits.SPICY_STEW_BROWN_SPICES));
List<StatChange> changes = new ArrayList<>();

6
runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
View File

@@ -79,8 +79,8 @@ public class KingdomPlugin extends Plugin
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
favor = client.getSetting(Varbits.KINGDOM_FAVOR);
coffer = client.getSetting(Varbits.KINGDOM_COFFER);
favor = client.getVar(Varbits.KINGDOM_FAVOR);
coffer = client.getVar(Varbits.KINGDOM_COFFER);
processInfobox();
}
@@ -130,7 +130,7 @@ public class KingdomPlugin extends Plugin
private boolean hasCompletedQuest()
{
return client.getSetting(Varbits.THRONE_OF_MISCELLANIA_QUEST) == 1;
return client.getVar(Varbits.THRONE_OF_MISCELLANIA_QUEST) == 1;
}
static int getFavorPercent(int favor)

4
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
View File

@@ -154,8 +154,8 @@ public class MotherlodePlugin extends Plugin
{
if (inMlm)
{
curSackSize = client.getSetting(Varbits.SACK_NUMBER);
boolean sackUpgraded = client.getSetting(Varbits.SACK_UPGRADED) == 1;
curSackSize = client.getVar(Varbits.SACK_NUMBER);
boolean sackUpgraded = client.getVar(Varbits.SACK_UPGRADED) == 1;
maxSackSize = sackUpgraded ? SACK_LARGE_SIZE : SACK_SIZE;
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
View File

@@ -84,7 +84,7 @@ class MotherlodeSackOverlay extends Overlay
panelComponent.getLines().add(new PanelComponent.Line(
"Pay-dirt in sack:",
Color.WHITE,
String.valueOf(client.getSetting(Varbits.SACK_NUMBER)),
String.valueOf(client.getVar(Varbits.SACK_NUMBER)),
Color.WHITE
));
}

4
runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
View File

@@ -31,7 +31,6 @@ import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.MenuEntry;
import net.runelite.api.VarClientInt;
import net.runelite.api.Varcs;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.ui.overlay.Overlay;
@@ -112,8 +111,7 @@ class MouseHighlightOverlay extends Overlay
if (widget != null)
{
// If this varc is set, some CS is showing tooltip
Varcs varcs = client.getVarcs();
int tooltipTimeout = varcs.getIntVar(VarClientInt.TOOLTIP_TIMEOUT);
int tooltipTimeout = client.getVar(VarClientInt.TOOLTIP_TIMEOUT);
if (tooltipTimeout > client.getGameCycle())
{
return null;

4
runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
View File

@@ -100,7 +100,7 @@ class NightmareZoneOverlay extends Overlay
panelComponent.getLines().add(new PanelComponent.Line(
"Points: ",
Color.WHITE,
StackFormatter.formatNumber(client.getSetting(Varbits.NMZ_POINTS)),
StackFormatter.formatNumber(client.getVar(Varbits.NMZ_POINTS)),
Color.WHITE
));
@@ -109,7 +109,7 @@ class NightmareZoneOverlay extends Overlay
private void renderAbsorptionCounter()
{
int absorptionPoints = client.getSetting(Varbits.NMZ_ABSORPTION);
int absorptionPoints = client.getVar(Varbits.NMZ_ABSORPTION);
if (absorptionPoints == 0)
{
if (absorptionCounter != null)

2
runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
View File

@@ -151,7 +151,7 @@ public class NightmareZonePlugin extends Plugin
private void checkAbsorption()
{
int absorptionPoints = client.getSetting(Varbits.NMZ_ABSORPTION);
int absorptionPoints = client.getVar(Varbits.NMZ_ABSORPTION);
if (!absorptionNotificationSend)
{

2
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
View File

@@ -126,7 +126,7 @@ class OpponentInfoOverlay extends Overlay
Actor opponentsOpponent = opponent.getInteracting();
if (opponentsOpponent != null
&& (opponentsOpponent != client.getLocalPlayer() || client.getSetting(Varbits.MULTICOMBAT_AREA) == 1))
&& (opponentsOpponent != client.getLocalPlayer() || client.getVar(Varbits.MULTICOMBAT_AREA) == 1))
{
opponentsOpponentName = Text.removeTags(opponentsOpponent.getName());
}

12
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -47,7 +47,7 @@ import net.runelite.api.GameState;
import net.runelite.api.InstanceTemplates;
import net.runelite.api.ObjectID;
import net.runelite.api.Point;
import net.runelite.api.Setting;
import net.runelite.api.VarPlayer;
import net.runelite.api.Tile;
import net.runelite.api.Varbits;
import static net.runelite.api.Perspective.SCENE_SIZE;
@@ -152,7 +152,7 @@ public class RaidsPlugin extends Plugin
{
if (client.getGameState() == GameState.LOGGED_IN)
{
inRaidChambers = client.getSetting(Varbits.IN_RAID) == 1;
inRaidChambers = client.getVar(Varbits.IN_RAID) == 1;
updateInfoBoxState();
}
@@ -226,7 +226,7 @@ public class RaidsPlugin extends Plugin
@Subscribe
public void onVarbitChange(VarbitChanged event)
{
boolean setting = client.getSetting(Varbits.IN_RAID) == 1;
boolean setting = client.getVar(Varbits.IN_RAID) == 1;
if (inRaidChambers != setting)
{
@@ -262,7 +262,7 @@ public class RaidsPlugin extends Plugin
}
}
if (client.getSetting(Setting.IN_RAID_PARTY) == -1)
if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1)
{
overlay.setScoutOverlayShown(false);
raid = null;
@@ -297,8 +297,8 @@ public class RaidsPlugin extends Plugin
if (config.pointsMessage())
{
int totalPoints = client.getSetting(Varbits.TOTAL_POINTS);
int personalPoints = client.getSetting(Varbits.PERSONAL_POINTS);
int totalPoints = client.getVar(Varbits.TOTAL_POINTS);
int personalPoints = client.getVar(Varbits.PERSONAL_POINTS);
double percentage = personalPoints / (totalPoints / 100.0);

6
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java
View File

@@ -61,8 +61,8 @@ public class RaidsPointsOverlay extends Overlay
return null;
}
int totalPoints = client.getSetting(Varbits.TOTAL_POINTS);
int personalPoints = client.getSetting(Varbits.PERSONAL_POINTS);
int totalPoints = client.getVar(Varbits.TOTAL_POINTS);
int personalPoints = client.getVar(Varbits.PERSONAL_POINTS);
panel.getLines().clear();
panel.getLines().add(new PanelComponent.Line(
@@ -72,7 +72,7 @@ public class RaidsPointsOverlay extends Overlay
client.getLocalPlayer().getName() + ":", Color.WHITE, POINTS_FORMAT.format(personalPoints), Color.WHITE
));
panel.getLines().add(new PanelComponent.Line(
"Party size:", Color.WHITE, String.valueOf(client.getSetting(Varbits.RAID_PARTY_SIZE)), Color.WHITE
"Party size:", Color.WHITE, String.valueOf(client.getVar(Varbits.RAID_PARTY_SIZE)), Color.WHITE
));
return panel.render(graphics);

4
runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java
View File

@@ -33,7 +33,7 @@ import lombok.Getter;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Prayer;
import net.runelite.api.Setting;
import net.runelite.api.VarPlayer;
import net.runelite.api.Skill;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick;
@@ -108,7 +108,7 @@ public class RegenMeterPlugin extends Plugin
@Subscribe
private void onTick(GameTick event)
{
if (client.getSetting(Setting.SPECIAL_ATTACK_PERCENT) == 1000)
if (client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT) == 1000)
{
// The recharge doesn't tick when at 100%
ticksSinceSpecRegen = 0;

2
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java
View File

@@ -103,7 +103,7 @@ public class RunecraftOverlay extends Overlay
final Rectangle bounds = item.getCanvasBounds();
final TextComponent textComponent = new TextComponent();
textComponent.setPosition(new Point(bounds.x, bounds.y + 16));
textComponent.setText(String.valueOf(client.getSetting(varbits)));
textComponent.setText(String.valueOf(client.getVar(varbits)));
textComponent.render(graphics);
}

4
runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
View File

@@ -105,14 +105,14 @@ public class RunepouchOverlay extends Overlay
{
Varbits amountVarbit = AMOUNT_VARBITS[i];
int amount = client.getSetting(amountVarbit);
int amount = client.getVar(amountVarbit);
if (amount <= 0)
{
continue;
}
Varbits runeVarbit = RUNE_VARBITS[i];
int runeId = client.getSetting(runeVarbit);
int runeId = client.getVar(runeVarbit);
Runes rune = Runes.getRune(runeId);
if (rune == null)
{

4
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -109,7 +109,7 @@ public class TimersPlugin extends Plugin
@Subscribe
public void onVarbitChange(VarbitChanged event)
{
int raidVarb = client.getSetting(Varbits.IN_RAID);
int raidVarb = client.getVar(Varbits.IN_RAID);
if (lastRaidVarb != raidVarb)
{
removeGameTimer(OVERLOAD_RAID);
@@ -321,7 +321,7 @@ public class TimersPlugin extends Plugin
if (config.showOverload() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload"))
{
if (client.getSetting(Varbits.IN_RAID) == 1)
if (client.getVar(Varbits.IN_RAID) == 1)
{
createGameTimer(OVERLOAD_RAID);
}

4
runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmSackOverlay.java
View File

@@ -65,11 +65,11 @@ class TitheFarmSackOverlay extends Overlay
{
panelComponent.getLines().add(new PanelComponent.Line(
"Fruits in sack:",
String.valueOf(client.getSetting(Varbits.TITHE_FARM_SACK_AMOUNT))
String.valueOf(client.getVar(Varbits.TITHE_FARM_SACK_AMOUNT))
));
panelComponent.getLines().add(new PanelComponent.Line(
"Points:",
String.valueOf(client.getSetting(Varbits.TITHE_FARM_POINTS))
String.valueOf(client.getVar(Varbits.TITHE_FARM_POINTS))
));
}

8
runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java
View File

@@ -30,7 +30,7 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule;
import java.util.Set;
import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.Setting;
import net.runelite.api.VarPlayer;
import net.runelite.api.Skill;
import net.runelite.api.Varbits;
import net.runelite.api.events.ConfigChanged;
@@ -85,14 +85,14 @@ public class AttackStylesPluginTest
assertTrue(warnedSkills.contains(Skill.ATTACK));
// Set mock client to attack in style that gives attack xp
when(client.getSetting(Setting.ATTACK_STYLE)).thenReturn(AttackStyle.ACCURATE.ordinal());
when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.ACCURATE.ordinal());
// verify that earning xp in a warned skill will display red text on the widget
attackPlugin.onAttackStyleChange(new VarbitChanged());
assertTrue(attackPlugin.isWarnedSkillSelected());
// Switch to attack style that doesn't give attack xp
when(client.getSetting(Setting.ATTACK_STYLE)).thenReturn(AttackStyle.AGGRESSIVE.ordinal());
when(client.getVar(VarPlayer.ATTACK_STYLE)).thenReturn(AttackStyle.AGGRESSIVE.ordinal());
// Verify the widget will now display white text
attackPlugin.onAttackStyleChange(new VarbitChanged());
@@ -123,7 +123,7 @@ public class AttackStylesPluginTest
when(strWidget.isHidden()).thenAnswer(x -> isStrHidden());
// equip type_4 weapon type on player
when(client.getSetting(Varbits.EQUIPPED_WEAPON_TYPE)).thenReturn(WeaponType.TYPE_4.ordinal());
when(client.getVar(Varbits.EQUIPPED_WEAPON_TYPE)).thenReturn(WeaponType.TYPE_4.ordinal());
attackPlugin.onEquippedWeaponTypeChange(new VarbitChanged());
// Verify there is a warned skill

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

@@ -51,7 +51,7 @@ import net.runelite.api.Player;
import net.runelite.api.Point;
import net.runelite.api.Prayer;
import net.runelite.api.Projectile;
import net.runelite.api.Setting;
import net.runelite.api.VarPlayer;
import net.runelite.api.Skill;
import net.runelite.api.SpritePixels;
import net.runelite.api.Tile;
@@ -316,17 +316,17 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public int getSetting(Setting setting)
public int getVar(VarPlayer varPlayer)
{
int[] varps = getVarps();
return varps[setting.getId()];
return varps[varPlayer.getId()];
}
@Inject
@Override
public boolean isPrayerActive(Prayer prayer)
{
return getSetting(prayer.getVarbit()) == 1;
return getVar(prayer.getVarbit()) == 1;
}
/**
@@ -380,7 +380,7 @@ public abstract class RSClientMixin implements RSClient
{
if (isResized())
{
if (getSetting(Varbits.SIDE_PANELS) == 1)
if (getVar(Varbits.SIDE_PANELS) == 1)
{
return getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE);
}

51
runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java
View File

@@ -1,51 +0,0 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* 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.VarClientInt;
import net.runelite.api.VarClientStr;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSVarcs;
@Mixin(RSVarcs.class)
public abstract class RSVarcsMixin implements RSVarcs
{
@Inject
@Override
public int getIntVar(VarClientInt var)
{
int[] varcs = getIntVarcs();
return varcs[var.getIndex()];
}
@Inject
@Override
public String getStrVar(VarClientStr var)
{
String[] varcs = getStrVarcs();
return varcs[var.getIndex()];
}
}

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

@@ -26,6 +26,8 @@ package net.runelite.mixins;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
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;
@@ -52,7 +54,7 @@ public abstract class VarbitMixin implements RSClient
@Inject
@Override
public int getSetting(Varbits varbit)
public int getVar(Varbits varbit)
{
int varbitId = varbit.getId();
return getVarbitValue(varbitId);
@@ -106,4 +108,18 @@ public abstract class VarbitMixin implements RSClient
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)
{
return getVarcs().getIntVarcs()[varClientInt.getIndex()];
}
@Inject
@Override
public String getVar(VarClientStr varClientStr)
{
return getVarcs().getStrVarcs()[varClientStr.getIndex()];
}
}

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

@@ -82,7 +82,6 @@ public interface RSClient extends RSGameEngine, Client
int[] getVarps();
@Import("varcs")
@Override
RSVarcs getVarcs();
@Import("energy")

3
runescape-api/src/main/java/net/runelite/rs/api/RSVarcs.java
View File

@@ -24,10 +24,9 @@
*/
package net.runelite.rs.api;
import net.runelite.api.Varcs;
import net.runelite.mapping.Import;
public interface RSVarcs extends Varcs
public interface RSVarcs
{
@Import("varcs")
int[] getIntVarcs();