From e209163d561d463472e6cb889c933ee5da99270c Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 19 Nov 2023 04:25:51 -0500 Subject: Fix crop detection when farming it during a contest --- .../hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java index 39f0ba73..7db32913 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java @@ -21,7 +21,8 @@ public class JacobsContestWidget extends Widget { private static final MutableText TITLE = Text.literal("Jacob's Contest").formatted(Formatting.YELLOW, Formatting.BOLD); - private static final Pattern CROP_PATTERN = Pattern.compile("(?:☘|○) (?[A-Za-z ]+)"); + //TODO Properly match the contest placement and display it + private static final Pattern CROP_PATTERN = Pattern.compile("(?:☘|○) (?[A-Za-z ]+)(?:.+)?"); private static final HashMap FARM_DATA = new HashMap<>(); @@ -61,7 +62,7 @@ public class JacobsContestWidget extends Widget { if (item == null) { itc = new IcoTextComponent(); } else { - String cropName = item.group("crop"); + String cropName = item.group("crop").trim(); itc = new IcoTextComponent(FARM_DATA.get(cropName), Text.of(cropName)); } tc.addToCell(0, i - 77, itc); -- cgit