Add color interpolation (#649)

2 files changed, 8 insertions, 21 deletions

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 82b7ef11..025514e9 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,6 +1,5 @@
 package de.hysky.skyblocker.skyblock.tabhud.util;
 
-import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
 
 public class Colors {
@@ -10,18 +9,6 @@ public class Colors {
      * @return an int representing a color, where 100% = green and 0% = red
      */
     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;
-        }
+        return MathHelper.hsvToRgb(pcnt / 300, 1, 1);
     }
 }
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 5832f31e..44a06c99 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
@@ -1,7 +1,5 @@
 package de.hysky.skyblocker.skyblock.tabhud.widget.hud;
 
-import java.util.List;
-
 import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
 import de.hysky.skyblocker.skyblock.tabhud.util.Colors;
 import de.hysky.skyblocker.skyblock.tabhud.util.Ico;
@@ -13,14 +11,15 @@ import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
+import java.util.List;
+
 // this widget shows the status of the king's commissions.
 // (dwarven mines and crystal hollows)
 // USE ONLY WITH THE DWARVEN HUD!
 
 public class HudCommsWidget extends Widget {
 
-    private static final MutableText TITLE = Text.literal("Commissions").formatted(Formatting.DARK_AQUA,
-            Formatting.BOLD);
+    private static final MutableText TITLE = Text.literal("Commissions").formatted(Formatting.DARK_AQUA, Formatting.BOLD);
 
     private List<Commission> commissions;
     private boolean isFancy;
@@ -59,9 +58,10 @@ public class HudCommsWidget extends Widget {
                 comp = new ProgressComponent(Ico.BOOK, c, p, Colors.pcntToCol(p));
             } else {
                 comp = new PlainTextComponent(
-                        Text.literal(comm.commission() + ": ")
-                                .append(Text.literal(comm.progression())
-                                        .formatted(Colors.hypixelProgressColor(p))));
+                        Text.literal(comm.commission() + ": ").append(
+                                Text.literal(comm.progression()).withColor(Colors.pcntToCol(p))
+                        )
+                );
             }
             this.addComponent(comp);
         }