Update regex for position addition

2 files changed, 25 insertions, 1 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffects.java b/src/main/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffects.java
index 7d0b4b87..abaac713 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffects.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffects.java
@@ -4,6 +4,7 @@ import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 
 import com.mojang.logging.LogUtils;
@@ -20,7 +21,8 @@ import net.minecraft.text.Text;
 public class DyeSpecialEffects {
 	private static final Logger LOGGER = LogUtils.getLogger();
 	private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
-	private static final Pattern DROP_PATTERN = Pattern.compile("WOW! (?:\\[[A-Z+]+\\] )?(?<player>[A-Za-z0-9_]+) found (?<dye>[A-Za-z ]+ Dye)!");
+	@VisibleForTesting
+	protected static final Pattern DROP_PATTERN = Pattern.compile("WOW! (?:\\[[A-Z+]+\\] )?(?<player>[A-Za-z0-9_]+) found (?<dye>[A-Za-z ]+ Dye) #[\\d,]+!");
 
 	static void init() {
 		ClientReceiveMessageEvents.GAME.register(DyeSpecialEffects::displayDyeDropEffect);
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java b/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java
new file mode 100644
index 00000000..e5910c8d
--- /dev/null
+++ b/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java
@@ -0,0 +1,22 @@
+package de.hysky.skyblocker.skyblock.special;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DyeSpecialEffectsTest {
+
+	@Test
+	void testDye1() {
+		Assertions.assertTrue(DyeSpecialEffects.DROP_PATTERN.matcher("WOW! [MVP+] Crystalfall found Necron Dye #7!").matches(), "Dye Test #1 didn't match!");
+	}
+	
+	@Test
+	void testDye2() {
+		Assertions.assertTrue(DyeSpecialEffects.DROP_PATTERN.matcher("WOW! [MVP+] AzureAaron found Wild Strawberry Dye #1,888!").matches(), "Dye Test #2 didn't match!");
+	}
+
+	@Test
+	void testDye3() {
+		Assertions.assertTrue(DyeSpecialEffects.DROP_PATTERN.matcher("WOW! [MVP+] Viciscat found Cat Dye #1!").matches(), "Dye Test #3 didn't match!");
+	}
+}