feat: Add macro wheels

2 files changed, 33 insertions, 5 deletions

diff --git a/src/main/kotlin/keybindings/IKeyBinding.kt b/src/main/kotlin/keybindings/IKeyBinding.kt
index 1975361..9d9b106 100644
--- a/src/main/kotlin/keybindings/IKeyBinding.kt
+++ b/src/main/kotlin/keybindings/IKeyBinding.kt
@@ -6,24 +6,45 @@ import net.minecraft.client.option.KeyBinding
 
 interface IKeyBinding {
     fun matches(keyCode: Int, scanCode: Int, modifiers: Int): Boolean
+	fun matchesAtLeast(keyCode: Int, scanCode: Int, modifiers: Int): Boolean
 
     fun withModifiers(wantedModifiers: Int): IKeyBinding {
         val old = this
         return object : IKeyBinding {
             override fun matches(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-                return old.matches(keyCode, scanCode, modifiers) && (modifiers and wantedModifiers) == wantedModifiers
+                return old.matchesAtLeast(keyCode, scanCode, modifiers) && (modifiers and wantedModifiers) == wantedModifiers
             }
-        }
+
+			override fun matchesAtLeast(
+				keyCode: Int,
+				scanCode: Int,
+				modifiers: Int
+			): Boolean {
+				return old.matchesAtLeast(keyCode, scanCode, modifiers) && (modifiers.inv() and wantedModifiers) == 0
+			}
+		}
     }
 
     companion object {
         fun minecraft(keyBinding: KeyBinding) = object : IKeyBinding {
             override fun matches(keyCode: Int, scanCode: Int, modifiers: Int) =
                 keyBinding.matchesKey(keyCode, scanCode)
-        }
+
+			override fun matchesAtLeast(
+				keyCode: Int,
+				scanCode: Int,
+				modifiers: Int
+			): Boolean =
+				keyBinding.matchesKey(keyCode, scanCode)
+		}
 
         fun ofKeyCode(wantedKeyCode: Int) = object : IKeyBinding {
-            override fun matches(keyCode: Int, scanCode: Int, modifiers: Int): Boolean = keyCode == wantedKeyCode
-        }
+            override fun matches(keyCode: Int, scanCode: Int, modifiers: Int): Boolean = keyCode == wantedKeyCode && modifiers == 0
+			override fun matchesAtLeast(
+				keyCode: Int,
+				scanCode: Int,
+				modifiers: Int
+			): Boolean = keyCode == wantedKeyCode
+		}
     }
 }
diff --git a/src/main/kotlin/keybindings/SavedKeyBinding.kt b/src/main/kotlin/keybindings/SavedKeyBinding.kt
index 3ae0b89..fc0270d 100644
--- a/src/main/kotlin/keybindings/SavedKeyBinding.kt
+++ b/src/main/kotlin/keybindings/SavedKeyBinding.kt
@@ -7,6 +7,7 @@ import net.minecraft.client.util.InputUtil
 import net.minecraft.text.Text
 import moe.nea.firmament.util.MC
 
+// TODO: add support for mouse keybindings
 @Serializable
 data class SavedKeyBinding(
 	val keyCode: Int,
@@ -86,6 +87,12 @@ data class SavedKeyBinding(
 			(shift == this.shift)
 	}
 
+	override fun matchesAtLeast(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
+		if (this.keyCode == GLFW.GLFW_KEY_UNKNOWN) return false
+		val (shift, ctrl, alt) = getMods(modifiers)
+		return keyCode == this.keyCode && this.shift <= shift && this.ctrl <= ctrl && this.alt <= alt
+	}
+
 	override fun matches(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
 		if (this.keyCode == GLFW.GLFW_KEY_UNKNOWN) return false
 		return keyCode == this.keyCode && getMods(modifiers) == Triple(shift, ctrl, alt)