From 5198a5eca8257ee05e4846dc7ef46c983f7752d0 Mon Sep 17 00:00:00 2001 From: nea Date: Thu, 3 Aug 2023 20:12:53 +0200 Subject: Add chat filter gui --- .../java/at/hannibal2/skyhanni/data/ChatManager.kt | 46 +++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt index 643ef46ff..399517d2a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt @@ -1,26 +1,62 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzActionBarEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.SeaCreatureFishEvent +import at.hannibal2.skyhanni.features.chat.ChatFilterGui import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager import at.hannibal2.skyhanni.utils.LorenzLogger import at.hannibal2.skyhanni.utils.LorenzUtils +import net.minecraft.client.Minecraft import net.minecraft.event.HoverEvent import net.minecraft.network.play.server.S02PacketChat +import net.minecraft.util.EnumChatFormatting import net.minecraft.util.IChatComponent import net.minecraftforge.client.event.ClientChatReceivedEvent import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import java.util.LinkedHashMap -class ChatManager { +object ChatManager { private val loggerAll = LorenzLogger("chat/all") private val loggerFiltered = LorenzLogger("chat/blocked") private val loggerAllowed = LorenzLogger("chat/allowed") private val loggerModified = LorenzLogger("chat/modified") private val loggerFilteredTypes = mutableMapOf() + private val messageHistory = object : LinkedHashMap() { + override fun removeEldestEntry(eldest: MutableMap.MutableEntry?): Boolean { + return size > 100 + } + } + + fun getRecentMessageHistory(): List { + return messageHistory.toList().map { it.second } + } + + enum class ActionKind(format: Any) { + BLOCKED(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD), + MODIFIED(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD), + ALLOWED(EnumChatFormatting.GREEN), + ; + + val renderedString = "$format$name" + + companion object { + val maxLength by lazy { + entries.maxOf { Minecraft.getMinecraft().fontRendererObj.getStringWidth(it.renderedString) } + } + } + } + + data class MessageFilteringResult( + val message: IChatComponent, + val actionKind: ActionKind, + val actionReason: String?, + val modified: IChatComponent? + ) @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true) fun onActionBarPacket(event: PacketEvent.ReceiveEvent) { @@ -56,6 +92,7 @@ class ChatManager { loggerAll.log("[$blockReason] $message") loggerFilteredTypes.getOrPut(blockReason) { LorenzLogger("chat/filter_blocked/$blockReason") } .log(message) + messageHistory.put(Object(), MessageFilteringResult(original, ActionKind.BLOCKED, blockReason, null)) return } @@ -67,6 +104,9 @@ class ChatManager { loggerModified.log(" ") loggerModified.log("[original] " + original.formattedText) loggerModified.log("[modified] " + modified.formattedText) + messageHistory.put(Object(), MessageFilteringResult(original, ActionKind.MODIFIED, null, modified)) + } else { + messageHistory.put(Object(), MessageFilteringResult(original, ActionKind.ALLOWED, null, null)) } } @@ -104,4 +144,8 @@ class ChatManager { val seaCreature = SeaCreatureManager.getSeaCreature(chatEvent.message) ?: return SeaCreatureFishEvent(seaCreature, chatEvent).postAndCatch() } + + fun openChatFilterGUI() { + SkyHanniMod.screenToOpen = (ChatFilterGui(getRecentMessageHistory())) + } } \ No newline at end of file -- cgit From 75ad1cd4a13487932750913b7c3054146adfd50e Mon Sep 17 00:00:00 2001 From: nea Date: Thu, 3 Aug 2023 22:17:47 +0200 Subject: Add support for retracted messages --- .../java/at/hannibal2/skyhanni/data/ChatManager.kt | 47 +++++++++++++++++----- 1 file changed, 37 insertions(+), 10 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt index 399517d2a..167efdb3b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt @@ -7,9 +7,13 @@ import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.SeaCreatureFishEvent import at.hannibal2.skyhanni.features.chat.ChatFilterGui import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager +import at.hannibal2.skyhanni.utils.IdentityCharacteristics import at.hannibal2.skyhanni.utils.LorenzLogger import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.LorenzUtils.makeAccessible import net.minecraft.client.Minecraft +import net.minecraft.client.gui.ChatLine +import net.minecraft.client.gui.GuiNewChat import net.minecraft.event.HoverEvent import net.minecraft.network.play.server.S02PacketChat import net.minecraft.util.EnumChatFormatting @@ -17,6 +21,8 @@ import net.minecraft.util.IChatComponent import net.minecraftforge.client.event.ClientChatReceivedEvent import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import net.minecraftforge.fml.relauncher.ReflectionHelper +import java.lang.invoke.MethodHandles import java.util.LinkedHashMap object ChatManager { @@ -26,11 +32,12 @@ object ChatManager { private val loggerAllowed = LorenzLogger("chat/allowed") private val loggerModified = LorenzLogger("chat/modified") private val loggerFilteredTypes = mutableMapOf() - private val messageHistory = object : LinkedHashMap() { - override fun removeEldestEntry(eldest: MutableMap.MutableEntry?): Boolean { - return size > 100 + private val messageHistory = + object : LinkedHashMap, MessageFilteringResult>() { + override fun removeEldestEntry(eldest: MutableMap.MutableEntry, MessageFilteringResult>?): Boolean { + return size > 100 + } } - } fun getRecentMessageHistory(): List { return messageHistory.toList().map { it.second } @@ -38,6 +45,7 @@ object ChatManager { enum class ActionKind(format: Any) { BLOCKED(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD), + RETRACTED(EnumChatFormatting.DARK_PURPLE.toString() + EnumChatFormatting.BOLD), MODIFIED(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD), ALLOWED(EnumChatFormatting.GREEN), ; @@ -53,8 +61,8 @@ object ChatManager { data class MessageFilteringResult( val message: IChatComponent, - val actionKind: ActionKind, - val actionReason: String?, + var actionKind: ActionKind, + var actionReason: String?, val modified: IChatComponent? ) @@ -79,7 +87,7 @@ object ChatManager { val message = LorenzUtils.stripVanillaMessage(original.formattedText) if (message.startsWith("§f{\"server\":\"")) return - + val key = IdentityCharacteristics(original) val chatEvent = LorenzChatEvent(message, original) if (!isSoopyMessage(event.message)) { chatEvent.postAndCatch() @@ -92,7 +100,7 @@ object ChatManager { loggerAll.log("[$blockReason] $message") loggerFilteredTypes.getOrPut(blockReason) { LorenzLogger("chat/filter_blocked/$blockReason") } .log(message) - messageHistory.put(Object(), MessageFilteringResult(original, ActionKind.BLOCKED, blockReason, null)) + messageHistory.put(key, MessageFilteringResult(original, ActionKind.BLOCKED, blockReason, null)) return } @@ -104,9 +112,9 @@ object ChatManager { loggerModified.log(" ") loggerModified.log("[original] " + original.formattedText) loggerModified.log("[modified] " + modified.formattedText) - messageHistory.put(Object(), MessageFilteringResult(original, ActionKind.MODIFIED, null, modified)) + messageHistory.put(key, MessageFilteringResult(original, ActionKind.MODIFIED, null, modified)) } else { - messageHistory.put(Object(), MessageFilteringResult(original, ActionKind.ALLOWED, null, null)) + messageHistory.put(key, MessageFilteringResult(original, ActionKind.ALLOWED, null, null)) } } @@ -148,4 +156,23 @@ object ChatManager { fun openChatFilterGUI() { SkyHanniMod.screenToOpen = (ChatFilterGui(getRecentMessageHistory())) } + + val chatLinesField by lazy { + MethodHandles.publicLookup().unreflectGetter( + ReflectionHelper.findField(GuiNewChat::class.java, "chatLines", "field_146252_h", "h") + .makeAccessible() + ) + } + + fun retractMessage(message: IChatComponent?, reason: String) { + if (message == null) return + val chatGUI = Minecraft.getMinecraft().ingameGUI.chatGUI + val chatLines = chatLinesField.invokeExact(chatGUI) as MutableList + if (chatLines.removeIf { it.chatComponent === message }) { + val history = messageHistory[IdentityCharacteristics(message)] + history?.actionKind = ActionKind.RETRACTED + history?.actionReason = reason.uppercase() + } + chatGUI.refreshChat() + } } \ No newline at end of file -- cgit From a4c61672d93aaf7418568ca6b3704289d890f48b Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Thu, 3 Aug 2023 23:36:44 +0200 Subject: code cleanup --- .../java/at/hannibal2/skyhanni/data/ChatManager.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/data') diff --git a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt index 167efdb3b..8b6330f6d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt @@ -23,7 +23,6 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.relauncher.ReflectionHelper import java.lang.invoke.MethodHandles -import java.util.LinkedHashMap object ChatManager { @@ -39,9 +38,7 @@ object ChatManager { } } - fun getRecentMessageHistory(): List { - return messageHistory.toList().map { it.second } - } + fun getRecentMessageHistory(): List = messageHistory.toList().map { it.second } enum class ActionKind(format: Any) { BLOCKED(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD), @@ -154,7 +151,7 @@ object ChatManager { } fun openChatFilterGUI() { - SkyHanniMod.screenToOpen = (ChatFilterGui(getRecentMessageHistory())) + SkyHanniMod.screenToOpen = ChatFilterGui(getRecentMessageHistory()) } val chatLinesField by lazy { @@ -167,12 +164,13 @@ object ChatManager { fun retractMessage(message: IChatComponent?, reason: String) { if (message == null) return val chatGUI = Minecraft.getMinecraft().ingameGUI.chatGUI + @Suppress("UNCHECKED_CAST") val chatLines = chatLinesField.invokeExact(chatGUI) as MutableList - if (chatLines.removeIf { it.chatComponent === message }) { - val history = messageHistory[IdentityCharacteristics(message)] - history?.actionKind = ActionKind.RETRACTED - history?.actionReason = reason.uppercase() - } + if (!chatLines.removeIf { it.chatComponent === message }) return chatGUI.refreshChat() + + val history = messageHistory[IdentityCharacteristics(message)] ?: return + history.actionKind = ActionKind.RETRACTED + history.actionReason = reason.uppercase() } } \ No newline at end of file -- cgit