diff options
Diffstat (limited to 'src/main/java/de')
4 files changed, 13 insertions, 19 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 deleted file mode 100644 index 025514e9..00000000 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/util/Colors.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.hysky.skyblocker.skyblock.tabhud.util; - -import net.minecraft.util.math.MathHelper; - -public class Colors { - - /** - * @param pcnt Percentage between 0% and 100%, NOT 0-1! - * @return an int representing a color, where 100% = green and 0% = red - */ - public static int pcntToCol(float pcnt) { - return MathHelper.hsvToRgb(pcnt / 300, 1, 1); - } -} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CommsWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CommsWidget.java index 3982d122..fe045351 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CommsWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/CommsWidget.java @@ -6,10 +6,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import de.hysky.skyblocker.skyblock.dwarven.CommissionLabels; -import de.hysky.skyblocker.skyblock.tabhud.util.Colors; import de.hysky.skyblocker.skyblock.tabhud.util.Ico; import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent; import de.hysky.skyblocker.skyblock.tabhud.widget.component.ProgressComponent; +import de.hysky.skyblocker.utils.ColorUtils; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -55,11 +55,11 @@ public class CommsWidget extends TabHudWidget { newCommissionsNames.add(name); if (progress.equals("DONE")) { - pc = new ProgressComponent(Ico.BOOK, Text.of(name), Text.of(progress), 100f, Colors.pcntToCol(100)); + pc = new ProgressComponent(Ico.BOOK, Text.of(name), Text.of(progress), 100f, ColorUtils.percentToColor(100)); commissionDone = true; } else { float pcnt = Float.parseFloat(progress.substring(0, progress.length() - 1)); - pc = new ProgressComponent(Ico.BOOK, Text.of(name), pcnt, Colors.pcntToCol(pcnt)); + pc = new ProgressComponent(Ico.BOOK, Text.of(name), pcnt, ColorUtils.percentToColor(pcnt)); } this.addComponent(pc); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java index 8856b9be..77654245 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java @@ -4,11 +4,11 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.hysky.skyblocker.skyblock.tabhud.util.Colors; import de.hysky.skyblocker.skyblock.tabhud.util.Ico; import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent; import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent; import de.hysky.skyblocker.skyblock.tabhud.widget.component.ProgressComponent; +import de.hysky.skyblocker.utils.ColorUtils; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -42,7 +42,7 @@ public class FireSaleWidget extends TabHudWidget { float total = Float.parseFloat(m.group("total")) * 1000; Text prgressTxt = Text.literal(String.format("%s/%.0f", avail, total)); float pcnt = (Float.parseFloat(avail) / (total)) * 100f; - ProgressComponent pc = new ProgressComponent(Ico.GOLD, itemTxt, prgressTxt, pcnt, Colors.pcntToCol(pcnt)); + ProgressComponent pc = new ProgressComponent(Ico.GOLD, itemTxt, prgressTxt, pcnt, ColorUtils.percentToColor(pcnt)); this.addComponent(pc); } else if (text.getString().toLowerCase() instanceof String s && (s.contains("starts") || s.contains("starting"))) { this.addComponent(new IcoTextComponent(Ico.CLOCK, text)); diff --git a/src/main/java/de/hysky/skyblocker/utils/ColorUtils.java b/src/main/java/de/hysky/skyblocker/utils/ColorUtils.java index e132f7e5..1babe5e5 100644 --- a/src/main/java/de/hysky/skyblocker/utils/ColorUtils.java +++ b/src/main/java/de/hysky/skyblocker/utils/ColorUtils.java @@ -26,6 +26,14 @@ public class ColorUtils { } /** + * @param pcnt Percentage between 0% and 100%, NOT 0-1! + * @return an int representing a color, where 100% = green and 0% = red + */ + public static int percentToColor(float pcnt) { + return MathHelper.hsvToRgb(pcnt / 300, 1, 1); + } + + /** * Interpolates linearly between two colours. */ //Credit to https://codepen.io/OliverBalfour/post/programmatically-making-gradients |