From 09c41b9513b5302cebbc0593ed735e35e9ee6009 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Thu, 7 Dec 2023 00:06:08 +0100 Subject: [PATCH 1/3] Bump labygradle --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 60a509f..70340cb 100644 --- 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) } From d29cb53d2b3a364cf73fee41c0e0bf69cd1713f6 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Thu, 7 Dec 2023 00:07:05 +0100 Subject: [PATCH 2/3] Add @CLAN/@TEAM as MatchResult#group exceptions --- .../java/com/rappytv/opsucht/listeners/ChatReceiveListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/com/rappytv/opsucht/listeners/ChatReceiveListener.java b/core/src/main/java/com/rappytv/opsucht/listeners/ChatReceiveListener.java index 2e4881f..234777d 100644 --- 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); From 103bc6447cece5750f186e2245a46419a3a11f71 Mon Sep 17 00:00:00 2001 From: RappyTV Date: Thu, 7 Dec 2023 00:07:16 +0100 Subject: [PATCH 3/3] Bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4b76a5e..db1dea7 100644 --- 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 {