fix chat screenshot feature with patcher and halfway with betterchat

2 files changed, 23 insertions, 7 deletions

diff --git a/src/main/kotlin/com/raeids/stratus/Stratus.kt b/src/main/kotlin/com/raeids/stratus/Stratus.kt
index 0bf6831..6559cc5 100644
--- a/src/main/kotlin/com/raeids/stratus/Stratus.kt
+++ b/src/main/kotlin/com/raeids/stratus/Stratus.kt
@@ -15,8 +15,10 @@ import net.minecraft.client.settings.KeyBinding
 import net.minecraft.client.shader.Framebuffer
 import net.minecraftforge.common.MinecraftForge.EVENT_BUS
 import net.minecraftforge.fml.client.registry.ClientRegistry
+import net.minecraftforge.fml.common.Loader
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
@@ -41,6 +43,10 @@ object Stratus {
     var doTheThing = false
     lateinit var jarFile: File
         private set
+    var isPatcher = false
+    private set
+    var isBetterChat = false
+    private set
 
     private val fileFormatter: SimpleDateFormat = SimpleDateFormat("yyyy-MM-dd_HH.mm.ss'.png'")
 
@@ -62,6 +68,12 @@ object Stratus {
         Updater.update()
     }
 
+    @Mod.EventHandler
+    fun onPostInitialization(event: FMLPostInitializationEvent) {
+        isPatcher = Loader.isModLoaded("patcher")
+        isBetterChat = Loader.isModLoaded("betterchat")
+    }
+
     @SubscribeEvent
     fun onTickEvent(event: TickEvent.ClientTickEvent) {
         if (event.phase == TickEvent.Phase.START && Minecraft.getMinecraft().theWorld != null && Minecraft.getMinecraft().thePlayer != null && (Minecraft.getMinecraft().currentScreen == null || Minecraft.getMinecraft().currentScreen is GuiChat)) {
diff --git a/src/main/kotlin/com/raeids/stratus/hook/CleanButton.kt b/src/main/kotlin/com/raeids/stratus/hook/CleanButton.kt
index 3c15842..38e44ad 100644
--- a/src/main/kotlin/com/raeids/stratus/hook/CleanButton.kt
+++ b/src/main/kotlin/com/raeids/stratus/hook/CleanButton.kt
@@ -1,5 +1,7 @@
 package com.raeids.stratus.hook
 
+import club.sk1er.patcher.config.PatcherConfig
+import com.raeids.stratus.Stratus
 import gg.essential.universal.UResolution
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiButton
@@ -31,13 +33,15 @@ class CleanButton(buttonId: Int, x: Int, y: Int, widthIn: Int, heightIn: Int, pr
             GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f)
             hovered =
                 mouseX >= xPosition && mouseY >= yPosition && mouseX < xPosition + width && mouseY < yPosition + height
-            drawRect(
-                xPosition,
-                yPosition,
-                xPosition + width,
-                yPosition + height,
-                if (hovered) hoveredColor else color
-            )
+            if (!Stratus.isPatcher || !PatcherConfig.transparentChatInputField) {
+                drawRect(
+                    xPosition,
+                    yPosition,
+                    xPosition + width,
+                    yPosition + height,
+                    if (hovered) hoveredColor else color
+                )
+            }
             mouseDragged(mc, mouseX, mouseY)
             var j = 14737632
             if (packedFGColour != 0) {