From 5398cce3534106ac476b61a3ec466c4b18c43de6 Mon Sep 17 00:00:00 2001 From: Rheon-D Date: Fri, 8 Feb 2019 13:39:02 +0930 Subject: [PATCH] Casual tidy --- .../client/plugins/statusbars/StatusBarsOverlay.java | 5 ++++- .../plugins/statusbars/renderer/BarRenderer.java | 12 ++++++------ .../plugins/statusbars/renderer/EnergyRenderer.java | 2 +- .../statusbars/renderer/HitPointsRenderer.java | 2 +- .../plugins/statusbars/renderer/PrayerRenderer.java | 2 +- .../statusbars/renderer/SpecialAttackRenderer.java | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) 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 420604b031..ef1a173e1e 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 @@ -117,15 +117,18 @@ public class StatusBarsOverlay extends Overlay offsetRightBarY = (location.getY() - offsetRight.getY()); } - BarRenderer left = plugin.getBarRenderers().get(config.leftBarMode()); BarRenderer right = plugin.getBarRenderers().get(config.rightBarMode()); if (left != null) + { left.draw(client, this, g, offsetLeftBarX, offsetLeftBarY, height); + } if (right != null) + { right.draw(client, this, g, offsetRightBarX, offsetRightBarY, height); + } return null; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java index bc5eacad49..21ed8fd96b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java @@ -38,6 +38,7 @@ import net.runelite.client.ui.overlay.components.TextComponent; import java.awt.Color; import java.awt.Graphics2D; import java.awt.Image; +import java.awt.Point; @RequiredArgsConstructor(access = AccessLevel.PROTECTED) public abstract class BarRenderer @@ -58,7 +59,7 @@ public abstract class BarRenderer protected final StatusBarsConfig config; protected int maximumValue; protected int currentValue; - protected int heal; + protected int restore; protected Color standardColor; protected Color restoreColor; protected Image icon; @@ -88,9 +89,8 @@ public abstract class BarRenderer if (config.enableCounter()) { graphics.setFont(FontManager.getRunescapeSmallFont()); - TEXT.setColor(Color.WHITE); TEXT.setText(counterText); - TEXT.setPosition(new java.awt.Point(x + centerText + 1, y + COUNTER_ICON_HEIGHT)); + TEXT.setPosition(new Point(x + centerText + 1, y + COUNTER_ICON_HEIGHT)); } else { @@ -100,7 +100,7 @@ public abstract class BarRenderer if (config.enableSkillIcon()) { graphics.drawImage(icon, x + ICON_AND_COUNTER_OFFSET_X + PADDING, y + ICON_AND_COUNTER_OFFSET_Y - icon.getWidth(null), null); - TEXT.setPosition(new java.awt.Point(x + centerText + 1, y + SKILL_ICON_HEIGHT)); + TEXT.setPosition(new Point(x + centerText + 1, y + SKILL_ICON_HEIGHT)); } TEXT.render(graphics); @@ -108,13 +108,13 @@ public abstract class BarRenderer private void renderRestore(Graphics2D graphics, int x, int y, int height) { - if (heal <= 0) + if (restore <= 0) { return; } final int filledCurrentHeight = getBarHeight(maximumValue, currentValue, height); - int filledHeight = getBarHeight(maximumValue, heal, height); + int filledHeight = getBarHeight(maximumValue, restore, height); graphics.setColor(restoreColor); if (filledHeight + filledCurrentHeight > height) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java index 1b948e440f..127aa6b601 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java @@ -55,6 +55,6 @@ public class EnergyRenderer extends BarRenderer { icon = spriteManager.getSprite(SpriteID.MINIMAP_ORB_RUN_ICON, 0); currentValue = client.getEnergy(); - heal = overlay.getRestoreValue("Run Energy"); + restore = overlay.getRestoreValue("Run Energy"); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java index 2c2e5f845e..68e1c29548 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java @@ -56,7 +56,7 @@ public class HitPointsRenderer extends BarRenderer { maximumValue = client.getRealSkillLevel(Skill.HITPOINTS); currentValue = client.getBoostedSkillLevel(Skill.HITPOINTS); - heal = overlay.getRestoreValue(Skill.HITPOINTS.getName()); + restore = overlay.getRestoreValue(Skill.HITPOINTS.getName()); final int poisonState = client.getVar(VarPlayer.IS_POISONED); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java index ea527ae8b0..76ed6fadca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java @@ -58,6 +58,6 @@ public class PrayerRenderer extends BarRenderer maximumValue = client.getRealSkillLevel(Skill.PRAYER); currentValue = client.getBoostedSkillLevel(Skill.PRAYER); standardColor = client.getVar(Varbits.QUICK_PRAYER) == 1 ? COLOR_ACTIVE : COLOR_STANDARD; - heal = overlay.getRestoreValue(Skill.PRAYER.getName()); + restore = overlay.getRestoreValue(Skill.PRAYER.getName()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java index 4b0a6f4e29..a2f43f1c2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java @@ -55,6 +55,6 @@ public class SpecialAttackRenderer extends BarRenderer { icon = spriteManager.getSprite(SpriteID.MINIMAP_ORB_SPECIAL_ICON, 0); currentValue = client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT) / 10; - heal = 0; + restore = 0; } }