Merge branch 'multiversion/dev' into port/26.1

Author: isXander

build.gradle.kts

@@ -101,6 +101,10 @@ dependencies {
     // Already included by YetAnotherConfigLib, but we need it too, so let's define explicit dep
     api("org.quiltmc.parsers:json:${property("deps.quiltparsers")}")
 
+    if (stonecutter.current.parsed < "1.21.11") {
+        compileOnly("org.jspecify:jspecify:1.0.0")
+    }
+
     // sodium compat
     modDependency("sodium", { "maven.modrinth:sodium:$it" })
     // RSO compat

changelog.md

@@ -7,8 +7,7 @@ This version has the following targets:
 
 **By donating on my [Patreon](https://patreon.com/isxander), you will gain access to builds of Controlify for splitscreen support and snapshot versions**
 
-## Changes
+## Bug Fixes
 
-- Fix various issues relating to focusing widgets in GUI screens
-  - Sign "Done" button no longer gains initial focus preventing typing enter
-- JAR is now signed with a GPG key
+- Fix config migration not migrating bindings
+- Fix never saving bindings

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
-modVersion=2.5.1
+modVersion=3.0.0-beta.2
 modId=controlify
 modName=Controlify
 modDescription=The most advanced controller mod for Minecraft.

src/main/java/dev/isxander/controlify/Controlify.java

@@ -42,7 +42,7 @@ public final class ControlifyEvents {
      */
     public static final EventHandler<LookInputModifier> LOOK_INPUT_MODIFIER = EventHandler.createPlatformBackedEvent();
 
-    public record ControllerConnected(ControllerEntity controller, boolean hotplugged, boolean newController) {
+    public record ControllerConnected(ControllerEntity controller, boolean hotplugged, @Deprecated boolean newController) {
     }
 
     public record ControllerDisconnected(ControllerEntity controller) {

src/main/java/dev/isxander/controlify/api/event/ControlifyEvents.java

@@ -1,12 +1,17 @@
 package dev.isxander.controlify.api.guide;
 
+import com.mojang.serialization.Codec;
 import dev.isxander.yacl3.api.NameableEnum;
 import net.minecraft.network.chat.Component;
+import net.minecraft.util.StringRepresentable;
+import org.jspecify.annotations.NonNull;
 
-public enum GuideVerbosity implements NameableEnum {
+public enum GuideVerbosity implements NameableEnum, StringRepresentable {
     FULL(3),
     REDUCED(2),
     MINIMAL(1);
+
+    public static final Codec<GuideVerbosity> CODEC = StringRepresentable.fromEnum(GuideVerbosity::values);
 
     private final int level;
 
@@ -22,4 +27,9 @@ public int getLevel() {
     public Component getDisplayName() {
         return Component.translatable("controlify.guide_verbosity." + name().toLowerCase());
     }
+
+    @Override
+    public @NonNull String getSerializedName() {
+        return name().toLowerCase();
+    }
 }

src/main/java/dev/isxander/controlify/api/guide/GuideVerbosity.java

@@ -103,12 +103,12 @@ private InGameFacts() {}
     /** When the player is using toggle sneak (does not mean it is currently toggled on) */
     public static final Fact<InGameCtx> IS_TOGGLE_SNEAK = register(
             CUtil.rl("is_toggle_sneak"),
-            ctx -> ctx.controller().genericConfig().config().toggleSneak
+            ctx -> ctx.controller().settings().generic.toggleSneak
     );
     /** When the player is using toggle sprint (does not mean it is currently toggled on) */
     public static final Fact<InGameCtx> IS_TOGGLE_SPRINT = register(
             CUtil.rl("is_toggle_sprint"),
-            ctx -> ctx.controller().genericConfig().config().toggleSprint
+            ctx -> ctx.controller().settings().generic.toggleSprint
     );
     /** When the player is attempting to sprint (pressing the sprint key, or it is toggled on) */
     public static final Fact<InGameCtx> SPRINTING = register(

src/main/java/dev/isxander/controlify/api/guide/InGameFacts.java

@@ -75,16 +75,21 @@ private void checkLocked() {
             throw new IllegalStateException("Registry is locked. Cannot add bind now.");
     }
 
-    public List<InputBinding> provideBindsForController(ControllerEntity controller) {
+    /**
+     * Provides all bindings for a given controller.
+     * @param controller The controller to provide bindings for. Can be null to get a list of all bindings.
+     * @return A list of input bindings.
+     */
+    public List<InputBinding> provideBindsForController(@Nullable ControllerEntity controller) {
         List<InputBinding> bindings = new ArrayList<>();
 
         for (RegistryEntry entry : bindEntries) {
-            if (!entry.filter().test(controller))
+            if (controller != null && !entry.filter().test(controller))
                 continue;
 
             InputBindingImpl binding = entry.builder().apply(controller);
 
-            if (entry.emulation() != null) {
+            if (controller != null && entry.emulation() != null) {
                 BooleanSupplier emulationToggle = null;
                 if (entry.emulationToggle() != null) {
                     emulationToggle = () -> entry.emulationToggle().apply(controller);
@@ -118,7 +123,7 @@ public Stream<Identifier> getAllBindIds() {
 
     private record RegistryEntry(
             Predicate<ControllerEntity> filter,
-            Function<ControllerEntity, InputBindingImpl> builder,
+            Function<@Nullable ControllerEntity, InputBindingImpl> builder,
             KeyMapping emulation,
             Function<ControllerEntity, Boolean> emulationToggle,
             Identifier id

src/main/java/dev/isxander/controlify/bindings/ControlifyBindApiImpl.java

@@ -80,7 +80,7 @@ public final class ControlifyBindings {
             .id("controlify", "sprint")
             .category(MOVEMENT_CATEGORY)
             .allowedContexts(BindContext.IN_GAME)
-            .keyEmulation(options.keySprint, c -> c.genericConfig().config().toggleSprint));
+            .keyEmulation(options.keySprint, c -> c.settings().generic.toggleSprint));
     public static final InputBindingSupplier SNEAK =  ControlifyBindApi.get().registerBinding(builder -> builder
             .id("controlify", "sneak")
             .category(MOVEMENT_CATEGORY)

src/main/java/dev/isxander/controlify/bindings/ControlifyBindings.java

@@ -6,6 +6,7 @@
 import dev.isxander.controlify.bindings.input.EmptyInput;
 import dev.isxander.controlify.bindings.input.Input;
 import dev.isxander.controlify.controller.ControllerEntity;
+import dev.isxander.controlify.controller.id.ControllerType;
 import dev.isxander.controlify.utils.CUtil;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.locale.Language;
@@ -118,20 +119,24 @@ public InputBindingBuilder keyEmulation(@NotNull KeyMapping keyMapping) {
         return keyEmulation(keyMapping, null);
     }
 
-    public InputBindingImpl build(ControllerEntity controller) {
+    public InputBindingImpl build(@Nullable ControllerEntity controller) {
         Validate.isTrue(locked, "Tried to build builder before it was locked.");
 
-        Component name = createDefaultString(controller, null, false);
+        Identifier controllerType = controller != null
+                ? controller.info().type().namespace()
+                : ControllerType.DEFAULT.namespace();
+
+        Component name = createDefaultString(controllerType, null, false);
         if (customName != null) name = customName;
 
-        Component description = createDefaultString(controller, "desc", true);
+        Component description = createDefaultString(controllerType, "desc", true);
         if (customDescription != null) description = customDescription;
         if (description == null) description = Component.empty();
 
         Supplier<Input> defaultSupplier = () -> {
             // retrieve every tick so the bind provider isn't cached after a resource reload
             DefaultBindProvider provider = Controlify.instance().defaultBindManager().getDefaultBindProvider(
-                    controller.info().type().namespace()
+                    controllerType
             );
 
             Input input = provider.getDefaultBind(id);
@@ -141,7 +146,17 @@ public InputBindingImpl build(ControllerEntity controller) {
             return input;
         };
 
-        return new InputBindingImpl(controller, id, name, description, category, defaultSupplier, allowedContexts, radialCandidate);
+        return new InputBindingImpl(
+                controller != null ? controller.input().orElse(null) : null,
+                controllerType,
+                id,
+                name,
+                description,
+                category,
+                defaultSupplier,
+                allowedContexts,
+                radialCandidate
+        );
     }
 
     @NotNull
@@ -171,12 +186,10 @@ private void checkLocked() {
         Validate.isTrue(!locked, "Tried to modify binding builder after is has been locked!");
     }
 
-    private Component createDefaultString(ControllerEntity controller, @Nullable String suffix, boolean notExistToNull) {
+    private Component createDefaultString(Identifier controllerType, @Nullable String suffix, boolean notExistToNull) {
         Objects.requireNonNull(id);
 
-        Identifier type = controller.info().type().namespace();
-
-        String typeSpecificKey = type.toLanguageKey("controlify.binding", id.toLanguageKey());
+        String typeSpecificKey = controllerType.toLanguageKey("controlify.binding", id.toLanguageKey());
         if (suffix != null) typeSpecificKey += "." + suffix;
         if (Language.getInstance().has(typeSpecificKey)) {
             return Component.translatable(typeSpecificKey);