From a29f8090ff819b100c9a1725faff1241e562c4f3 Mon Sep 17 00:00:00 2001
From: ingle <inglettronald@gmail.com>
Date: Mon, 3 Oct 2022 23:51:37 -0500
Subject: Expanded Bridge Support to fit "name: message" format

---
 src/main/kotlin/dulkirmod/config/Config.kt    |  2 +-
 src/main/kotlin/dulkirmod/events/ChatEvent.kt | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/kotlin/dulkirmod/config/Config.kt b/src/main/kotlin/dulkirmod/config/Config.kt
index d17ef47..da017c0 100644
--- a/src/main/kotlin/dulkirmod/config/Config.kt
+++ b/src/main/kotlin/dulkirmod/config/Config.kt
@@ -294,7 +294,7 @@ object Config : Vigilant(File("./config/dulkirmod/config.toml"), "DulkirMod", so
         )
         setCategoryDescription(
             "Bridge",
-            "Expected format: (bridge bot user) > (sent message) - without any parenthesis."
+            "If your bridge format does not work, message me on discord and I can probably add it."
         )
     }
     private object ConfigSorting : SortingBehavior() {
diff --git a/src/main/kotlin/dulkirmod/events/ChatEvent.kt b/src/main/kotlin/dulkirmod/events/ChatEvent.kt
index f1a4bef..e034996 100644
--- a/src/main/kotlin/dulkirmod/events/ChatEvent.kt
+++ b/src/main/kotlin/dulkirmod/events/ChatEvent.kt
@@ -10,7 +10,8 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class ChatEvent {
-    private val guildFormat = "^(§2Guild|§3Officer) > (?:\\S+ )?([\\w§]{3,18})(?: §[a-z]\\[[A-Z]+])?§f: (\\w+) > .+".toRegex()
+    private val guildFormat = "^(§2Guild|§3Officer) > (?:\\S+ )?([\\w§]{3,18})(?: §[a-z0-9]\\[[A-Z]+])?§f: (\\w+) > .+".toRegex()
+    private val alternateFormat = "^(§2Guild|§3Officer) > (?:\\S+ )?([\\w§]{3,18})(?: §[a-z0-9]\\[[A-Z]+])?§f: (\\w+): .+".toRegex()
     @SubscribeEvent(receiveCanceled = true, priority = EventPriority.LOW)
     fun onChat(event: ClientChatReceivedEvent) {
         if (event.type == 2.toByte()) {
@@ -40,5 +41,21 @@ class ChatEvent {
                 ).setChatStyle(event.message.siblings[1].chatStyle.createShallowCopy())
             }
         }
+
+        // OTHER FORMAT
+        else if (alternateFormat matches message && Config.bridgeBot) {
+            val matchResult = alternateFormat.find(message)
+            val (prefix, name, playerName) = matchResult!!.destructured
+            if (stripColorCodes(name.lowercase()) == Config.botName.lowercase()) {
+                val newPrefix = if (prefix == "§2Guild") "§2Bridge" else "§3Bridge"
+                val color = if (Config.bridgeColor == 16) "§z" else EnumChatFormatting.values()[Config.bridgeColor]
+                event.message.siblings[0] = ChatComponentText(
+                    "$newPrefix > $color$playerName§f: "
+                )
+                event.message.siblings[1] = ChatComponentText(
+                    event.message.siblings[1].unformattedText.replace("$playerName: ", "")
+                ).setChatStyle(event.message.siblings[1].chatStyle.createShallowCopy())
+            }
+        }
     }
 }
\ No newline at end of file
-- 
cgit