Release v1.3.1 for Minecraft 1.20.5+

Closes #14

.gitignore

@@ -24,10 +24,7 @@ bin/
 .classpath
 .project
 
-# forge
-
-logs/
-
 # fabric
 
 run/
+logs/

Fabric/build.gradle.kts

@@ -0,0 +1,50 @@
+val modId: String by project
+val minecraftVersion: String by project
+val fabricVersion: String by project
+
+plugins {
+	id("fabric-loom")
+}
+
+dependencies {
+	minecraft("com.mojang:minecraft:$minecraftVersion")
+	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
+	mappings(loom.officialMojangMappings())
+}
+
+loom {
+	runs {
+		val runJvmArgs: Set<String> by project
+		
+		configureEach {
+			runDir("../run")
+			vmArgs(runJvmArgs)
+			ideConfigGenerated(true)
+		}
+		
+		named("client") {
+			configName = "Fabric Client"
+			client()
+		}
+		
+		findByName("server")?.let(::remove)
+	}
+	
+	mixin {
+		defaultRefmapName.set("$modId.refmap.json")
+	}
+}
+
+tasks.processResources {
+	filesMatching("fabric.mod.json") {
+		expand(inputs.properties)
+	}
+}
+
+tasks.jar {
+	exclude("com/terraformersmc/modmenu/")
+}
+
+tasks.remapJar {
+	archiveVersion.set(tasks.jar.get().archiveVersion)
+}

Fabric/src/main/java/chylex/bettercontrols/BetterControlsMod.java

@@ -0,0 +1,12 @@
+package chylex.bettercontrols;
+
+import chylex.bettercontrols.config.BetterControlsConfig;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+
+public final class BetterControlsMod implements ClientModInitializer {
+	@Override
+	public void onInitializeClient() {
+		BetterControlsCommon.setConfig(BetterControlsConfig.load(FabricLoader.getInstance().getConfigDir().resolve("BetterControls.json")));
+	}
+}

Fabric/src/main/java/chylex/bettercontrols/compatibility/ModMenuSupport.java

@@ -0,0 +1,13 @@
+package chylex.bettercontrols.compatibility;
+
+import chylex.bettercontrols.gui.BetterControlsScreen;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import net.minecraft.client.Minecraft;
+
+public class ModMenuSupport implements ModMenuApi {
+	@Override
+	public ConfigScreenFactory<?> getModConfigScreenFactory() {
+		return parentScreen -> new BetterControlsScreen(Minecraft.getInstance(), parentScreen);
+	}
+}

Fabric/src/main/java/com/terraformersmc/modmenu/api/ConfigScreenFactory.java

@@ -0,0 +1,9 @@
+package com.terraformersmc.modmenu.api;
+
+import net.minecraft.client.gui.screens.Screen;
+
+@SuppressWarnings("unused")
+@FunctionalInterface
+public interface ConfigScreenFactory<S extends Screen> {
+	S create(Screen parent);
+}

Fabric/src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java

@@ -0,0 +1,8 @@
+package com.terraformersmc.modmenu.api;
+
+@SuppressWarnings("unused")
+public interface ModMenuApi {
+	default ConfigScreenFactory<?> getModConfigScreenFactory() {
+		return screen -> null;
+	}
+}

Fabric/src/main/resources/fabric.mod.json

@@ -0,0 +1,36 @@
+{
+  "schemaVersion": 1,
+  "id": "${id}",
+  "name": "${name}",
+  "description": "${description}",
+  "version": "${version}",
+  "license": "${license}",
+  
+  "icon": "assets/bettercontrols/icon.png",
+  
+  "authors": [
+    "${author}"
+  ],
+  
+  "contact": {
+    "homepage": "https://chylex.com",
+    "issues": "${issuesURL}",
+    "sources": "${sourcesURL}"
+  },
+  
+  "environment": "client",
+  "entrypoints": {
+    "client": [ "chylex.bettercontrols.BetterControlsMod" ],
+    "modmenu": [ "chylex.bettercontrols.compatibility.ModMenuSupport" ]
+  },
+  
+  "mixins": [{
+    "config": "${id}.mixins.json",
+    "environment": "client"
+  }],
+  
+  "depends": {
+    "fabricloader": ">=${minimumFabricVersion}",
+    "minecraft": ">=${minimumMinecraftVersion}"
+  }
+}

NeoForge/build.gradle.kts

@@ -0,0 +1,28 @@
+val neoForgeVersion: String by project
+
+plugins {
+	id("net.neoforged.gradle.userdev")
+	id("net.neoforged.gradle.mixin")
+}
+
+dependencies {
+	implementation("net.neoforged:neoforge:$neoForgeVersion")
+}
+
+runs {
+	val runJvmArgs: Set<String> by project
+	
+	configureEach {
+		workingDirectory = file("../run")
+		modSource(project.sourceSets.main.get())
+		jvmArguments(runJvmArgs)
+	}
+	
+	create("client")
+}
+
+tasks.processResources {
+	filesMatching("META-INF/neoforge.mods.toml") {
+		expand(inputs.properties)
+	}
+}

NeoForge/src/main/java/chylex/bettercontrols/BetterControlsMod.java

@@ -0,0 +1,20 @@
+package chylex.bettercontrols;
+
+import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.gui.BetterControlsScreen;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.fml.loading.FMLPaths;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+
+@Mod("bettercontrols")
+public final class BetterControlsMod {
+	public BetterControlsMod() {
+		if (FMLEnvironment.dist == Dist.CLIENT) {
+			BetterControlsCommon.setConfig(BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json")));
+			ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> BetterControlsScreen::new);
+		}
+	}
+}

NeoForge/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,31 @@
+modLoader = "javafml"
+loaderVersion = "[0,)"
+
+license = "${license}"
+issueTrackerURL = "${issuesURL}"
+
+[[mods]]
+modId = "${id}"
+displayName = "${name}"
+displayURL = "${sourcesURL}"
+description = "${description}"
+authors = "${author}"
+version = "${version}"
+logoFile = "icon.png"
+
+[[mixins]]
+config = "${id}.mixins.json"
+
+[[dependencies.${id}]]
+modId = "minecraft"
+type = "required"
+versionRange = "[${minimumMinecraftVersion},)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.${id}]]
+modId = "neoforge"
+type = "required"
+versionRange = "[${minimumNeoForgeVersion},)"
+ordering = "NONE"
+side = "CLIENT"

README.md

