From e973e58d98e47070c68048b1736f1c10fb6ddfcb Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sat, 1 Jul 2023 15:14:11 +0200 Subject: [PATCH] rename ControlsProfile::keyBindings --- .../config/profile/profiles/controls/ControlsProfile.kt | 2 +- .../rendering/input/key/manager/binding/BindingsManager.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/controls/ControlsProfile.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/controls/ControlsProfile.kt index 09ae69f7d..9f2365e01 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/controls/ControlsProfile.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/controls/ControlsProfile.kt @@ -40,7 +40,7 @@ class ControlsProfile( override val version: Int = latestVersion override var description by StringDelegate(this, description ?: "") - var keyBindings: MutableMap by MapDelegate(this, mutableMapOf(), "") + var bindings: MutableMap by MapDelegate(this, mutableMapOf(), "") private set val mouse = MouseC(this) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/binding/BindingsManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/binding/BindingsManager.kt index 300c5a067..d890cb327 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/binding/BindingsManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/manager/binding/BindingsManager.kt @@ -34,7 +34,7 @@ class BindingsManager( init { - profile::keyBindings.observeMap(this) { + profile::bindings.observeMap(this) { for ((key, value) in it.adds) { val binding = bindings[key] ?: continue binding.binding = value @@ -112,7 +112,7 @@ class BindingsManager( } fun register(name: ResourceLocation, default: KeyBinding, pressed: Boolean = false, callback: KeyBindingCallback) { - val keyBinding = profile.keyBindings.getOrPut(name) { default } + val keyBinding = profile.bindings.getOrPut(name) { default } val callbackPair = bindings.synchronizedGetOrPut(name) { KeyBindingState(keyBinding, default, pressed) } callbackPair.callback += callback @@ -123,7 +123,7 @@ class BindingsManager( fun registerCheck(vararg checks: Pair) { for ((name, binding) in checks) { - bindings.synchronizedGetOrPut(name) { KeyBindingState(profile.keyBindings.getOrPut(name) { binding }, binding) } + bindings.synchronizedGetOrPut(name) { KeyBindingState(profile.bindings.getOrPut(name) { binding }, binding) } } }