fix bindings never being saved, or migrated

Author: isXander

src/main/java/dev/isxander/controlify/config/dto/dfu/fixes/TheHolyMigrationFix.java

@@ -160,6 +160,10 @@ private <T> Dynamic<T> rewriteGenericConfig(Dynamic<T> old, Dynamic<T> root) {
     private <T> Dynamic<T> rewriteInputConfig(Dynamic<T> old, Dynamic<T> root) {
         var defaults = controllerDefaults.input;
 
+        // Build bindings sub-object - structure stays the same, just moved
+        Dynamic<T> bindings = old.get("bindings")
+                .result().orElse(root.createMap(Map.of()));
+
         // Build sensitivity sub-object
         Dynamic<T> sensitivity = root.createMap(Map.of(
                 root.createString("horizontal"), old.get("h_look_sensitivity")
@@ -190,6 +194,7 @@ private <T> Dynamic<T> rewriteInputConfig(Dynamic<T> old, Dynamic<T> root) {
         ));
 
         return root.createMap(Map.of(
+                root.createString("bindings"), bindings,
                 root.createString("sensitivity"), sensitivity,
                 root.createString("radial_menu"), radialMenu,
                 root.createString("button_activation_threshold"), old.get("button_activation_threshold")

src/main/java/dev/isxander/controlify/config/dto/profile/InputConfig.java

@@ -31,8 +31,7 @@ public record BindingsConfig(
     ) {
         public static final BindingsConfig EMPTY = new BindingsConfig(Map.of());
 
-        public static final Codec<BindingsConfig> CODEC = Codec.unboundedMap(Identifier.CODEC, Input.CODEC).fieldOf("bindings")
-                .codec()
+        public static final Codec<BindingsConfig> CODEC = Codec.unboundedMap(Identifier.CODEC, Input.CODEC)
                 .xmap(BindingsConfig::new, BindingsConfig::bindings);
 
         public BindingsConfig {

src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java

@@ -666,7 +666,7 @@ private Optional<ConfigCategory> makeBindsCategory(
                     .name(categoryName);
 
             controlsGroup.options(bindGroup.stream().map(binding -> {
-                Option.Builder<?> option = createBindingOpt(binding, controller.orElse(null))
+                Option.Builder<?> option = createBindingOpt(settings.input, binding, controller.orElse(null))
                         .addListener((opt, val) -> updateConflictingBinds(optionBinds));
 
                 Option<?> built = option.build();
@@ -721,11 +721,11 @@ private static Map<Component, List<InputBinding>> groupBindings(Collection<Input
                 .collect(Collectors.groupingBy(InputBinding::category, LinkedHashMap::new, Collectors.toList()));
     }
 
-    private static Option.Builder<Input> createBindingOpt(InputBindingSupplier bindingSupplier, ControllerEntity controller) {
-        return createBindingOpt(bindingSupplier.on(controller), controller);
+    private static Option.Builder<Input> createBindingOpt(InputSettings settings, InputBindingSupplier bindingSupplier, ControllerEntity controller) {
+        return createBindingOpt(settings, bindingSupplier.on(controller), controller);
     }
 
-    private static Option.Builder<Input> createBindingOpt(InputBinding binding, @Nullable ControllerEntity controller) {
+    private static Option.Builder<Input> createBindingOpt(InputSettings settings, InputBinding binding, @Nullable ControllerEntity controller) {
         return Option.<Input>createBuilder()
                 .name(binding.name())
                 .description(v -> OptionDescription.createBuilder()
@@ -751,7 +751,10 @@ private static Option.Builder<Input> createBindingOpt(InputBinding binding, @Nul
                                         ))
                         ))
                         .build())
-                .binding(EmptyInput.INSTANCE, binding::boundInput, binding::setBoundInput)
+                .binding(EmptyInput.INSTANCE, binding::boundInput, input -> {
+                    binding.setBoundInput(input);
+                    settings.bindings.bindings.put(binding.id(), input);
+                })
                 .customController(opt -> new BindController(opt, controller));
     }