Added Mouse Click Mouse Release and Keyboard Click to UIHandler

odtheking · Nov 9, 2024 · 3057ee9 · 3057ee9
1 parent 5145f89
commit 3057ee9
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 37 deletions.
diff --git a/odin/src/main/java/me/odin/mixin/mixins/MixinGuiScreen.java b/odin/src/main/java/me/odin/mixin/mixins/MixinGuiScreen.java
@@ -26,6 +26,14 @@ private void onMouseInput(CallbackInfo ci){
         }
     }
 
+    @Inject(method = "handleMouseInput", at = @At(value = "INVOKE", target = "net/minecraft/client/gui/GuiScreen.mouseReleased(III)V"), cancellable = true)
+    private void onReleaseMouseInput(CallbackInfo ci){
+        if (!Mouse.getEventButtonState()) {
+            if (postAndCatch(new GuiEvent.GuiMouseReleaseEvent(odin$gui, Mouse.getEventButton(), Mouse.getEventX(), Mouse.getEventY())))
+                ci.cancel();
+        }
+    }
+
     @Inject(method = "handleKeyboardInput", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiScreen;keyTyped(CI)V"), cancellable = true)
     private void onHandleKeyboardInput(CallbackInfo ci) {
         if (Keyboard.getEventKeyState()) {

diff --git a/odinclient/src/main/java/me/odinclient/mixin/accessors/IEntityRendererAccessor.java b/odinclient/src/main/java/me/odinclient/mixin/accessors/IEntityRendererAccessor.java
diff --git a/odinclient/src/main/java/me/odinclient/mixin/mixins/MixinGuiScreen.java b/odinclient/src/main/java/me/odinclient/mixin/mixins/MixinGuiScreen.java
@@ -27,6 +27,14 @@ private void onMouseInput(CallbackInfo ci){
         }
     }
 
+    @Inject(method = "handleMouseInput", at = @At(value = "INVOKE", target = "net/minecraft/client/gui/GuiScreen.mouseReleased(III)V"), cancellable = true)
+    private void onReleaseMouseInput(CallbackInfo ci){
+        if (!Mouse.getEventButtonState()) {
+            if (postAndCatch(new GuiEvent.GuiMouseReleaseEvent(odin$gui, Mouse.getEventButton(), Mouse.getEventX(), Mouse.getEventY())))
+                ci.cancel();
+        }
+    }
+
     @Inject(method = "handleKeyboardInput", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiScreen;keyTyped(CI)V"), cancellable = true)
     private void onHandleKeyboardInput(CallbackInfo ci) {
         if (postAndCatch(new GuiEvent.GuiKeyPressEvent(odin$gui, Keyboard.getEventKey(), Keyboard.getEventCharacter())))

diff --git a/src/main/kotlin/me/odinmain/events/impl/GuiEvents.kt b/src/main/kotlin/me/odinmain/events/impl/GuiEvents.kt
@@ -27,6 +27,9 @@ abstract class GuiEvent : Event() {
     @Cancelable
     data class GuiMouseClickEvent(val gui: GuiScreen, val button: Int, val x: Int, val y: Int) : GuiEvent()
 
+    @Cancelable
+    data class GuiMouseReleaseEvent(val gui: GuiScreen, val button: Int, val x: Int, val y: Int) : GuiEvent()
+
     @Cancelable
     data class GuiKeyPressEvent(val gui: GuiScreen, val keyCode: Int, val char: Char) : Event()
 

diff --git a/src/main/kotlin/me/odinmain/features/Module.kt b/src/main/kotlin/me/odinmain/features/Module.kt
@@ -148,30 +148,6 @@ abstract class Module(
         ModuleManager.messageFunctions.add(ModuleManager.MessageFunction(filter, shouldRun, func))
     }
 
-    /**
-     * Runs the given function when a Chat Packet is sent with the same message as the given text (or contains the given text) (Case Sensitive!)
-     *
-     * @param text The text to look for.
-     * @param contains If the function should run when the message only contains the text but does not necessarily equal it.
-     * @param shouldRun Boolean getter to decide if the function should run at any given time, could check if the option is enabled for instance.
-     * @param func The function to run if the message matches or contains the given text and shouldRun returns true.
-     *
-     * @author Bonsai
-     */
-    fun onMessage(text: String, contains: Boolean, shouldRun: () -> Boolean = { alwaysActive || enabled }, func: (String) -> Unit) {
-        val regex =
-            if (contains)
-                ".*${Regex.escape(text)}.*".toRegex()
-            else
-                Regex.escape(text).toRegex()
-
-        ModuleManager.messageFunctions.add(ModuleManager.MessageFunction(regex, shouldRun, func))
-    }
-
-//    fun onMessageCancellable(filter: Regex, shouldRun: () -> Boolean = { alwaysActive || enabled }, func: (ChatPacketEvent) -> Unit) {
-//        ModuleManager.cancellableMessageFunctions.add(ModuleManager.MessageFunctionCancellable(filter, shouldRun, func))
-//    }
-
     fun onWorldLoad(func: () -> Unit) {
         ModuleManager.worldLoadFunctions.add(func)
     }

diff --git a/src/main/kotlin/me/odinmain/utils/ui/UIHandler.kt b/src/main/kotlin/me/odinmain/utils/ui/UIHandler.kt
@@ -3,6 +3,7 @@ package me.odinmain.utils.ui
 import com.github.stivais.ui.UI
 import com.github.stivais.ui.Window
 import me.odinmain.OdinMain.mc
+import me.odinmain.events.impl.GuiEvent
 import net.minecraftforge.client.event.RenderWorldLastEvent
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -51,5 +52,18 @@ class UIHandler(private val ui: UI, private val onlyRender: Boolean = false) : W
         ui.render()
     }
 
-    // todo: add mouse click and other stuff
+    @SubscribeEvent
+    fun onMouseClick(event: GuiEvent.GuiMouseClickEvent) {
+        ui.eventManager.onMouseClick(event.button)
+    }
+
+    @SubscribeEvent
+    fun onMouseReleased(event: GuiEvent.GuiMouseReleaseEvent) {
+        ui.eventManager.onMouseRelease(event.button)
+    }
+
+    @SubscribeEvent
+    fun onKeyboardClick(event: GuiEvent.GuiKeyPressEvent) {
+        ui.eventManager.onKeyType(event.char)
+    }
 }