1 files changed, 3 insertions, 35 deletions
diff --git a/src/main/kotlin/gui/config/KeyBindingHandler.kt b/src/main/kotlin/gui/config/KeyBindingHandler.kt
index d7d0b47..3c08da2 100644
--- a/src/main/kotlin/gui/config/KeyBindingHandler.kt
+++ b/src/main/kotlin/gui/config/KeyBindingHandler.kt
@@ -1,11 +1,5 @@
 package moe.nea.firmament.gui.config
 
-import io.github.notenoughupdates.moulconfig.common.IMinecraft
-import io.github.notenoughupdates.moulconfig.common.MyResourceLocation
-import io.github.notenoughupdates.moulconfig.deps.libninepatch.NinePatch
-import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext
-import io.github.notenoughupdates.moulconfig.gui.KeyboardEvent
-import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.decodeFromJsonElement
@@ -13,6 +7,7 @@ import kotlinx.serialization.json.encodeToJsonElement
 import moe.nea.firmament.gui.FirmButtonComponent
 import moe.nea.firmament.keybindings.FirmamentKeyBindings
 import moe.nea.firmament.keybindings.SavedKeyBinding
+import moe.nea.firmament.util.data.ManagedConfig
 
 class KeyBindingHandler(val name: String, val managedConfig: ManagedConfig) :
 	ManagedConfig.OptionHandler<SavedKeyBinding> {
@@ -35,39 +30,12 @@ class KeyBindingHandler(val name: String, val managedConfig: ManagedConfig) :
 			{ opt.value },
 			{
 				opt.value = it
-				opt.element.save()
+				opt.element.markDirty()
 			},
 			{ button.blur() },
 			{ button.requestFocus() }
 		)
-		button = object : FirmButtonComponent(
-			TextComponent(
-				IMinecraft.instance.defaultFontRenderer,
-				{ sm.label.string },
-				130,
-				TextComponent.TextAlignment.LEFT,
-				false,
-				false
-			), action = {
-				sm.onClick()
-			}) {
-			override fun keyboardEvent(event: KeyboardEvent, context: GuiImmediateContext): Boolean {
-				if (event is KeyboardEvent.KeyPressed) {
-					return sm.keyboardEvent(event.keycode, event.pressed)
-				}
-				return super.keyboardEvent(event, context)
-			}
-
-			override fun getBackground(context: GuiImmediateContext): NinePatch<MyResourceLocation> {
-				if (sm.editing) return activeBg
-				return super.getBackground(context)
-			}
-
-
-			override fun onLostFocus() {
-				sm.onLostFocus()
-			}
-		}
+		button = sm.createButton()
 		sm.updateLabel()
 		return button
 	}