Bar changes (#1307)

* multiple mana display modes

* turn StatusBarTracker static

* move intelligence display below button

1 files changed, 13 insertions, 19 deletions

diff --git a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
index 9ab4e927..8e1ddd39 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
@@ -6,12 +6,6 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
 class StatusBarTrackerTest {
-    private StatusBarTracker tracker;
-
-    @BeforeEach
-    void setUp() {
-        tracker = new StatusBarTracker();
-    }
 
     void assertStats(int hp, int maxHp, int def, int mana, int maxMana, int overflowMana) {
         int absorption = 0;
@@ -19,55 +13,55 @@ class StatusBarTrackerTest {
             absorption = Math.min(hp - maxHp, maxHp);
             hp = maxHp;
         }
-        assertEquals(new StatusBarTracker.Resource(hp, maxHp, absorption), tracker.getHealth());
-        assertEquals(def, tracker.getDefense());
-        assertEquals(new StatusBarTracker.Resource(mana, maxMana, overflowMana), tracker.getMana());
+        assertEquals(new StatusBarTracker.Resource(hp, maxHp, absorption), StatusBarTracker.getHealth());
+        assertEquals(def, StatusBarTracker.getDefense());
+        assertEquals(new StatusBarTracker.Resource(mana, maxMana, overflowMana), StatusBarTracker.getMana());
     }
 
     @Test
     void normalStatusBar() {
-        String res = tracker.update("§c934/1086❤     §a159§a❈ Defense     §b562/516✎ Mana", false);
+        String res = StatusBarTracker.update("§c934/1086❤     §a159§a❈ Defense     §b562/516✎ Mana", false);
         assertNull(res);
         assertStats(934, 1086, 159, 562, 516, 0);
     }
 
     @Test
     void overflowMana() {
-        String res = tracker.update("§61605/1305❤     §a270§a❈ Defense     §b548/548✎ §3200ʬ", false);
+        String res = StatusBarTracker.update("§61605/1305❤     §a270§a❈ Defense     §b548/548✎ §3200ʬ", false);
         assertNull(res);
         assertStats(1605, 1305, 270, 548, 548, 200);
     }
 
     @Test
     void regeneration() {
-        String res = tracker.update("§c2484/2484❤+§c120▄     §a642§a❈ Defense     §b2557/2611✎ Mana", false);
+        String res = StatusBarTracker.update("§c2484/2484❤+§c120▄     §a642§a❈ Defense     §b2557/2611✎ Mana", false);
         assertEquals("§c❤+§c120▄", res);
     }
 
     @Test
     void instantTransmission() {
         String actionBar = "§c2259/2259❤     §b-20 Mana (§6Instant Transmission§b)     §b549/2676✎ Mana";
-        assertEquals("§b-20 Mana (§6Instant Transmission§b)", tracker.update(actionBar, false));
-        assertNull(tracker.update(actionBar, true));
+        assertEquals("§b-20 Mana (§6Instant Transmission§b)", StatusBarTracker.update(actionBar, false));
+        assertNull(StatusBarTracker.update(actionBar, true));
     }
 
     @Test
     void rapidFire() {
         String actionBar = "§c2509/2509❤     §b-48 Mana (§6Rapid-fire§b)     §b2739/2811✎ Mana";
-        assertEquals("§b-48 Mana (§6Rapid-fire§b)", tracker.update(actionBar, false));
-        assertNull(tracker.update(actionBar, true));
+        assertEquals("§b-48 Mana (§6Rapid-fire§b)", StatusBarTracker.update(actionBar, false));
+        assertNull(StatusBarTracker.update(actionBar, true));
     }
 
     @Test
     void zombieSword() {
         String actionBar = "§c2509/2509❤     §b-56 Mana (§6Instant Heal§b)     §b2674/2821✎ Mana    §e§lⓩⓩⓩⓩ§6§lⓄ";
-        assertEquals("§b-56 Mana (§6Instant Heal§b)     §e§lⓩⓩⓩⓩ§6§lⓄ", tracker.update(actionBar, false));
-        assertEquals("§e§lⓩⓩⓩⓩ§6§lⓄ", tracker.update(actionBar, true));
+        assertEquals("§b-56 Mana (§6Instant Heal§b)     §e§lⓩⓩⓩⓩ§6§lⓄ", StatusBarTracker.update(actionBar, false));
+        assertEquals("§e§lⓩⓩⓩⓩ§6§lⓄ", StatusBarTracker.update(actionBar, true));
     }
 
     @Test
     void campfire() {
-        String res = tracker.update("§c17070/25565❤+§c170▃   §65,625 DPS   §c1 second     §b590/626✎ §3106ʬ", false);
+        String res = StatusBarTracker.update("§c17070/25565❤+§c170▃   §65,625 DPS   §c1 second     §b590/626✎ §3106ʬ", false);
         assertEquals("§c❤+§c170▃   §65,625 DPS   §c1 second", res);
     }
 }