Add Hypixel's colouring to Dwarven Mines HUD. (#488)

3 files changed, 24 insertions, 2 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 779a3a62..6fa03816 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,6 +1,7 @@
 package de.hysky.skyblocker.skyblock.dwarven;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.tabhud.util.Colors;
 import de.hysky.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
 import it.unimi.dsi.fastutil.ints.IntIntPair;
@@ -91,12 +92,19 @@ public class DwarvenHud {
 
         int y = 0;
         for (Commission commission : commissions) {
+            float percentage;
+            if (!commission.progression().contains("DONE")) {
+                percentage = Float.parseFloat(commission.progression().substring(0, commission.progression().length() - 1));
+            } else {
+                percentage = 100f;
+            }
+
             context
                     .drawTextWithShadow(client.textRenderer,
                             Text.literal(commission.commission + ": ")
                                     .styled(style -> style.withColor(Formatting.AQUA))
                                     .append(Text.literal(commission.progression)
-                                            .styled(style -> style.withColor(Formatting.GREEN))),
+                                            .styled(style -> style.withColor(Colors.hypixelProgressColor(percentage)))),
                             hudX + 5, hudY + y + 5, 0xFFFFFFFF);
             y += 20;
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Colors.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Colors.java
index 0de3e45f..82b7ef11 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Colors.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Colors.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.skyblock.tabhud.util;
 
+import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
 
 public class Colors {
@@ -11,4 +12,16 @@ public class Colors {
     public static int pcntToCol(float pcnt) {
         return MathHelper.hsvToRgb(pcnt / 300f, 0.9f, 0.9f);
     }
+
+    public static Formatting hypixelProgressColor(float pcnt) {
+        if (pcnt < 25) {
+            return Formatting.RED;
+        } else if (pcnt < 50) {
+            return Formatting.GOLD;
+        } else if (pcnt < 75) {
+            return Formatting.YELLOW;
+        } else {
+            return Formatting.GREEN;
+        }
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java
index 442f12ca..5832f31e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java
@@ -60,7 +60,8 @@ public class HudCommsWidget extends Widget {
             } else {
                 comp = new PlainTextComponent(
                         Text.literal(comm.commission() + ": ")
-                                .append(Text.literal(comm.progression()).formatted(Formatting.GREEN)));
+                                .append(Text.literal(comm.progression())
+                                        .formatted(Colors.hypixelProgressColor(p))));
             }
             this.addComponent(comp);
         }