aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/keybindings/FirmamentKeyBindings.kt
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/kotlin/keybindings/FirmamentKeyBindings.kt')
-rw-r--r--src/main/kotlin/keybindings/FirmamentKeyBindings.kt17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/main/kotlin/keybindings/FirmamentKeyBindings.kt b/src/main/kotlin/keybindings/FirmamentKeyBindings.kt
index 59b131a..63b7232 100644
--- a/src/main/kotlin/keybindings/FirmamentKeyBindings.kt
+++ b/src/main/kotlin/keybindings/FirmamentKeyBindings.kt
@@ -1,18 +1,23 @@
package moe.nea.firmament.keybindings
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
-import net.minecraft.client.option.KeyBinding
-import net.minecraft.client.util.InputUtil
+import net.minecraft.client.KeyMapping
+import com.mojang.blaze3d.platform.InputConstants
+import moe.nea.firmament.Firmament
import moe.nea.firmament.gui.config.ManagedOption
import moe.nea.firmament.util.TestUtil
+import moe.nea.firmament.util.data.ManagedConfig
object FirmamentKeyBindings {
+ val cats = mutableMapOf<ManagedConfig.Category, KeyMapping.Category>()
+
+
fun registerKeyBinding(name: String, config: ManagedOption<SavedKeyBinding>) {
- val vanillaKeyBinding = KeyBinding(
+ val vanillaKeyBinding = KeyMapping(
name,
- InputUtil.Type.KEYSYM,
+ InputConstants.Type.KEYSYM,
-1,
- "firmament.key.category"
+ cats.computeIfAbsent(config.element.category) { KeyMapping.Category(Firmament.identifier(it.name.lowercase())) }
)
if (!TestUtil.isInTest) {
KeyBindingHelper.registerKeyBinding(vanillaKeyBinding)
@@ -20,6 +25,6 @@ object FirmamentKeyBindings {
keyBindings[vanillaKeyBinding] = config
}
- val keyBindings = mutableMapOf<KeyBinding, ManagedOption<SavedKeyBinding>>()
+ val keyBindings = mutableMapOf<KeyMapping, ManagedOption<SavedKeyBinding>>()
}