From 596100fbeb1bb2e0d79ec9f086894b578e4f642d Mon Sep 17 00:00:00 2001 From: chestnut1693 <47870624+chestnut1693@users.noreply.github.com> Date: Thu, 29 Aug 2019 00:30:24 +0200 Subject: [PATCH] boosts: add config to not display combat boosts --- .../client/plugins/boosts/BoostsConfig.java | 18 +++++++++---- .../client/plugins/boosts/BoostsPlugin.java | 25 +++++++++++++------ 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java index e623442da3..a853ea41c3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java @@ -38,15 +38,23 @@ public interface BoostsConfig extends Config NEVER } + enum DisplayBoosts + { + NONE, + COMBAT, + NON_COMBAT, + BOTH + } + @ConfigItem( - keyName = "enableSkill", - name = "Enable Skill Boosts", - description = "Configures whether or not to display skill boost information", + keyName = "displayBoosts", + name = "Display Boosts", + description = "Configures which skill boosts to display", position = 1 ) - default boolean enableSkill() + default DisplayBoosts displayBoosts() { - return true; + return DisplayBoosts.BOTH; } @ConfigItem( diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index 1962320efb..aa7e46d00e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -263,16 +263,25 @@ public class BoostsPlugin extends Plugin private void updateShownSkills() { - if (config.enableSkill()) + switch (config.displayBoosts()) { - shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); + case NONE: + shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; + case COMBAT: + shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; + case NON_COMBAT: + shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; + case BOTH: + shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS); + shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS); + break; } - else - { - shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS); - } - - shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS); } private void updateBoostedStats()