From 55bbbc5b44f8ff4414ff69abae3e9386800f97d7 Mon Sep 17 00:00:00 2001 From: sethtroll Date: Sat, 1 Jul 2017 22:37:04 -0500 Subject: [PATCH] Added skilling boosts option alongside combat boosts --- .../client/plugins/boosts/BoostsConfig.java | 10 ++++++ .../client/plugins/boosts/BoostsOverlay.java | 33 +++++++++++++++++-- 2 files changed, 40 insertions(+), 3 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 b96caa7ad0..b99494db27 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 @@ -43,4 +43,14 @@ public interface BoostsConfig { return true; } + + @ConfigItem( + keyName = "enableSkill", + name = "Enable Skill Boosts", + description = "Configures whether or not to display skill boost information" + ) + default boolean enableSkill() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java index 319af32538..9587cac5f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java @@ -22,13 +22,13 @@ * (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.client.plugins.boosts; import java.awt.Color; import java.awt.Dimension; import java.awt.FontMetrics; import java.awt.Graphics2D; +import com.google.common.collect.ObjectArrays; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Skill; @@ -43,7 +43,16 @@ class BoostsOverlay extends Overlay private static final Color BACKGROUND = new Color(Color.gray.getRed(), Color.gray.getGreen(), Color.gray.getBlue(), 127); - private static final Skill[] SHOW = new Skill[] { Skill.ATTACK, Skill.STRENGTH, Skill.DEFENCE, Skill.RANGED, Skill.MAGIC }; + private static final Skill[] COMBAT = new Skill[] + { + Skill.ATTACK, Skill.STRENGTH, Skill.DEFENCE, Skill.RANGED, Skill.MAGIC + }; + private static final Skill[] SKILLING = new Skill[] + { + Skill.COOKING, Skill.WOODCUTTING, Skill.FLETCHING, Skill.FISHING, Skill.FIREMAKING, Skill.CRAFTING, + Skill.SMITHING, Skill.HERBLORE, Skill.AGILITY, Skill.THIEVING, Skill.SLAYER, Skill.FARMING, Skill.RUNECRAFT, + Skill.HUNTER, Skill.CONSTRUCTION + }; private static final int TOP_BORDER = 2; private static final int LEFT_BORDER = 2; @@ -65,8 +74,20 @@ class BoostsOverlay extends Overlay Client client = RuneLite.getClient(); if (client.getGameState() != GameState.LOGGED_IN || !config.enabled()) + { return null; - + } + + Skill[] show; + if (config.enableSkill()) + { + show = ObjectArrays.concat(COMBAT, SKILLING, Skill.class); + } + else + { + show = COMBAT; + } + FontMetrics metrics = graphics.getFontMetrics(); int height = TOP_BORDER; @@ -76,13 +97,17 @@ class BoostsOverlay extends Overlay base = client.getRealSkillLevel(skill); if (boosted == base) + { continue; + } height += metrics.getHeight() + SEPARATOR; } if (height == TOP_BORDER) + { return null; + } graphics.setColor(BACKGROUND); graphics.fillRect(0, 0, WIDTH, height); @@ -94,7 +119,9 @@ class BoostsOverlay extends Overlay base = client.getRealSkillLevel(skill); if (boosted == base) + { continue; + } graphics.setColor(Color.white); graphics.drawString(skill.getName(), LEFT_BORDER, y + metrics.getHeight());