group new regexes better

Polyfrost · Jun 18, 2024 · c60466a · c60466a
1 parent 688b7f3
commit c60466a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/org/polyfrost/hytils/handlers/chat/modules/blockers/KarmaRemover.java b/src/main/java/org/polyfrost/hytils/handlers/chat/modules/blockers/KarmaRemover.java
@@ -28,7 +28,7 @@ public class KarmaRemover implements ChatReceiveModule {
     @Override
     public void onMessageReceived(@NotNull ClientChatReceivedEvent event) {
         String message = EnumChatFormatting.getTextWithoutFormattingCodes(event.message.getUnformattedText());
-        if (getLanguage().cancelKarmaMessagesRegex.matcher(message).matches()) {
+        if (getLanguage().chatCleanerKarmaMessagesRegex.matcher(message).matches()) {
             event.setCanceled(true);
         }
     }

diff --git a/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java b/src/main/java/org/polyfrost/hytils/handlers/language/LanguageData.java
@@ -34,11 +34,10 @@ public class LanguageData {
      */
     private String autoQueuePrefixGlobal = "^(?:You died! .+|YOU DIED! .+|You have been eliminated!|You won! .+|YOU WON! .+)$";
 
-    private String casualGameEnd = "^(?:MINOR EVENT! .+ in .+ ended|DRAGON EGG OVER! Earned [\\d,]+XP [\\d,]g clicking the egg \\d+ times|GIANT CAKE! Event ended! Cake's gone!|PIT EVENT ENDED: .+ \\[INFO\\])$";
-
     private String autoFriendPattern = "Friend request from (?<name>.+)\\[ACCEPT] - \\[DENY] - \\[IGNORE].*";
     private String autoAfkReplyPattern = "^From (\\[.+?] )?(.+?): .+$";
 
+    private String chatCleanerKarmaMessages = "^\\+(?<karma>\\d)+ Karma!$";
     private String chatCleanerJoin = "(?:sled into|slid into|joined|spooked into) the lobby";
     private String chatCleanerTicketAnnouncer = "^(?<player>(?!You )\\w{1,16} )has found an? .+$";
     private String chatCleanerSoulWellFind = "^.+ has found .+ in the Soul Well!$";
@@ -100,8 +99,8 @@ public class LanguageData {
 
     private String hypixelLevelUp = "You are now Hypixel Level (?<level>\\d+)!";
 
+    private String casualGameEnd = "^(?:MINOR EVENT! .+ in .+ ended|DRAGON EGG OVER! Earned [\\d,]+XP [\\d,]g clicking the egg \\d+ times|GIANT CAKE! Event ended! Cake's gone!|PIT EVENT ENDED: .+ \\[INFO\\])$";
     private String cancelGgMessages = "^(?:.* )?(?:\\[.+] )?\\w{1,16}(?: .+)?: (?:❤|gg|GG|gf|Good Game|Good Fight|Good Round! :D|Have a good day!|<3|AutoGG By Sk1er!|AutoGG By Hytils Reborn!|gf|Good Fight|Good Round|:D|Well Played!|wp)$";
-    private String cancelKarmaMessages = "^\\+(?<karma>\\d)+ Karma!$";
     private String cancelGlMessages = "(?!.+: )(gl|glhf|good luck|have a good game|autogl by sk1er)";
 
     public String autoChatReportConfirm = "Please type /report confirm to log your report for staff review.";
@@ -118,11 +117,10 @@ public class LanguageData {
      */
     public Pattern autoQueuePrefixGlobalRegex;
 
-    public Pattern casualGameEndRegex;
-
     public Pattern autoFriendPatternRegex;
     public Pattern autoAfkReplyPatternRegex;
 
+    public Pattern chatCleanerKarmaMessagesRegex;
     public Pattern chatCleanerJoinRegex;
     public Pattern chatCleanerTicketAnnouncerRegex;
     public Pattern chatCleanerSoulWellFindRegex;
@@ -170,8 +168,8 @@ public class LanguageData {
 
     public Pattern hypixelLevelUpRegex;
 
+    public Pattern casualGameEndRegex;
     public Pattern cancelGgMessagesRegex;
-    public Pattern cancelKarmaMessagesRegex;
     public Pattern cancelGlMessagesRegex;
 
     public Pattern gameBossbarAdvertisementRegex;
@@ -185,11 +183,10 @@ public void initialize() {
 
             autoQueuePrefixGlobalRegex = Pattern.compile(autoQueuePrefixGlobal);
 
-            casualGameEndRegex = Pattern.compile(casualGameEnd);
-
             autoFriendPatternRegex = Pattern.compile(autoFriendPattern);
             autoAfkReplyPatternRegex = Pattern.compile(autoAfkReplyPattern);
 
+            chatCleanerKarmaMessagesRegex = Pattern.compile(chatCleanerKarmaMessages);
             chatCleanerJoinRegex = Pattern.compile(chatCleanerJoin);
             chatCleanerTicketAnnouncerRegex = Pattern.compile(chatCleanerTicketAnnouncer);
             chatCleanerSoulWellFindRegex = Pattern.compile(chatCleanerSoulWellFind);
@@ -237,8 +234,8 @@ public void initialize() {
 
             hypixelLevelUpRegex = Pattern.compile(hypixelLevelUp);
 
+            casualGameEndRegex = Pattern.compile(casualGameEnd);
             cancelGgMessagesRegex = Pattern.compile(cancelGgMessages);
-            cancelKarmaMessagesRegex = Pattern.compile(cancelKarmaMessages);
             cancelGlMessagesRegex = Pattern.compile(cancelGlMessages, Pattern.CASE_INSENSITIVE);
 
             gameBossbarAdvertisementRegex = Pattern.compile(gameBossbarAdvertisement);