Remove some utility classes & unify with Fabric codebase

Fixes #6

.gitignore

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

Fabric/build.gradle.kts

@@ -1,50 +0,0 @@
-val modId: String by project
-val minecraftVersion: String by project
-val fabricVersion: String by project
-
-plugins {
-	idea
-	id("fabric-loom") version "0.10-SNAPSHOT"
-}
-
-dependencies {
-	minecraft("com.mojang:minecraft:$minecraftVersion")
-	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
-	mappings(loom.officialMojangMappings())
-}
-
-loom {
-	runs {
-		named("client") {
-			configName = "Fabric Client"
-			client()
-			runDir("run")
-			ideConfigGenerated(true)
-		}
-		
-		named("server") {
-			configName = "Fabric Server"
-			server()
-			runDir("run")
-			ideConfigGenerated(true)
-		}
-	}
-	
-	mixin {
-		add(sourceSets.main.get(), "$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

@@ -1,11 +0,0 @@
-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

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

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

@@ -1,9 +0,0 @@
-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

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

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

@@ -1,35 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "${id}",
-  "name": "${name}",
-  "description": "${description}",
-  "version": "${version}",
-  "license": "${license}",
-  
-  "icon": "assets/bettercontrols/icon.png",
-  
-  "authors": [
-    "${author}"
-  ],
-  
-  "contact": {
-    "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": ">=0.7.4",
-    "minecraft": ">=1.17"
-  }
-}

Forge/build.gradle.kts

@@ -1,95 +0,0 @@
-import net.minecraftforge.gradle.userdev.UserDevExtension
-import org.gradle.api.file.DuplicatesStrategy.INCLUDE
-import org.spongepowered.asm.gradle.plugins.MixinExtension
-
-val modId: String by project
-val minecraftVersion: String by project
-val forgeVersion: String by project
-val mixinVersion: String by project
-
-buildscript {
-	repositories {
-		maven("https://maven.minecraftforge.net")
-		maven("https://repo.spongepowered.org/maven")
-		mavenCentral()
-	}
-	
-	dependencies {
-		classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = "5.1.+") { isChanging = true }
-		classpath(group = "org.spongepowered", name = "mixingradle", version = "0.7-SNAPSHOT")
-	}
-}
-
-plugins {
-	java
-	eclipse
-}
-
-apply {
-	plugin("net.minecraftforge.gradle")
-	plugin("org.spongepowered.mixin")
-}
-
-dependencies {
-	"minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")
-	
-	if (System.getProperty("idea.sync.active") != "true") {
-		annotationProcessor("org.spongepowered:mixin:$mixinVersion:processor")
-	}
-}
-
-configure<UserDevExtension> {
-	mappings("official", minecraftVersion)
-	
-	runs {
-		create("client") {
-			taskName = "Client"
-			workingDirectory(rootProject.file("run"))
-			ideaModule("${rootProject.name}.${project.name}.main")
-			
-			property("mixin.env.remapRefMap", "true")
-			property("mixin.env.refMapRemappingFile", "$projectDir/build/createSrgToMcp/output.srg")
-			arg("-mixin.config=$modId.mixins.json")
-			
-			mods {
-				create(modId) {
-					source(sourceSets.main.get())
-					source(rootProject.sourceSets.main.get())
-				}
-			}
-		}
-		
-		create("server") {
-			taskName = "Server"
-			workingDirectory(rootProject.file("run"))
-			ideaModule("${rootProject.name}.${project.name}.main")
-			
-			property("mixin.env.remapRefMap", "true")
-			property("mixin.env.refMapRemappingFile", "$projectDir/build/createSrgToMcp/output.srg")
-			arg("-mixin.config=$modId.mixins.json")
-			
-			mods {
-				create(modId) {
-					source(sourceSets.main.get())
-					source(rootProject.sourceSets.main.get())
-				}
-			}
-		}
-	}
-}
-
-configure<MixinExtension> {
-	add(sourceSets.main.get(), "$modId.refmap.json")
-}
-
-tasks.processResources {
-	from(sourceSets.main.get().resources.srcDirs) {
-		include("META-INF/mods.toml")
-		expand(inputs.properties)
-		duplicatesStrategy = INCLUDE
-	}
-}
-
-tasks.jar {
-	finalizedBy("reobfJar")
-}

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

