2 files changed, 27 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
index 2a21776e..0e3b4d59 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
@@ -53,7 +53,8 @@ public class CrystalsLocationsManager {
      * A look-up table to convert between location names and waypoint in the {@link MiningLocationLabel.CrystalHollowsLocationsCategory} values.
      */
     private static final Map<String, MiningLocationLabel.CrystalHollowsLocationsCategory> WAYPOINT_LOCATIONS = Arrays.stream(MiningLocationLabel.CrystalHollowsLocationsCategory.values()).collect(Collectors.toMap(MiningLocationLabel.CrystalHollowsLocationsCategory::getName, Function.identity()));
-    private static final Pattern TEXT_CWORDS_PATTERN = Pattern.compile("([0-9][0-9][0-9])\\D*([0-9][0-9][0-9]?)\\D*([0-9][0-9][0-9])");
+    //Package-private for testing
+    static final Pattern TEXT_CWORDS_PATTERN = Pattern.compile("\\Dx?(\\d{3})(?=[, ]),? ?y?(\\d{2,3})(?=[, ]),? ?z?(\\d{3})\\D?(?!\\d)");
     private static final int REMOVE_UNKNOWN_DISTANCE = 50;
 
     protected static Map<String, MiningLocationLabel> activeWaypoints = new HashMap<>();
@@ -72,7 +73,6 @@ public class CrystalsLocationsManager {
     }
 
     private static void extractLocationFromMessage(Text message, Boolean overlay) {
-
         if (!SkyblockerConfigManager.get().mining.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows() || overlay) {
             return;
         }
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java
index 5d555742..11331fae 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java
@@ -6,7 +6,31 @@ import org.junit.jupiter.api.Test;
 
 import de.hysky.skyblocker.utils.Constants;
 
-public class CrystalsLocationManagerTest {
+class CrystalsLocationManagerTest {
+    boolean matches(String text) {
+        return CrystalsLocationsManager.TEXT_CWORDS_PATTERN.matcher(text).find();
+    }
+
+    @Test
+    void testRegex() {
+        Assertions.assertTrue(matches("x123 y12 z123"));
+        Assertions.assertTrue(matches("x123, y12, z123"));
+        Assertions.assertTrue(matches("Player: 123 12 123")); //This and the ones below fail when specified in the same format as those above, as the regex check assumes that the message is sent somewhere in a message and that it isn't the whole message
+        Assertions.assertTrue(matches("Player: 123 123 123"));
+        Assertions.assertTrue(matches("Player: 123, 12, 123"));
+        Assertions.assertTrue(matches("Player: 123, 123, 123"));
+        Assertions.assertTrue(matches("Player: 123,12,123"));
+        Assertions.assertTrue(matches("Player: 123,123,123"));
+
+        Assertions.assertFalse(matches("Player: 123 1234 123"));
+        Assertions.assertFalse(matches("Player: 1234 12 123"));
+        Assertions.assertFalse(matches("Player: 123 12 1234"));
+        Assertions.assertFalse(matches("Player: 12 12 123"));
+        Assertions.assertFalse(matches("Player: 123 1 123"));
+        Assertions.assertFalse(matches("Player: 123 12 12"));
+        Assertions.assertFalse(matches("Player: 12312123"));
+        Assertions.assertFalse(matches("Player: 123123123"));
+    }
 
     @Test
     void testLocationInCrystals() {