From 8a50aae2d0c7cc03368c610a82a3b47d5fd781e5 Mon Sep 17 00:00:00 2001 From: Stachelbeere1248 Date: Tue, 15 Apr 2025 00:56:43 +0200 Subject: [PATCH] fix regex --- gradle.properties | 2 +- src/main/java/xyz/stachel/bonzotimer/ChatHandler.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index a521415..f04bf71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2g baseGroup = xyz.stachel.bonzotimer mcVersion = 1.8.9 modid = bonzo-timer -version = 1.2.2 +version = 1.2.4 org.gradle.java.installations.paths=/home/stachel/down/zulu8.84.0.15-ca-jdk8.0.442-linux_x64 diff --git a/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java b/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java index 9696165..a58d145 100644 --- a/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java +++ b/src/main/java/xyz/stachel/bonzotimer/ChatHandler.java @@ -42,11 +42,11 @@ public class ChatHandler { @SubscribeEvent public void onChatReceived(@NotNull ClientChatReceivedEvent event) { if (event.type == 2) return; - final String message = event.message.getUnformattedText().trim().replaceAll("§[0-9a-f]", ""); + final String strippedMessage = event.message.getUnformattedText().replaceAll("§[0-9a-fklmnor]", "").trim(); if (autotransferEnabled) { - final Matcher transfer = TRANSFER_PATTERN.matcher(message); - final Matcher promote = PROMOTE_PATTERN.matcher(message); + final Matcher transfer = TRANSFER_PATTERN.matcher(strippedMessage); + final Matcher promote = PROMOTE_PATTERN.matcher(strippedMessage); String newLeader = ""; if (transfer.matches()) { this.oldLeader = transfer.group(2); @@ -61,7 +61,7 @@ public class ChatHandler { } } - final Matcher partyChat = PARTY_PATTERN.matcher(message); + final Matcher partyChat = PARTY_PATTERN.matcher(strippedMessage); if (partyChat.matches()) { final String partyMessage = partyChat.group(2); final String user = partyChat.group(1); @@ -94,7 +94,7 @@ public class ChatHandler { break; } } else { - switch (message) { + switch (strippedMessage) { case "Your Bonzo's Mask saved your life!": case "Your ⚚ Bonzo's Mask saved your life!": Timer.setInstance(new Timer((byte) 60)); @@ -125,7 +125,6 @@ public class ChatHandler { this.changeColor(1); break; default: - BonzoTimer.getInstance().getLogger().debug(message); break; } }