Merge branch 'main' into 'main'

Fix distant-horizons#870 : Correctly template regex

See merge request distant-horizons-team/distant-horizons-core!73
This commit is contained in:
s809
2024-11-20 16:27:44 +00:00
@@ -12,7 +12,8 @@ public class LevelInitMessage extends AbstractNetworkMessage
// prefix@namespace:path
// 1-150 characters in total, all parts except namespace can be omitted
public static final String VALIDATION_REGEX = "^(?=.{1,$MAX_LENGTH}$)([$PART_ALLOWED_CHARS_REGEX]+@)?[$PART_ALLOWED_CHARS_REGEX]+(:[$PART_ALLOWED_CHARS_REGEX]+)?$";
public static final String VALIDATION_REGEX = String.format("^(?=.{1,%s}$)([%s]+@)?[%s]+(:[%s]+)?$",
+ MAX_LENGTH, PART_ALLOWED_CHARS_REGEX, PART_ALLOWED_CHARS_REGEX, PART_ALLOWED_CHARS_REGEX);
public String levelKey;