@@ -3,9 +3,9 @@ Better Controls
 
 ![Logo](https://raw.githubusercontent.com/chylex/Better-Controls/master/logo.png "Depiction of Zero Regrets")
 
-Better Controls is a reimagining of [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting) with even more customizability. It features several new keybindings and many configurable options for how sprinting, sneaking, and flying should behave.
+[Better Controls](https://www.curseforge.com/minecraft/mc-mods/better-controls) is a reimagining of [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting) with even more customizability. It features several new keybindings and many configurable options for how sprinting, sneaking, and flying should behave.
 
-Better Controls only focuses on complementing vanilla mechanics rather than adding new mechanics (such as [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting)'s option to allow sprinting in all directions) that only work on client side and server owners must explicitly opt in to enable them. By not having such features in Better Controls, it significantly reduces complexity by not having a server side version of the mod, and not needing a way to completely disable the mod while the game is running.
+Better Controls only focuses on complementing vanilla mechanics, rather than adding new mechanics (such as [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting)'s option to allow sprinting in all directions) that only work on client side and server owners must explicitly opt in to enable them. By not having such features in Better Controls, it significantly reduces complexity by not having a server side version of the mod, and not needing a way to completely disable the mod while the game is running.
 
 Another major difference is the amount and granularity of options. Better Controls could be considered an *advanced controls mod* - by default, none of the keybinds are bound, and all options are set to match vanilla behavior. To take full advantage, go into *Options - Controls - Better Controls*, check out all of the available options, and figure out the best configuration for you.
 
@@ -54,7 +54,7 @@ While this is convenient, there is potential for bugs which can affect server pl
 ### Compatibility
 
 * Better Controls is a client-side mod, it will do nothing when installed on a server.
-* If you run into a conflict with another mod that modifies the *Controls* screen, hold Alt while opening *Controls* to prevent Better Controls from adding its button. If another mod prevents the button from appearing, you can install [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu) which adds a mod list with configuration buttons for mods.
+* If you run into a conflict with another mod that modifies the *Controls* screen, hold Alt while opening *Controls* to prevent Better Controls from adding its button. If another mod prevents the button from appearing, a button to open the mod's configuration is available in the Mods menu (for Fabric, install [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu)).
 
 ## Screenshot
 
@@ -63,11 +63,15 @@ While this is convenient, there is potential for bugs which can affect server pl
 Source Code
 ===========
 
-The `main` branch includes the latest version for Fabric. Older versions and their Forge equivalents are in branches named `fabric/<version>` and `forge/<version>`.
+The `main` branch includes both the Fabric and Forge version in a single project. The project uses Mojang mappings. The root project contains common source code and resource files, and the `Fabric` and `Forge` folders are subprojects with loader-specific files.
+
+The `main` branch always has the latest development version. Before updating to a new Minecraft version, a new branch is created from the `main` branch (for example, before the mod is updated to `1.18`, a branch named `1.17` will be created). Further development of older versions may continue in these branches in case backports or version-specific fixes are needed.
+
+Older versions from before the merge of the Fabric and Forge versions can be found in branches named `fabric/<version>` and `forge/<version>`.
 
 ## Contributing
 
-All contributions should target the `main` branch, unless the contribution is specifically made for older versions. Every feature must be portable to Forge to ensure parity, unless the feature adds integration with another mod that is only compatible with one mod loader. Integrations for Forge-only mods should target the most recent `forge/<version>` branch.
+All contributions should target the `main` branch and work in both Fabric and Forge, unless the contribution is specifically targeting older versions or a specific mod loader.
 
 For any larger contributions, please [open an issue](https://github.com/chylex/Better-Controls/issues/new) first before you make a PR.
 

build.gradle

@@ -1,94 +0,0 @@
-buildscript {
-	repositories {
-		maven { url = 'https://files.minecraftforge.net/maven' }
-		maven { url = "https://repo.spongepowered.org/maven" }
-		mavenCentral()
-	}
-	
-	dependencies {
-		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
-	}
-}
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
-apply plugin: 'eclipse'
-
-def mcversion = "1.17.1"
-def forgeversion = "37.0.75"
-
-def prefixName = 'displayName = '
-def prefixVersion = 'version = '
-
-def metaLines = file('src/main/resources/META-INF/mods.toml').readLines()
-def metaName = metaLines.find { line -> line.startsWith(prefixName) }.substring(prefixName.length())[1..-2]
-def metaVersion = metaLines.find { line -> line.startsWith(prefixVersion) }.substring(prefixVersion.length())[1..-2]
-
-group = 'chylex.bettercontrols'
-version = metaVersion
-archivesBaseName = metaName.replaceAll('\\s', '')
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
-
-minecraft {
-	mappings channel: 'official', version: '1.17.1'
-	
-	runs {
-		client {
-			workingDirectory file('run')
-			
-			property 'mixin.env.disableRefMap', 'true'
-			arg '-mixin.config=bettercontrols.mixins.json'
-			
-			mods {
-				bettercontrols {
-					source sourceSets.main
-				}
-			}
-		}
-		
-		server {
-			workingDirectory file('run')
-			
-			property 'mixin.env.disableRefMap', 'true'
-			arg '-mixin.config=bettercontrols.mixins.json'
-			
-			mods {
-				bettercontrols {
-					source sourceSets.main
-				}
-			}
-		}
-	}
-}
-
-dependencies {
-	minecraft 'net.minecraftforge:forge:' + mcversion + '-' + forgeversion
-}
-
-jar {
-	archiveName = archivesBaseName + '-' + mcversion + '+v' + version + '.jar'
-	
-	from('./') {
-		include 'LICENSE'
-	}
-	
-	manifest {
-		attributes([
-			'Specification-Title'     : 'bettercontrols',
-			'Specification-Version'   : '1',
-			'Specification-Vendor'    : 'chylex',
-			
-			'Implementation-Title'    : metaName,
-			'Implementation-Version'  : metaVersion,
-			'Implementation-Vendor'   : 'chylex',
-			
-			'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-			
-			'MixinConfigs'            : 'bettercontrols.mixins.json'
-		])
-	}
-	
-	finalizedBy('reobfJar')
-}

build.gradle.kts

@@ -0,0 +1,160 @@
+@file:Suppress("ConvertLambdaToReference")
+
+import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
+
+val modId: String by project
+val modName: String by project
+val modDescription: String by project
+val modAuthor: String by project
+val modVersion: String by project
+val modLicense: String by project
+val modSourcesURL: String by project
+val modIssuesURL: String by project
+
+val minecraftVersion: String by project
+val mixinVersion: String by project
+
+val minimumMinecraftVersion: String by project
+val minimumNeoForgeVersion: String by project
+val minimumFabricVersion: String by project
+
+val modNameStripped = modName.replace(" ", "")
+val jarVersion = "$minecraftVersion+v$modVersion"
+
+plugins {
+	idea
+	`java-library`
+	id("net.neoforged.gradle.vanilla")
+}
+
+idea {
+	module {
+		excludeDirs.add(file("gradle"))
+		excludeDirs.add(file("run"))
+		
+		if (findProject(":NeoForge") == null) {
+			excludeDirs.add(file("NeoForge"))
+		}
+		
+		if (findProject(":Fabric") == null) {
+			excludeDirs.add(file("Fabric"))
+		}
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation("net.minecraft:client:$minecraftVersion")
+	compileOnly("net.fabricmc:sponge-mixin:$mixinVersion")
+	api("com.google.code.findbugs:jsr305:3.0.2")
+}
+
+base {
+	archivesName.set("$modNameStripped-Common")
+}
+
+runs {
+	clear()
+}
+
+allprojects {
+	group = "com.$modAuthor.$modId"
+	version = modVersion
+	
+	apply(plugin = "java-library")
+	
+	dependencies {
+		implementation("org.jetbrains:annotations:24.1.0")
+	}
+	
+	extensions.getByType<JavaPluginExtension>().apply {
+		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+	}
+	
+	tasks.withType<JavaCompile> {
+		options.encoding = "UTF-8"
+		options.release.set(21)
+	}
+	
+	val runJvmArgs = mutableSetOf<String>().also {
+		extra["runJvmArgs"] = it
+	}
+	
+	if (project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.orNull == "JetBrains") {
+		runJvmArgs.add("-XX:+AllowEnhancedClassRedefinition")
+	}
+}
+
+subprojects {
+	dependencies {
+		implementation(rootProject)
+	}
+	
+	base {
+		archivesName.set("$modNameStripped-${project.name}")
+	}
+	
+	listOf("compileJava", "compileTestJava").forEach {
+		tasks.named<JavaCompile>(it) {
+			source({ rootProject.sourceSets.main.get().allSource })
+		}
+	}
+	
+	tasks.processResources {
+		inputs.property("id", modId)
+		inputs.property("name", modName)
+		inputs.property("description", modDescription)
+		inputs.property("version", modVersion)
+		inputs.property("author", modAuthor)
+		inputs.property("license", modLicense)
+		inputs.property("sourcesURL", modSourcesURL)
+		inputs.property("issuesURL", modIssuesURL)
+		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
+		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
+		inputs.property("minimumFabricVersion", minimumFabricVersion)
+		
+		from(rootProject.sourceSets.main.get().resources) {
+			expand(inputs.properties)
+		}
+	}
+	
+	tasks.jar {
+		archiveVersion.set(jarVersion)
+		
+		from(rootProject.file("LICENSE"))
+		
+		manifest {
+			attributes(
+				"Specification-Title" to modId,
+				"Specification-Vendor" to modAuthor,
+				"Specification-Version" to "1",
+				"Implementation-Title" to "$modNameStripped-${project.name}",
+				"Implementation-Vendor" to modAuthor,
+				"Implementation-Version" to modVersion,
+			)
+		}
+	}
+	
+	tasks.test {
+		onlyIf { false }
+	}
+}
+
+val copyJars = tasks.register<Copy>("copyJars") {
+	group = "build"
+	duplicatesStrategy = EXCLUDE
+	
+	for (subproject in subprojects) {
+		dependsOn(subproject.tasks.assemble)
+		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
+	}
+	
+	into(project.layout.buildDirectory.dir("dist"))
+}
+
+tasks.assemble {
+	finalizedBy(copyJars)
+}

gradle.properties

@@ -1,4 +1,26 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+# Mod
-# This is required to provide enough memory for the Minecraft decompilation process.
+modId=bettercontrols
+modName=Better Controls
+modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
+modAuthor=chylex
+modVersion=1.3.1
+modLicense=MPL-2.0
+modSourcesURL=https://github.com/chylex/Better-Controls
+modIssuesURL=https://github.com/chylex/Better-Controls/issues
+
+# Dependencies
+minecraftVersion=1.20.5
+neoForgeVersion=20.5.0-beta
+neoGradleVersion=7.0.120
+fabricVersion=0.15.11
+loomVersion=1.3
+mixinVersion=0.12.5+mixin.0.8.5
+
+# Constraints
+minimumMinecraftVersion=1.20.5
+minimumNeoForgeVersion=20.5.0-beta
+minimumFabricVersion=0.12.3
+
+# Gradle
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright <EFBFBD> 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions <EFBFBD>$var<EFBFBD>, <EFBFBD>${var}<EFBFBD>, <EFBFBD>${var:-default}<EFBFBD>, <EFBFBD>${var+SET}<EFBFBD>,
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           <EFBFBD>${var#prefix}<EFBFBD>, <EFBFBD>${var%suffix}<EFBFBD>, and <EFBFBD>$( cmd )<EFBFBD>;
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially <EFBFBD>case<EFBFBD>;
+#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including <EFBFBD>command<EFBFBD>, <EFBFBD>set<EFBFBD>, and <EFBFBD>ulimit<EFBFBD>.
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -0,0 +1,31 @@
+rootProject.name = "Better-Controls"
+
+pluginManagement {
+	repositories {
+		gradlePluginPortal()
+		maven(url = "https://maven.neoforged.net/releases") { name = "NeoForge" }
+		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
+	}
+	
+	plugins {
+		val neoGradleVersion = settings.extra.get("neoGradleVersion") as? String
+		if (neoGradleVersion != null) {
+			id("net.neoforged.gradle.vanilla") version neoGradleVersion
+			id("net.neoforged.gradle.userdev") version neoGradleVersion
+			id("net.neoforged.gradle.mixin") version neoGradleVersion
+		}
+		
+		val loomVersion = settings.extra.get("loomVersion") as? String
+		if (loomVersion != null) {
+			id("fabric-loom") version "$loomVersion-SNAPSHOT"
+		}
+	}
+}
+
+if (settings.extra.has("neoForgeVersion")) {
+	include("NeoForge")
+}
+
+if (settings.extra.has("fabricVersion")) {
+	include("Fabric")
+}

src/main/java/chylex/bettercontrols/BetterControlsCommon.java

@@ -0,0 +1,17 @@
+package chylex.bettercontrols;
+
+import chylex.bettercontrols.config.BetterControlsConfig;
+
+public final class BetterControlsCommon {
+	private static BetterControlsConfig config;
+	
+	public static BetterControlsConfig getConfig() {
+		return config;
+	}
+	
+	static void setConfig(final BetterControlsConfig config) {
+		BetterControlsCommon.config = config;
+	}
+	
+	private BetterControlsCommon() {}
+}

src/main/java/chylex/bettercontrols/BetterControlsMod.java

@@ -1,33 +0,0 @@
-package chylex.bettercontrols;
-import chylex.bettercontrols.config.BetterControlsConfig;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.fmlclient.ConfigGuiHandler.ConfigGuiFactory;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
-
-@Mod("bettercontrols")
-public final class BetterControlsMod {
-	public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
-	
-	public BetterControlsMod() {
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
-	}
-	
-	private static final class ClientLoader {
-		public static BetterControlsConfig loadConfig() {
-			return BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json"));
-		}
-		
-		public static BetterControlsScreen createScreen(final Minecraft mc, final Screen parentScreen) {
-			return new BetterControlsScreen(parentScreen);
-		}
-	}
-}

src/main/java/chylex/bettercontrols/config/BetterControlsConfig.java

@@ -1,14 +1,23 @@
 package chylex.bettercontrols.config;
+
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
 import java.nio.file.Path;
 
 public final class BetterControlsConfig {
 	public static BetterControlsConfig load(final Path path) {
-		return ConfigSerializer.deserialize(path).setPath(path);
+		final BetterControlsConfig cfg = ConfigSerializer.read(path);
+		cfg.path = path;
+		
+		if (cfg.wasMigrated) {
+			cfg.save();
+		}
+		
+		return cfg;
 	}
 	
 	private Path path;
+	boolean wasMigrated = false;
 	
 	public final KeyBindingWithModifier keyToggleSprint = new KeyBindingWithModifier("key.bettercontrols.toggle_sprint");
 	public SprintMode sprintMode = SprintMode.TAP_TO_START;
@@ -23,14 +32,14 @@ public final class BetterControlsConfig {
 	public boolean disableFlightInertia = false;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
-	public float flightSpeedMpCreativeDefault = 1F;
+	public float flightHorizontalSpeedMpCreativeDefault = 1F;
-	public float flightSpeedMpCreativeSprinting = 2F;
+	public float flightHorizontalSpeedMpCreativeSprinting = 2F;
-	public float flightSpeedMpSpectatorDefault = 1F;
+	public float flightHorizontalSpeedMpSpectatorDefault = 1F;
-	public float flightSpeedMpSpectatorSprinting = 2F;
+	public float flightHorizontalSpeedMpSpectatorSprinting = 2F;
-	public float flightVerticalBoostCreativeDefault = 0F;
+	public float flightVerticalSpeedMpCreativeDefault = 1F;
-	public float flightVerticalBoostCreativeSprinting = 0F;
+	public float flightVerticalSpeedMpCreativeSprinting = 2F;
-	public float flightVerticalBoostSpectatorDefault = 0F;
+	public float flightVerticalSpeedMpSpectatorDefault = 1F;
-	public float flightVerticalBoostSpectatorSprinting = 0F;
+	public float flightVerticalSpeedMpSpectatorSprinting = 2F;
 	
 	public final KeyBindingWithModifier keyToggleWalkForward = new KeyBindingWithModifier("key.bettercontrols.toggle_forward");
 	public final KeyBindingWithModifier keyToggleJump = new KeyBindingWithModifier("key.bettercontrols.toggle_jump");
@@ -39,11 +48,6 @@ public final class BetterControlsConfig {
 	
 	BetterControlsConfig() {}
 	
-	private BetterControlsConfig setPath(final Path path) {
-		this.path = path;
-		return this;
-	}
-	
 	public KeyBindingWithModifier[] getAllKeyBindings() {
 		return new KeyBindingWithModifier[] {
 			keyToggleSprint,
@@ -57,6 +61,6 @@ public final class BetterControlsConfig {
 	}
 	
 	public void save() {
-		ConfigSerializer.serialize(path, this);
+		ConfigSerializer.write(path, this);
 	}
 }

src/main/java/chylex/bettercontrols/config/ConfigSerializer.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.config;
+
 import chylex.bettercontrols.input.SprintMode;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -11,6 +12,7 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import net.minecraft.util.Mth;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import java.io.FileNotFoundException;
@@ -44,14 +46,14 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		Json.setBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		Json.setBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		Json.setBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.writeKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.writeKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -83,14 +85,14 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		cfg.disableFlightInertia = Json.getBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		cfg.disableChangingFovWhileFlying = Json.getBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		cfg.flyOnGroundInCreative = Json.getBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		cfg.flightSpeedMpCreativeDefault = Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpCreativeDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpCreativeSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpSpectatorDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpSpectatorSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
+		cfg.flightVerticalSpeedMpCreativeDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Default", "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
+		cfg.flightVerticalSpeedMpCreativeSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Sprinting", "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
+		cfg.flightVerticalSpeedMpSpectatorDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Default", "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
+		cfg.flightVerticalSpeedMpSpectatorSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Sprinting", "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -100,7 +102,38 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config) {
+	private static float readHorizontalSpeedMultiplier(final JsonObject obj, final String key, final float defaultValue) {
+		return Json.getFloat(obj, key, defaultValue, 0.25F, 8F);
+	}
+	
+	private static float readVerticalSpeedMultiplier(final JsonObject obj, final BetterControlsConfig cfg, final String newKey, final String legacyBoostKey, final float defaultValue) {
+		if (obj.has(newKey)) {
+			return Json.getFloat(obj, newKey, defaultValue, 0.25F, 8F);
+		}
+		else if (obj.has(legacyBoostKey)) {
+			cfg.wasMigrated = true;
+			
+			final float value = 1F + Json.getFloat(obj, legacyBoostKey, 0F, 0F, 3F);
+			// 1.25x, 1.75x, 2.5x, and 3.5x are not supported
+			if (Mth.equal(value, 1.25F) || Mth.equal(value, 1.75F)) {
+				return 1.5F;
+			}
+			else if (Mth.equal(value, 2.5F)) {
+				return 2F;
+			}
+			else if (Mth.equal(value, 3.5F)) {
+				return 3F;
+			}
+			else {
+				return value;
+			}
+		}
+		else {
+			return defaultValue;
+		}
+	}
+	
+	static void write(final Path path, final BetterControlsConfig config) {
 		try (final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
 			gson.getAdapter(BetterControlsConfig.class).write(writer, config);
 		} catch (final IOException e) {
@@ -108,7 +141,7 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		}
 	}
 	
-	static BetterControlsConfig deserialize(final Path path) {
+	static BetterControlsConfig read(final Path path) {
 		try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
 		} catch (final FileNotFoundException | NoSuchFileException ignored) {

src/main/java/chylex/bettercontrols/config/Json.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.config;
+
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import com.google.gson.JsonObject;
@@ -24,10 +25,12 @@ final class Json {
 		return obj.has(key) ? obj.get(key).getAsBoolean() : defaultValue;
 	}
 	
+	@SuppressWarnings("SameParameterValue")
 	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value) {
 		obj.addProperty(key, value.name());
 	}
 	
+	@SuppressWarnings("SameParameterValue")
 	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass) {
 		if (!obj.has(key)) {
 			return defaultValue;

src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java

@@ -1,8 +1,7 @@
 package chylex.bettercontrols.gui;
-import chylex.bettercontrols.BetterControlsMod;
+
+import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import chylex.bettercontrols.gui.elements.BooleanValueWidget;
-import chylex.bettercontrols.gui.elements.CycleButtonWidget;
 import chylex.bettercontrols.gui.elements.DiscreteValueSliderWidget;
 import chylex.bettercontrols.gui.elements.KeyBindingWidget;
 import chylex.bettercontrols.gui.elements.Option;
@@ -10,32 +9,33 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
+import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.PoseStack;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.OptionsSubScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 import static chylex.bettercontrols.gui.OptionListWidget.COL2_W;
 import static chylex.bettercontrols.gui.OptionListWidget.COL4_W;
 import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
-import static chylex.bettercontrols.util.Statics.OPTIONS;
+import static net.minecraft.network.chat.Component.literal;
 
 public class BetterControlsScreen extends OptionsSubScreen {
-	private static TextComponent text(final String text) {
+	private static Component text(final String text) {
-		return new TextComponent(text);
+		return literal(text);
 	}
 	
 	public static final Component TITLE = text("Better Controls");
@@ -54,48 +54,39 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	// Options
 	
 	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsMod.config;
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Sprint Key Mode"));
+		generateCycleOptionRow(y, elements, text("Sprint Key Mode"), SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value);
-		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Double Tap 'Walk Forwards' To Sprint"));
+		generateBooleanOptionRow(y, elements, text("Double Tap 'Walk Forwards' To Sprint"), cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Resume Sprinting After Hitting Obstacle"));
+		generateBooleanOptionRow(y, elements, text("Resume Sprinting After Hitting Obstacle"), cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value));
-		
 		y += ROW_HEIGHT;
+		
 		return y;
 	}
 	
 	private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsMod.config;
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Move Camera Smoothly"));
+		generateBooleanOptionRow(y, elements, text("Move Camera Smoothly"), cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value));
-		
 		y += ROW_HEIGHT;
+		
 		return y;
 	}
 	
-	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
 	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsMod.config;
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
-		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
+		final ImmutableList<Option<Float>> flightSpeedOptions = ImmutableList.of(
 			new Option<>(Float.valueOf(0.25F), text("0.25x")),
 			new Option<>(Float.valueOf(0.50F), text("0.5x")),
 			new Option<>(Float.valueOf(0.75F), text("0.75x")),
@@ -110,91 +101,64 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
-		final List<Option<Float>> flightVerticalBoostOptions = Arrays.asList(
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
-			new Option<>(Float.valueOf(0.00F), text("None")),
-			new Option<>(Float.valueOf(0.25F), text("+25%")),
-			new Option<>(Float.valueOf(0.50F), text("+50%")),
-			new Option<>(Float.valueOf(0.75F), text("+75%")),
-			new Option<>(Float.valueOf(1.00F), text("+100%")),
-			new Option<>(Float.valueOf(1.50F), text("+150%")),
-			new Option<>(Float.valueOf(2.00F), text("+200%")),
-			new Option<>(Float.valueOf(2.50F), text("+250%")),
-			new Option<>(Float.valueOf(3.00F), text("+300%"))
-		);
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Double Tap 'Jump' To Fly (Creative)"));
+		generateBooleanOptionRow(y, elements, text("Double Tap 'Jump' To Fly (Creative)"), cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Disable Flight Inertia"));
+		generateBooleanOptionRow(y, elements, text("Disable Flight Inertia"), cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Disable Field Of View Changing"));
+		generateBooleanOptionRow(y, elements, text("Disable Field Of View Changing"), cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Fly On Ground (Creative Mode)"));
+		generateBooleanOptionRow(y, elements, text("Fly On Ground (Creative Mode)"), cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value);
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value));
+		y += ROW_HEIGHT;
-		
-		y += ROW_HEIGHT * 4 / 3;
 		
+		y += ROW_HEIGHT / 3;
 		elements.add(new TextWidget(col4(2), y, COL4_W - TEXT_PADDING_RIGHT, text("Creative"), CENTER));
 		elements.add(new TextWidget(col4(3), y, COL4_W - TEXT_PADDING_RIGHT, text("Spectator"), CENTER));
-		
 		y += ROW_HEIGHT * 7 / 8;
 		
-		generateLeftSideText(y, elements, text("Speed Multiplier (Default)"));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeDefault, value -> cfg.flightHorizontalSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorDefault, value -> cfg.flightHorizontalSpeedMpSpectatorDefault = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Speed Multiplier (Sprinting)"));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpCreativeSprinting, value -> cfg.flightSpeedMpCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeSprinting, value -> cfg.flightHorizontalSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorSprinting, value -> cfg.flightHorizontalSpeedMpSpectatorSprinting = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (Default)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeDefault, value -> cfg.flightVerticalBoostCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeDefault, value -> cfg.flightVerticalSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorDefault, value -> cfg.flightVerticalSpeedMpSpectatorDefault = value));
-		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeSprinting, value -> cfg.flightVerticalSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorSprinting, value -> cfg.flightVerticalSpeedMpSpectatorSprinting = value));
-		
 		y += ROW_HEIGHT;
+		
 		return y;
 	}
 	
 	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsMod.config;
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
-		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierOption(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
+		generateKeyBindingWithModifierRow(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
-		
 		y += ROW_HEIGHT * 4 / 3;
 		
-		generateKeyBindingWithModifierOption(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
+		generateKeyBindingWithModifierRow(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
-		
 		y += ROW_HEIGHT;
+		
 		return y;
 	}
 	
@@ -207,9 +171,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
+	private void generateKeyBindingWithModifierRow(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
-		final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
+		final var modifierButton = Option.button(col4(2), y, COL4_W, text.plainCopy().append(" Modifier"), MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
-		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
+		final var bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -218,6 +182,19 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		allKeyBindings.add(bindingButton);
 	}
 	
+	private static <T> void generateCycleOptionRow(final int y, final List<GuiEventListener> elements, final Component text, final List<Option<T>> options, final T initialValue, final Consumer<T> onValueChanged) {
+		generateLeftSideText(y, elements, text);
+		elements.add(Option.button(col2(1), y, COL2_W, text, options, initialValue, onValueChanged));
+	}
+	
+	private static void generateBooleanOptionRow(final int y, final List<GuiEventListener> elements, final Component text, final boolean initialValue, final BooleanConsumer onValueChanged) {
+		generateLeftSideText(y, elements, text);
+		elements.add(CycleButton.onOffBuilder()
+			.displayOnlyValue()
+			.withInitialValue(Boolean.valueOf(initialValue))
+			.create(col2(1), y, COL2_W, 20, text, (btn, newValue) -> onValueChanged.accept(newValue.booleanValue())));
+	}
+	
 	private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final Component text) {
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
@@ -228,12 +205,15 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(@Nullable final Screen parentScreen) {
+	@SuppressWarnings("DataFlowIssue")
-		super(parentScreen, OPTIONS, TITLE);
+	public BetterControlsScreen(final Minecraft mc, @Nullable final Screen parentScreen) {
+		super(parentScreen, mc.options, TITLE);
 	}
 	
 	@Override
 	public void init() {
+		super.init();
+		
 		allKeyBindings.clear();
 		
 		final List<GuiEventListener> elements = new ArrayList<>();
@@ -251,21 +231,21 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
+		optionsWidget = addRenderableWidget(new OptionListWidget(width, layout.getContentHeight(), layout.getHeaderHeight(), y - TITLE_MARGIN_TOP + BOTTOM_PADDING, elements));
-		addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+	}
+	
+	@Override
+	protected void repositionElements() {
+		super.repositionElements();
+		
+		if (optionsWidget != null) {
+			optionsWidget.updateSize(width, layout);
+		}
 	}
 	
 	@Override
 	public void removed() {
-		BetterControlsMod.config.save();
+		BetterControlsCommon.getConfig().save();
-	}
-	
-	@Override
-	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		renderBackground(matrices);
-		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
-		super.render(matrices, mouseX, mouseY, delta);
 	}
 	
 	private void startEditingKeyBinding(final KeyBindingWidget widget) {

src/main/java/chylex/bettercontrols/gui/OptionListWidget.java

@@ -1,25 +1,29 @@
 package chylex.bettercontrols.gui;
+
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
+import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
 public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
 	public static final int ROW_WIDTH = 408;
-	public static final int ROW_PADDING = 2;
 	
-	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
+	private static final int ROW_HORIZONTAL_PADDING = 2;
-	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
+	private static final int SCROLL_MULTIPLIER = 18;
+	
+	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_HORIZONTAL_PADDING;
+	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_HORIZONTAL_PADDING;
 	
 	public static int col2(final int column) {
 		return (column * ROW_WIDTH) / 2;
@@ -30,42 +34,34 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	}
 	
 	private static Offset getElementOffset(final GuiEventListener element) {
-		if (element instanceof OptionWidget) {
+		if (element instanceof final OptionWidget widget) {
-			return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
+			return new Offset(widget.getX(), widget.getY());
 		}
-		else if (element instanceof AbstractWidget) {
+		else if (element instanceof final AbstractWidget widget) {
-			return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
+			return new Offset(widget.getX(), widget.getY());
 		}
 		else {
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface OptionWidget extends GuiEventListener, Widget {
+	public interface OptionWidget extends GuiEventListener, Renderable {
 		int getX();
 		int getY();
 		void setX(int x);
 		void setY(int y);
 	}
 	
-	private static final class Offset {
+	private record Offset(int x, int y) {}
-		public final int x;
-		public final int y;
 	
-		private Offset(final int x, final int y) {
+	public OptionListWidget(final int width, final int height, final int top, final int innerHeight, final List<GuiEventListener> widgets) {
-			this.x = x;
+		super(Minecraft.getInstance(), width, height, top, innerHeight);
-			this.y = y;
-		}
-	}
-	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
-		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
 	public int getRowLeft() {
-		return super.getRowLeft() - ROW_PADDING;
+		return super.getRowLeft() - ROW_HORIZONTAL_PADDING;
 	}
 	
 	@Override
@@ -78,6 +74,12 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
+	@Override
+	public boolean mouseScrolled(final double x, final double y, final double xAmount, final double yAmount) {
+		setScrollAmount(getScrollAmount() - yAmount * SCROLL_MULTIPLIER);
+		return true;
+	}
+	
 	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
 		private final List<GuiEventListener> elements;
 		private final List<NarratableEntry> narratables;
@@ -89,34 +91,34 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
+		@NotNull
 		@Override
 		public List<? extends GuiEventListener> children() {
 			return Collections.unmodifiableList(elements);
 		}
 		
+		@NotNull
 		@Override
 		public List<? extends NarratableEntry> narratables() {
 			return Collections.unmodifiableList(narratables);
 		}
 		
 		@Override
-		public void render(final PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
+		public void render(final @NotNull GuiGraphics graphics, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
 			for (final GuiEventListener element : elements) {
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof AbstractWidget) {
+				if (element instanceof final AbstractWidget widget) {
-					final AbstractWidget button = (AbstractWidget)element;
+					widget.setX(x + offset.x);
-					button.x = x + offset.x;
+					widget.setY(y + offset.y);
-					button.y = y + offset.y;
 				}
-				else if (element instanceof OptionWidget) {
+				else if (element instanceof final OptionWidget widget) {
-					final OptionWidget widget = (OptionWidget)element;
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Widget) {
+				if (element instanceof final Renderable renderable) {
-					((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
+					renderable.render(graphics, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java

@@ -1,61 +0,0 @@
-package chylex.bettercontrols.gui;
-import chylex.bettercontrols.mixin.AccessCycleButtonFields;
-import chylex.bettercontrols.mixin.AccessOptionFields;
-import chylex.bettercontrols.mixin.AccessScreenButtons;
-import net.minecraft.client.Option;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.components.events.ContainerEventHandler;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
-
-public final class ScreenPatcher {
-	private ScreenPatcher() {}
-	
-	public static void onControlsScreenOpened(final ControlsScreen screen) {
-		final AccessScreenButtons accessor = (AccessScreenButtons)screen;
-		final List<? extends GuiEventListener> children = screen.children();
-		
-		final CycleButton<?> autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
-		
-		if (autoJump != null) {
-			final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
-				MINECRAFT.setScreen(new BetterControlsScreen(screen));
-			});
-			
-			accessor.callRemoveWidget(autoJump);
-			accessor.callAddRenderableWidget(widget);
-		}
-	}
-	
-	public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen) {
-		walkChildren(screen.children(), it -> {
-			getOptionButton(it, Option.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
-			getOptionButton(it, Option.TOGGLE_CROUCH).ifPresent(button -> button.active = false);
-		});
-	}
-	
-	private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback) {
-		for (final GuiEventListener element : elements) {
-			callback.accept(element);
-			
-			if (element instanceof ContainerEventHandler) {
-				walkChildren(((ContainerEventHandler)element).children(), callback);
-			}
-		}
-	}
-	
-	private static Optional<CycleButton<?>> getOptionButton(final GuiEventListener element, final Option option) {
-		if (element instanceof CycleButton<?> && ((AccessOptionFields)option).getCaption().equals(((AccessCycleButtonFields)element).getName())) {
-			return Optional.of((CycleButton<?>)element);
-		}
-		else {
-			return Optional.empty();
-		}
-	}
-}

src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java

@@ -1,27 +0,0 @@
-package chylex.bettercontrols.gui.elements;
-import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.CommonComponents;
-
-public final class BooleanValueWidget extends Button {
-	private final BooleanConsumer onChanged;
-	private boolean value;
-	
-	public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged) {
-		super(x, y, width, height, currentValue ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
-		this.value = currentValue;
-		this.onChanged = onChanged;
-	}
-	
-	public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged) {
-		this(x, y, width, 20, currentValue, onChanged);
-	}
-	
-	@Override
-	public void onPress() {
-		super.onPress();
-		value = !value;
-		setMessage(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
-		onChanged.accept(value);
-	}
-}

src/main/java/chylex/bettercontrols/gui/elements/CycleButtonWidget.java

@@ -1,36 +0,0 @@
-package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.components.Button;
-import java.util.List;
-import java.util.function.Consumer;
-
-public class CycleButtonWidget<T> extends Button {
-	private final List<Option<T>> options;
-	private final Consumer<T> onChanged;
-	private T selectedValue;
-	
-	public CycleButtonWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
-		super(x, y, width, height, Option.find(options, selectedValue).getText(), btn -> {});
-		this.options = options;
-		this.selectedValue = selectedValue;
-		this.onChanged = onChanged;
-	}
-	
-	public CycleButtonWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
-		this(x, y, width, 20, options, selectedValue, onChanged);
-	}
-	
-	@Override
-	public void onPress() {
-		int nextIndex = options.indexOf(Option.find(options, selectedValue)) + 1;
-		
-		if (nextIndex >= options.size()) {
-			nextIndex = 0;
-		}
-		
-		final Option<T> newSelectedOption = options.get(nextIndex);
-		
-		selectedValue = newSelectedOption.getValue();
-		onChanged.accept(selectedValue);
-		setMessage(newSelectedOption.getText());
-	}
-}

src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java

@@ -1,23 +1,29 @@
 package chylex.bettercontrols.gui.elements;
+
+import com.google.common.collect.ImmutableList;
 import net.minecraft.client.gui.components.AbstractSliderButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.util.Mth;
-import java.util.List;
+import org.jetbrains.annotations.NotNull;
 import java.util.function.Consumer;
 
 public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
-	private final List<Option<T>> options;
+	private final Component narration;
+	private final ImmutableList<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final Component narration, final ImmutableList<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
-		super(x, y, width, height, Option.find(options, selectedValue).getText(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
+		super(x, y, width, height, Option.find(options, selectedValue).text(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
+		this.narration = narration;
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
 	}
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final Component narration, final ImmutableList<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
-		this(x, y, width, 20, options, selectedValue, onChanged);
+		this(x, y, width, 20, narration, options, selectedValue, onChanged);
 	}
 	
 	public Option<T> getSelectedOption() {
@@ -26,16 +32,22 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 	
 	@Override
 	protected void updateMessage() {
-		setMessage(getSelectedOption().getText());
+		setMessage(getSelectedOption().text());
 	}
 	
 	@Override
 	protected void applyValue() {
-		final T newSelectedValue = getSelectedOption().getValue();
+		final T newSelectedValue = getSelectedOption().value();
 		
 		if (selectedValue != newSelectedValue) {
 			selectedValue = newSelectedValue;
 			onChanged.accept(newSelectedValue);
 		}
 	}
+	
+	@NotNull
+	@Override
+	protected MutableComponent createNarrationMessage() {
+		return Component.translatable("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
+	}
 }

src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java

@@ -1,17 +1,17 @@
 package chylex.bettercontrols.gui.elements;
+
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TextComponent;
+import org.jetbrains.annotations.NotNull;
-import net.minecraft.network.chat.TranslatableComponent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
-import static chylex.bettercontrols.util.Statics.OPTIONS;
 
 public final class KeyBindingWidget extends Button {
 	private final KeyMapping binding;
@@ -23,7 +23,7 @@ public final class KeyBindingWidget extends Button {
 	private boolean isEditing;
 	
 	public KeyBindingWidget(final int x, final int y, final int width, final int height, final Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
-		super(x, y, width, height, TextComponent.EMPTY, btn -> {});
+		super(x, y, width, height, Component.empty(), btn -> {}, DEFAULT_NARRATION);
 		this.binding = binding;
 		this.bindingName = bindingName;
 		this.onEditingStarted = onEditingStarted;
@@ -39,9 +39,10 @@ public final class KeyBindingWidget extends Button {
 		button.active = !binding.isUnbound();
 	}
 	
+	@NotNull
 	@Override
 	protected MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
+		return binding.isUnbound() ? Component.translatable("narrator.controls.unbound", bindingName) : Component.translatable("narrator.controls.bound", bindingName, super.createNarrationMessage());
 	}
 	
 	@Override
@@ -69,8 +70,8 @@ public final class KeyBindingWidget extends Button {
 		boolean hasConflict = false;
 		
 		if (!binding.isUnbound()) {
-			for (final KeyMapping other : OPTIONS.keyMappings) {
+			for (final KeyMapping other : Minecraft.getInstance().options.keyMappings) {
-				if (binding != other && binding.equals(other)) {
+				if (binding != other && binding.same(other)) {
 					hasConflict = true;
 					break;
 				}
@@ -78,13 +79,13 @@ public final class KeyBindingWidget extends Button {
 		}
 		
 		if (isEditing) {
-			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
+			setMessage(Component.literal("> ").append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
 		}
 		else if (hasConflict) {
 			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
 		}
 		else {
-			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
+			setMessage(binding.isUnbound() ? Component.literal("(No Binding)") : binding.getTranslatedKeyMessage());
 		}
 	}
 }

src/main/java/chylex/bettercontrols/gui/elements/Option.java

@@ -1,26 +1,21 @@
 package chylex.bettercontrols.gui.elements;
+
+import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.network.chat.Component;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
-public final class Option<T> {
+public record Option<T>(T value, Component text) {
-	private final T value;
-	private final Component text;
-	
-	public Option(final T value, final Component text) {
-		this.value = value;
-		this.text = text;
-	}
-	
-	public T getValue() {
-		return value;
-	}
-	
-	public Component getText() {
-		return text;
-	}
-	
 	public static <T> Option<T> find(final List<Option<T>> options, final T value) {
 		return options.stream().filter(it -> Objects.equals(it.value, value)).findFirst().orElseGet(() -> options.get(0));
 	}
+	
+	public static <T> CycleButton<Option<T>> button(final int x, final int y, final int width, final Component text, final List<Option<T>> options, final T initialValue, final Consumer<T> onValueChanged) {
+		return CycleButton.<Option<T>>builder(Option::text)
+			.displayOnlyValue()
+			.withValues(options)
+			.withInitialValue(find(options, initialValue))
+			.create(x, y, width, 20, text, (btn, newValue) -> onValueChanged.accept(newValue.value()));
+	}
 }

src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java

@@ -1,17 +1,20 @@
 package chylex.bettercontrols.gui.elements;
+
 import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
+import org.jetbrains.annotations.NotNull;
 import java.util.List;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class TextWidget extends GuiComponent implements OptionWidget {
+public final class TextWidget implements OptionWidget {
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
+	public static final int WHITE = 0xFF_FF_FF;
+	
 	private final Component text;
 	private int x;
 	private int y;
@@ -57,8 +60,16 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 	}
 	
 	@Override
-	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
+	public void setFocused(final boolean focused) {}
-		final Font textRenderer = MINECRAFT.font;
+	
+	@Override
+	public boolean isFocused() {
+		return false;
+	}
+	
+	@Override
+	public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
+		final Font textRenderer = Minecraft.getInstance().font;
 		final List<FormattedCharSequence> lines = textRenderer.split(text, width);
 		final int lineHeight = textRenderer.lineHeight + 1;
 		
@@ -66,8 +77,7 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 		final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
 		
 		for (int i = 0; i < lines.size(); i++) {
-			final FormattedCharSequence line = lines.get(i);
+			graphics.drawString(textRenderer, lines.get(i), finalX, finalY + (i * lineHeight), WHITE);
-			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

src/main/java/chylex/bettercontrols/input/KeyBindingWithModifier.java

@@ -1,17 +1,12 @@
 package chylex.bettercontrols.input;
+
 import com.mojang.blaze3d.platform.InputConstants.Type;
 import net.minecraft.client.KeyMapping;
-import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.Nullable;
-import net.minecraft.network.chat.TranslatableComponent;
-import javax.annotation.Nullable;
 
 public class KeyBindingWithModifier extends KeyMapping {
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final Component text) {
-		return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)text).getKey());
-	}
-	
 	@Nullable
 	private ModifierKey modifier = null;
 	

src/main/java/chylex/bettercontrols/input/ModifierKey.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import net.minecraft.client.gui.screens.Screen;
 
 public enum ModifierKey {

src/main/java/chylex/bettercontrols/input/ToggleTracker.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import net.minecraft.client.KeyMapping;
 
 public class ToggleTracker {

src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import chylex.bettercontrols.mixin.AccessKeyBindingFields;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.KeyMapping;

src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java

@@ -1,10 +1,11 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.client.Camera;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Camera.class)
 public interface AccessCameraFields {
-	@Accessor("eyeHeight")
+	@Accessor
-	void setCameraY(float y);
+	void setEyeHeight(float y);
 }

src/main/java/chylex/bettercontrols/mixin/AccessClientPlayerFields.java

@@ -1,10 +1,11 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(LocalPlayer.class)
 public interface AccessClientPlayerFields {
-	@Accessor("sprintTriggerTime")
+	@Accessor
-	void setTicksLeftToDoubleTapSprint(int value);
+	void setSprintTriggerTime(int value);
 }

src/main/java/chylex/bettercontrols/mixin/AccessControlsListCategory.java

@@ -1,11 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(CategoryEntry.class)
-public interface AccessControlsListCategory {
-	@Accessor("name")
-	Component getText();
-}

src/main/java/chylex/bettercontrols/mixin/AccessControlsListKeyBinding.java

@@ -1,11 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(KeyEntry.class)
-public interface AccessControlsListKeyBinding {
-	@Accessor("key")
-	KeyMapping getBinding();
-}

src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java

@@ -1,12 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(CycleButton.class)
-public interface AccessCycleButtonFields {
-	@Accessor("name")
-	Component getName();
-}

src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.client.KeyMapping;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java

@@ -1,12 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.Option;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Option.class)
-public interface AccessOptionFields {
-	@Accessor("caption")
-	Component getCaption();
-}

src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java

@@ -1,10 +1,11 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Player.class)
 public interface AccessPlayerFields {
-	@Accessor("jumpTriggerTime")
+	@Accessor
-	void setTicksLeftToDoubleTapFlight(int value);
+	void setJumpTriggerTime(int value);
 }

src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java

@@ -1,16 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.screens.Screen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(Screen.class)
-public interface AccessScreenButtons {
-	@Invoker
-	<T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);
-	
-	@Invoker
-	void callRemoveWidget(GuiEventListener widget);
-}

src/main/java/chylex/bettercontrols/mixin/AccessStickyKeyBindingStateGetter.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.client.ToggleKeyMapping;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -7,10 +8,10 @@ import java.util.function.BooleanSupplier;
 
 @Mixin(ToggleKeyMapping.class)
 public interface AccessStickyKeyBindingStateGetter {
-	@Accessor("needsToggle")
+	@Accessor
-	BooleanSupplier getToggleGetter();
+	BooleanSupplier getNeedsToggle();
 	
-	@Accessor("needsToggle")
+	@Accessor
 	@Mutable
-	void setToggleGetter(final BooleanSupplier toggleGetter);
+	void setNeedsToggle(final BooleanSupplier toggleGetter);
 }

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java

@@ -1,15 +1,14 @@
 package chylex.bettercontrols.mixin;
 
 import chylex.bettercontrols.player.PlayerTicker;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
 import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-@SuppressWarnings("MethodMayBeStatic")
 @Mixin(AbstractClientPlayer.class)
 public abstract class HookClientPlayerFOV {
 	@Redirect(
@@ -21,7 +20,7 @@ public abstract class HookClientPlayerFOV {
 		)
 	)
 	private boolean resetFOV(final float movementSpeed) {
-		final LocalPlayer player = MINECRAFT.player;
+		final LocalPlayer player = Minecraft.getInstance().player;
 		return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
 	}
 }

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java

@@ -1,5 +1,7 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.player.PlayerTicker;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.Input;
 import net.minecraft.client.player.KeyboardInput;
 import net.minecraft.client.player.LocalPlayer;
@@ -7,15 +9,16 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(KeyboardInput.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookClientPlayerInputTick {
-	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
+	@Inject(method = "tick(ZF)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info) {
+		@SuppressWarnings("ConstantConditions")
 		final Input input = (Input)(Object)this;
-		final LocalPlayer player = MINECRAFT.player;
+		final LocalPlayer player = Minecraft.getInstance().player;
 		
 		if (player != null) {
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerTick.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -11,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(LocalPlayer.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookClientPlayerTick extends AbstractClientPlayer {
 	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
 		super(world, profile);
@@ -18,18 +20,21 @@ public abstract class HookClientPlayerTick extends AbstractClientPlayer {
 	
 	@Inject(method = "aiStep()V", at = @At("HEAD"))
 	private void atHead(final CallbackInfo info) {
+		@SuppressWarnings("ConstantConditions")
 		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(ZF)V", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info) {
+		@SuppressWarnings("ConstantConditions")
 		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).afterInputTick(player);
 	}
 	
 	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;aiStep()V", ordinal = 0, shift = AFTER))
 	private void afterSuperCall(final CallbackInfo info) {
+		@SuppressWarnings("ConstantConditions")
 		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).afterSuperCall(player);
 	}

src/main/java/chylex/bettercontrols/mixin/HookClientPlayerVerticalFlightSpeed.java

@@ -0,0 +1,34 @@
+package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.player.FlightHelper;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Abilities;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+
+@Mixin(LocalPlayer.class)
+@SuppressWarnings({ "SameReturnValue", "UnreachableCode" })
+public abstract class HookClientPlayerVerticalFlightSpeed extends LivingEntity {
+	protected HookClientPlayerVerticalFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
+		super(type, world);
+	}
+	
+	@Redirect(
+		method = "aiStep",
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F"),
+		slice = @Slice(
+			from = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Abilities;flying:Z"),
+			to = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;setDeltaMovement(Lnet/minecraft/world/phys/Vec3;)V")
+		)
+	)
+	private float modifyVerticalFlightSpeed(final Abilities abilities) {
+		@SuppressWarnings("ConstantConditions")
+		final LocalPlayer me = (LocalPlayer)(Object)this;
+		return abilities.getFlyingSpeed() * FlightHelper.getVerticalSpeedMultiplier(me);
+	}
+}

src/main/java/chylex/bettercontrols/mixin/HookControlsListWidget.java

@@ -1,37 +1,25 @@
 package chylex.bettercontrols.mixin;
-import chylex.bettercontrols.BetterControlsMod;
+
-import chylex.bettercontrols.input.KeyBindingWithModifier;
+import chylex.bettercontrols.BetterControlsCommon;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.Options;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.controls.ControlList;
+import net.minecraft.client.gui.screens.controls.KeyBindsList;
-import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
+import net.minecraft.client.gui.screens.controls.KeyBindsList.Entry;
-import net.minecraft.client.gui.screens.controls.ControlList.Entry;
-import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ControlList.class)
+@Mixin(KeyBindsList.class)
 public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
+	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int itemHeight) {
-		super(client, width, height, top, bottom, itemHeight);
+		super(client, width, height, top, itemHeight);
 	}
 	
-	@Inject(method = "<init>", at = @At("TAIL"))
+	@Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))
-	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
+	private KeyMapping[] excludeOwnKeyBindings(final Options options) {
-		children().removeIf(it -> {
+		return ArrayUtils.removeElements(options.keyMappings, BetterControlsCommon.getConfig().getAllKeyBindings());
-			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())) {
-				return true;
-			}
-			
-			if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
-				return true;
-			}
-			
-			return false;
-		});
 	}
 }

src/main/java/chylex/bettercontrols/mixin/HookControlsScreen.java

@@ -0,0 +1,45 @@
+package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.gui.BetterControlsScreen;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.Options;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.OptionsList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.OptionsSubScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.controls.ControlsScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import java.util.List;
+
+@Mixin(ControlsScreen.class)
+@SuppressWarnings("UnreachableCode")
+public abstract class HookControlsScreen extends OptionsSubScreen {
+	public HookControlsScreen(final Screen parentScreen, final Options options, final Component title) {
+		super(parentScreen, options, title);
+	}
+	
+	@Inject(method = "init", at = @At("RETURN"))
+	public void afterInit(final CallbackInfo ci) {
+		@SuppressWarnings("ConstantConditions")
+		final ControlsScreen screen = (ControlsScreen)(Object)this;
+		
+		for (final GuiEventListener child : children()) {
+			if (child instanceof final OptionsList optionsList) {
+				final MutableComponent buttonTitle = BetterControlsScreen.TITLE.plainCopy().append("...");
+				optionsList.addSmall(List.of(Button.builder(buttonTitle, btn -> showOptionsScreen(screen)).build()));
+				break;
+			}
+		}
+	}
+	
+	private static void showOptionsScreen(final ControlsScreen screen) {
+		final Minecraft mc = Minecraft.getInstance();
+		mc.setScreen(new BetterControlsScreen(mc, screen));
+	}
+}

src/main/java/chylex/bettercontrols/mixin/HookLoadGameOptions.java

@@ -1,10 +1,14 @@
 package chylex.bettercontrols.mixin;
-import chylex.bettercontrols.BetterControlsMod;
+
+import chylex.bettercontrols.BetterControlsCommon;
+import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Options;
 import org.apache.commons.lang3.ArrayUtils;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,6 +18,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class HookLoadGameOptions {
 	private boolean hasLoaded = false;
 	
+	@Mutable
+	@Final
 	@Shadow
 	public KeyMapping[] keyMappings;
 	
@@ -23,8 +29,13 @@ public abstract class HookLoadGameOptions {
 			return;
 		}
 		
+		final BetterControlsConfig config = BetterControlsCommon.getConfig();
+		if (config == null) {
+			return;
+		}
+		
 		hasLoaded = true;
-		keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
+		keyMappings = ArrayUtils.addAll(keyMappings, config.getAllKeyBindings());
 		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }

src/main/java/chylex/bettercontrols/mixin/HookOpenScreen.java

@@ -1,29 +0,0 @@
-package chylex.bettercontrols.mixin;
-import chylex.bettercontrols.gui.ScreenPatcher;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
-
-@SuppressWarnings("MethodMayBeStatic")
-@Mixin(value = Minecraft.class, priority = 100)
-public abstract class HookOpenScreen {
-	@Inject(method = "setScreen", at = @At("TAIL"))
-	private void openScreen(final Screen ignore, final CallbackInfo ci) {
-		final Screen screen = MINECRAFT.screen;
-		
-		if (screen != null && !Screen.hasAltDown()) {
-			if (screen.getClass() == ControlsScreen.class) {
-				ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
-			}
-			else if (screen.getClass() == AccessibilityOptionsScreen.class) {
-				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);
-			}
-		}
-	}
-}

src/main/java/chylex/bettercontrols/mixin/HookPlayerFlightSpeed.java

@@ -1,26 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.Slice;
-
-@SuppressWarnings("MethodMayBeStatic")
-@Mixin(Player.class)
-public abstract class HookPlayerFlightSpeed extends LivingEntity {
-	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
-		super(type, world);
-	}
-	
-	@Redirect(
-		method = "travel",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
-		slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F"))
-	)
-	private boolean disableVanillaSprintBoost(final Player player) {
-		return false;
-	}
-}

src/main/java/chylex/bettercontrols/mixin/HookPlayerHorizontalFlightSpeed.java

@@ -0,0 +1,51 @@
+package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.player.FlightHelper;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Player.class)
+@SuppressWarnings({ "SameReturnValue", "UnreachableCode" })
+public abstract class HookPlayerHorizontalFlightSpeed extends LivingEntity {
+	protected HookPlayerHorizontalFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
+		super(type, world);
+	}
+	
+	@SuppressWarnings("SimplifiableIfStatement")
+	@Redirect(
+		method = "getFlyingSpeed",
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
+		slice = @Slice(
+			from = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Abilities;flying:Z"),
+			to = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F")
+		)
+	)
+	private boolean disableVanillaSprintBoost(final Player player) {
+		if (player instanceof LocalPlayer) {
+			return false;
+		}
+		else {
+			return player.isSprinting();
+		}
+	}
+	
+	@Inject(method = "getFlyingSpeed", at = @At("RETURN"), cancellable = true)
+	private void modifyHorizontalFlyingSpeed(final CallbackInfoReturnable<Float> cir) {
+		@SuppressWarnings("ConstantConditions")
+		final Player me = (Player)(Object)this;
+		
+		if (me instanceof final LocalPlayer localPlayer && localPlayer.getAbilities().flying) {
+			final float multiplier = FlightHelper.getHorizontalSpeedMultiplier(localPlayer);
+			cir.setReturnValue(Float.valueOf(cir.getReturnValueF() * multiplier));
+		}
+	}
+}

src/main/java/chylex/bettercontrols/mixin/HookStickyKeyBindingState.java

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.ToggleKeyMapping;

src/main/java/chylex/bettercontrols/mixin/HookToggleOptionButtons.java

@@ -0,0 +1,24 @@
+package chylex.bettercontrols.mixin;
+
+import net.minecraft.client.OptionInstance;
+import net.minecraft.client.Options;
+import net.minecraft.client.gui.components.AbstractWidget;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import java.util.function.Consumer;
+
+@Mixin(OptionInstance.class)
+@SuppressWarnings("UnreachableCode")
+public abstract class HookToggleOptionButtons {
+	@Inject(method = "createButton(Lnet/minecraft/client/Options;IIILjava/util/function/Consumer;)Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("RETURN"))
+	private <T> void disableToggleOptions(final Options options, final int x, final int y, final int width, final Consumer<T> callback, final CallbackInfoReturnable<AbstractWidget> cir) {
+		@SuppressWarnings("ConstantConditions")
+		final OptionInstance<?> me = (OptionInstance<?>)(Object)this;
+		
+		if (me == options.toggleCrouch() || me == options.toggleSprint()) {
+			cir.getReturnValue().active = false;
+		}
+	}
+}

src/main/java/chylex/bettercontrols/player/FlightHelper.java

@@ -1,16 +1,22 @@
 package chylex.bettercontrols.player;
-import chylex.bettercontrols.BetterControlsMod;
+
+import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 
-final class FlightHelper {
+public final class FlightHelper {
 	private FlightHelper() {}
 	
-	private static final float BASE_FLIGHT_SPEED = 0.05F;
+	private static final KeyMapping KEY_SPRINT = Minecraft.getInstance().options.keySprint;
-	private static final float BASE_VERTICAL_VELOCITY = 3F;
+	
+	private static boolean isSprinting() {
+		return KEY_SPRINT.isDown();
+	}
 	
 	private static BetterControlsConfig cfg() {
-		return BetterControlsMod.config;
+		return BetterControlsCommon.getConfig();
 	}
 	
 	static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
@@ -21,47 +27,27 @@ final class FlightHelper {
 		return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
 	}
 	
-	static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
+	public static float getHorizontalSpeedMultiplier(final LocalPlayer player) {
 		if (player.isCreative()) {
-			if (boost) {
+			return isSprinting() ? cfg().flightHorizontalSpeedMpCreativeSprinting : cfg().flightHorizontalSpeedMpCreativeDefault;
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
-			}
-			else {
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
-			}
 		}
 		else if (player.isSpectator()) {
-			if (boost) {
+			return isSprinting() ? cfg().flightHorizontalSpeedMpSpectatorSprinting : cfg().flightHorizontalSpeedMpSpectatorDefault;
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
-			}
-			else {
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
-			}
 		}
 		else {
-			return 0F;
+			return 1F;
 		}
 	}
 	
-	static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting) {
+	public static float getVerticalSpeedMultiplier(final LocalPlayer player) {
 		if (player.isCreative()) {
-			if (isSprinting) {
+			return isSprinting() ? cfg().flightVerticalSpeedMpCreativeSprinting : cfg().flightVerticalSpeedMpCreativeDefault;
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
-			}
-			else {
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
-			}
 		}
 		else if (player.isSpectator()) {
-			if (isSprinting) {
+			return isSprinting() ? cfg().flightVerticalSpeedMpSpectatorSprinting : cfg().flightVerticalSpeedMpSpectatorDefault;
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
-			}
-			else {
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorDefault;
-			}
 		}
 		else {
-			return 0F;
+			return 1F;
 		}
 	}
 }

src/main/java/chylex/bettercontrols/player/PlayerTicker.java

@@ -1,5 +1,6 @@
 package chylex.bettercontrols.player;
-import chylex.bettercontrols.BetterControlsMod;
+
+import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import chylex.bettercontrols.input.SprintMode;
@@ -10,18 +11,23 @@ import chylex.bettercontrols.mixin.AccessClientPlayerFields;
 import chylex.bettercontrols.mixin.AccessPlayerFields;
 import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
 import net.minecraft.client.Camera;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.Options;
 import net.minecraft.client.player.Input;
 import net.minecraft.client.player.LocalPlayer;
 import java.lang.ref.WeakReference;
 import java.util.function.BooleanSupplier;
-import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
-import static chylex.bettercontrols.util.Statics.KEY_JUMP;
-import static chylex.bettercontrols.util.Statics.KEY_SNEAK;
-import static chylex.bettercontrols.util.Statics.KEY_SPRINT;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;
-import static chylex.bettercontrols.util.Statics.OPTIONS;
 
 public final class PlayerTicker {
+	private static final Minecraft MINECRAFT = Minecraft.getInstance();
+	private static final Options OPTIONS = MINECRAFT.options;
+	
+	private static final KeyMapping KEY_SPRINT = OPTIONS.keySprint;
+	private static final KeyMapping KEY_SNEAK = OPTIONS.keyShift;
+	private static final KeyMapping KEY_FORWARD = OPTIONS.keyUp;
+	private static final KeyMapping KEY_JUMP = OPTIONS.keyJump;
+	
 	private static PlayerTicker ticker = new PlayerTicker(null);
 	
 	public static PlayerTicker get(final LocalPlayer player) {
@@ -33,7 +39,7 @@ public final class PlayerTicker {
 	}
 	
 	private static BetterControlsConfig cfg() {
-		return BetterControlsMod.config;
+		return BetterControlsCommon.getConfig();
 	}
 	
 	private final WeakReference<LocalPlayer> ref;
@@ -45,8 +51,8 @@ public final class PlayerTicker {
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
+	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, OPTIONS.toggleSprint()::set);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
+	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, OPTIONS.toggleCrouch()::set);
 	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
 	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
 	
@@ -63,13 +69,13 @@ public final class PlayerTicker {
 	
 	private void setup() {
 		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
-		BooleanSupplier getter = sprint.getToggleGetter();
+		BooleanSupplier getter = sprint.getNeedsToggle();
 		
-		if (getter instanceof SprintPressGetter) {
+		if (getter instanceof final SprintPressGetter g) {
-			getter = ((SprintPressGetter)getter).getWrapped();
+			getter = g.wrapped();
 		}
 		
-		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
+		sprint.setNeedsToggle(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
 	public void atHead(final LocalPlayer player) {
@@ -78,15 +84,15 @@ public final class PlayerTicker {
 		}
 		
 		if (!cfg().doubleTapForwardToSprint) {
-			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
+			((AccessClientPlayerFields)player).setSprintTriggerTime(0);
 		}
 		
 		if (!cfg().doubleTapJumpToToggleFlight) {
-			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
+			((AccessPlayerFields)player).setJumpTriggerTime(0);
 		}
 		
 		final SprintMode sprintMode = cfg().sprintMode;
-		final boolean wasSprintToggled = OPTIONS.toggleSprint;
+		final boolean wasSprintToggled = Boolean.TRUE.equals(OPTIONS.toggleSprint().get());
 		final boolean isSprintToggled = toggleSprint.tick();
 		
 		if (temporarySprintTimer > 0) {
@@ -144,6 +150,7 @@ public final class PlayerTicker {
 	
 	public void afterInputAssignsPressingForward(final Input input) {
 		if (MINECRAFT.screen == null) {
+			//noinspection NonShortCircuitBooleanExpression
 			input.up |= toggleWalkForward.tick();
 		}
 	}
@@ -152,35 +159,10 @@ public final class PlayerTicker {
 		final Input input = player.input;
 		
 		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+			//noinspection NonShortCircuitBooleanExpression
 			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			final boolean boost = KEY_SPRINT.isDown();
-			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
-			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
-			
-			if (flightSpeed > 0F) {
-				player.getAbilities().setFlyingSpeed(flightSpeed);
-			}
-			
-			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
-				int direction = 0;
-				
-				if (input.shiftKeyDown) {
-					--direction;
-				}
-				
-				if (input.jumping) {
-					++direction;
-				}
-				
-				if (direction != 0) {
-					player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
-				}
-			}
-		}
-		
 		if (cfg().resumeSprintingAfterHittingObstacle) {
 			if (wasHittingObstacle != player.horizontalCollision) {
 				if (!wasHittingObstacle) {
@@ -204,7 +186,7 @@ public final class PlayerTicker {
 	public void afterSuperCall(final LocalPlayer player) {
 		if (FlightHelper.shouldFlyOnGround(player)) {
 			final boolean isSneaking = player.isShiftKeyDown();
-			final boolean isOnGround = player.isOnGround();
+			final boolean isOnGround = player.onGround();
 			
 			if (!isSneaking) {
 				wasSneakingBeforeTouchingGround = false;
@@ -282,7 +264,7 @@ public final class PlayerTicker {
 			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
 			
 			if (camera.getEntity() == player) {
-				((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
+				((AccessCameraFields)camera).setEyeHeight(player.getEyeHeight());
 			}
 		}
 		
@@ -294,7 +276,7 @@ public final class PlayerTicker {
 		}
 		
 		if (cfg().keyOpenMenu.isDown()) {
-			MINECRAFT.setScreen(new BetterControlsScreen(null));
+			MINECRAFT.setScreen(new BetterControlsScreen(MINECRAFT, null));
 		}
 	}
 	

src/main/java/chylex/bettercontrols/player/SprintPressGetter.java

@@ -1,19 +1,8 @@
 package chylex.bettercontrols.player;
+
 import java.util.function.BooleanSupplier;
 
-final class SprintPressGetter implements BooleanSupplier {
+record SprintPressGetter(BooleanSupplier wrapped, BooleanSupplier or) implements BooleanSupplier {
-	private final BooleanSupplier wrapped;
-	private final BooleanSupplier or;
-	
-	public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or) {
-		this.wrapped = wrapped;
-		this.or = or;
-	}
-	
-	public BooleanSupplier getWrapped() {
-		return wrapped;
-	}
-	
 	@Override
 	public boolean getAsBoolean() {
 		return wrapped.getAsBoolean() || or.getAsBoolean();

src/main/java/chylex/bettercontrols/util/Statics.java

@@ -1,16 +0,0 @@
-package chylex.bettercontrols.util;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
-
-public final class Statics {
-	private Statics() {}
-	
-	public static final Minecraft MINECRAFT = Minecraft.getInstance();
-	public static final Options OPTIONS = MINECRAFT.options;
-	
-	public static final KeyMapping KEY_SPRINT = OPTIONS.keySprint;
-	public static final KeyMapping KEY_SNEAK = OPTIONS.keyShift;
-	public static final KeyMapping KEY_FORWARD = OPTIONS.keyUp;
-	public static final KeyMapping KEY_JUMP = OPTIONS.keyJump;
-}

src/main/resources/META-INF/mods.toml

@@ -1,30 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[31,)"
-
-authors = "chylex"
-license = "MPL-2.0"
-issueTrackerURL = "https://github.com/chylex/Better-Controls/issues"
-
-[[mods]]
-modId = "bettercontrols"
-version = "1.2.0a"
-displayName = "Better Controls"
-logoFile = "icon.png"
-description = '''
-Adds many powerful key bindings and options to control your movement.
-The features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
-'''
-
-[[dependencies.bettercontrols]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.16.3,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.bettercontrols]]
-modId = "forge"
-mandatory = true
-versionRange = "[31,)"
-ordering = "NONE"
-side = "BOTH"

src/main/resources/bettercontrols.mixins.json

@@ -2,26 +2,24 @@
   "required": true,
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "refmap": "bettercontrols.refmap.json",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
-    "AccessControlsListCategory",
-    "AccessControlsListKeyBinding",
-    "AccessCycleButtonFields",
     "AccessKeyBindingFields",
-    "AccessOptionFields",
     "AccessPlayerFields",
-    "AccessScreenButtons",
     "AccessStickyKeyBindingStateGetter",
     "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
+    "HookClientPlayerVerticalFlightSpeed",
     "HookControlsListWidget",
+    "HookControlsScreen",
     "HookLoadGameOptions",
-    "HookOpenScreen",
+    "HookPlayerHorizontalFlightSpeed",
-    "HookPlayerFlightSpeed",
+    "HookStickyKeyBindingState",
-    "HookStickyKeyBindingState"
+    "HookToggleOptionButtons"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/pack.mcmeta

@@ -1,7 +1,7 @@
 {
     "pack": {
-        "description": "Better Controls",
+        "description": "${name}",
-        "pack_format": 5,
+        "pack_format": 7,
         "_comment": ""
     }
 }