@@ -1,27 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[37,)"
-
-authors = "${author}"
-license = "${license}"
-issueTrackerURL = "${issuesURL}"
-
-[[mods]]
-modId = "${id}"
-version = "${version}"
-displayName = "${name}"
-description = "${description}"
-logoFile = "icon.png"
-
-[[dependencies.${id}]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.17.1,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.${id}]]
-modId = "forge"
-mandatory = true
-versionRange = "[37,)"
-ordering = "NONE"
-side = "BOTH"

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](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 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, 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)).
+* 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.
 
 ## Screenshot
 
@@ -63,15 +63,11 @@ While this is convenient, there is potential for bugs which can affect server pl
 Source Code
 ===========
 
-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>`.
+The `main` branch includes the latest version for Fabric. Older versions and their Forge equivalents are in branches named `fabric/<version>` and `forge/<version>`.
 
 ## Contributing
 
-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.
+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.
 
 For any larger contributions, please [open an issue](https://github.com/chylex/Better-Controls/issues/new) first before you make a PR.
 

build.gradle

@@ -0,0 +1,94 @@
+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

@@ -1,173 +0,0 @@
-import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
-import java.text.SimpleDateFormat
-import java.util.Date
-
-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 modNameStripped = modName.replace(" ", "")
-val jarVersion = "$minecraftVersion+v$modVersion"
-
-buildscript {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-}
-
-plugins {
-	`java-library`
-	idea
-	id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
-}
-
-idea {
-	module {
-		excludeDirs.add(file("gradle"))
-		excludeDirs.add(file("run"))
-		excludeDirs.add(file("Fabric/run"))
-		
-		if (findProject(":Forge") == null) {
-			excludeDirs.add(file("Forge"))
-		}
-		
-		if (findProject(":Fabric") == null) {
-			excludeDirs.add(file("Fabric"))
-		}
-	}
-}
-
-repositories {
-	maven("https://repo.spongepowered.org/maven")
-	mavenCentral()
-}
-
-dependencies {
-	implementation("org.spongepowered:mixin:$mixinVersion")
-	api("com.google.code.findbugs:jsr305:3.0.2")
-}
-
-base {
-	archivesName.set("$modNameStripped-Common")
-}
-
-minecraft {
-	version(minecraftVersion)
-	runs.clear()
-}
-
-allprojects {
-	group = "com.$modAuthor.$modId"
-	version = modVersion
-	
-	apply(plugin = "java")
-	
-	dependencies {
-		implementation("org.jetbrains:annotations:22.0.0")
-	}
-	
-	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-	}
-	
-	tasks.withType<JavaCompile> {
-		options.encoding = "UTF-8"
-		options.release.set(17)
-	}
-}
-
-subprojects {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-	
-	dependencies {
-		implementation(rootProject)
-	}
-	
-	base {
-		archivesName.set("$modNameStripped-${project.name}")
-	}
-	
-	tasks.withType<JavaCompile> {
-		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)
-		
-		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,
-				"Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()),
-				"MixinConfigs" to "$modId.mixins.json"
-			)
-		}
-	}
-	
-	tasks.test {
-		onlyIf { false }
-	}
-}
-
-tasks.register("setupIdea") {
-	group = "mod"
-	
-	dependsOn(tasks.findByName("decompile"))
-	
-	val forge = findProject(":Forge")
-	if (forge != null) {
-		dependsOn(forge.tasks.getByName("genIntellijRuns"))
-	}
-	
-	val fabric = findProject(":Fabric")
-	if (fabric != null) {
-		dependsOn(fabric.tasks.getByName("genSources"))
-	}
-}
-
-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(file("${project.buildDir}/dist"))
-}
-
-tasks.assemble {
-	finalizedBy(copyJars)
-}

gradle.properties

@@ -1,19 +1,4 @@
-# Mod
-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.2.3
-modLicense=MPL-2.0
-modSourcesURL=https://github.com/chylex/Better-Controls
-modIssuesURL=https://github.com/chylex/Better-Controls/issues
-
-# Dependencies
-minecraftVersion=1.18
-forgeVersion=38.0.8
-fabricVersion=0.12.8
-mixinVersion=0.8.4
-
-# Gradle
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+# This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright <20> 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.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
+#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
+#         * compound commands having a testable exit status, especially <20>case<73>;
+#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       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
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,78 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-ARGV=("$@")
-eval set -- $DEFAULT_JVM_OPTS
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-IFS=$'
-' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
-IFS=$'
-' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

settings.gradle.kts

@@ -1,17 +0,0 @@
-rootProject.name = "Better-Controls"
-
-pluginManagement {
-	repositories {
-		gradlePluginPortal()
-		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
-		maven(url = "https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge Snapshots" }
-	}
-}
-
-if (settings.extra.has("forgeVersion")) {
-	include("Forge")
-}
-
-if (settings.extra.has("fabricVersion")) {
-	include("Fabric")
-}

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

@@ -1,17 +0,0 @@
-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

@@ -4,20 +4,21 @@ 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.client.ConfigGuiHandler.ConfigGuiFactory;
 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.network.NetworkConstants;
+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() {
-		BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
 		ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 	}
 	
 	private static final class ClientLoader {

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

@@ -1,6 +1,8 @@
 package chylex.bettercontrols.gui;
-import chylex.bettercontrols.BetterControlsCommon;
+import chylex.bettercontrols.BetterControlsMod;
 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,30 +12,26 @@ import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
 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.Minecraft;
 import net.minecraft.client.gui.components.Button;
-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.NotNull;
-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;
 
 public class BetterControlsScreen extends OptionsSubScreen {
 	private static TextComponent text(final String text) {
@@ -56,38 +54,46 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	// Options
 	
 	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+		final BetterControlsConfig cfg = BetterControlsMod.config;
+		
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		y += ROW_HEIGHT;
 		
-		generateCycleOptionRow(y, elements, text("Sprint Key Mode"), SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value);
+		generateLeftSideText(y, elements, text("Sprint Key Mode"));
+		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Double Tap 'Walk Forwards' To Sprint"), cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value);
+		generateLeftSideText(y, elements, text("Double Tap 'Walk Forwards' To Sprint"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Resume Sprinting After Hitting Obstacle"), cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value);
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Resume Sprinting After Hitting Obstacle"));
+		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 = BetterControlsCommon.getConfig();
+		final BetterControlsConfig cfg = BetterControlsMod.config;
+		
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Move Camera Smoothly"), cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value);
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Move Camera Smoothly"));
+		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 = BetterControlsCommon.getConfig();
+		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
 			new Option<>(Float.valueOf(0.25F), text("0.25x")),
@@ -116,64 +122,79 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(3.00F), text("+300%"))
 		);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Double Tap 'Jump' To Fly (Creative)"), cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value);
+		generateLeftSideText(y, elements, text("Double Tap 'Jump' To Fly (Creative)"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Disable Flight Inertia"), cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value);
+		generateLeftSideText(y, elements, text("Disable Flight Inertia"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Disable Field Of View Changing"), cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value);
+		generateLeftSideText(y, elements, text("Disable Field Of View Changing"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Fly On Ground (Creative Mode)"), cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value);
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Fly On Ground (Creative Mode)"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value));
+		
+		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)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
+		
 		y += ROW_HEIGHT;
 		
 		generateLeftSideText(y, elements, text("Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightSpeedMpCreativeSprinting, value -> cfg.flightSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpCreativeSprinting, value -> cfg.flightSpeedMpCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = value));
+		
 		y += ROW_HEIGHT;
 		
 		generateLeftSideText(y, elements, text("Vertical Speed Boost (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Boost in Creative Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeDefault, value -> cfg.flightVerticalBoostCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Boost in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeDefault, value -> cfg.flightVerticalBoostCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
+		
 		y += ROW_HEIGHT;
 		
 		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Boost when Sprinting in Creative Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Boost when Sprinting in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
-		y += ROW_HEIGHT;
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
 		
+		y += ROW_HEIGHT;
 		return y;
 	}
 	
 	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+		final BetterControlsConfig cfg = BetterControlsMod.config;
+		
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
+		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
+		generateKeyBindingWithModifierOption(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
+		
 		y += ROW_HEIGHT * 4 / 3;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
-		y += ROW_HEIGHT;
+		generateKeyBindingWithModifierOption(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
 		
+		y += ROW_HEIGHT;
 		return y;
 	}
 	
@@ -186,9 +207,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierRow(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
-		final var modifierButton = Option.button(col4(2), y, COL4_W, text.plainCopy().append(" Modifier"), MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
-		final var bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
+	private void generateKeyBindingWithModifierOption(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 KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -197,19 +218,6 @@ 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));
 	}
@@ -221,7 +229,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
 	public BetterControlsScreen(@Nullable final Screen parentScreen) {
-		super(parentScreen, Minecraft.getInstance().options, TITLE);
+		super(parentScreen, OPTIONS, TITLE);
 	}
 	
 	@Override
@@ -249,11 +257,11 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	@Override
 	public void removed() {
-		BetterControlsCommon.getConfig().save();
+		BetterControlsMod.config.save();
 	}
 	
 	@Override
-	public void render(final @NotNull PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
+	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);

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

@@ -1,19 +1,18 @@
 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.components.AbstractWidget;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
 import net.minecraft.client.gui.components.Widget;
 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;
@@ -31,11 +30,11 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	}
 	
 	private static Offset getElementOffset(final GuiEventListener element) {
-		if (element instanceof final OptionWidget widget) {
-			return new Offset(widget.getX(), widget.getY());
+		if (element instanceof OptionWidget) {
+			return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
 		}
-		else if (element instanceof final AbstractWidget widget) {
-			return new Offset(widget.x, widget.y);
+		else if (element instanceof AbstractWidget) {
+			return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
 		}
 		else {
 			return new Offset(0, 0);
@@ -49,10 +48,18 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		void setY(int y);
 	}
 	
-	private record Offset(int x, int y) {}
+	private static final class Offset {
+		public final int x;
+		public final int y;
+		
+		private Offset(final int x, final int y) {
+			this.x = x;
+			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.getInstance(), width, height, top, bottom, innerHeight);
+		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
@@ -83,31 +90,33 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		}
 		
 		@Override
-		public @NotNull List<? extends GuiEventListener> children() {
+		public List<? extends GuiEventListener> children() {
 			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
-		public @NotNull List<? extends NarratableEntry> narratables() {
+		public List<? extends NarratableEntry> narratables() {
 			return Collections.unmodifiableList(narratables);
 		}
 		
 		@Override
-		public void render(final @NotNull 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 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) {
 			for (final GuiEventListener element : elements) {
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof final AbstractWidget widget) {
-					widget.x = x + offset.x;
-					widget.y = y + offset.y;
+				if (element instanceof AbstractWidget) {
+					final AbstractWidget button = (AbstractWidget)element;
+					button.x = x + offset.x;
+					button.y = y + offset.y;
 				}
-				else if (element instanceof final OptionWidget widget) {
+				else if (element instanceof OptionWidget) {
+					final OptionWidget widget = (OptionWidget)element;
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof final Widget widget) {
-					widget.render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof Widget) {
+					((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -0,0 +1,61 @@
+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

@@ -0,0 +1,27 @@
+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

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

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

@@ -2,17 +2,16 @@ 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 net.minecraft.network.chat.TranslatableComponent;
-import org.jetbrains.annotations.NotNull;
 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;
@@ -41,7 +40,7 @@ public final class KeyBindingWidget extends Button {
 	}
 	
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
+	protected MutableComponent createNarrationMessage() {
 		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
 	}
 	
@@ -70,8 +69,8 @@ public final class KeyBindingWidget extends Button {
 		boolean hasConflict = false;
 		
 		if (!binding.isUnbound()) {
-			for (final KeyMapping other : Minecraft.getInstance().options.keyMappings) {
-				if (binding != other && binding.same(other)) {
+			for (final KeyMapping other : OPTIONS.keyMappings) {
+				if (binding != other && binding.equals(other)) {
 					hasConflict = true;
 					break;
 				}

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

@@ -1,20 +1,26 @@
 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 record Option<T>(T value, Component text) {
+public final class Option<T> {
+	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,13 +1,12 @@
 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.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 static final int LEFT = 0;
@@ -58,8 +57,8 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 	}
 	
 	@Override
-	public void render(final @NotNull PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		final Font textRenderer = Minecraft.getInstance().font;
+	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
+		final Font textRenderer = MINECRAFT.font;
 		final List<FormattedCharSequence> lines = textRenderer.split(text, width);
 		final int lineHeight = textRenderer.lineHeight + 1;
 		

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

@@ -1,11 +1,17 @@
 package chylex.bettercontrols.input;
 import com.mojang.blaze3d.platform.InputConstants.Type;
 import net.minecraft.client.KeyMapping;
-import org.jetbrains.annotations.Nullable;
+import net.minecraft.network.chat.Component;
+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/mixin/AccessCameraFields.java

@@ -5,6 +5,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Camera.class)
 public interface AccessCameraFields {
-	@Accessor
-	void setEyeHeight(float y);
+	@Accessor("eyeHeight")
+	void setCameraY(float y);
 }

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

@@ -5,6 +5,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(LocalPlayer.class)
 public interface AccessClientPlayerFields {
-	@Accessor
-	void setSprintTriggerTime(int value);
+	@Accessor("sprintTriggerTime")
+	void setTicksLeftToDoubleTapSprint(int value);
 }

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,12 @@
+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/AccessOptionFields.java

@@ -0,0 +1,12 @@
+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

@@ -5,6 +5,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Player.class)
 public interface AccessPlayerFields {
-	@Accessor
-	void setJumpTriggerTime(int value);
+	@Accessor("jumpTriggerTime")
+	void setTicksLeftToDoubleTapFlight(int value);
 }

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

@@ -0,0 +1,16 @@
+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

@@ -7,10 +7,10 @@ import java.util.function.BooleanSupplier;
 
 @Mixin(ToggleKeyMapping.class)
 public interface AccessStickyKeyBindingStateGetter {
-	@Accessor
-	BooleanSupplier getNeedsToggle();
+	@Accessor("needsToggle")
+	BooleanSupplier getToggleGetter();
 	
-	@Accessor
+	@Accessor("needsToggle")
 	@Mutable
-	void setNeedsToggle(final BooleanSupplier toggleGetter);
+	void setToggleGetter(final BooleanSupplier toggleGetter);
 }

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

@@ -1,14 +1,15 @@
 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(
@@ -20,7 +21,7 @@ public abstract class HookClientPlayerFOV {
 		)
 	)
 	private boolean resetFOV(final float movementSpeed) {
-		final LocalPlayer player = Minecraft.getInstance().player;
+		final LocalPlayer player = MINECRAFT.player;
 		return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
 	}
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -8,15 +7,15 @@ 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)
 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))
 	private void afterInputTick(final CallbackInfo info) {
-		@SuppressWarnings("ConstantConditions")
 		final Input input = (Input)(Object)this;
-		final LocalPlayer player = Minecraft.getInstance().player;
+		final LocalPlayer player = MINECRAFT.player;
 		
 		if (player != null) {
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);

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

@@ -18,21 +18,18 @@ 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))
 	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/HookControlsListWidget.java

@@ -1,24 +1,37 @@
 package chylex.bettercontrols.mixin;
-import chylex.bettercontrols.BetterControlsCommon;
-import net.minecraft.client.KeyMapping;
+import chylex.bettercontrols.BetterControlsMod;
+import chylex.bettercontrols.input.KeyBindingWithModifier;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.controls.KeyBindsList;
-import net.minecraft.client.gui.screens.controls.KeyBindsList.Entry;
+import net.minecraft.client.gui.screens.controls.ControlList;
+import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(KeyBindsList.class)
+@Mixin(ControlList.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) {
 		super(client, width, height, top, bottom, itemHeight);
 	}
 	
-	@Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))
-	private KeyMapping[] excludeOwnKeyBindings(final Options options) {
-		return ArrayUtils.removeElements(options.keyMappings, BetterControlsCommon.getConfig().getAllKeyBindings());
+	@Inject(method = "<init>", at = @At("TAIL"))
+	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
+		children().removeIf(it -> {
+			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

@@ -1,61 +0,0 @@
-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.AbstractWidget;
-import net.minecraft.client.gui.components.Button;
-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 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;
-
-@Mixin(ControlsScreen.class)
-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;
-		final int center = width / 2;
-		
-		int leftBottomY = 0;
-		int rightBottomY = 0;
-		
-		for (final GuiEventListener child : children()) {
-			if (!(child instanceof AbstractWidget widget)) {
-				continue;
-			}
-			
-			final int bottomY = widget.y + widget.getHeight();
-			
-			if (widget.x + widget.getWidth() < center) {
-				leftBottomY = Math.max(leftBottomY, bottomY);
-			}
-			if (widget.x >= center) {
-				rightBottomY = Math.max(rightBottomY, bottomY);
-			}
-		}
-		
-		final int x, y;
-		
-		if (leftBottomY < rightBottomY) {
-			x = center - 155;
-			y = leftBottomY + 4;
-		}
-		else {
-			x = center + 5;
-			y = rightBottomY + 4;
-		}
-		
-		addRenderableWidget(new Button(x, y, 150, 20, BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> Minecraft.getInstance().setScreen(new BetterControlsScreen(screen))));
-	}
-}

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

@@ -1,13 +1,10 @@
 package chylex.bettercontrols.mixin;
-import chylex.bettercontrols.BetterControlsCommon;
-import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.BetterControlsMod;
 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;
@@ -17,8 +14,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class HookLoadGameOptions {
 	private boolean hasLoaded = false;
 	
-	@Mutable
-	@Final
 	@Shadow
 	public KeyMapping[] keyMappings;
 	
@@ -28,13 +23,8 @@ public abstract class HookLoadGameOptions {
 			return;
 		}
 		
-		final BetterControlsConfig config = BetterControlsCommon.getConfig();
-		if (config == null) {
-			return;
-		}
-		
 		hasLoaded = true;
-		keyMappings = ArrayUtils.addAll(keyMappings, config.getAllKeyBindings());
+		keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
 		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }

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

@@ -0,0 +1,29 @@
+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

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
 
-@SuppressWarnings("SameReturnValue")
+@SuppressWarnings("MethodMayBeStatic")
 @Mixin(Player.class)
 public abstract class HookPlayerFlightSpeed extends LivingEntity {
 	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {

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

@@ -1,23 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.CycleOption;
-import net.minecraft.client.Option;
-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;
-
-@Mixin(CycleOption.class)
-public abstract class HookToggleOptionButtons {
-	@Inject(method = "createButton", at = @At("RETURN"))
-	private void disableToggleOptions(final Options options, final int x, final int y, final int width, final CallbackInfoReturnable<AbstractWidget> ci) {
-		@SuppressWarnings("ConstantConditions")
-		final CycleOption<?> me = (CycleOption<?>)(Object)this;
-		
-		if (me == Option.TOGGLE_CROUCH || me == Option.TOGGLE_SPRINT) {
-			ci.getReturnValue().active = false;
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 package chylex.bettercontrols.player;
-import chylex.bettercontrols.BetterControlsCommon;
+import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import net.minecraft.client.player.LocalPlayer;
 
@@ -10,7 +10,7 @@ final class FlightHelper {
 	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
 	private static BetterControlsConfig cfg() {
-		return BetterControlsCommon.getConfig();
+		return BetterControlsMod.config;
 	}
 	
 	static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {

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

@@ -1,5 +1,5 @@
 package chylex.bettercontrols.player;
-import chylex.bettercontrols.BetterControlsCommon;
+import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import chylex.bettercontrols.input.SprintMode;
@@ -10,23 +10,18 @@ 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) {
@@ -38,7 +33,7 @@ public final class PlayerTicker {
 	}
 	
 	private static BetterControlsConfig cfg() {
-		return BetterControlsCommon.getConfig();
+		return BetterControlsMod.config;
 	}
 	
 	private final WeakReference<LocalPlayer> ref;
@@ -68,13 +63,13 @@ public final class PlayerTicker {
 	
 	private void setup() {
 		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
-		BooleanSupplier getter = sprint.getNeedsToggle();
+		BooleanSupplier getter = sprint.getToggleGetter();
 		
-		if (getter instanceof final SprintPressGetter g) {
-			getter = g.wrapped();
+		if (getter instanceof SprintPressGetter) {
+			getter = ((SprintPressGetter)getter).getWrapped();
 		}
 		
-		sprint.setNeedsToggle(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
+		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
 	public void atHead(final LocalPlayer player) {
@@ -83,11 +78,11 @@ public final class PlayerTicker {
 		}
 		
 		if (!cfg().doubleTapForwardToSprint) {
-			((AccessClientPlayerFields)player).setSprintTriggerTime(0);
+			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
 		}
 		
 		if (!cfg().doubleTapJumpToToggleFlight) {
-			((AccessPlayerFields)player).setJumpTriggerTime(0);
+			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
 		}
 		
 		final SprintMode sprintMode = cfg().sprintMode;
@@ -287,7 +282,7 @@ public final class PlayerTicker {
 			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
 			
 			if (camera.getEntity() == player) {
-				((AccessCameraFields)camera).setEyeHeight(player.getEyeHeight());
+				((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
 			}
 		}
 		

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

@@ -1,7 +1,19 @@
 package chylex.bettercontrols.player;
 import java.util.function.BooleanSupplier;
 
-record SprintPressGetter(BooleanSupplier wrapped, BooleanSupplier or) implements BooleanSupplier {
+final class SprintPressGetter 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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,30 @@
+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,23 +2,26 @@
   "required": true,
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
-  "refmap": "bettercontrols.refmap.json",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
+    "AccessControlsListCategory",
+    "AccessControlsListKeyBinding",
+    "AccessCycleButtonFields",
     "AccessKeyBindingFields",
+    "AccessOptionFields",
     "AccessPlayerFields",
+    "AccessScreenButtons",
     "AccessStickyKeyBindingStateGetter",
     "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
     "HookControlsListWidget",
-    "HookControlsScreen",
     "HookLoadGameOptions",
+    "HookOpenScreen",
     "HookPlayerFlightSpeed",
-    "HookStickyKeyBindingState",
-    "HookToggleOptionButtons"
+    "HookStickyKeyBindingState"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/pack.mcmeta

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