Merge branch 'beta' into chunked

j10a1n15 · Jun 13, 2024 · 4936429 · 4936429
2 parents 6642ac4 + 1d35ee7
commit 4936429
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 126 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt
@@ -30,10 +30,10 @@ object HotmAPI {
             }
         } == true
 
-    enum class Powder() {
-        MITHRIL,
-        GEMSTONE,
-        GLACITE,
+    enum class Powder(val displayName: String, val color: String) {
+        MITHRIL("Mithril", "§2"),
+        GEMSTONE("Gemstone", "§d"),
+        GLACITE("Glacite", "§b"),
 
         ;
 

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
@@ -75,6 +75,29 @@ public class DisplayConfig {
     @ConfigEditorBoolean
     public boolean showMaxIslandPlayers = true;
 
+    @Expose
+    @ConfigOption(name = "Powder Display", desc = "Select how the powder display should be formatted.")
+    @ConfigEditorDropdown
+    public PowderDisplay powderDisplay = PowderDisplay.AVAILABLE;
+
+    public enum PowderDisplay {
+        AVAILABLE("Available"),
+        TOTAL("Total"),
+        BOTH("Available / All")
+        ;
+
+        private final String str;
+
+        PowderDisplay(String str) {
+            this.str = str;
+        }
+
+        @Override
+        public String toString() {
+            return str;
+        }
+    }
+
     @Expose
     @ConfigOption(name = "Number Format", desc = "")
     @ConfigEditorDropdown