From cac8a42e71b04833d5b62e8bd48e496b493f1afa Mon Sep 17 00:00:00 2001 From: Rime <81419447+Emirlol@users.noreply.github.com> Date: Wed, 29 May 2024 19:47:05 +0300 Subject: Fix titlePattern not matching when the title is changed by ChestValue --- .../java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java | 2 +- .../de/hysky/skyblocker/skyblock/item/tooltip/adders/TooltipAdder.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock/item/tooltip') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java index f6652248..324c0616 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/TooltipManager.java @@ -40,7 +40,7 @@ public class TooltipManager { private static void onScreenChange(Screen screen) { final String title = screen.getTitle().getString(); for (TooltipAdder adder : adders) { - if (adder.titlePattern == null || adder.titlePattern.matcher(title).matches()) { + if (adder.titlePattern == null || adder.titlePattern.matcher(title).find()) { currentScreenAdders.add(adder); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/TooltipAdder.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/TooltipAdder.java index b0b24c1c..065dfe5e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/TooltipAdder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/TooltipAdder.java @@ -1,5 +1,6 @@ package de.hysky.skyblocker.skyblock.item.tooltip.adders; +import de.hysky.skyblocker.skyblock.ChestValue; import de.hysky.skyblocker.skyblock.item.tooltip.TooltipManager; import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; @@ -13,6 +14,8 @@ import java.util.regex.Pattern; public abstract class TooltipAdder { /** * The title of the screen must match this pattern for this adder to be applied. Null means it will be applied to all screens. + * @implNote Don't end your regex with a {@code $} as {@link ChestValue} appends text to the end of the title, + * so the regex will stop matching if the player uses it. */ public final Pattern titlePattern; /** -- cgit