only care if the specified modifiers are pressed while ignoring extras

Author: beanbag44

src/main/kotlin/com/lambda/event/events/KeyboardEvent.kt

@@ -20,12 +20,6 @@ package com.lambda.event.events
 import com.lambda.config.settings.complex.Bind
 import com.lambda.event.Event
 import com.lambda.util.KeyCode
-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
 import org.lwjgl.glfw.GLFW.GLFW_PRESS
 import org.lwjgl.glfw.GLFW.GLFW_RELEASE
 
@@ -55,7 +49,7 @@ sealed class KeyboardEvent {
         val isPressed = action >= GLFW_PRESS
         val isReleased = action == GLFW_RELEASE
 
-        fun satisfies(bind: Bind) = bind.key == keyCode && bind.modifiers == modifiers
+        fun satisfies(bind: Bind) = bind.key == keyCode && bind.modifiers and modifiers == bind.modifiers
     }
 
     /**

src/main/kotlin/com/lambda/event/events/MouseEvent.kt

@@ -20,14 +20,7 @@ package com.lambda.event.events
 import com.lambda.config.settings.complex.Bind
 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 {
     /**
@@ -45,9 +38,7 @@ sealed class MouseEvent {
         val isReleased = action == 0
         val isPressed = action == 1
 
-        fun satisfies(bind: Bind) = bind.modifiers == modifiers && bind.mouse == button
-
-        fun hasModifier(mod: Int) = modifiers and mod == mod
+        fun satisfies(bind: Bind) = bind.modifiers and modifiers == bind.modifiers && bind.mouse == button
     }
 
     /**