From 2bc2e867bdc1b07be38f486193faeadfa780845f Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 9 Apr 2022 23:38:36 -0400 Subject: [PATCH] api: deprecate getVar(int) and use getVarbitValue(int) getVarbitValue was originally for external plugins which could not modify the varbits enum, but now ints are used everywhere it is no longer necessary for two separate methods --- .../main/java/net/runelite/api/Client.java | 19 +++++----- .../java/net/runelite/api/Perspective.java | 2 +- .../client/chat/ChatMessageManager.java | 6 +-- .../achievementdiary/FavourRequirement.java | 2 +- .../attackstyles/AttackStylesPlugin.java | 8 ++-- .../plugins/banktags/tabs/TabInterface.java | 2 +- .../BarbarianAssaultPlugin.java | 2 +- .../barrows/BarrowsBrotherSlainOverlay.java | 16 ++++---- .../plugins/barrows/BarrowsOverlay.java | 2 +- .../BlastFurnaceClickBoxOverlay.java | 2 +- .../BlastFurnaceCofferOverlay.java | 2 +- .../blastfurnace/BlastFurnaceOverlay.java | 2 +- .../blastmine/BlastMineOreCountOverlay.java | 10 ++--- .../chatchannel/ChatChannelPlugin.java | 4 +- .../chatcommands/ChatCommandsPlugin.java | 2 +- .../cluescrolls/ClueScrollOverlay.java | 2 +- .../plugins/cluescrolls/ClueScrollPlugin.java | 4 +- .../plugins/corp/CorpDamageOverlay.java | 2 +- .../client/plugins/corp/CorpPlugin.java | 2 +- .../cooking/CrowdsourcingCooking.java | 2 +- .../thieving/CrowdsourcingThieving.java | 8 ++-- .../crowdsourcing/zmi/CrowdsourcingZMI.java | 2 +- .../dailytaskindicators/DailyTasksPlugin.java | 38 +++++++++---------- .../plugins/driftnet/DriftNetPlugin.java | 4 +- .../plugins/experiencedrop/XpDropPlugin.java | 2 +- .../plugins/fairyring/FairyRingPlugin.java | 4 +- .../client/plugins/fishing/FishingPlugin.java | 2 +- .../plugins/herbiboars/HerbiboarPlugin.java | 6 +-- .../idlenotifier/IdleNotifierPlugin.java | 4 +- .../plugins/itemcharges/ItemChargePlugin.java | 2 +- .../plugins/itemstats/ItemStatPlugin.java | 4 +- .../plugins/itemstats/special/SpicyStew.java | 8 ++-- .../keyremapping/KeyRemappingPlugin.java | 2 +- .../kingdomofmiscellania/KingdomPlugin.java | 4 +- .../plugins/motherlode/MotherlodePlugin.java | 4 +- .../motherlode/MotherlodeSackOverlay.java | 2 +- .../client/plugins/music/MusicPlugin.java | 2 +- .../nightmarezone/NightmareZoneOverlay.java | 4 +- .../nightmarezone/NightmareZonePlugin.java | 4 +- .../opponentinfo/OpponentInfoOverlay.java | 2 +- .../pyramidplunder/PyramidPlunderOverlay.java | 4 +- .../pyramidplunder/PyramidPlunderPlugin.java | 4 +- .../pyramidplunder/PyramidPlunderTimer.java | 4 +- .../plugins/questlist/QuestListPlugin.java | 2 +- .../client/plugins/raids/RaidsOverlay.java | 2 +- .../client/plugins/raids/RaidsPlugin.java | 8 ++-- .../plugins/regenmeter/RegenMeterPlugin.java | 2 +- .../plugins/runenergy/RunEnergyPlugin.java | 2 +- .../plugins/runepouch/RunepouchOverlay.java | 4 +- .../plugins/screenshot/ScreenshotPlugin.java | 6 +-- .../client/plugins/slayer/SlayerUnlock.java | 2 +- .../plugins/statusbars/StatusBarsOverlay.java | 4 +- .../plugins/statusbars/StatusBarsPlugin.java | 2 +- .../client/plugins/timers/TimersPlugin.java | 14 +++---- .../plugins/timestamp/TimestampPlugin.java | 2 +- .../timetracking/farming/FarmingTracker.java | 8 ++-- .../client/plugins/wiki/WikiPlugin.java | 4 +- .../plugins/wintertodt/WintertodtPlugin.java | 2 +- .../worldhopper/WorldHopperPlugin.java | 4 +- .../client/plugins/xptracker/XpWorldType.java | 6 +-- .../client/ui/overlay/OverlayRenderer.java | 2 +- .../client/ui/overlay/WidgetOverlay.java | 8 ++-- .../attackstyles/AttackStylesPluginTest.java | 2 +- .../cluescrolls/ClueScrollPluginTest.java | 8 ++-- .../motherlode/MotherlodePluginTest.java | 4 +- .../screenshot/ScreenshotPluginTest.java | 6 +-- .../plugins/timers/TimersPluginTest.java | 8 ++-- .../wintertodt/WintertodtPluginTest.java | 26 ++++++------- 68 files changed, 176 insertions(+), 175 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 c86ea79529..278812d405 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -778,9 +778,19 @@ public interface Client extends OAuthApi, GameEngine * * @param varbit the varbit id * @return the value + * @see Client#getVarbitValue(int) */ + @Deprecated int getVar(@Varbit int varbit); + /** + * Gets a value corresponding to the passed varbit. + * + * @param varbit the varbit id + * @return the value + */ + int getVarbitValue(@Varbit int varbit); + /** * Gets an int value corresponding to the passed variable. * @@ -806,15 +816,6 @@ public interface Client extends OAuthApi, GameEngine @VisibleForExternalPlugins int getVarpValue(int varpId); - /** - * Gets the value of a given Varbit. - * - * @param varbitId the varbit id - * @return the value - */ - @VisibleForExternalPlugins - int getVarbitValue(@Varbit int varbitId); - /** * Gets the value of a given VarClientInt * diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java index 256355d5fc..38a86eea7b 100644 --- a/runelite-api/src/main/java/net/runelite/api/Perspective.java +++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java @@ -336,7 +336,7 @@ public class Perspective Widget minimapDrawWidget; if (client.isResized()) { - if (client.getVar(Varbits.SIDE_PANELS) == 1) + if (client.getVarbitValue(Varbits.SIDE_PANELS) == 1) { minimapDrawWidget = client.getWidget(WidgetInfo.RESIZABLE_MINIMAP_DRAW_AREA); } diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index c212b8fee5..341ae0e047 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -106,7 +106,7 @@ public class ChatMessageManager final String channel = stringStack[size - 4]; final ChatMessageType chatMessageType = messageNode.getType(); - final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; + final boolean isChatboxTransparent = client.isResized() && client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) == 1; Color usernameColor = null; Color channelColor = null; @@ -217,7 +217,7 @@ public class ChatMessageManager return; } - boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; + boolean isChatboxTransparent = client.isResized() && client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) == 1; Color usernameColor = isChatboxTransparent ? chatColorConfig.transparentPrivateUsernames() : chatColorConfig.opaquePrivateUsernames(); if (usernameColor == null) { @@ -842,7 +842,7 @@ public class ChatMessageManager @VisibleForTesting String formatRuneLiteMessage(String runeLiteFormatMessage, ChatMessageType type, boolean pmbox) { - final boolean transparentChatbox = client.getVar(Varbits.TRANSPARENT_CHATBOX) != 0; + final boolean transparentChatbox = client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) != 0; final boolean transparent = client.isResized() && transparentChatbox; final Collection chatColors = colorCache.get(type); for (ChatColor chatColor : chatColors) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java index 0ab665d90f..7e1b74994f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java @@ -64,7 +64,7 @@ public class FavourRequirement implements Requirement @Override public boolean satisfiesRequirement(Client client) { - int realFavour = client.getVar(house.getVarbit()); + int realFavour = client.getVarbitValue(house.getVarbit()); return (realFavour / 10) >= percent; } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index eecaa99843..d268bc16c7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -105,8 +105,8 @@ public class AttackStylesPlugin extends Plugin { resetWarnings(); attackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE); - equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE); - castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE); + equippedWeaponTypeVarbit = client.getVarbitValue(Varbits.EQUIPPED_WEAPON_TYPE); + castingModeVarbit = client.getVarbitValue(Varbits.DEFENSIVE_CASTING_MODE); updateAttackStyle( equippedWeaponTypeVarbit, attackStyleVarbit, @@ -174,8 +174,8 @@ public class AttackStylesPlugin extends Plugin public void onVarbitChanged(VarbitChanged event) { int currentAttackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE); - int currentEquippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE); - int currentCastingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE); + int currentEquippedWeaponTypeVarbit = client.getVarbitValue(Varbits.EQUIPPED_WEAPON_TYPE); + int currentCastingModeVarbit = client.getVarbitValue(Varbits.DEFENSIVE_CASTING_MODE); if (attackStyleVarbit != currentAttackStyleVarbit || equippedWeaponTypeVarbit != currentEquippedWeaponTypeVarbit || castingModeVarbit != currentCastingModeVarbit) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 7a1954e656..22c2f8a5f3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -788,7 +788,7 @@ public class TabInterface return; } - if (client.getVar(Varbits.BANK_REARRANGE_MODE) == 0) + if (client.getVarbitValue(Varbits.BANK_REARRANGE_MODE) == 0) { tabManager.swap(source.getName(), dest.getName()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index 61db1d7cf9..8a60a4f48a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -177,7 +177,7 @@ public class BarbarianAssaultPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - int inGame = client.getVar(Varbits.IN_GAME_BA); + int inGame = client.getVarbitValue(Varbits.IN_GAME_BA); if (inGameBit != inGame) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java index 42aabfcef3..0280aa8e5e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java @@ -70,7 +70,7 @@ class BarrowsBrotherSlainOverlay extends OverlayPanel for (BarrowsBrothers brother : BarrowsBrothers.values()) { - final boolean brotherSlain = client.getVar(brother.getKilledVarbit()) > 0; + final boolean brotherSlain = client.getVarbitValue(brother.getKilledVarbit()) > 0; String slain = brotherSlain ? "\u2713" : "\u2717"; panelComponent.getChildren().add(LineComponent.builder() .left(brother.getName()) @@ -109,12 +109,12 @@ class BarrowsBrotherSlainOverlay extends OverlayPanel private int rewardPotential() { // this is from [proc,barrows_overlay_reward] - int brothers = client.getVar(Varbits.BARROWS_KILLED_AHRIM) - + client.getVar(Varbits.BARROWS_KILLED_DHAROK) - + client.getVar(Varbits.BARROWS_KILLED_GUTHAN) - + client.getVar(Varbits.BARROWS_KILLED_KARIL) - + client.getVar(Varbits.BARROWS_KILLED_TORAG) - + client.getVar(Varbits.BARROWS_KILLED_VERAC); - return client.getVar(Varbits.BARROWS_REWARD_POTENTIAL) + brothers * 2; + int brothers = client.getVarbitValue(Varbits.BARROWS_KILLED_AHRIM) + + client.getVarbitValue(Varbits.BARROWS_KILLED_DHAROK) + + client.getVarbitValue(Varbits.BARROWS_KILLED_GUTHAN) + + client.getVarbitValue(Varbits.BARROWS_KILLED_KARIL) + + client.getVarbitValue(Varbits.BARROWS_KILLED_TORAG) + + client.getVarbitValue(Varbits.BARROWS_KILLED_VERAC); + return client.getVarbitValue(Varbits.BARROWS_REWARD_POTENTIAL) + brothers * 2; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java index b3d4d1c801..15df59b115 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java @@ -92,7 +92,7 @@ class BarrowsOverlay extends Overlay graphics.setColor(Color.black); graphics.drawString(brotherLetter, miniMapLocation.getX() + 1, miniMapLocation.getY() + 1); - if (client.getVar(brother.getKilledVarbit()) > 0) + if (client.getVarbitValue(brother.getKilledVarbit()) > 0) { graphics.setColor(config.deadBrotherLocColor()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java index 01c00107a0..be81fab7b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java @@ -60,7 +60,7 @@ class BlastFurnaceClickBoxOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - int dispenserState = client.getVar(Varbits.BAR_DISPENSER); + int dispenserState = client.getVarbitValue(Varbits.BAR_DISPENSER); if (config.showConveyorBelt() && plugin.getConveyorBelt() != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java index 1b93f8f640..37d08313e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java @@ -71,7 +71,7 @@ class BlastFurnaceCofferOverlay extends OverlayPanel if (sack != null) { - final int coffer = client.getVar(BLAST_FURNACE_COFFER); + final int coffer = client.getVarbitValue(BLAST_FURNACE_COFFER); sack.setHidden(true); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java index d24c8b4d4a..2f2205c80a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java @@ -67,7 +67,7 @@ class BlastFurnaceOverlay extends OverlayPanel for (BarsOres varbit : BarsOres.values()) { - int amount = client.getVar(varbit.getVarbit()); + int amount = client.getVarbitValue(varbit.getVarbit()); if (amount == 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java index ef9336bbee..6db7c1cfe2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java @@ -73,11 +73,11 @@ class BlastMineOreCountOverlay extends OverlayPanel if (config.showOreOverlay()) { blastMineWidget.setHidden(true); - panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.COAL, client.getVar(Varbits.BLAST_MINE_COAL)))); - panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.GOLD_ORE, client.getVar(Varbits.BLAST_MINE_GOLD)))); - panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.MITHRIL_ORE, client.getVar(Varbits.BLAST_MINE_MITHRIL)))); - panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.ADAMANTITE_ORE, client.getVar(Varbits.BLAST_MINE_ADAMANTITE)))); - panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.RUNITE_ORE, client.getVar(Varbits.BLAST_MINE_RUNITE)))); + panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.COAL, client.getVarbitValue(Varbits.BLAST_MINE_COAL)))); + panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.GOLD_ORE, client.getVarbitValue(Varbits.BLAST_MINE_GOLD)))); + panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.MITHRIL_ORE, client.getVarbitValue(Varbits.BLAST_MINE_MITHRIL)))); + panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.ADAMANTITE_ORE, client.getVarbitValue(Varbits.BLAST_MINE_ADAMANTITE)))); + panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.RUNITE_ORE, client.getVarbitValue(Varbits.BLAST_MINE_RUNITE)))); } else { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java index 7268e6aaf8..32dd1709d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java @@ -406,7 +406,7 @@ public class ChatChannelPlugin extends Plugin int rankIcon = -1; // Use configured friends chat info colors if set, otherwise default to the jagex text and fc name colors - if (client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1) + if (client.isResized() && client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) == 1) { textColor = MoreObjects.firstNonNull(chatColorConfig.transparentFriendsChatInfo(), CHAT_FC_TEXT_TRANSPARENT_BACKGROUND); channelColor = MoreObjects.firstNonNull(chatColorConfig.transparentFriendsChatChannelName(), CHAT_FC_NAME_TRANSPARENT_BACKGROUND); @@ -462,7 +462,7 @@ public class ChatChannelPlugin extends Plugin final Color textColor; // Use configured clan chat info colors if set, otherwise default to the jagex text and fc name colors - if (client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1) + if (client.isResized() && client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) == 1) { textColor = MoreObjects.firstNonNull( chatType == MemberActivity.ChatType.CLAN_CHAT ? chatColorConfig.transparentClanChatInfo() : chatColorConfig.transparentClanChatGuestInfo(), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index ec92e92d39..36cc4311d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -1128,7 +1128,7 @@ public class ChatCommandsPlugin extends Plugin private boolean gambleCountSubmit(ChatInput chatInput, String value) { - final int gc = client.getVar(Varbits.BA_GC); + final int gc = client.getVarbitValue(Varbits.BA_GC); final String playerName = client.getLocalPlayer().getName(); executor.execute(() -> diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java index 4be7a8868f..b4d21959c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java @@ -113,7 +113,7 @@ public class ClueScrollOverlay extends OverlayPanel } if (clue.isRequiresLight() - && ((clue.getFirePitVarbitId() == -1 || client.getVar(clue.getFirePitVarbitId()) != 1) + && ((clue.getFirePitVarbitId() == -1 || client.getVarbitValue(clue.getFirePitVarbitId()) != 1) && (inventoryItems == null || !HAS_LIGHT.fulfilledBy(inventoryItems)) && (equippedItems == null || !HAS_LIGHT.fulfilledBy(equippedItems)))) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 69498436ca..3114136231 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -431,13 +431,13 @@ public class ClueScrollPlugin extends Plugin List items = new ArrayList<>(RUNEPOUCH_AMOUNT_VARBITS.length); for (int i = 0; i < RUNEPOUCH_AMOUNT_VARBITS.length; i++) { - int amount = client.getVar(RUNEPOUCH_AMOUNT_VARBITS[i]); + int amount = client.getVarbitValue(RUNEPOUCH_AMOUNT_VARBITS[i]); if (amount <= 0) { continue; } - int varbId = client.getVar(RUNEPOUCH_RUNE_VARBITS[i]); + int varbId = client.getVarbitValue(RUNEPOUCH_RUNE_VARBITS[i]); RunepouchRune rune = RunepouchRune.getRune(varbId); if (rune == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java index 390d7a4270..8a158abb11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java @@ -79,7 +79,7 @@ class CorpDamageOverlay extends OverlayPanel return null; } - int myDamage = client.getVar(Varbits.CORP_DAMAGE); + int myDamage = client.getVarbitValue(Varbits.CORP_DAMAGE); int totalDamage = corpPlugin.getTotalDamage(); int players = corpPlugin.getPlayers().size(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 9cd17b047c..dda20fd608 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -235,7 +235,7 @@ public class CorpPlugin extends Plugin { if (corp != null) { - int myDamage = client.getVar(Varbits.CORP_DAMAGE); + int myDamage = client.getVarbitValue(Varbits.CORP_DAMAGE); // avoid resetting our counter when the client's is reset if (myDamage > 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java index 24e82b70f5..f461bdee5b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java @@ -99,7 +99,7 @@ public class CrowdsourcingCooking int cookingLevel = client.getBoostedSkillLevel(Skill.COOKING); boolean hasCookingGauntlets = hasCookingGauntlets(); - boolean kourendElite = client.getVar(Varbits.DIARY_KOUREND_ELITE) == 1; + boolean kourendElite = client.getVarbitValue(Varbits.DIARY_KOUREND_ELITE) == 1; CookingData data = new CookingData(message, hasCookingGauntlets, inHosidiusKitchen, kourendElite, lastGameObjectClicked, cookingLevel); manager.storeEvent(data); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/thieving/CrowdsourcingThieving.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/thieving/CrowdsourcingThieving.java index 698e359265..4a58c97a66 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/thieving/CrowdsourcingThieving.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/thieving/CrowdsourcingThieving.java @@ -82,10 +82,10 @@ public class CrowdsourcingThieving private int getArdougneDiary() { - int easy = client.getVar(Varbits.DIARY_ARDOUGNE_EASY); - int medium = client.getVar(Varbits.DIARY_ARDOUGNE_MEDIUM); - int hard = client.getVar(Varbits.DIARY_ARDOUGNE_HARD); - int elite = client.getVar(Varbits.DIARY_ARDOUGNE_ELITE); + int easy = client.getVarbitValue(Varbits.DIARY_ARDOUGNE_EASY); + int medium = client.getVarbitValue(Varbits.DIARY_ARDOUGNE_MEDIUM); + int hard = client.getVarbitValue(Varbits.DIARY_ARDOUGNE_HARD); + int elite = client.getVarbitValue(Varbits.DIARY_ARDOUGNE_ELITE); return easy + 2 * medium + 4 * hard + 8 * elite; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java index 669be22f22..d001d03555 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java @@ -127,7 +127,7 @@ public class CrowdsourcingZMI } int tickDelta = itemContainerChangedTick - illegalActionTick; - boolean ardougneMedium = client.getVar(Varbits.DIARY_ARDOUGNE_MEDIUM) == 1; + boolean ardougneMedium = client.getVarbitValue(Varbits.DIARY_ARDOUGNE_MEDIUM) == 1; int runecraftBoostedLevel = client.getBoostedSkillLevel(Skill.RUNECRAFT); Multiset currentInventorySnapshot = getInventorySnapshot(); final Multiset itemsReceived = Multisets.difference(currentInventorySnapshot, previousInventorySnapshot); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java index aee48ee463..768b7c6dc9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java @@ -171,7 +171,7 @@ public class DailyTasksPlugin extends Plugin { if (client.getAccountType() == AccountType.NORMAL && client.getVar(VarPlayer.NMZ_REWARD_POINTS) >= HERB_BOX_COST - && (client.getVar(Varbits.DAILY_HERB_BOXES_COLLECTED) < HERB_BOX_MAX + && (client.getVarbitValue(Varbits.DAILY_HERB_BOXES_COLLECTED) < HERB_BOX_MAX || dailyReset)) { sendChatMessage(HERB_BOX_MESSAGE); @@ -180,8 +180,8 @@ public class DailyTasksPlugin extends Plugin private void checkStaves(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_VARROCK_EASY) == 1 - && (client.getVar(Varbits.DAILY_STAVES_COLLECTED) == 0 + if (client.getVarbitValue(Varbits.DIARY_VARROCK_EASY) == 1 + && (client.getVarbitValue(Varbits.DAILY_STAVES_COLLECTED) == 0 || dailyReset)) { sendChatMessage(STAVES_MESSAGE); @@ -190,8 +190,8 @@ public class DailyTasksPlugin extends Plugin private void checkEssence(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_ARDOUGNE_MEDIUM) == 1 - && (client.getVar(Varbits.DAILY_ESSENCE_COLLECTED) == 0 + if (client.getVarbitValue(Varbits.DIARY_ARDOUGNE_MEDIUM) == 1 + && (client.getVarbitValue(Varbits.DAILY_ESSENCE_COLLECTED) == 0 || dailyReset)) { sendChatMessage(ESSENCE_MESSAGE); @@ -200,8 +200,8 @@ public class DailyTasksPlugin extends Plugin private void checkRunes(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_WILDERNESS_EASY) == 1 - && (client.getVar(Varbits.DAILY_RUNES_COLLECTED) == 0 + if (client.getVarbitValue(Varbits.DIARY_WILDERNESS_EASY) == 1 + && (client.getVarbitValue(Varbits.DAILY_RUNES_COLLECTED) == 0 || dailyReset)) { sendChatMessage(RUNES_MESSAGE); @@ -211,8 +211,8 @@ public class DailyTasksPlugin extends Plugin private void checkSand(boolean dailyReset) { if (client.getAccountType() != AccountType.ULTIMATE_IRONMAN - && client.getVar(Varbits.QUEST_THE_HAND_IN_THE_SAND) >= SAND_QUEST_COMPLETE - && (client.getVar(Varbits.DAILY_SAND_COLLECTED) == 0 + && client.getVarbitValue(Varbits.QUEST_THE_HAND_IN_THE_SAND) >= SAND_QUEST_COMPLETE + && (client.getVarbitValue(Varbits.DAILY_SAND_COLLECTED) == 0 || dailyReset)) { sendChatMessage(SAND_MESSAGE); @@ -221,8 +221,8 @@ public class DailyTasksPlugin extends Plugin private void checkFlax(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_KANDARIN_EASY) == 1 - && (client.getVar(Varbits.DAILY_FLAX_STATE) == 0 + if (client.getVarbitValue(Varbits.DIARY_KANDARIN_EASY) == 1 + && (client.getVarbitValue(Varbits.DAILY_FLAX_STATE) == 0 || dailyReset)) { sendChatMessage(FLAX_MESSAGE); @@ -231,8 +231,8 @@ public class DailyTasksPlugin extends Plugin private void checkArrows(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_WESTERN_EASY) == 1 - && (client.getVar(Varbits.DAILY_ARROWS_STATE) == 0 + if (client.getVarbitValue(Varbits.DIARY_WESTERN_EASY) == 1 + && (client.getVarbitValue(Varbits.DAILY_ARROWS_STATE) == 0 || dailyReset)) { sendChatMessage(ARROWS_MESSAGE); @@ -241,14 +241,14 @@ public class DailyTasksPlugin extends Plugin private void checkBonemeal(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_MORYTANIA_MEDIUM) == 1) + if (client.getVarbitValue(Varbits.DIARY_MORYTANIA_MEDIUM) == 1) { - int collected = client.getVar(Varbits.DAILY_BONEMEAL_STATE); + int collected = client.getVarbitValue(Varbits.DAILY_BONEMEAL_STATE); int max = BONEMEAL_PER_DIARY; - if (client.getVar(Varbits.DIARY_MORYTANIA_HARD) == 1) + if (client.getVarbitValue(Varbits.DIARY_MORYTANIA_HARD) == 1) { max += BONEMEAL_PER_DIARY; - if (client.getVar(Varbits.DIARY_MORYTANIA_ELITE) == 1) + if (client.getVarbitValue(Varbits.DIARY_MORYTANIA_ELITE) == 1) { max += BONEMEAL_PER_DIARY; } @@ -262,8 +262,8 @@ public class DailyTasksPlugin extends Plugin private void checkDynamite(boolean dailyReset) { - if (client.getVar(Varbits.DIARY_KOUREND_MEDIUM) == 1 - && (client.getVar(Varbits.DAILY_DYNAMITE_COLLECTED) == 0 + if (client.getVarbitValue(Varbits.DIARY_KOUREND_MEDIUM) == 1 + && (client.getVarbitValue(Varbits.DAILY_DYNAMITE_COLLECTED) == 0 || dailyReset)) { sendChatMessage(DYNAMITE_MESSAGE); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/driftnet/DriftNetPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/driftnet/DriftNetPlugin.java index b7eecf2545..7da55f877b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/driftnet/DriftNetPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/driftnet/DriftNetPlugin.java @@ -198,8 +198,8 @@ public class DriftNetPlugin extends Plugin for (DriftNet net : NETS) { - DriftNetStatus status = DriftNetStatus.of(client.getVar(net.getStatusVarbit())); - int count = client.getVar(net.getCountVarbit()); + DriftNetStatus status = DriftNetStatus.of(client.getVarbitValue(net.getStatusVarbit())); + int count = client.getVarbitValue(net.getCountVarbit()); net.setStatus(status); net.setCount(count); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index 419c90b242..309c308db5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -161,7 +161,7 @@ public class XpDropPlugin extends Plugin else { EnumComposition colorEnum = client.getEnum(EnumID.XPDROP_COLORS); - int defaultColorId = client.getVar(Varbits.EXPERIENCE_DROP_COLOR); + int defaultColorId = client.getVarbitValue(Varbits.EXPERIENCE_DROP_COLOR); int color = colorEnum.getIntValue(defaultColorId); widget.setTextColor(color); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java index 28e480ba34..a338fefb03 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java @@ -171,8 +171,8 @@ public class FairyRingPlugin extends Plugin String destination; try { - FairyRings fairyRingDestination = getFairyRingDestination(client.getVar(Varbits.FAIRY_RING_DIAL_ADCB), - client.getVar(Varbits.FAIRY_RIGH_DIAL_ILJK), client.getVar(Varbits.FAIRY_RING_DIAL_PSRQ)); + FairyRings fairyRingDestination = getFairyRingDestination(client.getVarbitValue(Varbits.FAIRY_RING_DIAL_ADCB), + client.getVarbitValue(Varbits.FAIRY_RIGH_DIAL_ILJK), client.getVarbitValue(Varbits.FAIRY_RING_DIAL_PSRQ)); destination = fairyRingDestination.getDestination(); } catch (IllegalArgumentException ex) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index 8ade1cc5f1..7582517cfe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -387,7 +387,7 @@ public class FishingPlugin extends Plugin return; } - int trawlerContribution = client.getVar(Varbits.FISHING_TRAWLER_ACTIVITY); + int trawlerContribution = client.getVarbitValue(Varbits.FISHING_TRAWLER_ACTIVITY); trawlerContributionWidget.setText("Contribution: " + trawlerContribution); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java index ce1a67eda6..9623d65020 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java @@ -199,7 +199,7 @@ public class HerbiboarPlugin extends Plugin { for (TrailToSpot trail : spot.getTrails()) { - int value = client.getVar(trail.getVarbitId()); + int value = client.getVarbitValue(trail.getVarbitId()); if (value == trail.getValue()) { @@ -222,11 +222,11 @@ public class HerbiboarPlugin extends Plugin } } - finishId = client.getVar(Varbits.HB_FINISH); + finishId = client.getVarbitValue(Varbits.HB_FINISH); // The started varbit doesn't get set until the first spot of the rotation has been searched // so we need to use the current group as an indicator of the rotation being started - started = client.getVar(Varbits.HB_STARTED) > 0 || currentGroup != null; + started = client.getVarbitValue(Varbits.HB_STARTED) > 0 || currentGroup != null; boolean finished = !pathActive && started; if (!wasStarted && started) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index ddcdd5fa92..c8bed9c9db 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -535,7 +535,7 @@ public class IdleNotifierPlugin extends Plugin { return false; } - if (config.getOxygenThreshold() >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1) + if (config.getOxygenThreshold() >= client.getVarbitValue(Varbits.OXYGEN_LEVEL) * 0.1) { if (!notifyOxygen) { @@ -558,7 +558,7 @@ public class IdleNotifierPlugin extends Plugin } if (client.getRealSkillLevel(Skill.HITPOINTS) > config.getHitpointsThreshold()) { - if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= config.getHitpointsThreshold()) + if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVarbitValue(Varbits.NMZ_ABSORPTION) <= config.getHitpointsThreshold()) { if (!notifyHitpoints) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 600b493fa8..89ec2dff05 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -471,7 +471,7 @@ public class ItemChargePlugin extends Plugin @Subscribe private void onVarbitChanged(VarbitChanged event) { - int explorerRingCharge = client.getVar(Varbits.EXPLORER_RING_ALCHS); + int explorerRingCharge = client.getVarbitValue(Varbits.EXPLORER_RING_ALCHS); if (lastExplorerRingCharge != explorerRingCharge) { lastExplorerRingCharge = explorerRingCharge; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java index 62271135d9..e96ded89b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java @@ -157,7 +157,7 @@ public class ItemStatPlugin extends Plugin if (event.getScriptId() == ScriptID.GE_OFFERS_SETUP_BUILD && config.geStats()) { int currentGeItem = client.getVar(VarPlayer.CURRENT_GE_ITEM); - if (currentGeItem != -1 && client.getVar(Varbits.GE_OFFER_CREATION_TYPE) == 0) + if (currentGeItem != -1 && client.getVarbitValue(Varbits.GE_OFFER_CREATION_TYPE) == 0) { createItemInformation(currentGeItem); } @@ -413,7 +413,7 @@ public class ItemStatPlugin extends Plugin { if (client.isResized()) { - if (client.getVar(Varbits.SIDE_PANELS) == 1) + if (client.getVarbitValue(Varbits.SIDE_PANELS) == 1) { return client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_CONTAINER); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java index 7eee548751..6533b6ac15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java @@ -41,10 +41,10 @@ public class SpicyStew implements Effect /* * Spice boosts listed in the colour order of [Spicy stew -> Smell] */ - 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)); + int redBoost = spiceBoostOf(client.getVarbitValue(Varbits.SPICY_STEW_RED_SPICES)); + int yellowBoost = spiceBoostOf(client.getVarbitValue(Varbits.SPICY_STEW_YELLOW_SPICES)); + int orangeBoost = spiceBoostOf(client.getVarbitValue(Varbits.SPICY_STEW_ORANGE_SPICES)); + int brownBoost = spiceBoostOf(client.getVarbitValue(Varbits.SPICY_STEW_BROWN_SPICES)); List changes = new ArrayList<>(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 5e9628f726..4259220768 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -192,7 +192,7 @@ public class KeyRemappingPlugin extends Plugin { if (client.getGameState() == GameState.LOGGED_IN) { - final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; + final boolean isChatboxTransparent = client.isResized() && client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) == 1; final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND; setChatboxWidgetInput(chatboxInput, ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor)); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java index bae9b177bf..957805e2fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java @@ -110,8 +110,8 @@ public class KingdomPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - final int coffer = client.getVar(Varbits.KINGDOM_COFFER); - final int approval = client.getVar(Varbits.KINGDOM_APPROVAL); + final int coffer = client.getVarbitValue(Varbits.KINGDOM_COFFER); + final int approval = client.getVarbitValue(Varbits.KINGDOM_APPROVAL); if (client.getGameState() == GameState.LOGGED_IN && isThroneOfMiscellaniaCompleted() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index ffdb03717e..a40ba17880 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -490,8 +490,8 @@ public class MotherlodePlugin extends Plugin private void refreshSackValues() { - curSackSize = client.getVar(Varbits.SACK_NUMBER); - boolean sackUpgraded = client.getVar(Varbits.SACK_UPGRADED) == 1; + curSackSize = client.getVarbitValue(Varbits.SACK_NUMBER); + boolean sackUpgraded = client.getVarbitValue(Varbits.SACK_UPGRADED) == 1; maxSackSize = sackUpgraded ? SACK_LARGE_SIZE : SACK_SIZE; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java index c69f09f6fe..3d7f91471a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java @@ -85,7 +85,7 @@ class MotherlodeSackOverlay extends OverlayPanel panelComponent.getChildren().add(LineComponent.builder() .left("Pay-dirt in sack:") - .right(String.valueOf(client.getVar(Varbits.SACK_NUMBER))) + .right(String.valueOf(client.getVarbitValue(Varbits.SACK_NUMBER))) .build()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java index a5bace7d42..5e02dedc17 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java @@ -826,7 +826,7 @@ public class MusicPlugin extends Plugin int raw = client.getVar(var); if (raw == 0) { - raw = -client.getVar(mutedVarbitId); + raw = -client.getVarbitValue(mutedVarbitId); } value = raw * this.max / 100; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java index 4ad21005b2..3d62afe194 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java @@ -93,7 +93,7 @@ class NightmareZoneOverlay extends OverlayPanel renderAbsorptionCounter(); - final int currentPoints = client.getVar(Varbits.NMZ_POINTS); + final int currentPoints = client.getVarbitValue(Varbits.NMZ_POINTS); final int totalPoints = currentPoints + client.getVar(VarPlayer.NMZ_REWARD_POINTS); panelComponent.getChildren().add(LineComponent.builder() @@ -114,7 +114,7 @@ class NightmareZoneOverlay extends OverlayPanel private void renderAbsorptionCounter() { - int absorptionPoints = client.getVar(Varbits.NMZ_ABSORPTION); + int absorptionPoints = client.getVarbitValue(Varbits.NMZ_ABSORPTION); if (absorptionPoints == 0) { if (absorptionCounter != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index f95e2ab8a6..6e2e361f12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -244,7 +244,7 @@ public class NightmareZonePlugin extends Plugin private void checkAbsorption() { - int absorptionPoints = client.getVar(Varbits.NMZ_ABSORPTION); + int absorptionPoints = client.getVarbitValue(Varbits.NMZ_ABSORPTION); if (!absorptionNotificationSend) { @@ -266,7 +266,7 @@ public class NightmareZonePlugin extends Plugin private int calculatePointsPerHour() { Instant now = Instant.now(); - final int currentPoints = client.getVar(Varbits.NMZ_POINTS); + final int currentPoints = client.getVarbitValue(Varbits.NMZ_POINTS); if (nmzSessionStartTime == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java index 48989d2d29..7735a053cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java @@ -226,7 +226,7 @@ class OpponentInfoOverlay extends OverlayPanel */ private boolean hasHpHud(Actor opponent) { - boolean settingEnabled = client.getVar(Varbits.BOSS_HEALTH_OVERLAY) == 0; + boolean settingEnabled = client.getVarbitValue(Varbits.BOSS_HEALTH_OVERLAY) == 0; if (settingEnabled && opponent instanceof NPC) { int opponentId = client.getVar(VarPlayer.HP_HUD_NPC_ID); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java index 6f11cde829..92bda8bf40 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java @@ -85,7 +85,7 @@ class PyramidPlunderOverlay extends Overlay LocalPoint playerLocation = client.getLocalPlayer().getLocalLocation(); // Highlight convex hulls of urns, chests, and sarcophagus - int currentFloor = client.getVar(Varbits.PYRAMID_PLUNDER_ROOM); + int currentFloor = client.getVarbitValue(Varbits.PYRAMID_PLUNDER_ROOM); for (GameObject object : plugin.getObjectsToHighlight()) { if (config.highlightUrnsFloor() > currentFloor && URN_IDS.contains(object.getId()) @@ -127,7 +127,7 @@ class PyramidPlunderOverlay extends Overlay if (SPEARTRAP_ID == object.getId()) { // this varbit is set to 1 when you enter a room and 0 once you get passed the spike traps - if (client.getVar(Varbits.PYRAMID_PLUNDER_ROOM_LOCATION) != 1) + if (client.getVarbitValue(Varbits.PYRAMID_PLUNDER_ROOM_LOCATION) != 1) { return; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index ef8c04e481..97b3490d28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -171,7 +171,7 @@ public class PyramidPlunderPlugin extends Plugin { if (timer == null) { - int ppTimer = client.getVar(Varbits.PYRAMID_PLUNDER_TIMER); + int ppTimer = client.getVarbitValue(Varbits.PYRAMID_PLUNDER_TIMER); Duration remaining = PYRAMID_PLUNDER_DURATION.minus(ppTimer, RSTimeUnit.GAME_TICKS); timer = new PyramidPlunderTimer(remaining, itemManager.getImage(PHARAOHS_SCEPTRE), this, config, client); @@ -217,6 +217,6 @@ public class PyramidPlunderPlugin extends Plugin { return client.getLocalPlayer() != null && PYRAMID_PLUNDER_REGION == client.getLocalPlayer().getWorldLocation().getRegionID() - && client.getVar(Varbits.PYRAMID_PLUNDER_TIMER) > 0; + && client.getVarbitValue(Varbits.PYRAMID_PLUNDER_TIMER) > 0; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java index b1b9e35493..2e8118be6e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java @@ -61,8 +61,8 @@ class PyramidPlunderTimer extends Timer @Override public String getTooltip() { - int floor = client.getVar(Varbits.PYRAMID_PLUNDER_ROOM); - int thievingLevel = client.getVar(Varbits.PYRAMID_PLUNDER_THIEVING_LEVEL); + int floor = client.getVarbitValue(Varbits.PYRAMID_PLUNDER_ROOM); + int thievingLevel = client.getVarbitValue(Varbits.PYRAMID_PLUNDER_THIEVING_LEVEL); return String.format("Time remaining. Floor: %d. Thieving level: %d", floor, thievingLevel); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java index 49bc77d81c..fa480da2db 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java @@ -166,7 +166,7 @@ public class QuestListPlugin extends Plugin private boolean isOnQuestTab() { - return client.getVar(Varbits.QUEST_TAB) == 0 && client.getVar(VarClientInt.INVENTORY_TAB) == 2; + return client.getVarbitValue(Varbits.QUEST_TAB) == 0 && client.getVar(VarClientInt.INVENTORY_TAB) == 2; } private boolean isChatboxOpen() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 7b750f1c63..4a7031a068 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -206,7 +206,7 @@ class RaidsOverlay extends OverlayPanel if (plugin.isInRaidChambers()) { // If the raid has started - if (client.getVar(Varbits.RAID_STATE) > 0) + if (client.getVarbitValue(Varbits.RAID_STATE) > 0) { if (client.getPlane() == OLM_PLANE) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index dd1b96bd3f..382828dfcb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -264,7 +264,7 @@ public class RaidsPlugin extends Plugin public void onVarbitChanged(VarbitChanged event) { int tempPartyID = client.getVar(VarPlayer.IN_RAID_PARTY); - boolean tempInRaid = client.getVar(Varbits.IN_RAID) == 1; + boolean tempInRaid = client.getVarbitValue(Varbits.IN_RAID) == 1; // if the player's party state has changed if (tempPartyID != raidPartyID) @@ -321,8 +321,8 @@ public class RaidsPlugin extends Plugin if (config.pointsMessage()) { - int totalPoints = client.getVar(Varbits.TOTAL_POINTS); - int personalPoints = client.getVar(Varbits.PERSONAL_POINTS); + int totalPoints = client.getVarbitValue(Varbits.TOTAL_POINTS); + int personalPoints = client.getVarbitValue(Varbits.PERSONAL_POINTS); double percentage = personalPoints / (totalPoints / 100.0); @@ -425,7 +425,7 @@ public class RaidsPlugin extends Plugin return; } - inRaidChambers = client.getVar(Varbits.IN_RAID) == 1; + inRaidChambers = client.getVarbitValue(Varbits.IN_RAID) == 1; if (!inRaidChambers) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java index 2160148401..a3ddc957b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java @@ -144,7 +144,7 @@ public class RegenMeterPlugin extends Plugin ticksPerHPRegen /= 2; } - if (client.getVar(Varbits.LEAGUE_RELIC_3) == TRAILBLAZER_LEAGUE_FLUID_STRIKES_RELIC) + if (client.getVarbitValue(Varbits.LEAGUE_RELIC_3) == TRAILBLAZER_LEAGUE_FLUID_STRIKES_RELIC) { ticksPerHPRegen /= 4; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java index a331eb5efc..c14fd67d99 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java @@ -215,7 +215,7 @@ public class RunEnergyPlugin extends Plugin final int effectiveWeight = Math.max(client.getWeight(), 0); double lossRate = (Math.min(effectiveWeight, 64) / 100.0) + 0.64; - if (client.getVar(Varbits.RUN_SLOWED_DEPLETION_ACTIVE) != 0) + if (client.getVarbitValue(Varbits.RUN_SLOWED_DEPLETION_ACTIVE) != 0) { lossRate *= 0.3; // Stamina effect reduces energy depletion to 30% } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java index 812c700a4c..65aef7813b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java @@ -90,14 +90,14 @@ public class RunepouchOverlay extends WidgetItemOverlay for (int i = 0; i < AMOUNT_VARBITS.length; i++) { @Varbit int amountVarbit = AMOUNT_VARBITS[i]; - int amount = client.getVar(amountVarbit); + int amount = client.getVarbitValue(amountVarbit); if (amount <= 0) { continue; } @Varbit int runeVarbit = RUNE_VARBITS[i]; - int runeId = client.getVar(runeVarbit); + int runeId = client.getVarbitValue(runeVarbit); RunepouchRune rune = RunepouchRune.getRune(runeId); if (rune == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index f9ecc59d02..365be120f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -490,14 +490,14 @@ public class ScreenshotPlugin extends Plugin } } - if (config.screenshotCollectionLogEntries() && chatMessage.startsWith(COLLECTION_LOG_TEXT) && client.getVar(Varbits.COLLECTION_LOG_NOTIFICATION) == 1) + if (config.screenshotCollectionLogEntries() && chatMessage.startsWith(COLLECTION_LOG_TEXT) && client.getVarbitValue(Varbits.COLLECTION_LOG_NOTIFICATION) == 1) { String entry = Text.removeTags(chatMessage).substring(COLLECTION_LOG_TEXT.length()); String fileName = "Collection log (" + entry + ")"; takeScreenshot(fileName, SD_COLLECTION_LOG); } - if (chatMessage.contains("combat task") && config.screenshotCombatAchievements() && client.getVar(Varbits.COMBAT_ACHIEVEMENTS_POPUP) == 1) + if (chatMessage.contains("combat task") && config.screenshotCombatAchievements() && client.getVarbitValue(Varbits.COMBAT_ACHIEVEMENTS_POPUP) == 1) { String fileName = parseCombatAchievementWidget(chatMessage); if (!fileName.isEmpty()) @@ -663,7 +663,7 @@ public class ScreenshotPlugin extends Plugin String fileName = "Collection log (" + entry + ")"; takeScreenshot(fileName, SD_COLLECTION_LOG); } - if (topText.equalsIgnoreCase("Combat Task Completed!") && config.screenshotCombatAchievements() && client.getVar(Varbits.COMBAT_ACHIEVEMENTS_POPUP) == 0) + if (topText.equalsIgnoreCase("Combat Task Completed!") && config.screenshotCombatAchievements() && client.getVarbitValue(Varbits.COMBAT_ACHIEVEMENTS_POPUP) == 0) { String entry = Text.removeTags(bottomText).substring("Task Completed: ".length()); String fileName = "Combat task (" + entry.replaceAll("[:?]", "") + ")"; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerUnlock.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerUnlock.java index e59e670de2..ac97567911 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerUnlock.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerUnlock.java @@ -123,7 +123,7 @@ enum SlayerUnlock { return true; } - return client.getVar(toggleVarbit) == 0; + return client.getVarbitValue(toggleVarbit) == 0; } return false; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java index b08a1d5331..5b8310ed49 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java @@ -135,7 +135,7 @@ class StatusBarsOverlay extends Overlay return DISEASE_COLOR; } - if (client.getVar(Varbits.PARASITE) >= 1) + if (client.getVarbitValue(Varbits.PARASITE) >= 1) { return PARASITE_COLOR; } @@ -193,7 +193,7 @@ class StatusBarsOverlay extends Overlay () -> getRestoreValue("Run Energy"), () -> { - if (client.getVar(Varbits.RUN_SLOWED_DEPLETION_ACTIVE) != 0) + if (client.getVarbitValue(Varbits.RUN_SLOWED_DEPLETION_ACTIVE) != 0) { return RUN_STAMINA_COLOR; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index 21e9553b5d..7659b01f20 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -123,7 +123,7 @@ public class StatusBarsPlugin extends Plugin barsDisplayed = true; } else if ((interacting instanceof NPC && ArrayUtils.contains(((NPC) interacting).getComposition().getActions(), "Attack")) - || (interacting instanceof Player && client.getVar(Varbits.PVP_SPEC_ORB) == 1)) + || (interacting instanceof Player && client.getVarbitValue(Varbits.PVP_SPEC_ORB) == 1)) { lastCombatActionTickCount = client.getTickCount(); barsDisplayed = true; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 6f9efd63c4..528aeadf6e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -206,13 +206,13 @@ public class TimersPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged event) { - int raidVarb = client.getVar(Varbits.IN_RAID); - int vengCooldownVarb = client.getVar(Varbits.VENGEANCE_COOLDOWN); - int isVengeancedVarb = client.getVar(Varbits.VENGEANCE_ACTIVE); + int raidVarb = client.getVarbitValue(Varbits.IN_RAID); + int vengCooldownVarb = client.getVarbitValue(Varbits.VENGEANCE_COOLDOWN); + int isVengeancedVarb = client.getVarbitValue(Varbits.VENGEANCE_ACTIVE); int poisonVarp = client.getVar(VarPlayer.POISON); - int pvpVarb = client.getVar(Varbits.PVP_SPEC_ORB); - int corruptionCooldownVarb = client.getVar(Varbits.CORRUPTION_COOLDOWN); - int imbuedHeartCooldownVarb = client.getVar(Varbits.IMBUED_HEART_COOLDOWN); + int pvpVarb = client.getVarbitValue(Varbits.PVP_SPEC_ORB); + int corruptionCooldownVarb = client.getVarbitValue(Varbits.CORRUPTION_COOLDOWN); + int imbuedHeartCooldownVarb = client.getVarbitValue(Varbits.IMBUED_HEART_COOLDOWN); if (lastRaidVarb != raidVarb) { @@ -576,7 +576,7 @@ public class TimersPlugin extends Plugin if (config.showOverload() && message.startsWith("You drink some of your") && message.contains("overload")) { - if (client.getVar(Varbits.IN_RAID) == 1) + if (client.getVarbitValue(Varbits.IN_RAID) == 1) { createGameTimer(OVERLOAD_RAID); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index d65fe2e2e9..999d3146b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -128,7 +128,7 @@ public class TimestampPlugin extends Plugin private Color getTimestampColour() { - boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1; + boolean isChatboxTransparent = client.isResized() && client.getVarbitValue(Varbits.TRANSPARENT_CHATBOX) == 1; return isChatboxTransparent ? config.transparentTimestamp() : config.opaqueTimestamp(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java index baa5103762..ce739768e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java @@ -111,7 +111,7 @@ public class FarmingTracker } { - String autoweed = Integer.toString(client.getVar(Varbits.AUTOWEED)); + String autoweed = Integer.toString(client.getVarbitValue(Varbits.AUTOWEED)); if (!autoweed.equals(configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.AUTOWEED))) { configManager.setRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.AUTOWEED, autoweed); @@ -120,7 +120,7 @@ public class FarmingTracker } { - boolean botanist = client.getVar(Varbits.LEAGUE_RELIC_5) == 1; + boolean botanist = client.getVarbitValue(Varbits.LEAGUE_RELIC_5) == 1; if (!Boolean.valueOf(botanist).equals(configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.BOTANIST, Boolean.class))) { configManager.setRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, TimeTrackingConfig.BOTANIST, botanist); @@ -146,7 +146,7 @@ public class FarmingTracker // Write the config value if it doesn't match what is current, or it is more than 5 minutes old int varbit = patch.getVarbit(); String key = patch.configKey(); - String strVarbit = Integer.toString(client.getVar(varbit)); + String strVarbit = Integer.toString(client.getVarbitValue(varbit)); String storedValue = configManager.getRSProfileConfiguration(TimeTrackingConfig.CONFIG_GROUP, key); if (storedValue != null) @@ -173,7 +173,7 @@ public class FarmingTracker else if (!newRegionLoaded && timeSinceModalClose > 1) { PatchState previousPatchState = patch.getImplementation().forVarbitValue(Integer.parseInt(parts[0])); - PatchState currentPatchState = patch.getImplementation().forVarbitValue(client.getVar(varbit)); + PatchState currentPatchState = patch.getImplementation().forVarbitValue(client.getVarbitValue(varbit)); if (previousPatchState == null || currentPatchState == null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index 9ac225d4ba..c5d6442ab4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -131,7 +131,7 @@ public class WikiPlugin extends Plugin children[0] = null; Widget vanilla = client.getWidget(WidgetInfo.MINIMAP_WIKI_BANNER); - if (vanilla != null && client.getVar(Varbits.WIKI_ENTITY_LOOKUP) == 0) + if (vanilla != null && client.getVarbitValue(Varbits.WIKI_ENTITY_LOOKUP) == 0) { vanilla.setHidden(false); } @@ -157,7 +157,7 @@ public class WikiPlugin extends Plugin return; } - if (client.getVar(Varbits.WIKI_ENTITY_LOOKUP) == 1) // disabled + if (client.getVarbitValue(Varbits.WIKI_ENTITY_LOOKUP) == 1) // disabled { // when the wiki entity lookup option is disabled the banner parent layer, // which is used for var transmit events, is not positioned. This is copied diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index bc7d374c60..2a82f5def2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -194,7 +194,7 @@ public class WintertodtPlugin extends Plugin @Subscribe public void onVarbitChanged(VarbitChanged varbitChanged) { - int timerValue = client.getVar(Varbits.WINTERTODT_TIMER); + int timerValue = client.getVarbitValue(Varbits.WINTERTODT_TIMER); if (timerValue != previousTimerValue) { int timeToNotify = config.roundNotification(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 109095545b..56c1c0879c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -335,8 +335,8 @@ public class WorldHopperPlugin extends Plugin int old1 = favoriteWorld1; int old2 = favoriteWorld2; - favoriteWorld1 = client.getVar(Varbits.WORLDHOPPER_FAVROITE_1); - favoriteWorld2 = client.getVar(Varbits.WORLDHOPPER_FAVROITE_2); + favoriteWorld1 = client.getVarbitValue(Varbits.WORLDHOPPER_FAVROITE_1); + favoriteWorld2 = client.getVarbitValue(Varbits.WORLDHOPPER_FAVROITE_2); if (old1 != favoriteWorld1 || old2 != favoriteWorld2) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java index 909a7de841..c1aa9d1325 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java @@ -45,15 +45,15 @@ enum XpWorldType @Override int modifier(Client client) { - if (client.getVar(Varbits.LEAGUE_RELIC_6) != 0) + if (client.getVarbitValue(Varbits.LEAGUE_RELIC_6) != 0) { return 16; } - if (client.getVar(Varbits.LEAGUE_RELIC_4) != 0) + if (client.getVarbitValue(Varbits.LEAGUE_RELIC_4) != 0) { return 12; } - if (client.getVar(Varbits.LEAGUE_RELIC_2) != 0) + if (client.getVarbitValue(Varbits.LEAGUE_RELIC_2) != 0) { return 8; } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index d673faba77..d92ef65e72 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -848,7 +848,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener { if (client.isResized()) { - if (client.getVar(Varbits.SIDE_PANELS) == 1) + if (client.getVarbitValue(Varbits.SIDE_PANELS) == 1) { return client.getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE); } diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index 0d854ab91d..7a4816a0f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -209,8 +209,8 @@ public class WidgetOverlay extends Overlay { // The xptracker component layer isn't hidden if the counter and process bar are both configured "Off", // it just has its children hidden. - if (client.getVar(Varbits.EXPERIENCE_TRACKER_COUNTER) == 30 // Off - && client.getVar(Varbits.EXPERIENCE_TRACKER_PROGRESS_BAR) == 0) // Off + if (client.getVarbitValue(Varbits.EXPERIENCE_TRACKER_COUNTER) == 30 // Off + && client.getVarbitValue(Varbits.EXPERIENCE_TRACKER_PROGRESS_BAR) == 0) // Off { return null; } @@ -234,7 +234,7 @@ public class WidgetOverlay extends Overlay } OverlayPosition position; - switch (client.getVar(Varbits.EXPERIENCE_TRACKER_POSITION)) + switch (client.getVarbitValue(Varbits.EXPERIENCE_TRACKER_POSITION)) { case 0: default: @@ -269,7 +269,7 @@ public class WidgetOverlay extends Overlay public Dimension render(Graphics2D graphics) { // Don't draw widget overlay if the PVP KDR stats text will be empty - if (client.getVar(Varbits.SHOW_PVP_KDR_STATS) == 1) + if (client.getVarbitValue(Varbits.SHOW_PVP_KDR_STATS) == 1) { return super.render(graphics); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java index 9a1a6be79d..a74a77c73e 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/attackstyles/AttackStylesPluginTest.java @@ -128,7 +128,7 @@ public class AttackStylesPluginTest when(strWidget.isHidden()).thenAnswer(x -> isStrHidden()); // equip type_4 weapon type on player - when(client.getVar(Varbits.EQUIPPED_WEAPON_TYPE)).thenReturn(WeaponType.TYPE_4.ordinal()); + when(client.getVarbitValue(Varbits.EQUIPPED_WEAPON_TYPE)).thenReturn(WeaponType.TYPE_4.ordinal()); attackPlugin.onVarbitChanged(new VarbitChanged()); // Verify there is a warned skill diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java index 7db5ce3f6e..b3ccabb37f 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/ClueScrollPluginTest.java @@ -216,10 +216,10 @@ public class ClueScrollPluginTest when(container.getItems()).thenReturn(inventory); when(container.contains(ItemID.RUNE_POUCH)).thenReturn(true); - when(client.getVar(Varbits.RUNE_POUCH_RUNE1)).thenReturn(9); // Cosmic Rune - when(client.getVar(Varbits.RUNE_POUCH_AMOUNT1)).thenReturn(20); - when(client.getVar(Varbits.RUNE_POUCH_RUNE3)).thenReturn(4); // Fire Rune - when(client.getVar(Varbits.RUNE_POUCH_AMOUNT3)).thenReturn(4000); + when(client.getVarbitValue(Varbits.RUNE_POUCH_RUNE1)).thenReturn(9); // Cosmic Rune + when(client.getVarbitValue(Varbits.RUNE_POUCH_AMOUNT1)).thenReturn(20); + when(client.getVarbitValue(Varbits.RUNE_POUCH_RUNE3)).thenReturn(4); // Fire Rune + when(client.getVarbitValue(Varbits.RUNE_POUCH_AMOUNT3)).thenReturn(4000); plugin.onItemContainerChanged(event); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java index 99531b5404..bf40320d10 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java @@ -110,7 +110,7 @@ public class MotherlodePluginTest motherlodePlugin.onGameStateChanged(gameStateChanged); // Initial sack count - when(client.getVar(Varbits.SACK_NUMBER)).thenReturn(42); + when(client.getVarbitValue(Varbits.SACK_NUMBER)).thenReturn(42); motherlodePlugin.onVarbitChanged(new VarbitChanged()); // Create before inventory @@ -129,7 +129,7 @@ public class MotherlodePluginTest when(client.getItemContainer(InventoryID.INVENTORY)).thenReturn(inventory); // Withdraw 20 - when(client.getVar(Varbits.SACK_NUMBER)).thenReturn(22); + when(client.getVarbitValue(Varbits.SACK_NUMBER)).thenReturn(22); motherlodePlugin.onVarbitChanged(new VarbitChanged()); inventory = mock(ItemContainer.class); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java index 655fe4d42e..f305bfe3e1 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java @@ -427,13 +427,13 @@ public class ScreenshotPluginTest { ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", COLLECTION_LOG_CHAT, null, 0); - when(client.getVar(Varbits.COLLECTION_LOG_NOTIFICATION)).thenReturn(1); + when(client.getVarbitValue(Varbits.COLLECTION_LOG_NOTIFICATION)).thenReturn(1); screenshotPlugin.onChatMessage(chatMessageEvent); verify(screenshotPlugin).takeScreenshot("Collection log (Chompy bird hat)", "Collection Log"); reset(screenshotPlugin); - when(client.getVar(Varbits.COLLECTION_LOG_NOTIFICATION)).thenReturn(3); + when(client.getVarbitValue(Varbits.COLLECTION_LOG_NOTIFICATION)).thenReturn(3); screenshotPlugin.onChatMessage(chatMessageEvent); verify(screenshotPlugin, never()).takeScreenshot(anyString(), anyString()); @@ -490,7 +490,7 @@ public class ScreenshotPluginTest { when(screenshotConfig.screenshotCombatAchievements()).thenReturn(true); - when(client.getVar(Varbits.COMBAT_ACHIEVEMENTS_POPUP)).thenReturn(1); + when(client.getVarbitValue(Varbits.COMBAT_ACHIEVEMENTS_POPUP)).thenReturn(1); ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "", "Congratulations, you've completed an easy combat task: Handyman.", null, 0); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java index 72cb6c1021..35a85c7034 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java @@ -454,7 +454,7 @@ public class TimersPluginTest public void testCorruptionCooldown() { when(timersConfig.showArceuusCooldown()).thenReturn(true); - when(client.getVar(Varbits.CORRUPTION_COOLDOWN)).thenReturn(1); + when(client.getVarbitValue(Varbits.CORRUPTION_COOLDOWN)).thenReturn(1); timersPlugin.onVarbitChanged(new VarbitChanged()); ArgumentCaptor captor = ArgumentCaptor.forClass(InfoBox.class); @@ -539,7 +539,7 @@ public class TimersPluginTest public void testImbuedHeartStart() { when(timersConfig.showImbuedHeart()).thenReturn(true); - when(client.getVar(Varbits.IMBUED_HEART_COOLDOWN)).thenReturn(70); + when(client.getVarbitValue(Varbits.IMBUED_HEART_COOLDOWN)).thenReturn(70); timersPlugin.onVarbitChanged(new VarbitChanged()); ArgumentCaptor captor = ArgumentCaptor.forClass(InfoBox.class); @@ -554,7 +554,7 @@ public class TimersPluginTest { when(timersConfig.showImbuedHeart()).thenReturn(true); - when(client.getVar(Varbits.IMBUED_HEART_COOLDOWN)).thenReturn(70); + when(client.getVarbitValue(Varbits.IMBUED_HEART_COOLDOWN)).thenReturn(70); timersPlugin.onVarbitChanged(new VarbitChanged()); // Calls removeIf once (on createGameTimer) ArgumentCaptor> prcaptor = ArgumentCaptor.forClass(Predicate.class); @@ -564,7 +564,7 @@ public class TimersPluginTest Predicate pred = prcaptor.getValue(); assertTrue(pred.test(imbuedHeartInfoBox)); - when(client.getVar(Varbits.IMBUED_HEART_COOLDOWN)).thenReturn(0); + when(client.getVarbitValue(Varbits.IMBUED_HEART_COOLDOWN)).thenReturn(0); timersPlugin.onVarbitChanged(new VarbitChanged()); // Calls removeIf once verify(infoBoxManager, times(1)).addInfoBox(any()); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java index 3d57b80a3f..1568a4be1b 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java @@ -80,10 +80,10 @@ public class WintertodtPluginTest { when(config.roundNotification()).thenReturn(15); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(35); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(35); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); //(15 * 50) / 30 = ~25 - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(25); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); verify(notifier, times(1)).notify("Wintertodt round is about to start"); @@ -94,10 +94,10 @@ public class WintertodtPluginTest { when(config.roundNotification()).thenReturn(10); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(20); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(20); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); //(10 * 50) / 30 = ~16 - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(16); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(16); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); verify(notifier, times(1)).notify("Wintertodt round is about to start"); @@ -108,10 +108,10 @@ public class WintertodtPluginTest { when(config.roundNotification()).thenReturn(5); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(10); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); //(5 * 50) / 30 = ~8 - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(8); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); verify(notifier, times(1)).notify("Wintertodt round is about to start"); @@ -122,17 +122,17 @@ public class WintertodtPluginTest { when(config.roundNotification()).thenReturn(5); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(0); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(0); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(10); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(8); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(6); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(6); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(5); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(5); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(4); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(4); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); verify(notifier, times(1)).notify("Wintertodt round is about to start"); @@ -142,7 +142,7 @@ public class WintertodtPluginTest public void matchStartingNotification_shouldNotNotify_whenNoneOptionSelected() { when(config.roundNotification()).thenReturn(5); - when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25); + when(client.getVarbitValue(Varbits.WINTERTODT_TIMER)).thenReturn(25); wintertodtPlugin.onVarbitChanged(new VarbitChanged()); verify(notifier, times(0)).notify("Wintertodt round is about to start");