From 747af7cb24db523319fa69c56bab68402a407aad Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 3 May 2017 19:23:58 -0400 Subject: [PATCH] runelite-api: change getBoosted/RealSkillLevel to take a Skill --- .../src/main/java/net/runelite/api/Client.java | 15 ++++++--------- .../client/plugins/boosts/BoostsOverlay.java | 11 ++++------- 2 files changed, 10 insertions(+), 16 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 88ff8e8d3d..51919cf067 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -62,19 +62,16 @@ public class Client .toArray(size -> new Player[size]); } - public int[] getBoostedSkillLevels() + public int getBoostedSkillLevel(Skill skill) { - return client.getBoostedSkillLevels(); + int[] boostedLevels = client.getBoostedSkillLevels(); + return boostedLevels[skill.ordinal()]; } - public int[] getRealSkillLevels() + public int getRealSkillLevel(Skill skill) { - return client.getRealSkillLevels(); - } - - public int[] getSkillExperiences() - { - return client.getSkillExperiences(); + int[] realLevels = client.getRealSkillLevels(); + return realLevels[skill.ordinal()]; } public void sendGameMessage(String message) 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 67c02bea9b..d6973a3472 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 @@ -66,14 +66,11 @@ class BoostsOverlay extends Overlay FontMetrics metrics = graphics.getFontMetrics(); - int[] boostedSkills = client.getBoostedSkillLevels(), - baseSkills = client.getRealSkillLevels(); - int height = TOP_BORDER; for (Skill skill : SHOW) { - int boosted = boostedSkills[skill.ordinal()], - base = baseSkills[skill.ordinal()]; + int boosted = client.getBoostedSkillLevel(skill), + base = client.getRealSkillLevel(skill); if (boosted == base) continue; @@ -90,8 +87,8 @@ class BoostsOverlay extends Overlay int y = TOP_BORDER; for (Skill skill : SHOW) { - int boosted = boostedSkills[skill.ordinal()], - base = baseSkills[skill.ordinal()]; + int boosted = client.getBoostedSkillLevel(skill), + base = client.getRealSkillLevel(skill); if (boosted == base) continue;