1 files changed, 14 insertions, 11 deletions
diff --git a/src/compat/yacl/java/KeybindingController.kt b/src/compat/yacl/java/KeybindingController.kt
index 204d521..3714455 100644
--- a/src/compat/yacl/java/KeybindingController.kt
+++ b/src/compat/yacl/java/KeybindingController.kt
@@ -6,10 +6,13 @@ import dev.isxander.yacl3.api.utils.Dimension
 import dev.isxander.yacl3.gui.AbstractWidget
 import dev.isxander.yacl3.gui.YACLScreen
 import dev.isxander.yacl3.gui.controllers.ControllerWidget
-import net.minecraft.text.Text
+import net.minecraft.client.input.MouseButtonEvent
+import net.minecraft.client.input.KeyEvent
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.gui.config.KeyBindingHandler
 import moe.nea.firmament.gui.config.KeyBindingStateManager
 import moe.nea.firmament.gui.config.ManagedOption
+import moe.nea.firmament.keybindings.GenericInputButton
 import moe.nea.firmament.keybindings.SavedKeyBinding
 
 class KeybindingController(
@@ -21,7 +24,7 @@ class KeybindingController(
 		return option
 	}
 
-	override fun formatValue(): Text {
+	override fun formatValue(): Component {
 		return option.pendingValue().format()
 	}
 
@@ -52,16 +55,16 @@ class KeybindingWidget(
 		return 130
 	}
 
-	override fun getValueText(): Text {
+	override fun getValueText(): Component {
 		return sm.label
 	}
 
-	override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-		return sm.keyboardEvent(keyCode, true)
+	override fun keyPressed(keyEvent: KeyEvent): Boolean {
+		return sm.keyboardEvent(GenericInputButton.of(keyEvent), true)
 	}
 
-	override fun keyReleased(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-		return sm.keyboardEvent(keyCode, false)
+	override fun keyReleased(keyEvent: KeyEvent): Boolean {
+		return sm.keyboardEvent(GenericInputButton.of(keyEvent), false)
 	}
 
 	override fun unfocus() {
@@ -73,11 +76,11 @@ class KeybindingWidget(
 		if (!focused) sm.onLostFocus()
 	}
 
-	override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-		if (button == 0 && isHovered) {
-			sm.onClick()
+	override fun mouseClicked(mouseButtonEvent: MouseButtonEvent, doubleClick: Boolean): Boolean {
+		if (isHovered) {
+			sm.onClick(mouseButtonEvent.button())
 			return true
 		}
-		return super.mouseClicked(mouseX, mouseY, button)
+		return super.mouseClicked(mouseButtonEvent, doubleClick)
 	}
 }