Merge branch 'isXander:multiversion/dev' into improvement/better-flick-stick

Author: Lokito23

.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 25
           distribution: temurin
       - name: Make gradlew executable
         run: chmod +x ./gradlew

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     `kotlin-dsl`
-    kotlin("jvm") version "2.2.0"
+    kotlin("jvm") version "2.2.21"
 }
 
 repositories {
@@ -31,7 +31,7 @@ dependencies {
     fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
 
     implementation(plugin("dev.isxander.modstitch.base", "0.7.1-unstable"))
-    implementation(plugin("dev.kikugie.stonecutter", "0.7.7"))
-    implementation(plugin("fabric-loom", "1.11.4"))
-    implementation(plugin("net.neoforged.moddev", "2.0.103"))
+    implementation(plugin("dev.kikugie.stonecutter", "0.7.9"))
+    implementation(plugin("fabric-loom", "1.13.4"))
+    implementation(plugin("net.neoforged.moddev", "2.0.119"))
 }

changelog.md

@@ -7,8 +7,19 @@ 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**
 
-## Bug fixes
+## Configurable Look Input Curves
 
-- Fix the temporarily disabling of the enhanced steam deck driver causing a Decky popup
-- Fix crash on some NeoForge targets due to NeoForge patching vanilla methods like a good mod loader
-- Fix missing texture on custom radial menu icons on NeoForge
+You can now pick between Linear, Gentle, Standard, Strong, Cubic, and S-Curve input curves for controller look sensitivity!
+
+Find this new option in the "Sensitivity" section of your controller's settings.
+
+## Changes
+
+- Fix missing texture icon for custom radial icons on NeoForge. (#702 Ellet)
+- Fix crash when interacting with CycleButton with a controller
+- Fix crash when using Steam Deck
+- Fix crash for running Controlify server-side on NeoForge
+- Optimise some mixins
+- Fix crash when attempting to run Controlify with Title Screen mods that remove vanilla buttons
+- Enhanced sodium compatibility is temporarily disabled on 1.21.10-neoforge target due to issues.
+- Fix on-screen keyboard opening in the chat menu regardless of settings

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 org.gradle.configuration-cache=true
 
-modVersion=2.4.3
+modVersion=2.4.4
 modId=controlify
 modName=Controlify
 modDescription=The most advanced controller mod for Minecraft.
@@ -12,7 +12,7 @@ curseforgeSlug=controlify
 modrinthId=DOUdJVEm
 githubProject=isXander/Controlify
 
-deps.fabricLoader=0.17.0
+deps.fabricLoader=0.18.1
 deps.sdl3Target=3.2.18.release-3.2.18
 deps.sdl34jBuild=79
 deps.hid4java=0.8.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -25,7 +25,7 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.7.7"
+    id("dev.kikugie.stonecutter") version "0.7.9"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 

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

@@ -42,12 +42,12 @@ public class ControlifyBootstrap {
     public ControlifyBootstrap(IEventBus modBus) {
         ControlifyServer.getInstance().onInitialize();
 
-        ModLoadingContext.get().registerExtensionPoint(
-                net.neoforged.neoforge.client.gui.IConfigScreenFactory.class,
-                () -> (client, parent) -> new ModConfigOpenerScreen(parent)
-        );
-
         if (PlatformMainUtil.getEnv() == Environment.CLIENT) {
+            ModLoadingContext.get().registerExtensionPoint(
+                    net.neoforged.neoforge.client.gui.IConfigScreenFactory.class,
+                    () -> (client, parent) -> new ModConfigOpenerScreen(parent)
+            );
+
             Controlify.instance().preInitialiseControlify();
         }
         if (PlatformMainUtil.getEnv() == Environment.SERVER) {

src/main/java/dev/isxander/controlify/controller/input/InputComponent.java

@@ -17,6 +17,7 @@
 import dev.isxander.controlify.controller.impl.ConfigImpl;
 import dev.isxander.controlify.controller.input.mapping.ControllerMappingStorage;
 import dev.isxander.controlify.gui.screen.RadialMenuScreen;
+import dev.isxander.controlify.ingame.InputCurves;
 import dev.isxander.controlify.utils.CUtil;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.resources.ResourceLocation;
@@ -220,6 +221,7 @@ public Config(@Nullable ControllerMapping typeProvidedMapping) {
 
         public float buttonActivationThreshold = 0.5f;
 
+        public InputCurves lookInputCurve = InputCurves.STANDARD;
         public boolean isLCE = false;
 
         public Map<ResourceLocation, Float> deadzones = new Object2ObjectOpenHashMap<>();

src/main/java/dev/isxander/controlify/driver/steamdeck/SteamDeckUtil.java

@@ -55,6 +55,7 @@ public static Optional<SteamDeck> getDeckInstance() {
     private static boolean isHardwareSteamDeck() {
         if (true) {
             logger.error("Skipping Steam Deck checks as steamOS has temporarily broken the enhaned driver.");
+            return false;
         }
 
         logger.debugLog("Checking if hardware is Steam Deck.");

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

@@ -19,6 +19,7 @@
 import dev.isxander.controlify.gui.controllers.BindController;
 import dev.isxander.controlify.gui.controllers.Deadzone2DImageRenderer;
 import dev.isxander.controlify.gui.guide.InGameButtonGuide;
+import dev.isxander.controlify.ingame.InputCurves;
 import dev.isxander.controlify.rumble.BasicRumbleEffect;
 import dev.isxander.controlify.rumble.RumbleSource;
 import dev.isxander.controlify.rumble.RumbleState;
@@ -156,6 +157,15 @@ private Optional<OptionGroup> makeSensitivityGroup(ControllerEntity controller)
                         .binding(def.reduceAimingSensitivity, () -> config.reduceAimingSensitivity, v -> config.reduceAimingSensitivity = v)
                         .controller(TickBoxControllerBuilder::create)
                         .build())
+                .option(Option.<InputCurves>createBuilder()
+                        .name(Component.translatable("controlify.gui.look_input_curve"))
+                        .description(OptionDescription.createBuilder()
+                                .text(Component.translatable("controlify.gui.look_input_curve.tooltip"))
+                                .build())
+                        .binding(def.lookInputCurve, () -> config.lookInputCurve, v -> config.lookInputCurve = v)
+                        .controller(opt -> EnumControllerBuilder.create(opt)
+                                .enumClass(InputCurves.class))
+                        .build())
                 .option(Option.<Boolean>createBuilder()
                         .name(Component.translatable("controlify.gui.is_lce"))
                         .description(OptionDescription.createBuilder()