chat message changes #482

* add chat component functions

* reword + remove empty text

* remove type

* isPlayerMessage

* include the other stuff in the translator pr plus format

* Merge branch 'hannibal002:beta' into chat_component_stuff

* Merge remote-tracking branch 'origin/chat_component_stuff' into chat_…

* allow to work with priv messages + get ready for future

2 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
index 1274fbdf2..300f8805b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
@@ -1,16 +1,17 @@
 package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.test.command.CopyErrorCommand
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.OSUtils
+import at.hannibal2.skyhanni.utils.StringUtils.getPlayerName
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import com.google.gson.*
 import net.minecraft.event.ClickEvent
 import net.minecraft.event.HoverEvent
 import net.minecraft.util.ChatComponentText
 import net.minecraft.util.ChatStyle
-import net.minecraftforge.client.event.ClientChatReceivedEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.apache.http.client.config.RequestConfig
@@ -23,26 +24,24 @@ import java.net.URLDecoder
 import java.net.URLEncoder
 
 class Translator {
-
     private val messageContentRegex = Regex(".*: (.*)")
 
     // Logic for listening for a user click on a chat message is from NotEnoughUpdates
 
-    @SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
-    fun onGuiChat(e: ClientChatReceivedEvent) {
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onGuiChat(e: LorenzChatEvent) {
         if (!SkyHanniMod.feature.chat.translator) return
-        if (e.type != 0.toByte()) return // If this is not a player-sent message, return
 
-        val chatComponent = e.message
-        val message = chatComponent.unformattedText
-        if (!messageContentRegex.matches(message.removeColor())) return
+        val message = e.message
+        if (message.getPlayerName() == "-") return
+
+        val editedComponent = if (e.chatComponent.siblings.size > 0) e.chatComponent.siblings.last() else e.chatComponent
 
-        val clickStyle = createClickStyle(message)
-        chatComponent.siblings.last().setChatStyle(clickStyle)
+        val clickStyle = createClickStyle(message.removeColor(), editedComponent.chatStyle)
+        editedComponent.setChatStyle(clickStyle)
     }
 
-    private fun createClickStyle(message: String): ChatStyle {
-        val style = ChatStyle()
+    private fun createClickStyle(message: String, style: ChatStyle): ChatStyle {
         style.setChatClickEvent(
             ClickEvent(
                 ClickEvent.Action.RUN_COMMAND,
@@ -212,5 +211,4 @@ class Translator {
             OSUtils.copyToClipboard(translation)
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt
index 72c265cc6..6c0be90d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt
@@ -3,12 +3,13 @@ package at.hannibal2.skyhanni.features.inventory
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.GuiContainerEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.interpolate
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.item.ItemStack
-import net.minecraftforge.client.event.ClientChatReceivedEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 import kotlin.time.*
@@ -57,8 +58,8 @@ class HighlightBonzoMasks {
     }
 
     @SubscribeEvent
-    fun onChatReceived(event: ClientChatReceivedEvent) {
-        val message = event.message.unformattedText
+    fun onChatReceived(event: LorenzChatEvent) {
+        val message = event.message.removeColor()
         if (bonzoMaskMessage.matches(message)) {
             maskTimers["BONZO_MASK"] = CooldownTimer(TimeSource.Monotonic.markNow(), bonzoMaskCooldown)
         } else if (spiritMaskMessage.matches(message)) {