diff options
Diffstat (limited to 'src/main/kotlin/org/polyfrost')
| -rw-r--r-- | src/main/kotlin/org/polyfrost/chatting/config/ChattingConfig.kt | 9 | ||||
| -rw-r--r-- | src/main/kotlin/org/polyfrost/chatting/utils/ModCompatHooks.kt | 84 |
2 files changed, 78 insertions, 15 deletions
diff --git a/src/main/kotlin/org/polyfrost/chatting/config/ChattingConfig.kt b/src/main/kotlin/org/polyfrost/chatting/config/ChattingConfig.kt index 0701471..7ed45e4 100644 --- a/src/main/kotlin/org/polyfrost/chatting/config/ChattingConfig.kt +++ b/src/main/kotlin/org/polyfrost/chatting/config/ChattingConfig.kt @@ -136,25 +136,20 @@ object ChattingConfig : Config( ) var hideChatHeadOnConsecutiveMessages = true - /*/ - @Property( - type = PropertyType.SWITCH, + @Switch( name = "Show Timestamp", description = "Show message timestamp.", category = "General" ) var showTimestamp = false - @Property( - type = PropertyType.SWITCH, + @Switch( name = "Timestamp Only On Hover", description = "Show timestamp only on mouse hover.", category = "General" ) var showTimestampHover = true - */ - @Info( text = "If Chatting detects a public chat message that seems like spam, and the probability is higher than this, it will hide it.\n" + "Made for Hypixel Skyblock. Set to 100% to disable. 95% is a reasonable threshold to use it at.\n" + "Note that this is not and never will be 100% accurate; however, it's pretty much guaranteed to block most spam.", size = 2, diff --git a/src/main/kotlin/org/polyfrost/chatting/utils/ModCompatHooks.kt b/src/main/kotlin/org/polyfrost/chatting/utils/ModCompatHooks.kt index 591461d..1a53f8d 100644 --- a/src/main/kotlin/org/polyfrost/chatting/utils/ModCompatHooks.kt +++ b/src/main/kotlin/org/polyfrost/chatting/utils/ModCompatHooks.kt @@ -3,11 +3,6 @@ package org.polyfrost.chatting.utils import cc.polyfrost.oneconfig.renderer.TextRenderer import cc.polyfrost.oneconfig.utils.dsl.getAlpha import cc.polyfrost.oneconfig.utils.dsl.mc -import org.polyfrost.chatting.Chatting.isBetterChat -import org.polyfrost.chatting.Chatting.isPatcher -import org.polyfrost.chatting.config.ChattingConfig.offsetNonPlayerMessages -import org.polyfrost.chatting.config.ChattingConfig.showChatHeads -import org.polyfrost.chatting.config.ChattingConfig.textRenderType import club.sk1er.patcher.config.PatcherConfig import com.llamalad7.betterchat.BetterChat import net.minecraft.client.Minecraft @@ -15,9 +10,18 @@ import net.minecraft.client.gui.ChatLine import net.minecraft.client.gui.FontRenderer import net.minecraft.client.gui.Gui import net.minecraft.client.renderer.GlStateManager +import org.polyfrost.chatting.Chatting.isBetterChat +import org.polyfrost.chatting.Chatting.isPatcher +import org.polyfrost.chatting.config.ChattingConfig.offsetNonPlayerMessages +import org.polyfrost.chatting.config.ChattingConfig.showChatHeads +import org.polyfrost.chatting.config.ChattingConfig.showTimestamp +import org.polyfrost.chatting.config.ChattingConfig.textRenderType import org.polyfrost.chatting.hook.ChatLineHook import org.polyfrost.chatting.hook.GuiNewChatHook import org.polyfrost.chatting.mixin.GuiNewChatAccessor +import java.text.SimpleDateFormat +import java.util.* +import kotlin.math.pow // This exists because mixin doesn't like dummy classes object ModCompatHooks { @@ -54,10 +58,43 @@ object ModCompatHooks { get() = (Minecraft.getMinecraft().ingameGUI.chatGUI as GuiNewChatAccessor).drawnChatLines @JvmStatic + fun getFullMessage(chatLine: ChatLine): ChatLine? { + return (Minecraft.getMinecraft().ingameGUI.chatGUI as GuiNewChatHook).getFullMessage(chatLine) + } + + private var hoveredText: ChatLine? = null + private var hoverProgress = 0L + private val formatter = SimpleDateFormat("HH:mm") + + fun getTimeStampText(comp: ChatLine): String { + comp as ChatLineHook + return "[${formatter.format(Date(comp.timestamp))}] " + } + + @JvmStatic + fun setHoveredText(comp: ChatLine?) { + val newComp = comp?.let(::getFullMessage) + if (hoveredText != newComp) { + hoveredText = newComp + hoverProgress = System.currentTimeMillis() + } + } + + @JvmStatic fun redirectDrawString(text: String, x: Float, y: Float, color: Int, chatLine: ChatLine, screenshot: Boolean): Int { var actualX = x + val hook = chatLine as ChatLineHook + if (showTimestamp && !screenshot) { + val timeOffsetInfo = getTimeOffset(chatLine) + if (timeOffsetInfo != null) { + if (timeOffsetInfo.shouldRender) { + fontRenderer.drawString(timeOffsetInfo.text, actualX, y, -1, true) + } + actualX += timeOffsetInfo.offset + } + } if (showChatHeads && !screenshot) { - val hook = chatLine as ChatLineHook + val renderX = actualX if (hook.isDetected || offsetNonPlayerMessages) { actualX += 10f } @@ -70,7 +107,7 @@ object ModCompatHooks { GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0) GlStateManager.color(1.0f, 1.0f, 1.0f, color.getAlpha() / 255f) Gui.drawScaledCustomSizeModalRect( - (x).toInt(), + (renderX).toInt(), (y - 1f).toInt(), 8.0f, 8.0f, @@ -82,7 +119,7 @@ object ModCompatHooks { 64.0f ) Gui.drawScaledCustomSizeModalRect( - (x).toInt(), + (renderX).toInt(), (y - 1f).toInt(), 40.0f, 8.0f, @@ -106,4 +143,35 @@ object ModCompatHooks { else -> fontRenderer.drawString(text, actualX, y, color, true) } } + + + data class TimeOffsetInfo( + val text: String, + val shouldRender: Boolean, + val offset: Int, + ) + + private fun ease(x: Double): Double { + return if (x < 0.5) 4 * x * x * x else 1 - (-2.0 * x + 2).pow(3.0) / 2 + } + + private fun getTimeOffset(comp: ChatLine): TimeOffsetInfo? { + if (!showTimestamp) return null + val root = getFullMessage(comp) + if (root == null || root != hoveredText) return null + if ((root as ChatLineHook).children.firstOrNull() != comp) return null + val text = getTimeStampText(root) + val strWidth = fontRenderer.getStringWidth(text) + val animationTime = ((System.currentTimeMillis() - hoverProgress) / 100.0).coerceIn(0.0, 1.0) + val easedAnimationPercentage = ease(animationTime) + val progress = (easedAnimationPercentage * strWidth).toInt() + return TimeOffsetInfo(text, progress == strWidth, progress) + } + + @JvmStatic + fun getStartOffset(value: Int, comp: ChatLine): Int { + var actualX = value + actualX += getTimeOffset(comp)?.offset ?: 0 + return actualX + } } |