Merge pull request #39 from RappyLabyAddons/fix/coloredTeamAndClan

Fix `@CLAN` and `@TEAM` getting overwritten
RappyLabyAddons · Dec 7, 2023 · 96d7389 · 96d7389
2 parents 9bc05e1 + 103bc64
commit 96d7389
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ labyMod {
         author = "RappyTV"
         description = "Adds some ingame utilities for OPSUCHT.net | Not affiliated with Interwebmedia GmbH"
         minecraftVersion = "1.19<*"
-        version = System.getenv().getOrDefault("VERSION", "1.1.8")
+        version = System.getenv().getOrDefault("VERSION", "1.1.9")
     }
 
     minecraft {

diff --git a/core/src/main/java/com/rappytv/opsucht/listeners/ChatReceiveListener.java b/core/src/main/java/com/rappytv/opsucht/listeners/ChatReceiveListener.java
@@ -32,6 +32,7 @@ public void onChatReceive(ChatReceiveEvent event) {
 
         if(config.coloredMentions().get() && text.contains("@")) {
             for(MatchResult matcher : pattern.matcher(text).results().toList()) {
+                if(matcher.group().equals("@TEAM") || matcher.group().equals("@CLAN")) continue;
                 replaceComponent(message, matcher.group(), () -> Component.text(matcher.group(), NamedTextColor.AQUA).copy());
             }
             event.setMessage(message);

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 rootProject.name = "OPSUCHT-Utilities"
 
 pluginManagement {
-    val labyGradlePluginVersion = "0.3.29"
+    val labyGradlePluginVersion = "0.3.38"
     plugins {
         id("net.labymod.gradle") version (labyGradlePluginVersion)
     }