From de0341400abcfca65afe5d65053ab520aa20844c Mon Sep 17 00:00:00 2001 From: Wyvest <45589059+Wyvest@users.noreply.github.com> Date: Thu, 23 Dec 2021 00:27:46 +0700 Subject: fix chat screenshot feature with patcher & betterchat fix chat animating when chat tabs cancel --- src/main/kotlin/com/raeids/stratus/hook/ChatTabs.kt | 3 +-- .../kotlin/com/raeids/stratus/hook/ModCompatHooks.kt | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 src/main/kotlin/com/raeids/stratus/hook/ModCompatHooks.kt (limited to 'src/main/kotlin/com/raeids') diff --git a/src/main/kotlin/com/raeids/stratus/hook/ChatTabs.kt b/src/main/kotlin/com/raeids/stratus/hook/ChatTabs.kt index b162671..ffef559 100644 --- a/src/main/kotlin/com/raeids/stratus/hook/ChatTabs.kt +++ b/src/main/kotlin/com/raeids/stratus/hook/ChatTabs.kt @@ -10,7 +10,6 @@ object ChatTabs { private val GSON = GsonBuilder().setPrettyPrinting().create() private val PARSER = JsonParser() val tabs = arrayListOf() - var isDoing = false var currentTab: ChatTab? = null set(value) { if (value != null) { @@ -58,7 +57,7 @@ object ChatTabs { } private fun generateDefaultTabs(): JsonArray { - val all = ChatTab("ALL", false, null, null, null, null, null, "/ac ") + val all = ChatTab("ALL", false, null, null, null, null, null, "") val party = ChatTab( "PARTY", false, diff --git a/src/main/kotlin/com/raeids/stratus/hook/ModCompatHooks.kt b/src/main/kotlin/com/raeids/stratus/hook/ModCompatHooks.kt new file mode 100644 index 0000000..e2ac629 --- /dev/null +++ b/src/main/kotlin/com/raeids/stratus/hook/ModCompatHooks.kt @@ -0,0 +1,20 @@ +package com.raeids.stratus.hook + +import club.sk1er.patcher.config.PatcherConfig +import com.llamalad7.betterchat.BetterChat + +// This exists because mixin doesn't like dummy classes +object ModCompatHooks { + @JvmStatic + val xOffset + get() = BetterChat.getSettings().xOffset + + @JvmStatic + val yOffset + get() = BetterChat.getSettings().yOffset + + @JvmStatic + val chatPosition + get() = PatcherConfig.chatPosition + +} -- cgit