ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Updates based on Reviewer Suggestions

Browse Source 
- 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
This commit is contained in:
ErmalSh
2019-01-19 14:53:25 -05:00
parent 2d394a24a3
commit bca45c5d4c
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsConfig.java
View File

@@ -67,7 +67,7 @@ public interface StatusBarsConfig extends Config
@ConfigItem( @ConfigItem(
position = 4, position = 4,
keyName = "toggleRestorationBars", 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." description = "Visually hides the Status Bars when player is out of combat."
) )
default boolean toggleRestorationBars() default boolean toggleRestorationBars()

39
runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java
View File

@@ -88,27 +88,32 @@ public class StatusBarsPlugin extends Plugin
} }
else else
{ {
final Actor interacting = client.getLocalPlayer().getInteracting(); hideStatusBar();
final boolean isNpc = interacting instanceof NPC; }
final int COMBAT_TIMEOUT = config.hideStatusBarDelay(); }
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<String> npcMenuActions = Arrays.asList(npcComposition.getActions());
if (npcMenuActions.contains("Attack") && config.toggleRestorationBars())
{ {
final NPC npc = (NPC) interacting; updateLastCombatAction();
final NPCComposition npcComposition = npc.getComposition(); overlayManager.add(overlay);
final List<String> npcMenuActions = Arrays.asList(npcComposition.getActions());
if (npcMenuActions.contains("Attack") && config.toggleRestorationBars())
{
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);
}
} }
} }
} }