diff options
Diffstat (limited to 'src/compat/yacl/java')
| -rw-r--r-- | src/compat/yacl/java/KeybindingController.kt | 16 | ||||
| -rw-r--r-- | src/compat/yacl/java/YaclIntegration.kt | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/compat/yacl/java/KeybindingController.kt b/src/compat/yacl/java/KeybindingController.kt index c303da2..6ceef5d 100644 --- a/src/compat/yacl/java/KeybindingController.kt +++ b/src/compat/yacl/java/KeybindingController.kt @@ -6,6 +6,8 @@ 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.client.gui.Click +import net.minecraft.client.input.KeyInput import net.minecraft.text.Text import moe.nea.firmament.gui.config.KeyBindingHandler import moe.nea.firmament.gui.config.KeyBindingStateManager @@ -57,12 +59,12 @@ class KeybindingWidget( return sm.label } - override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean { - return sm.keyboardEvent(GenericInputButton.ofKeyAndScan(keyCode, scanCode), true) + override fun keyPressed(keyEvent: KeyInput): Boolean { + return sm.keyboardEvent(GenericInputButton.of(keyEvent), true) } - override fun keyReleased(keyCode: Int, scanCode: Int, modifiers: Int): Boolean { - return sm.keyboardEvent(GenericInputButton.ofKeyAndScan(keyCode, scanCode), false) + override fun keyReleased(keyEvent: KeyInput): Boolean { + return sm.keyboardEvent(GenericInputButton.of(keyEvent), false) } override fun unfocus() { @@ -74,11 +76,11 @@ class KeybindingWidget( if (!focused) sm.onLostFocus() } - override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean { + override fun mouseClicked(mouseButtonEvent: Click, doubleClick: Boolean): Boolean { if (isHovered) { - sm.onClick(button) + sm.onClick(mouseButtonEvent.button()) return true } - return super.mouseClicked(mouseX, mouseY, button) + return super.mouseClicked(mouseButtonEvent, doubleClick) } } diff --git a/src/compat/yacl/java/YaclIntegration.kt b/src/compat/yacl/java/YaclIntegration.kt index 79ab528..d94e96f 100644 --- a/src/compat/yacl/java/YaclIntegration.kt +++ b/src/compat/yacl/java/YaclIntegration.kt @@ -18,7 +18,6 @@ import dev.isxander.yacl3.api.controller.StringControllerBuilder import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder import dev.isxander.yacl3.api.controller.ValueFormatter import dev.isxander.yacl3.gui.YACLScreen -import dev.isxander.yacl3.gui.tab.ListHolderWidget import io.github.notenoughupdates.moulconfig.ChromaColour import java.awt.Color import kotlin.time.Duration @@ -26,6 +25,7 @@ import kotlin.time.Duration.Companion.seconds import kotlin.time.DurationUnit import net.minecraft.client.gui.Element import net.minecraft.client.gui.screen.Screen +import net.minecraft.client.gui.widget.ContainerWidget import net.minecraft.text.Text import moe.nea.firmament.gui.config.BooleanHandler import moe.nea.firmament.gui.config.ChoiceHandler @@ -208,7 +208,7 @@ class YaclIntegration : FirmamentConfigScreenProvider { return object : YACLScreen(buildConfig(), parent) { override fun setFocused(focused: Element?) { if (this.focused is KeybindingWidget && - focused is ListHolderWidget<*> + focused is ContainerWidget ) { return } |