Merge pull request #777 from LifeIsAParadox/update-mod-to-1.21.0

update mod to 1.21.0

2 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
index b845e07a..5837ea20 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
@@ -135,7 +135,7 @@ public class FarmingHud {
     }
 
     public enum CounterType {
-        NONE("", "No Counter: "),
+        NONE("", "No Counter"),
         COUNTER("mined_crops", "Counter: "),
         CULTIVATING("farmed_cultivating", "Cultivating Counter: ");
 
@@ -146,5 +146,8 @@ public class FarmingHud {
             this.nbtKey = nbtKey;
             this.text = text;
         }
+        public boolean matchesText(String textToMatch) {
+            return this.text.equals(textToMatch);
+        }
     }
 }
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 c413ad44..84013f0b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -66,7 +66,10 @@ public class FarmingHudWidget extends Widget {
         String cropItemId = FARMING_TOOLS.get(ItemUtils.getItemId(farmingToolStack));
         ItemStack cropStack = ItemRepository.getItemStack(ItemTooltip.getNeuName(cropItemId, cropItemId)); // The cropItemId is being used as the api id in the second parameter because the skyblock id and api id are the same for all crops.
 
-        addSimpleIcoText(cropStack, FarmingHud.counterText(), Formatting.YELLOW, FarmingHud.NUMBER_FORMAT.format(FarmingHud.counter()));
+        String counterText = FarmingHud.counterText();
+        String counterNumber = FarmingHud.NUMBER_FORMAT.format(FarmingHud.counter());
+        if (FarmingHud.CounterType.NONE.matchesText(counterText)) counterNumber = "";
+        addSimpleIcoText(cropStack, counterText, Formatting.YELLOW, counterNumber);
         float cropsPerMinute = FarmingHud.cropsPerMinute();
         addSimpleIcoText(cropStack, "Crops/min: ", Formatting.YELLOW, FarmingHud.NUMBER_FORMAT.format((int) cropsPerMinute / 10 * 10));
         addSimpleIcoText(Ico.GOLD, "Coins/h: ", Formatting.GOLD, getPriceText(cropItemId, cropsPerMinute));