Fix ClickGUI keybind again

Author: Avanatiker

common/src/main/kotlin/com/lambda/module/Module.kt

@@ -14,7 +14,6 @@ import com.lambda.event.listener.Listener
 import com.lambda.event.listener.SafeListener
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.event.listener.UnsafeListener
-import com.lambda.gui.api.LambdaGui
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.tag.ModuleTag
@@ -116,9 +115,9 @@ abstract class Module(
             if (mc.options.commandKey.isPressed) return@listener
             if (keybind == KeyCode.UNBOUND) return@listener
             if (event.translated != keybind) return@listener
-            if (mc.currentScreen is ChatScreen) return@listener
+            if (mc.currentScreen != null) return@listener
 
-            if (mc.currentScreen == null || this@Module is ClickGui) toggle()
+            toggle()
         }
 
         onEnable {

common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt

@@ -1,6 +1,9 @@
 package com.lambda.module.modules.client
 
 import com.lambda.event.events.ClientEvent
+import com.lambda.event.events.KeyPressEvent
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.event.listener.UnsafeListener.Companion.unsafeListener
 import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.gui.impl.hudgui.LambdaHudGui
@@ -43,6 +46,14 @@ object ClickGui : Module(
             LambdaHudGui.close()
         }
 
+        listener<KeyPressEvent> { event ->
+            if (mc.options.commandKey.isPressed) return@listener
+            if (keybind == KeyCode.UNBOUND) return@listener
+            if (event.translated != keybind) return@listener
+            // ToDo: Exception for ui text input
+            toggle()
+        }
+
         unsafeListener<ClientEvent.Shutdown> {
             disable()
         }