From 38e1057e08afcfe2912a19183ab70de97476d902 Mon Sep 17 00:00:00 2001 From: viciscat <51047087+viciscat@users.noreply.github.com> Date: Wed, 24 Apr 2024 02:41:59 +0200 Subject: fix garden icons and clamp the progress bar (#668) * professional bug fixer * capitalize the s --- .../de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java | 10 +++++++--- .../skyblock/tabhud/widget/component/ProgressComponent.java | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java index febbe825..d03323be 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java @@ -31,13 +31,17 @@ public class FarmingHudWidget extends Widget { Map.entry("THEORETICAL_HOE_CANE_1", Ico.SUGAR_CANE), Map.entry("THEORETICAL_HOE_CANE_2", Ico.SUGAR_CANE), Map.entry("THEORETICAL_HOE_CANE_3", Ico.SUGAR_CANE), - Map.entry("THEORETICAL_HOE_WARTs_1", Ico.NETHER_WART), - Map.entry("THEORETICAL_HOE_WARTs_2", Ico.NETHER_WART), - Map.entry("THEORETICAL_HOE_WARTs_3", Ico.NETHER_WART), + Map.entry("THEORETICAL_HOE_WARTS_1", Ico.NETHER_WART), + Map.entry("THEORETICAL_HOE_WARTS_2", Ico.NETHER_WART), + Map.entry("THEORETICAL_HOE_WARTS_3", Ico.NETHER_WART), Map.entry("FUNGI_CUTTER", Ico.MUSHROOM), Map.entry("CACTUS_KNIFE", Ico.CACTUS), Map.entry("MELON_DICER", Ico.MELON), + Map.entry("MELON_DICER_2", Ico.MELON), + Map.entry("MELON_DICER_3", Ico.MELON), Map.entry("PUMPKIN_DICER", Ico.PUMPKIN), + Map.entry("PUMPKIN_DICER_2", Ico.PUMPKIN), + Map.entry("PUMPKIN_DICER_3", Ico.PUMPKIN), Map.entry("COCO_CHOPPER", Ico.COCOA_BEANS) ); public static final FarmingHudWidget INSTANCE = new FarmingHudWidget(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java index fa839dbe..c4388178 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java @@ -5,6 +5,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +import net.minecraft.util.math.MathHelper; /** @@ -36,7 +37,7 @@ public class ProgressComponent extends Component { this.ico = (ico == null) ? Ico.BARRIER : ico; this.desc = d; this.bar = b; - this.pcnt = pcnt; + this.pcnt = MathHelper.clamp(pcnt, 0f, 100f); this.color = 0xff000000 | color; } -- cgit