Changed mouse events and fixed clickfriend

emyfops · emyfops · commit b706e79d45ce · 2025-05-04T15:23:45.000-04:00
diff --git a/common/src/main/kotlin/com/lambda/event/events/KeyboardEvent.kt b/common/src/main/kotlin/com/lambda/event/events/KeyboardEvent.kt
@@ -56,7 +56,7 @@ sealed class KeyboardEvent {
 
         val hasShift = modifiers and GLFW_MOD_SHIFT != 0
         val hasControl = modifiers and GLFW_MOD_CONTROL != 0
-        val hasClt = modifiers and GLFW_MOD_ALT != 0
+        val hasAlt = modifiers and GLFW_MOD_ALT != 0
         val hasSuper = modifiers and GLFW_MOD_SUPER != 0
         val hasCapsLock = modifiers and GLFW_MOD_CAPS_LOCK != 0
         val hasNumLock = modifiers and GLFW_MOD_NUM_LOCK != 0
diff --git a/common/src/main/kotlin/com/lambda/event/events/MouseEvent.kt b/common/src/main/kotlin/com/lambda/event/events/MouseEvent.kt
@@ -21,6 +21,12 @@ import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import com.lambda.util.Mouse
 import com.lambda.util.math.Vec2d
+import org.lwjgl.glfw.GLFW.GLFW_MOD_ALT
+import org.lwjgl.glfw.GLFW.GLFW_MOD_CAPS_LOCK
+import org.lwjgl.glfw.GLFW.GLFW_MOD_CONTROL
+import org.lwjgl.glfw.GLFW.GLFW_MOD_NUM_LOCK
+import org.lwjgl.glfw.GLFW.GLFW_MOD_SHIFT
+import org.lwjgl.glfw.GLFW.GLFW_MOD_SUPER
 
 sealed class MouseEvent {
     /**
@@ -32,17 +38,32 @@ sealed class MouseEvent {
      * @property position The x and y position of the mouse on the screen
      */
     data class Click(
-        val button: Mouse.Button,
-        val action: Mouse.Action,
+        val button: Int,
+        val action: Int,
         val modifiers: Int,
         val position: Vec2d,
     ) : ICancellable by Cancellable() {
-        constructor(button: Int, action: Int, modifiers: Int, position: Vec2d) : this(
-            Mouse.Button.fromMouseCode(button),
-            Mouse.Action.fromActionCode(action),
+        constructor(button: Mouse.Button, action: Mouse.Action, modifiers: Int, position: Vec2d) : this(
+            button.ordinal,
+            action.ordinal,
             modifiers,
             position
         )
+
+        val isMainButton = button <= 2
+        val isSideButton = button > 2
+        val isLeftButton = button == 0
+        val isRightButton = button == 1
+        val isMiddleButton = button == 2
+
+        val hasShift = hasModifier(GLFW_MOD_SHIFT)
+        val hasControl = hasModifier(GLFW_MOD_CONTROL)
+        val hasAlt = hasModifier(GLFW_MOD_ALT)
+        val hasSuper = hasModifier(GLFW_MOD_SUPER)
+        val hasCapsLock = hasModifier(GLFW_MOD_CAPS_LOCK)
+        val hasNumLock = hasModifier(GLFW_MOD_NUM_LOCK)
+
+        fun hasModifier(mod: Int) = modifiers and mod == mod
     }
 
     /**
diff --git a/common/src/main/kotlin/com/lambda/friend/FriendManager.kt b/common/src/main/kotlin/com/lambda/friend/FriendManager.kt
@@ -56,10 +56,7 @@ object FriendManager : Configurable(FriendConfig), Loadable {
     fun OtherClientPlayerEntity.befriend() = befriend(gameProfile)
     fun OtherClientPlayerEntity.unfriend() = unfriend(gameProfile)
 
-    override fun load(): String {
-        // TODO: Because the settings are loaded after the property and the loadables, the friend list is empty at that point
-        return "Loaded ${friends.size} friends"
-    }
+    override fun load() = "Loaded ${friends.size} friends"
 
     fun befriendedText(name: String): Text = befriendedText(Text.of(name))
     fun befriendedText(name: Text) = buildText {
diff --git a/common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt b/common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt
@@ -30,7 +30,9 @@ import com.lambda.util.Mouse
 import com.lambda.util.world.raycast.RayCastUtils.entityResult
 import net.minecraft.client.network.OtherClientPlayerEntity
 import org.lwjgl.glfw.GLFW.GLFW_MOD_ALT
+import org.lwjgl.glfw.GLFW.GLFW_MOD_CAPS_LOCK
 import org.lwjgl.glfw.GLFW.GLFW_MOD_CONTROL
+import org.lwjgl.glfw.GLFW.GLFW_MOD_NUM_LOCK
 import org.lwjgl.glfw.GLFW.GLFW_MOD_SHIFT
 import org.lwjgl.glfw.GLFW.GLFW_MOD_SUPER
 
@@ -46,24 +48,17 @@ object ClickFriend : Module(
 
     init {
         listen<MouseEvent.Click> {
-            if (it.button != friendButton ||
-                it.action != friendAction ||
-                mc.currentScreen != null
-            ) return@listen
+            if (mc.currentScreen != null) return@listen
+            if (it.button != friendButton.ordinal || it.action != friendAction.ordinal) return@listen
 
             val target = mc.crosshairTarget?.entityResult?.entity as? OtherClientPlayerEntity
                 ?: return@listen
 
-            if (modUnfriend.flagsPresent(it.modifiers) || !comboUnfriend) {
-                when {
-                    target.isFriend && target.unfriend() -> {
-                        this@ClickFriend.info(FriendManager.unfriendedText(target.name))
-                    }
+            if (!it.hasModifier(modUnfriend.modifiers) && comboUnfriend && target.isFriend) return@listen
 
-                    !target.isFriend && target.befriend() -> {
-                        this@ClickFriend.info(FriendManager.befriendedText(target.name))
-                    }
-                }
+            when {
+                target.isFriend && target.unfriend() -> info(FriendManager.unfriendedText(target.name))
+                !target.isFriend && target.befriend() -> info(FriendManager.befriendedText(target.name))
             }
         }
     }
@@ -72,8 +67,8 @@ object ClickFriend : Module(
         Shift(GLFW_MOD_SHIFT),
         Control(GLFW_MOD_CONTROL),
         Alt(GLFW_MOD_ALT),
-        Super(GLFW_MOD_SUPER);
-
-        fun flagsPresent(flags: Int) = flags and modifiers == modifiers
+        Super(GLFW_MOD_SUPER),
+        Caps(GLFW_MOD_CAPS_LOCK),
+        NumLock(GLFW_MOD_NUM_LOCK);
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/util/Mouse.kt b/common/src/main/kotlin/com/lambda/util/Mouse.kt
@@ -22,6 +22,7 @@ import com.mojang.blaze3d.systems.RenderSystem
 import org.lwjgl.glfw.GLFW
 import org.lwjgl.glfw.GLFW.GLFW_ARROW_CURSOR
 import org.lwjgl.glfw.GLFW.GLFW_POINTING_HAND_CURSOR
+import org.lwjgl.glfw.GLFW.GLFW_RELEASE
 import org.lwjgl.glfw.GLFW.GLFW_RESIZE_EW_CURSOR
 import org.lwjgl.glfw.GLFW.GLFW_RESIZE_NS_CURSOR
 import org.lwjgl.glfw.GLFW.GLFW_RESIZE_NWSE_CURSOR
@@ -30,20 +31,20 @@ import org.lwjgl.glfw.GLFW.glfwSetCursor
 import kotlin.jvm.Throws
 
 class Mouse {
-    enum class Button(val key: Int) {
-        Left(GLFW.GLFW_MOUSE_BUTTON_LEFT),
-        Right(GLFW.GLFW_MOUSE_BUTTON_RIGHT),
-        Middle(GLFW.GLFW_MOUSE_BUTTON_MIDDLE),
-        Button4(GLFW.GLFW_MOUSE_BUTTON_4),
-        Button5(GLFW.GLFW_MOUSE_BUTTON_5),
-        Button6(GLFW.GLFW_MOUSE_BUTTON_6),
-        Button7(GLFW.GLFW_MOUSE_BUTTON_7),
-        Button8(GLFW.GLFW_MOUSE_BUTTON_8);
-
-        val isMainButton get() = key == GLFW.GLFW_MOUSE_BUTTON_LEFT || key == GLFW.GLFW_MOUSE_BUTTON_RIGHT
+    enum class Button {
+        Left,
+        Right,
+        Middle,
+        Button4,
+        Button5,
+        Button6,
+        Button7,
+        Button8;
+
+        val isMainButton get() = ordinal == GLFW.GLFW_MOUSE_BUTTON_LEFT || ordinal == GLFW.GLFW_MOUSE_BUTTON_RIGHT
 
         companion object {
-            private val mouseCodeMap = entries.associateBy { it.key }
+            private val mouseCodeMap = entries.associateBy { it.ordinal }
             private val nameMap = entries.associateBy { it.name.lowercase() }
 
             @Throws(IllegalArgumentException::class)
@@ -57,8 +58,8 @@ class Mouse {
     }
 
     enum class Action {
-        Click,
-        Release;
+        Release,
+        Click;
 
         companion object {
             private val mouseActionMap = entries.associateBy { it.ordinal }
