From aafc9be2b850fda7e6f6892d061299f8621e2007 Mon Sep 17 00:00:00 2001 From: Zickles Date: Mon, 22 Jul 2024 00:12:04 -0400 Subject: [PATCH 1/3] fix(pm): update regex to check for the whole message --- .../handlers/chat/modules/modifiers/DefaultChatRestyler.java | 5 +++-- .../org/polyfrost/hytils/handlers/language/LanguageData.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java index c3536df..25bc8cb 100644 --- a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java +++ b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java @@ -102,10 +102,10 @@ public void onMessageReceived(@NotNull ClientChatReceivedEvent event) { Matcher privateMessageFromMatcher = language.chatRestylerPrivateMessageFromPatternRegex.matcher(message); if (privateMessageToMatcher.find()) { event.message = shortenChannelName(event.message, language.chatRestylerPrivateMessageToPatternRegex.pattern(), - "§d" + "PM >", true); + "§d" + "PM >" + privateMessageToMatcher.group(3) + ":" + privateMessageToMatcher.group(4), true); } else if (privateMessageFromMatcher.find()) { event.message = shortenChannelName(event.message, language.chatRestylerPrivateMessageFromPatternRegex.pattern(), - "§5" + "PM <", true); + "§5" + "PM <" + privateMessageFromMatcher.group(3) + ":" + privateMessageFromMatcher.group(4), true); } } @@ -209,6 +209,7 @@ private ChatComponentText shortenChannelName(IChatComponent message, String patt String originalText = message.getUnformattedTextForChat(); if (checkParentComponent && !originalText.contains("\u00a7")) { originalText = (message.getChatStyle().getFormattingCode() + originalText + EnumChatFormatting.RESET).replaceAll(pattern, replacement); + System.out.println(originalText); } ChatComponentText copy = (ChatComponentText) new ChatComponentText(originalText).setChatStyle(message.getChatStyle()); for (IChatComponent sibling : message.getSiblings()) { diff --git a/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java b/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java index c3be347..5929989 100644 --- a/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java +++ b/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java @@ -80,8 +80,8 @@ public class LanguageData { private String chatRestylerFriendPattern = "^((?:\u00a7r)?\u00a7\\w)(Friend >)"; private String chatRestylerOfficerPattern = "^((?:\u00a7r)?\u00a7\\w)(Officer >)"; private String chatRestylerStatusPattern = "^(?(?:\u00a7aFriend|\u00a7a\u00a7aF|\u00a72Guild|\u00a72\u00a72G)) > (\u00a7r|\u00a7r\u00a7r){1,2}(?\u00a7[\\da-f]\\w{1,16}) \u00a7r\u00a7e(?(?:joined|left))\\.\u00a7r$"; - private String chatRestylerPrivateMessageToPattern = "^((?:\u00a7r)?\u00a7\\w)(To)"; - private String chatRestylerPrivateMessageFromPattern = "^((?:\u00a7r)?\u00a7\\w)(From)"; + private String chatRestylerPrivateMessageToPattern = "^((?:§r)?§\\w)(To)([^:]*):(.*)"; + private String chatRestylerPrivateMessageFromPattern = "^((?:§r)?§\\w)(From)([^:]*):(.*)"; private String autoChatSwapperPartyStatus = "^(?:You have been kicked from the party by (?:\\[.+] )?\\w{1,16}|(?:\\[.+] )?\\w{1,16} has disbanded the party!|You left the party.)$"; private String autoChatSwapperPartyStatus2 = "^(?:You have joined (?:\\[.+] )?(?:.*)|Party Members(?:\\[.+] )?\\w{1,100}|(?:\\[.+] )?\\w{1,100} joined the(?:.*) party(?:.*))$"; From 9fdaa3f168cfd841725500fc9db200de9dcd381b Mon Sep 17 00:00:00 2001 From: Zickles Date: Mon, 22 Jul 2024 00:15:28 -0400 Subject: [PATCH 2/3] remove log --- .../handlers/chat/modules/modifiers/DefaultChatRestyler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java index 25bc8cb..01c983a 100644 --- a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java +++ b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/modifiers/DefaultChatRestyler.java @@ -209,7 +209,6 @@ private ChatComponentText shortenChannelName(IChatComponent message, String patt String originalText = message.getUnformattedTextForChat(); if (checkParentComponent && !originalText.contains("\u00a7")) { originalText = (message.getChatStyle().getFormattingCode() + originalText + EnumChatFormatting.RESET).replaceAll(pattern, replacement); - System.out.println(originalText); } ChatComponentText copy = (ChatComponentText) new ChatComponentText(originalText).setChatStyle(message.getChatStyle()); for (IChatComponent sibling : message.getSiblings()) { From 87304cff1cf030f1e10c5900be193a2f016c1aa5 Mon Sep 17 00:00:00 2001 From: Zickles Date: Mon, 22 Jul 2024 00:17:13 -0400 Subject: [PATCH 3/3] fix unicode --- .../org/polyfrost/hytils/handlers/language/LanguageData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java b/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java index 5929989..1c93a49 100644 --- a/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java +++ b/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java @@ -80,8 +80,8 @@ public class LanguageData { private String chatRestylerFriendPattern = "^((?:\u00a7r)?\u00a7\\w)(Friend >)"; private String chatRestylerOfficerPattern = "^((?:\u00a7r)?\u00a7\\w)(Officer >)"; private String chatRestylerStatusPattern = "^(?(?:\u00a7aFriend|\u00a7a\u00a7aF|\u00a72Guild|\u00a72\u00a72G)) > (\u00a7r|\u00a7r\u00a7r){1,2}(?\u00a7[\\da-f]\\w{1,16}) \u00a7r\u00a7e(?(?:joined|left))\\.\u00a7r$"; - private String chatRestylerPrivateMessageToPattern = "^((?:§r)?§\\w)(To)([^:]*):(.*)"; - private String chatRestylerPrivateMessageFromPattern = "^((?:§r)?§\\w)(From)([^:]*):(.*)"; + private String chatRestylerPrivateMessageToPattern = "^((?:\u00a7r)?\u00a7\\w)(To)([^:]*):(.*)"; + private String chatRestylerPrivateMessageFromPattern = "^((?:\u00a7r)?\u00a7\\w)(From)([^:]*):(.*)"; private String autoChatSwapperPartyStatus = "^(?:You have been kicked from the party by (?:\\[.+] )?\\w{1,16}|(?:\\[.+] )?\\w{1,16} has disbanded the party!|You left the party.)$"; private String autoChatSwapperPartyStatus2 = "^(?:You have joined (?:\\[.+] )?(?:.*)|Party Members(?:\\[.+] )?\\w{1,100}|(?:\\[.+] )?\\w{1,100} joined the(?:.*) party(?:.*))$";