mark players in chat

4 files changed, 91 insertions, 18 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/PlayerMarker.kt b/src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt
index eac2f2575..48570898d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/PlayerMarker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt
@@ -1,5 +1,7 @@
 package at.hannibal2.skyhanni.features
 
+import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.events.PlayerSendChatEvent
 import at.hannibal2.skyhanni.events.RenderMobColoredEvent
 import at.hannibal2.skyhanni.events.ResetEntityHurtEvent
 import at.hannibal2.skyhanni.events.withAlpha
@@ -7,11 +9,12 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
+import net.minecraft.util.EnumChatFormatting
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 
-class PlayerMarker {
+class MarkedPlayerManager {
 
     companion object {
         private val playerNamesToMark = mutableListOf<String>()
@@ -25,14 +28,21 @@ class PlayerMarker {
 
             val displayName = args[0]
             val name = displayName.lowercase()
+
+
+            if (name == Minecraft.getMinecraft().thePlayer.name.lowercase()) {
+                LorenzUtils.chat("§c[SkyHanni] You can't add or remove yourself this way! Go to the settings and toggle 'Mark your own name'.")
+                return
+            }
+
             if (name !in playerNamesToMark) {
                 playerNamesToMark.add(name)
                 findPlayers()
-                LorenzUtils.chat("§e[SkyHanni] §aMarked §eplayer §b$displayName!")
+                LorenzUtils.chat("§e[SkyHanni] §aMarked §eplayer §b$displayName§e!")
             } else {
                 playerNamesToMark.remove(name)
                 markedPlayers.remove(name)
-                LorenzUtils.chat("§e[SkyHanni] §cUnmarked §eplayer §b$displayName!")
+                LorenzUtils.chat("§e[SkyHanni] §cUnmarked §eplayer §b$displayName§e!")
             }
         }
 
@@ -48,13 +58,28 @@ class PlayerMarker {
                 }
             }
         }
+
+        fun isMarkedPlayer(player: String): Boolean = player.lowercase() in playerNamesToMark
+
+        @JvmStatic
+        fun toggleOwn() {
+            val ownName = SkyHanniMod.feature.markedPlayers.markOwnName
+            val name = Minecraft.getMinecraft().thePlayer.name
+            if (ownName) {
+                if (!playerNamesToMark.contains(name)) {
+                    playerNamesToMark.add(name)
+                }
+            } else {
+                playerNamesToMark.remove(name)
+            }
+        }
     }
 
     var tick = 0
 
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyblock) return
 
         if (tick++ % 20 == 0) {
             findPlayers()
@@ -63,7 +88,9 @@ class PlayerMarker {
 
     @SubscribeEvent
     fun onRenderMobColored(event: RenderMobColoredEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyblock) return
+        if (!SkyHanniMod.feature.markedPlayers.highlightInWorld) return
+
         val entity = event.entity
         if (entity in markedPlayers.values) {
             event.color = LorenzColor.YELLOW.toColor().withAlpha(127)
@@ -72,7 +99,9 @@ class PlayerMarker {
 
     @SubscribeEvent
     fun onResetEntityHurtTime(event: ResetEntityHurtEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyblock) return
+        if (!SkyHanniMod.feature.markedPlayers.highlightInWorld) return
+
         val entity = event.entity
         if (entity in markedPlayers.values) {
             event.shouldReset = true
@@ -81,10 +110,26 @@ class PlayerMarker {
 
     @SubscribeEvent
     fun onWorldChange(event: WorldEvent.Load) {
+        if (Minecraft.getMinecraft().thePlayer == null) return
+
         markedPlayers.clear()
+        if (SkyHanniMod.feature.markedPlayers.markOwnName) {
+            val name = Minecraft.getMinecraft().thePlayer.name
+            if (!playerNamesToMark.contains(name)) {
+                playerNamesToMark.add(name)
+            }
+        }
     }
 
-    private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock
+    @SubscribeEvent(receiveCanceled = true)
+    fun onMarkedChatMessage(event: PlayerSendChatEvent) {
+        if (!LorenzUtils.inSkyblock) return
+
+        for (chatComponent in event.chatComponents) {
+            val text = chatComponent.unformattedText
+            if (isMarkedPlayer(text) && SkyHanniMod.feature.markedPlayers.highlightInChat) {
+                chatComponent.chatStyle.color = EnumChatFormatting.YELLOW
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/HideFarDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 0a3ead47d..4e1e26fdb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/HideFarDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -3,8 +3,10 @@ package at.hannibal2.skyhanni.features.chat
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.MarkedPlayerManager
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
@@ -13,7 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import java.util.regex.Pattern
 
-class HideFarDeathMessages {
+class PlayerDeathMessages {
 
     private var tick = 0
     private val lastTimePlayerSeen = mutableMapOf<String, Long>()
@@ -23,7 +25,7 @@ class HideFarDeathMessages {
 
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
-        if (!isEnabled()) return
+        if (!isHideFarDeathsEnabled()) return
 
         if (tick++ % 20 == 0) {
             checkOtherPlayers()
@@ -32,14 +34,30 @@ class HideFarDeathMessages {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!isEnabled()) return
+        if (!LorenzUtils.inSkyblock) return
 
         val message = event.message
         val matcher = pattern.matcher(message)
         if (matcher.matches()) {
             val name = matcher.group(1)
-            if (System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(name, 0) + 30_000) {
-                event.blockedReason = "far_away_player_death"
+            if (SkyHanniMod.feature.markedPlayers.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight) {
+                if (MarkedPlayerManager.isMarkedPlayer(name)) {
+                    val reason = matcher.group(2).removeColor()
+                    LorenzUtils.chat(" §c☠ §e$name §7$reason")
+                    event.blockedReason = "marked_player_death"
+                    return
+                }
+            }
+
+
+            if (isHideFarDeathsEnabled()) {
+                if (System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(name, 0) + 30_000) {
+                    event.blockedReason = "far_away_player_death"
+                }
+            }
+        } else {
+            if (message.contains("☠")) {
+                println("wrong death message: '$message'")
             }
         }
     }
@@ -58,7 +76,7 @@ class HideFarDeathMessages {
         }
     }
 
-    private fun isEnabled(): Boolean {
+    private fun isHideFarDeathsEnabled(): Boolean {
         return LorenzUtils.inSkyblock && SkyHanniMod.feature.chat.hideFarDeathMessages && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerChatFormatter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFormatter.kt
index 36a9e057c..39b8458f2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerChatFormatter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFormatter.kt
@@ -1,8 +1,9 @@
-package at.hannibal2.skyhanni.features.chat
+package at.hannibal2.skyhanni.features.chat.playerchat
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PlayerSendChatEvent
+import at.hannibal2.skyhanni.features.MarkedPlayerManager
 import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -180,10 +181,19 @@ class PlayerChatFormatter {
             return cleanName
         }
 
+        val markedPlayer = MarkedPlayerManager.isMarkedPlayer(cleanName) && SkyHanniMod.feature.markedPlayers.highlightInChat
         return if (SkyHanniMod.feature.chat.playerRankHider) {
-            "§b$cleanName"
+            if (markedPlayer) "§e$cleanName" else "§b$cleanName"
         } else {
-            rawName
+            if (markedPlayer) {
+                if (rawName.contains(" ")) {
+                    rawName[0] + " §e" + cleanName
+                } else {
+                    "§e$cleanName"
+                }
+            } else {
+                rawName
+            }
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerMessageChannel.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerMessageChannel.kt
index e457bea8f..b75f2c970 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerMessageChannel.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerMessageChannel.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.features.chat
+package at.hannibal2.skyhanni.features.chat.playerchat
 
 enum class PlayerMessageChannel(
     val prefixColor: String,