Glacite Powder

3 files changed, 29 insertions, 9 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
index 3297ef5a..e3e0802c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -24,13 +24,14 @@ import java.util.stream.Stream;
 
 public class DwarvenHud {
 
-    public static final MinecraftClient client = MinecraftClient.getInstance();
-    public static List<Commission> commissionList = new ArrayList<>();
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    private static List<Commission> commissionList = new ArrayList<>();
 
     public static String mithrilPowder = "0";
     public static String gemStonePowder = "0";
+    public static String glacitePowder = "0";
 
-    public static final List<Pattern> COMMISSIONS = Stream.of(
+    private static final List<Pattern> COMMISSIONS = Stream.of(
                     "(?:Titanium|Mithril|Hard Stone) Miner",
                     "(?:Ice Walker|Golden Goblin|(?<!Golden )Goblin|Goblin Raid|Automaton|Sludge|Team Treasurite Member|Yog|Boss Corleone|Thyst) Slayer",
                     "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Mithril",
@@ -45,8 +46,9 @@ public class DwarvenHud {
                     "(?:Amber|Sapphire|Jade|Amethyst|Topaz) Crystal Hunter",
                     "Chest Looter").map(s -> Pattern.compile("(" + s + "): (\\d+\\.?\\d*%|DONE)")
             ).collect(Collectors.toList());
-    public static final Pattern MITHRIL_PATTERN = Pattern.compile("Mithril Powder: [0-9,]+");
-    public static final Pattern GEMSTONE_PATTERN = Pattern.compile("Gemstone Powder: [0-9,]+");
+    private static final Pattern MITHRIL_PATTERN = Pattern.compile("Mithril: [0-9,]+");
+    private static final Pattern GEMSTONE_PATTERN = Pattern.compile("Gemstone: [0-9,]+");
+    private static final Pattern GLACITE_PATTERN = Pattern.compile("Glacite: [0-9,]+");
 
     public static void init() {
         ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
@@ -186,6 +188,10 @@ public class DwarvenHud {
             if (gemstoneMatcher.matches()) {
                 gemStonePowder = gemstoneMatcher.group(0).split(": ")[1];
             }
+            Matcher glaciteMatcher = GLACITE_PATTERN.matcher(name);
+            if (glaciteMatcher.matches()) {
+                glacitePowder = glaciteMatcher.group(0).split(": ")[1];
+            }
         }
     }
 
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java
index 4872435b..818056f0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Ico.java
@@ -72,4 +72,5 @@ public class Ico {
     public static final ItemStack LIME_DYE = new ItemStack(Items.LIME_DYE);
     public static final ItemStack ENCHANTED_BOOK = new ItemStack(Items.ENCHANTED_BOOK);
     public static final ItemStack SPIDER_EYE = new ItemStack(Items.SPIDER_EYE);
+    public static final ItemStack BLUE_ICE = new ItemStack(Items.BLUE_ICE);
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudPowderWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudPowderWidget.java
index fe23f19a..50a7880c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudPowderWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudPowderWidget.java
@@ -30,6 +30,10 @@ public class HudPowderWidget extends Widget {
      */
     private static int gemstonePowder = 0;
     /**
+     * current value of Glacite Powder
+     */
+    private static int glacitePowder = 0;
+    /**
      * the difference between the previous and current value of Mithril Powder
      */
     private static int mithrilPowderDiff = 0;
@@ -38,6 +42,10 @@ public class HudPowderWidget extends Widget {
      */
     private static int gemstonePowderDiff = 0;
     /**
+     * the difference between the previous and current value of Glacite Powder
+     */
+    private static int glacitePowderDiff = 0;
+    /**
      * The initial value of the timer for the difference update delay countdown.
      */
     private static long startTime = System.currentTimeMillis();
@@ -77,8 +85,8 @@ public class HudPowderWidget extends Widget {
     /**
      * Converts Powder and difference values to a string and adds commas to the digits of the numbers.
      *
-     * @param powder the value of Mithril or Gemstone Powder
-     * @param diff   the difference between the previous and current value of Mithril or Gemstone Powder
+     * @param powder the value of Mithril, Gemstone Powder, or Glacite Powder
+     * @param diff   the difference between the previous and current value of Mithril, Gemstone, or Glacite Powder
      * @return formatted string
      */
     private static String formatPowderString(int powder, int diff) {
@@ -94,15 +102,18 @@ public class HudPowderWidget extends Widget {
 
         int newMithrilPowder = parsePowder(DwarvenHud.mithrilPowder);
         int newGemstonePowder = parsePowder(DwarvenHud.gemStonePowder);
+        int newGlacitePowder = parsePowder(DwarvenHud.glacitePowder);
 
-        if (newMithrilPowder != mithrilPowder || newGemstonePowder != gemstonePowder || elapsedTime > 2000) {
+        if (newMithrilPowder != mithrilPowder || newGemstonePowder != gemstonePowder || newGlacitePowder != glacitePowder || elapsedTime > 2000) {
             startTime = System.currentTimeMillis();
 
             mithrilPowderDiff = newMithrilPowder - mithrilPowder;
             gemstonePowderDiff = newGemstonePowder - gemstonePowder;
+            glacitePowderDiff = newGlacitePowder - glacitePowder;
 
             mithrilPowder = newMithrilPowder;
             gemstonePowder = newGemstonePowder;
+            glacitePowder = newGlacitePowder;
         }
     }
 
@@ -111,9 +122,11 @@ public class HudPowderWidget extends Widget {
         updatePowders();
         String mithrilPowderString = formatPowderString(mithrilPowder, mithrilPowderDiff);
         String gemstonePowderString = formatPowderString(gemstonePowder, gemstonePowderDiff);
+        String glacitePowderString = formatPowderString(glacitePowder, glacitePowderDiff);
 
-        this.addSimpleIcoText(Ico.MITHRIL, "Mithril: ", Formatting.AQUA, mithrilPowderString);
+        this.addSimpleIcoText(Ico.MITHRIL, "Mithril: ", Formatting.DARK_GREEN, mithrilPowderString);
         this.addSimpleIcoText(Ico.AMETHYST_SHARD, "Gemstone: ", Formatting.DARK_PURPLE, gemstonePowderString);
+        this.addSimpleIcoText(Ico.BLUE_ICE, "Glacite: ", Formatting.AQUA, glacitePowderString);
     }
 
 }