Merge remote-tracking branch 'origin/main'

api/src/main/java/com/alttd/chat/config/Config.java

@@ -172,6 +172,7 @@ public final class Config {
     public static String CONSOLENAME = "Console";
     public static UUID CONSOLEUUID = UUID.randomUUID();
     public static int EMOTELIMIT = 3;
+    public static String MENTIONPLAYERTAG = "<aqua>@</aqua>";
     private static void settings() {
         PREFIXGROUPS = getList("settings.prefix-groups",
                 Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch", "developer"));
@@ -183,6 +184,7 @@ public final class Config {
         CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString()));
         MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK);
         EMOTELIMIT = getInt("settings.emote-limit", EMOTELIMIT);
+        MENTIONPLAYERTAG = getString("settings.mention-player-tag", MENTIONPLAYERTAG);
     }
 
     public static List<String> MESSAGECOMMANDALIASES = new ArrayList<>();

api/src/main/java/com/alttd/chat/objects/ChatFilter.java

@@ -110,7 +110,7 @@ public class ChatFilter {
             String group = matcher.group();
             modifiableString.replace(TextReplacementConfig.builder()
                     .matchLiteral(group)
-                    .replacement(group.substring(0, length))
+                    .replacement(Component.text(group.substring(0, length), modifiableString.component().color()))
                     .build());
         }
     }