From bca45c5d4cf396474d4f57cc57dc29cbef259af5 Mon Sep 17 00:00:00 2001 From: ErmalSh Date: Sat, 19 Jan 2019 14:53:25 -0500 Subject: [PATCH] Updates based on Reviewer Suggestions - COMBAT_TIMEOUT renamed to combatTimeout since it's not a constant - Created hideStatusBar() method for code cleanliness - Renamed Config option to remove capitalization on some words --- .../plugins/statusbars/StatusBarsConfig.java | 2 +- .../plugins/statusbars/StatusBarsPlugin.java | 39 +++++++++++-------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java index 8772dcdb12..58842332e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java @@ -67,7 +67,7 @@ public interface StatusBarsConfig extends Config @ConfigItem( position = 4, keyName = "toggleRestorationBars", - name = "Toggle to Hide when not in Combat", + name = "Toggle to hide when not in combat", description = "Visually hides the Status Bars when player is out of combat." ) default boolean toggleRestorationBars() 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 33914f4633..e32895d910 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 @@ -88,27 +88,32 @@ public class StatusBarsPlugin extends Plugin } else { - final Actor interacting = client.getLocalPlayer().getInteracting(); - final boolean isNpc = interacting instanceof NPC; - final int COMBAT_TIMEOUT = config.hideStatusBarDelay(); + hideStatusBar(); + } + } - if (isNpc) + private void hideStatusBar() + { + final Actor interacting = client.getLocalPlayer().getInteracting(); + final boolean isNpc = interacting instanceof NPC; + final int combatTimeout = config.hideStatusBarDelay(); + + if (isNpc) + { + final NPC npc = (NPC) interacting; + final NPCComposition npcComposition = npc.getComposition(); + final List npcMenuActions = Arrays.asList(npcComposition.getActions()); + if (npcMenuActions.contains("Attack") && config.toggleRestorationBars()) { - final NPC npc = (NPC) interacting; - final NPCComposition npcComposition = npc.getComposition(); - final List npcMenuActions = Arrays.asList(npcComposition.getActions()); - if (npcMenuActions.contains("Attack") && config.toggleRestorationBars()) - { - updateLastCombatAction(); - overlayManager.add(overlay); - } + updateLastCombatAction(); + overlayManager.add(overlay); } - else if (lastCombatAction != null) + } + else if (lastCombatAction != null) + { + if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout) { - if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > COMBAT_TIMEOUT) - { - overlayManager.remove(overlay); - } + overlayManager.remove(overlay); } } }