diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/kotlin/com/dulkirfabric/features/chat/ChatStacking.kt | 89 |
1 files changed, 46 insertions, 43 deletions
diff --git a/src/main/kotlin/com/dulkirfabric/features/chat/ChatStacking.kt b/src/main/kotlin/com/dulkirfabric/features/chat/ChatStacking.kt index d222540..b7837bd 100644 --- a/src/main/kotlin/com/dulkirfabric/features/chat/ChatStacking.kt +++ b/src/main/kotlin/com/dulkirfabric/features/chat/ChatStacking.kt @@ -9,47 +9,50 @@ import meteordevelopment.orbit.EventHandler import net.minecraft.text.MutableText import net.minecraft.text.Text -object ChatStacking { +// TODO: Fix - this tends to mess with other mod features and also doesn't work on player messages +// and ALSO doesn't work on some multi-line messages sent by the server: For example, the double tap +// to confirm drop message does not stack properly. - data class ChatLog(var timestamp: Long, val message: Text, var frequency: Int) - - private var chatLogs = mutableSetOf<ChatLog>() - private val stackRegex = """ §7\((\d+)\)$""".toRegex() - private val whiteListedMessages = listOf( - "".toRegex(), - "(-+)".toRegex() - ) - - @EventHandler - fun modifyChat(event: ChatEvents.AllowChat) { - chatLogs.forEach { curMsg -> - if (curMsg.message.string.equals(event.message.string)) { - // Probably don't stack empty lines and the long bars - if (whiteListedMessages.any { - it matches event.message.string - }) return - - curMsg.timestamp = System.currentTimeMillis() - curMsg.frequency++ - mc.inGameHud.chatHud.messages.removeIf { msg -> - TextUtils.stripColorCodes(msg.content.string.replace(stackRegex, "")) == curMsg.message.string - && mc.inGameHud.ticks - msg.creationTick <= 1200 - } - mc.inGameHud.chatHud.addMessage(Text.literal("${curMsg.message.formattedString()} §7(${curMsg.frequency})")) - mc.inGameHud.chatHud.refresh() - // TODO: implement something like this to avoid stripColorCodes call - // MutableText.of(event.message.content).append(Text.literal(" §7(${curMsg.frequency})")) - event.cancel() - return - } - } - chatLogs.add(ChatLog(System.currentTimeMillis(), event.message, 1)) - } - - @EventHandler - fun cullLogs(event: LongUpdateEvent) { - chatLogs.removeIf { - System.currentTimeMillis() - it.timestamp >= 60000 - } - } -}
\ No newline at end of file +//object ChatStacking { +// +// data class ChatLog(var timestamp: Long, val message: Text, var frequency: Int) +// +// private var chatLogs = mutableSetOf<ChatLog>() +// private val stackRegex = """ §7\((\d+)\)$""".toRegex() +// private val whiteListedMessages = listOf( +// "".toRegex(), +// "(-+)".toRegex() +// ) +// +// @EventHandler +// fun modifyChat(event: ChatEvents.AllowChat) { +// chatLogs.forEach { curMsg -> +// if (curMsg.message.string.equals(event.message.string)) { +// // Probably don't stack empty lines and the long bars +// if (whiteListedMessages.any { +// it matches event.message.string +// }) return +// +// curMsg.timestamp = System.currentTimeMillis() +// curMsg.frequency++ +// mc.inGameHud.chatHud.messages.removeIf { msg -> +// TextUtils.stripColorCodes(msg.content.string.replace(stackRegex, "")) == curMsg.message.string +// && mc.inGameHud.ticks - msg.creationTick <= 1200 +// } +// mc.inGameHud.chatHud.addMessage(MutableText.of(event.message.content).append(Text.literal(" §7(${curMsg.frequency})"))) +// mc.inGameHud.chatHud.refresh() +// // TODO: implement something like this to avoid stripColorCodes call +// event.cancel() +// return +// } +// } +// chatLogs.add(ChatLog(System.currentTimeMillis(), event.message, 1)) +// } +// +// @EventHandler +// fun cullLogs(event: LongUpdateEvent) { +// chatLogs.removeIf { +// System.currentTimeMillis() - it.timestamp >= 60000 +// } +// } +//}
\ No newline at end of file |