Release v1.2.3 for Minecraft 1.18+

Fixes #6

.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 {
+	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

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

@@ -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,35 @@
+{
+  "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

@@ -0,0 +1,95 @@
+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/java/chylex/bettercontrols/BetterControlsMod.java

@@ -2,23 +2,22 @@ package chylex.bettercontrols;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
+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.ExtensionPoint;
+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.fml.network.FMLNetworkConstants;
-import org.apache.commons.lang3.tuple.Pair;
+import net.minecraftforge.network.NetworkConstants;
 
 @Mod("bettercontrols")
-public final class BetterControlsMod{
-	public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
-	
-	public BetterControlsMod(){
-		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> ClientLoader::createScreen);
-		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+public final class BetterControlsMod {
+	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));
 	}
 	
 	private static final class ClientLoader {

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

@@ -0,0 +1,27 @@
+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 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,100 +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: '3.+', changing: true
-		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
-	}
-}
-
-repositories {
-	maven {
-		url "https://maven.tterrag.com/"
-	}
-}
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
-apply plugin: 'eclipse'
-
-def mcversion = "1.16.4"
-def forgeversion = "35.0.1"
-
-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', '')
-
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
-
-minecraft {
-	mappings channel: 'snapshot', version: '20201028-1.16.3'
-	
-	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,173 @@
+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,4 +1,19 @@
-# 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.
+# 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
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -56,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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
@@ -138,35 +156,28 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        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" ;;
+        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" ;;
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+ARGV=("$@")
+eval set -- $DEFAULT_JVM_OPTS
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+IFS=$'
+' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
+IFS=$'
+' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

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

@@ -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/config/BetterControlsConfig.java

@@ -3,8 +3,8 @@ 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){
+public final class BetterControlsConfig {
+	public static BetterControlsConfig load(final Path path) {
 		return ConfigSerializer.deserialize(path).setPath(path);
 	}
 	
@@ -37,15 +37,15 @@ public final class BetterControlsConfig{
 	public final KeyBindingWithModifier keyResetAllToggles = new KeyBindingWithModifier("key.bettercontrols.reset_all_toggles");
 	public final KeyBindingWithModifier keyOpenMenu = new KeyBindingWithModifier("key.bettercontrols.open_menu");
 	
-	BetterControlsConfig(){}
+	BetterControlsConfig() {}
 	
-	private BetterControlsConfig setPath(final Path path){
+	private BetterControlsConfig setPath(final Path path) {
 		this.path = path;
 		return this;
 	}
 	
-	public KeyBindingWithModifier[] getAllKeyBindings(){
-		return new KeyBindingWithModifier[]{
+	public KeyBindingWithModifier[] getAllKeyBindings() {
+		return new KeyBindingWithModifier[] {
 			keyToggleSprint,
 			keyToggleSneak,
 			keyToggleFlight,
@@ -56,7 +56,7 @@ public final class BetterControlsConfig{
 		};
 	}
 	
-	public void save(){
+	public void save() {
 		ConfigSerializer.serialize(path, this);
 	}
 }

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

@@ -21,14 +21,14 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 
-final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig>{
+final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig> {
 	private static final Logger logger = LogManager.getLogger();
 	private static final Gson gson = new GsonBuilder().registerTypeAdapter(BetterControlsConfig.class, new ConfigSerializer()).setPrettyPrinting().create();
 	
-	private ConfigSerializer(){}
+	private ConfigSerializer() {}
 	
 	@Override
-	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context){
+	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context) {
 		final JsonObject obj = new JsonObject();
 		
 		Json.writeKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
@@ -62,11 +62,11 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 	}
 	
 	@Override
-	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException{
+	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
 		final BetterControlsConfig cfg = new BetterControlsConfig();
 		final JsonObject obj = json.getAsJsonObject();
 		
-		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()){
+		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()) {
 			cfg.sprintMode = SprintMode.TAP_TO_TOGGLE;
 		}
 		
@@ -100,19 +100,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config){
-		try(final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))){
+	static void serialize(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){
+		} catch (final IOException e) {
 			logger.error("Error saving BetterControls configuration file!", e);
 		}
 	}
 	
-	static BetterControlsConfig deserialize(final Path path){
-		try(final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))){
+	static BetterControlsConfig deserialize(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){
-		}catch(final IOException e){
+		} catch (final FileNotFoundException | NoSuchFileException ignored) {
+		} catch (final IOException e) {
 			logger.error("Error reading BetterControls configuration file!", e);
 		}
 		

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

@@ -1,45 +1,45 @@
 package chylex.bettercontrols.config;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
-import chylex.bettercontrols.util.Key;
 import com.google.gson.JsonObject;
+import com.mojang.blaze3d.platform.InputConstants;
 
-final class Json{
-	private Json(){}
+final class Json {
+	private Json() {}
 	
-	static void setFloat(final JsonObject obj, final String key, final float value){
+	static void setFloat(final JsonObject obj, final String key, final float value) {
 		obj.addProperty(key, Float.valueOf(value));
 	}
 	
-	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue){
+	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue) {
 		final float value = obj.has(key) ? obj.get(key).getAsFloat() : defaultValue;
 		return Math.max(minValue, Math.min(maxValue, value));
 	}
 	
-	static void setBool(final JsonObject obj, final String key, final boolean value){
+	static void setBool(final JsonObject obj, final String key, final boolean value) {
 		obj.addProperty(key, Boolean.valueOf(value));
 	}
 	
-	static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue){
+	static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue) {
 		return obj.has(key) ? obj.get(key).getAsBoolean() : defaultValue;
 	}
 	
-	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value){
+	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value) {
 		obj.addProperty(key, value.name());
 	}
 	
-	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass){
-		if (!obj.has(key)){
+	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;
 		}
 		
 		final T[] constants = enumClass.getEnumConstants();
 		
-		if (constants != null){
+		if (constants != null) {
 			final String value = obj.get(key).getAsString();
 			
-			for(final T constant : constants){
-				if (constant.name().equalsIgnoreCase(value)){
+			for (final T constant : constants) {
+				if (constant.name().equalsIgnoreCase(value)) {
 					return constant;
 				}
 			}
@@ -51,20 +51,24 @@ final class Json{
 	private static final String KEY_SUFFIX = ".Key";
 	private static final String MOD_SUFFIX = ".Mod";
 	
-	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
-		obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
+	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
+		obj.addProperty(key + KEY_SUFFIX, keyBinding.saveString());
 		
-		if (keyBinding.getModifier() != null){
+		if (keyBinding.getModifier() != null) {
 			obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
 		}
 	}
 	
-	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
-		if (obj.has(key + KEY_SUFFIX)){
-			Key.readBinding(keyBinding, obj.get(key + KEY_SUFFIX).getAsString());
+	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
+		if (obj.has(key + KEY_SUFFIX)) {
+			try {
+				keyBinding.setKey(InputConstants.getKey(obj.get(key + KEY_SUFFIX).getAsString()));
+			} catch (final IllegalArgumentException e) {
+				e.printStackTrace(); // let's not crash if the config file has garbage, okay?
+			}
 		}
 		
-		if (obj.has(key + MOD_SUFFIX)){
+		if (obj.has(key + MOD_SUFFIX)) {
 			keyBinding.setModifier(ModifierKey.getById(obj.get(key + MOD_SUFFIX).getAsInt()));
 		}
 	}

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

@@ -1,8 +1,6 @@
 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,31 +8,39 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import chylex.bettercontrols.util.Key;
-import chylex.bettercontrols.util.LiteralText;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.gui.DialogTexts;
-import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.SettingsScreen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.settings.KeyBinding;
+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.LiteralText.text;
-import static chylex.bettercontrols.util.Statics.OPTIONS;
 
-public class BetterControlsScreen extends SettingsScreen{
-	public static final LiteralText TITLE = text("Better Controls");
+public class BetterControlsScreen extends OptionsSubScreen {
+	private static TextComponent text(final String text) {
+		return new TextComponent(text);
+	}
+	
+	public static final Component TITLE = text("Better Controls");
 	
 	private static final int BOTTOM_PADDING = 3;
 	private static final int TEXT_PADDING_RIGHT = 4;
@@ -49,47 +55,39 @@ public class BetterControlsScreen extends SettingsScreen{
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<IGuiEventListener> elements){
-		final BetterControlsConfig cfg = BetterControlsMod.config;
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
+	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		y += ROW_HEIGHT;
 		
-		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));
-		
+		generateCycleOptionRow(y, elements, text("Sprint Key Mode"), SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value);
 		y += ROW_HEIGHT;
 		
-		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));
-		
+		generateBooleanOptionRow(y, elements, text("Double Tap 'Walk Forwards' To Sprint"), cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = 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));
-		
+		generateBooleanOptionRow(y, elements, text("Resume Sprinting After Hitting Obstacle"), cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value);
 		y += ROW_HEIGHT;
+		
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<IGuiEventListener> elements){
-		final BetterControlsConfig cfg = BetterControlsMod.config;
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
+	private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		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));
-		
+		generateBooleanOptionRow(y, elements, text("Move Camera Smoothly"), cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value);
 		y += ROW_HEIGHT;
+		
 		return y;
 	}
 	
 	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
-	private int generateFlightOptions(int y, final List<IGuiEventListener> elements){
-		final BetterControlsConfig cfg = BetterControlsMod.config;
+	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
 			new Option<>(Float.valueOf(0.25F), text("0.25x")),
@@ -118,79 +116,64 @@ public class BetterControlsScreen extends SettingsScreen{
 			new Option<>(Float.valueOf(3.00F), text("+300%"))
 		);
 		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
-		
+		generateKeyBindingWithModifierRow(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
 		y += ROW_HEIGHT;
 		
-		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));
-		
+		generateBooleanOptionRow(y, elements, text("Double Tap 'Jump' To Fly (Creative)"), cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value);
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Disable Flight Inertia"));
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value));
-		
+		generateBooleanOptionRow(y, elements, text("Disable Flight Inertia"), cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value);
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Disable Field Of View Changing"));
-		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value));
-		
+		generateBooleanOptionRow(y, elements, text("Disable Field Of View Changing"), cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = 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;
+		generateBooleanOptionRow(y, elements, text("Fly On Ground (Creative Mode)"), cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value);
+		y += ROW_HEIGHT;
 		
+		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, flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
-		
+		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));
 		y += ROW_HEIGHT;
 		
 		generateLeftSideText(y, elements, text("Speed Multiplier (Sprinting)"));
-		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));
-		
+		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));
 		y += ROW_HEIGHT;
 		
 		generateLeftSideText(y, elements, text("Vertical Speed Boost (Default)"));
-		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));
-		
+		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));
 		y += ROW_HEIGHT;
 		
 		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
-		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));
-		
+		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;
+		
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<IGuiEventListener> elements){
-		final BetterControlsConfig cfg = BetterControlsMod.config;
-		
-		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
+	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
+		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
+		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;
 	}
 	
@@ -203,9 +186,9 @@ public class BetterControlsScreen extends SettingsScreen{
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<IGuiEventListener> elements, final LiteralText 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, binding, this::startEditingKeyBinding);
+	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);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -214,7 +197,20 @@ public class BetterControlsScreen extends SettingsScreen{
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static void generateLeftSideText(final int y, final List<IGuiEventListener> elements, final LiteralText text){
+	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));
 	}
 	
@@ -224,15 +220,15 @@ public class BetterControlsScreen extends SettingsScreen{
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(@Nullable final Screen parentScreen){
-		super(parentScreen, OPTIONS, TITLE);
+	public BetterControlsScreen(@Nullable final Screen parentScreen) {
+		super(parentScreen, Minecraft.getInstance().options, TITLE);
 	}
 	
 	@Override
-	public void init(){
+	public void init() {
 		allKeyBindings.clear();
 		
-		final List<IGuiEventListener> elements = new ArrayList<>();
+		final List<GuiEventListener> elements = new ArrayList<>();
 		int y = 0;
 		
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@@ -247,25 +243,25 @@ public class BetterControlsScreen extends SettingsScreen{
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		addButton(new Button(width / 2 - 99, height - 29, 200, 20, DialogTexts.GUI_DONE, btn -> minecraft.displayGuiScreen(parentScreen)));
-		addListener(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
+		addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
-	public void onClose(){
-		BetterControlsMod.config.save();
+	public void removed() {
+		BetterControlsCommon.getConfig().save();
 	}
 	
 	@Override
-	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
+	public void render(final @NotNull 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){
-		if (editingKeyBinding != null){
+	private void startEditingKeyBinding(final KeyBindingWidget widget) {
+		if (editingKeyBinding != null) {
 			editingKeyBinding.stopEditing();
 		}
 		
@@ -273,40 +269,40 @@ public class BetterControlsScreen extends SettingsScreen{
 	}
 	
 	@Override
-	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
-		if (editingKeyBinding != null){
-			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
+	public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
+		if (editingKeyBinding != null) {
+			editingKeyBinding.bindAndStopEditing(InputConstants.Type.MOUSE.getOrCreate(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else{
+		else {
 			return super.mouseClicked(mouseX, mouseY, button);
 		}
 	}
 	
 	@Override
-	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
-		if (editingKeyBinding != null){
-			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
-				editingKeyBinding.bindAndStopEditing(Key.INVALID);
+	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
+		if (editingKeyBinding != null) {
+			if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
+				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
 			}
-			else{
-				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
+			else {
+				editingKeyBinding.bindAndStopEditing(InputConstants.getKey(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else{
+		else {
 			return super.keyPressed(keyCode, scanCode, modifiers);
 		}
 	}
 	
-	private void onKeyBindingEditingFinished(){
+	private void onKeyBindingEditingFinished() {
 		editingKeyBinding = null;
-		KeyBinding.resetKeyBindingArrayAndHash();
+		KeyMapping.resetMapping();
 		
-		for(final KeyBindingWidget widget : allKeyBindings){
+		for (final KeyBindingWidget widget : allKeyBindings) {
 			widget.updateKeyBindingText();
 		}
 	}

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

@@ -1,113 +1,113 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.gui.IRenderable;
-import net.minecraft.client.gui.widget.list.AbstractOptionList;
+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 AbstractOptionList<Entry>{
+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;
 	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
 	
-	public static int col2(final int column){
+	public static int col2(final int column) {
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col4(final int column){
+	public static int col4(final int column) {
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	private static Offset getElementOffset(final IGuiEventListener element){
-		if (element instanceof Widget){
-			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
+	private static Offset getElementOffset(final GuiEventListener element) {
+		if (element instanceof final OptionWidget widget) {
+			return new Offset(widget.getX(), widget.getY());
 		}
-		else if (element instanceof net.minecraft.client.gui.widget.Widget){
-			return new Offset(((net.minecraft.client.gui.widget.Widget)element).x, ((net.minecraft.client.gui.widget.Widget)element).y);
+		else if (element instanceof final AbstractWidget widget) {
+			return new Offset(widget.x, widget.y);
 		}
-		else{
+		else {
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface Widget extends IGuiEventListener, IRenderable{
+	public interface OptionWidget extends GuiEventListener, Widget {
 		int getX();
 		int getY();
 		void setX(int x);
 		void setY(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;
-		}
-	}
+	private record Offset(int x, int y) {}
 	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<IGuiEventListener> widgets, final int innerHeight){
-		super(MINECRAFT, width, height, top, bottom, innerHeight);
+	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);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	public int getRowLeft(){
+	public int getRowLeft() {
 		return super.getRowLeft() - ROW_PADDING;
 	}
 	
 	@Override
-	public int getRowWidth(){
+	public int getRowWidth() {
 		return ROW_WIDTH;
 	}
 	
 	@Override
-	protected int getScrollbarPosition(){
+	protected int getScrollbarPosition() {
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	protected static final class Entry extends AbstractOptionList.Entry<Entry>{
-		private final List<IGuiEventListener> elements;
-		private final Map<IGuiEventListener, Offset> offsets;
+	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
+		private final List<GuiEventListener> elements;
+		private final List<NarratableEntry> narratables;
+		private final Map<GuiEventListener, Offset> offsets;
 		
-		public Entry(final List<IGuiEventListener> elements){
+		public Entry(final List<GuiEventListener> elements) {
 			this.elements = new ArrayList<>(elements);
+			this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry)e).collect(Collectors.toList());
 			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
 		@Override
-		public List<? extends IGuiEventListener> getEventListeners(){
+		public @NotNull List<? extends GuiEventListener> children() {
 			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
-		public void render(final MatrixStack 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 IGuiEventListener element : elements){
+		public @NotNull 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) {
+			for (final GuiEventListener element : elements) {
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof net.minecraft.client.gui.widget.Widget){
-					final net.minecraft.client.gui.widget.Widget button = (net.minecraft.client.gui.widget.Widget)element;
-					button.x = x + offset.x;
-					button.y = y + offset.y;
+				if (element instanceof final AbstractWidget widget) {
+					widget.x = x + offset.x;
+					widget.y = y + offset.y;
 				}
-				else if (element instanceof Widget){
-					final Widget widget = (Widget)element;
+				else if (element instanceof final OptionWidget widget) {
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof IRenderable){
-					((IRenderable)element).render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof final Widget widget) {
+					widget.render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,62 +0,0 @@
-package chylex.bettercontrols.gui;
-import chylex.bettercontrols.mixin.AccessScreenButtons;
-import net.minecraft.client.AbstractOption;
-import net.minecraft.client.gui.AccessibilityScreen;
-import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.gui.INestedGuiEventHandler;
-import net.minecraft.client.gui.screen.ControlsScreen;
-import net.minecraft.client.gui.widget.button.AbstractButton;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.gui.widget.button.OptionButton;
-import java.util.List;
-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 IGuiEventListener> children = screen.getEventListeners();
-		final List<AbstractButton> buttons = accessor.getButtons();
-		
-		final AbstractButton autoJump = buttons
-			.stream()
-			.filter(it -> it instanceof OptionButton && ((OptionButton)it).func_238517_a_() == AbstractOption.AUTO_JUMP)
-			.findAny()
-			.orElse(null);
-		
-		if (autoJump != null){
-			children.remove(autoJump);
-			buttons.remove(autoJump);
-			
-			accessor.callAddButton(new Button(autoJump.x, autoJump.y, autoJump.getWidth(), 20, BetterControlsScreen.TITLE.copy().appendString("..."), btn -> {
-				MINECRAFT.displayGuiScreen(new BetterControlsScreen(screen));
-			}));
-		}
-	}
-	
-	public static void onAccessibilityScreenOpened(final AccessibilityScreen screen){
-		walkChildren(screen.getEventListeners(), it -> {
-			if (it instanceof OptionButton){
-				final OptionButton button = (OptionButton)it;
-				final AbstractOption option = button.func_238517_a_();
-				
-				if (option == AbstractOption.SPRINT || option == AbstractOption.SNEAK){
-					button.active = false;
-				}
-			}
-		});
-	}
-	
-	private static void walkChildren(final List<? extends IGuiEventListener> listeners, final Consumer<IGuiEventListener> callback){
-		for(final IGuiEventListener listener : listeners){
-			callback.accept(listener);
-			
-			if (listener instanceof INestedGuiEventHandler){
-				walkChildren(((INestedGuiEventHandler)listener).getEventListeners(), callback);
-			}
-		}
-	}
-}

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.DialogTexts;
-import net.minecraft.client.gui.widget.button.Button;
-
-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 ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_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 ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_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.widget.button.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,41 +1,52 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.widget.AbstractSlider;
-import net.minecraft.util.math.MathHelper;
+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 AbstractSlider{
+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 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));
+	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;
 		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){
-		this(x, y, width, 20, options, selectedValue, 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 Option<T> getSelectedOption(){
-		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, sliderValue)));
+	public Option<T> getSelectedOption() {
+		return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
 	}
 	
 	@Override
-	protected void func_230979_b_(){
-		setMessage(getSelectedOption().getText());
+	protected void updateMessage() {
+		setMessage(getSelectedOption().text());
 	}
 	
 	@Override
-	protected void func_230972_a_(){
-		final T newSelectedValue = getSelectedOption().getValue();
+	protected void applyValue() {
+		final T newSelectedValue = getSelectedOption().value();
 		
-		if (selectedValue != newSelectedValue){
+		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

@@ -1,91 +1,91 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.util.Key;
-import net.minecraft.client.gui.widget.button.AbstractButton;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.util.InputMappings;
-import net.minecraft.util.text.IFormattableTextComponent;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.TranslationTextComponent;
+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 KeyBinding binding;
-	private final ITextComponent bindingName;
+public final class KeyBindingWidget extends Button {
+	private final KeyMapping binding;
+	private final Component bindingName;
 	
 	private final List<AbstractButton> linkedButtons = new ArrayList<>(1);
 	
 	private final Consumer<KeyBindingWidget> onEditingStarted;
 	private boolean isEditing;
 	
-	public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted){
-		super(x, y, width, height, StringTextComponent.EMPTY, btn -> {});
+	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 -> {});
 		this.binding = binding;
-		this.bindingName = new TranslationTextComponent(binding.getTranslationKey());
+		this.bindingName = bindingName;
 		this.onEditingStarted = onEditingStarted;
 		updateKeyBindingText();
 	}
 	
-	public KeyBindingWidget(final int x, final int y, final int width, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted){
-		this(x, y, width, 20, binding, onEditingStarted);
+	public KeyBindingWidget(final int x, final int y, final int width, final Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
+		this(x, y, width, 20, bindingName, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButton button){
+	public void linkButtonToBoundState(final AbstractButton button) {
 		linkedButtons.add(button);
-		button.active = !Key.isUnbound(binding);
+		button.active = !binding.isUnbound();
 	}
 	
 	@Override
-	protected IFormattableTextComponent getNarrationMessage(){
-		return Key.isUnbound(binding) ? new TranslationTextComponent("narrator.controls.unbound", bindingName) : new TranslationTextComponent("narrator.controls.bound", bindingName, super.getNarrationMessage());
+	protected @NotNull MutableComponent createNarrationMessage() {
+		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
 	}
 	
 	@Override
-	public void onPress(){
+	public void onPress() {
 		isEditing = true;
 		onEditingStarted.accept(this);
 		updateKeyBindingText();
 	}
 	
-	public void bindAndStopEditing(final InputMappings.Input key){
-		Key.bind(binding, key);
+	public void bindAndStopEditing(final InputConstants.Key key) {
+		binding.setKey(key);
 		stopEditing();
 		
-		for(final AbstractButton button : linkedButtons){
-			button.active = !Key.isUnbound(binding);
+		for (final AbstractButton button : linkedButtons) {
+			button.active = !binding.isUnbound();
 		}
 	}
 	
-	public void stopEditing(){
+	public void stopEditing() {
 		isEditing = false;
 		updateKeyBindingText();
 	}
 	
-	public void updateKeyBindingText(){
+	public void updateKeyBindingText() {
 		boolean hasConflict = false;
 		
-		if (!Key.isUnbound(binding)){
-			for(final KeyBinding other : OPTIONS.keyBindings){
-				if (binding != other && binding.equals(other)){
+		if (!binding.isUnbound()) {
+			for (final KeyMapping other : Minecraft.getInstance().options.keyMappings) {
+				if (binding != other && binding.same(other)) {
 					hasConflict = true;
 					break;
 				}
 			}
 		}
 		
-		if (isEditing){
-			setMessage((new StringTextComponent("> ")).append(Key.getBoundKeyText(binding).deepCopy().mergeStyle(TextFormatting.YELLOW)).appendString(" <").mergeStyle(TextFormatting.YELLOW));
+		if (isEditing) {
+			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
 		}
-		else if (hasConflict){
-			setMessage(Key.getBoundKeyText(binding).deepCopy().mergeStyle(TextFormatting.RED));
+		else if (hasConflict) {
+			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
 		}
-		else{
-			setMessage(Key.isUnbound(binding) ? new StringTextComponent("(No Binding)") : Key.getBoundKeyText(binding));
+		else {
+			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
 		}
 	}
 }

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

@@ -1,26 +1,20 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.util.LiteralText;
+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>{
-	private final T value;
-	private final LiteralText text;
-	
-	public Option(final T value, final LiteralText text){
-		this.value = value;
-		this.text = text;
-	}
-	
-	public T getValue(){
-		return value;
-	}
-	
-	public LiteralText getText(){
-		return text;
-	}
-	
-	public static <T> Option<T> find(final List<Option<T>> options, final T value){
+public record Option<T>(T value, Component 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,25 +1,26 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.gui.OptionListWidget.Widget;
-import chylex.bettercontrols.util.LiteralText;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.gui.AbstractGui;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.util.IReorderingProcessor;
+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 AbstractGui implements Widget{
+public final class TextWidget extends GuiComponent implements OptionWidget {
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
-	private final LiteralText text;
+	private final Component text;
 	private int x;
 	private int y;
 	private final int width;
 	private final int height;
 	private final int align;
 	
-	public TextWidget(final int x, final int y, final int width, final int height, final LiteralText text, final int align){
+	public TextWidget(final int x, final int y, final int width, final int height, final Component text, final int align) {
 		this.x = x;
 		this.y = y;
 		this.width = width;
@@ -28,46 +29,46 @@ public final class TextWidget extends AbstractGui implements Widget{
 		this.align = align;
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align){
+	public TextWidget(final int x, final int y, final int width, final Component text, final int align) {
 		this(x, y, width, 20, text, align);
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final LiteralText text){
+	public TextWidget(final int x, final int y, final int width, final Component text) {
 		this(x, y, width, 20, text, LEFT);
 	}
 	
 	@Override
-	public int getX(){
+	public int getX() {
 		return x;
 	}
 	
 	@Override
-	public int getY(){
+	public int getY() {
 		return y;
 	}
 	
 	@Override
-	public void setX(final int x){
+	public void setX(final int x) {
 		this.x = x;
 	}
 	
 	@Override
-	public void setY(final int y){
+	public void setY(final int y) {
 		this.y = y;
 	}
 	
 	@Override
-	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
-		final FontRenderer textRenderer = MINECRAFT.fontRenderer;
-		final List<IReorderingProcessor> lines = textRenderer.trimStringToWidth(text, width);
-		final int lineHeight = textRenderer.FONT_HEIGHT + 1;
+	public void render(final @NotNull PoseStack matrices, 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;
 		
-		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::func_243245_a).max().orElse(0) / 2) : x;
+		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::width).max().orElse(0) / 2) : x;
 		final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
 		
-		for(int i = 0; i < lines.size(); i++){
-			final IReorderingProcessor line = lines.get(i);
-			textRenderer.func_238407_a_(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+		for (int i = 0; i < lines.size(); i++) {
+			final FormattedCharSequence line = lines.get(i);
+			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

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

@@ -1,40 +1,34 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.util.InputMappings.Type;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import javax.annotation.Nullable;
+import com.mojang.blaze3d.platform.InputConstants.Type;
+import net.minecraft.client.KeyMapping;
+import org.jetbrains.annotations.Nullable;
 
-public class KeyBindingWithModifier extends KeyBinding{
+public class KeyBindingWithModifier extends KeyMapping {
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final ITextComponent text){
-		return text instanceof TranslationTextComponent && CATEGORY.equals(((TranslationTextComponent)text).getKey());
-	}
-	
 	@Nullable
 	private ModifierKey modifier = null;
 	
-	public KeyBindingWithModifier(final String translationKey){
+	public KeyBindingWithModifier(final String translationKey) {
 		super(translationKey, Type.KEYSYM, -1, CATEGORY);
 	}
 	
-	public void setModifier(@Nullable final ModifierKey modifier){
+	public void setModifier(@Nullable final ModifierKey modifier) {
 		this.modifier = modifier;
 	}
 	
 	@Nullable
-	public ModifierKey getModifier(){
+	public ModifierKey getModifier() {
 		return modifier;
 	}
 	
 	@Override
-	public boolean isKeyDown(){
-		return super.isKeyDown() && (modifier == null || modifier.isPressed());
+	public boolean isDown() {
+		return super.isDown() && (modifier == null || modifier.isPressed());
 	}
 	
 	@Override
-	public boolean isPressed(){
-		return super.isPressed() && (modifier == null || modifier.isPressed());
+	public boolean consumeClick() {
+		return super.consumeClick() && (modifier == null || modifier.isPressed());
 	}
 }

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

@@ -1,42 +1,42 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screens.Screen;
 
-public enum ModifierKey{
-	CONTROL(0){
+public enum ModifierKey {
+	CONTROL(0) {
 		@Override
-		public boolean isPressed(){
+		public boolean isPressed() {
 			return Screen.hasControlDown();
 		}
 	},
 	
-	SHIFT(1){
+	SHIFT(1) {
 		@Override
-		public boolean isPressed(){
+		public boolean isPressed() {
 			return Screen.hasShiftDown();
 		}
 	},
 	
-	ALT(2){
+	ALT(2) {
 		@Override
-		public boolean isPressed(){
+		public boolean isPressed() {
 			return Screen.hasAltDown();
 		}
 	};
 	
 	public final int id;
 	
-	ModifierKey(final int id){
+	ModifierKey(final int id) {
 		this.id = id;
 	}
 	
 	public abstract boolean isPressed();
 	
-	public static ModifierKey getById(final int id){
-		switch(id){
-			case 0: return CONTROL;
-			case 1: return SHIFT;
-			case 2: return ALT;
-			default: return null;
-		}
+	public static ModifierKey getById(final int id) {
+		return switch (id) {
+			case 0 -> CONTROL;
+			case 1 -> SHIFT;
+			case 2 -> ALT;
+			default -> null;
+		};
 	}
 }

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

@@ -1,6 +1,6 @@
 package chylex.bettercontrols.input;
 
-public enum SprintMode{
+public enum SprintMode {
 	TAP_TO_START,
 	TAP_TO_TOGGLE,
 	HOLD

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

@@ -1,10 +1,9 @@
 package chylex.bettercontrols.input;
-import chylex.bettercontrols.util.Key;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.KeyMapping;
 
-public class ToggleTracker{
-	protected final KeyBinding bindingToggle;
-	protected final KeyBinding bindingReset;
+public class ToggleTracker {
+	protected final KeyMapping bindingToggle;
+	protected final KeyMapping bindingReset;
 	
 	protected boolean isToggled;
 	
@@ -12,7 +11,7 @@ public class ToggleTracker{
 	private boolean hasToggledWhileHoldingReset;
 	private boolean skipNextToggle;
 	
-	public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset){
+	public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset) {
 		this.bindingToggle = bindingToggle;
 		this.bindingReset = bindingReset;
 	}
@@ -41,15 +40,15 @@ public class ToggleTracker{
 	 *   +CTRL, +G, -CTRL, +CTRL, +G, +G  -->  toggled on
 	 */
 	
-	public boolean tick(){
+	public boolean tick() {
 		final boolean isHoldingReset = isResetKeyPressed();
 		
-		if (Key.isPressed(bindingToggle)){
-			if (!waitForRelease){
-				if (skipNextToggle){
+		if (bindingToggle.isDown()) {
+			if (!waitForRelease) {
+				if (skipNextToggle) {
 					skipNextToggle = false;
 				}
-				else{
+				else {
 					isToggled = !isToggled;
 				}
 				
@@ -57,32 +56,32 @@ public class ToggleTracker{
 				hasToggledWhileHoldingReset = isHoldingReset;
 			}
 		}
-		else{
+		else {
 			waitForRelease = false;
 		}
 		
-		if (isToggled){
-			if (hasToggledWhileHoldingReset && !isHoldingReset){
+		if (isToggled) {
+			if (hasToggledWhileHoldingReset && !isHoldingReset) {
 				hasToggledWhileHoldingReset = false;
 			}
-			else if (!hasToggledWhileHoldingReset && isHoldingReset){
+			else if (!hasToggledWhileHoldingReset && isHoldingReset) {
 				isToggled = false;
 				skipNextToggle = true;
 			}
 		}
 		
-		if (skipNextToggle && !isHoldingReset){
+		if (skipNextToggle && !isHoldingReset) {
 			skipNextToggle = false;
 		}
 		
 		return isToggled;
 	}
 	
-	protected boolean isResetKeyPressed(){
-		return Key.isPressed(bindingReset);
+	protected boolean isResetKeyPressed() {
+		return bindingReset.isDown();
 	}
 	
-	public void reset(){
+	public void reset() {
 		isToggled = false;
 		waitForRelease = false;
 	}

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

@@ -1,20 +1,20 @@
 package chylex.bettercontrols.input;
 import chylex.bettercontrols.mixin.AccessKeyBindingFields;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.KeyMapping;
 import java.util.HashSet;
 import java.util.Set;
 
-public final class ToggleTrackerForStickyKey extends ToggleTracker{
-	private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
+public final class ToggleTrackerForStickyKey extends ToggleTracker {
+	private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
 	
-	public static boolean isOverrideEnabled(final KeyBinding binding){
+	public static boolean isOverrideEnabled(final KeyMapping binding) {
 		return enabledOverrides.contains(binding);
 	}
 	
 	private final BooleanConsumer setToggleState;
 	
-	public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding bindingStickyReset, final BooleanConsumer setToggleState){
+	public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState) {
 		super(bindingToggle, bindingStickyReset);
 		this.setToggleState = setToggleState;
 		this.setToggleState.accept(false);
@@ -22,14 +22,14 @@ public final class ToggleTrackerForStickyKey extends ToggleTracker{
 	}
 	
 	@Override
-	public boolean tick(){
+	public boolean tick() {
 		final boolean isToggled = super.tick();
 		setToggleState.accept(isToggled);
 		return isToggled;
 	}
 	
 	@Override
-	protected boolean isResetKeyPressed(){
+	protected boolean isResetKeyPressed() {
 		return ((AccessKeyBindingFields)bindingReset).isPressedField();
 	}
 }

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

@@ -1,14 +1,10 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.renderer.ActiveRenderInfo;
-import net.minecraft.entity.Entity;
+import net.minecraft.client.Camera;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(ActiveRenderInfo.class)
-public interface AccessCameraFields{
-	@Accessor("renderViewEntity")
-	Entity getFocusedEntity();
-	
-	@Accessor("height")
-	void setCameraY(float y);
+@Mixin(Camera.class)
+public interface AccessCameraFields {
+	@Accessor
+	void setEyeHeight(float y);
 }

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

@@ -1,10 +1,10 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(ClientPlayerEntity.class)
-public interface AccessClientPlayerFields{
-	@Accessor("sprintToggleTimer")
-	void setTicksLeftToDoubleTapSprint(int value);
+@Mixin(LocalPlayer.class)
+public interface AccessClientPlayerFields {
+	@Accessor
+	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.widget.list.KeyBindingList.CategoryEntry;
-import net.minecraft.util.text.ITextComponent;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(CategoryEntry.class)
-public interface AccessControlsListCategory{
-	@Accessor("labelText")
-	ITextComponent getText();
-}

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

@@ -1,11 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.widget.list.KeyBindingList.KeyEntry;
-import net.minecraft.client.settings.KeyBinding;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(KeyEntry.class)
-public interface AccessControlsListKeyBinding{
-	@Accessor("keybinding")
-	KeyBinding getBinding();
-}

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

@@ -1,10 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.client.renderer.GameRenderer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(GameRenderer.class)
-public interface AccessGameRendererFields{
-	@Accessor("fovModifierHand")
-	void setMovementFovMultiplier(float value);
-}

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

@@ -1,19 +1,19 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.KeyMapping;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.Map;
 
-@Mixin(KeyBinding.class)
-public interface AccessKeyBindingFields{
-	@Accessor("CATEGORY_ORDER")
-	static Map<String, Integer> getCategoryOrderMap(){
+@Mixin(KeyMapping.class)
+public interface AccessKeyBindingFields {
+	@Accessor("CATEGORY_SORT_ORDER")
+	static Map<String, Integer> getCategoryOrderMap() {
 		throw new AssertionError();
 	}
 	
-	@Accessor("pressed")
+	@Accessor("isDown")
 	boolean isPressedField();
 	
-	@Accessor("pressed")
+	@Accessor("isDown")
 	void setPressedField(boolean value);
 }

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

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

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

@@ -1,17 +0,0 @@
-package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.gui.widget.button.AbstractButton;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
-import java.util.List;
-
-@Mixin(Screen.class)
-public interface AccessScreenButtons{
-	@Accessor
-	List<AbstractButton> getButtons();
-	
-	@Invoker
-	<T extends Widget> T callAddButton(T button);
-}

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

@@ -1,16 +1,16 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.settings.ToggleableKeyBinding;
+import net.minecraft.client.ToggleKeyMapping;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.function.BooleanSupplier;
 
-@Mixin(ToggleableKeyBinding.class)
-public interface AccessStickyKeyBindingStateGetter{
-	@Accessor("getterToggle")
-	BooleanSupplier getToggleGetter();
+@Mixin(ToggleKeyMapping.class)
+public interface AccessStickyKeyBindingStateGetter {
+	@Accessor
+	BooleanSupplier getNeedsToggle();
 	
-	@Accessor("getterToggle")
+	@Accessor
 	@Mutable
-	void setToggleGetter(final BooleanSupplier toggleGetter);
+	void setNeedsToggle(final BooleanSupplier toggleGetter);
 }

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

@@ -0,0 +1,26 @@
+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;
+
+@Mixin(AbstractClientPlayer.class)
+public abstract class HookClientPlayerFOV {
+	@Redirect(
+		method = "getFieldOfViewModifier",
+		at = @At(value = "INVOKE", target = "Ljava/lang/Float;isNaN(F)Z"),
+		slice = @Slice(
+			from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getWalkingSpeed()F"),
+			to = @At(value = "INVOKE", target = "Ljava/lang/Float;isInfinite(F)Z")
+		)
+	)
+	private boolean resetFOV(final float movementSpeed) {
+		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,23 +1,24 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.util.MovementInput;
-import net.minecraft.util.MovementInputFromOptions;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.Input;
+import net.minecraft.client.player.KeyboardInput;
+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.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(MovementInputFromOptions.class)
-public abstract class HookClientPlayerInputTick{
-	@Inject(method = "tickMovement(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/util/MovementInputFromOptions;forwardKeyDown:Z", ordinal = 0, shift = AFTER))
-	private void afterInputTick(final CallbackInfo info){
-		final MovementInput input = (MovementInput)(Object)this;
-		final ClientPlayerEntity player = MINECRAFT.player;
+@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;
 		
-		if (player != null){
+		if (player != null) {
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);
 		}
 	}

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

@@ -1,36 +1,39 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
-import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.world.ClientWorld;
+import net.minecraft.client.multiplayer.ClientLevel;
+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.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
-@Mixin(ClientPlayerEntity.class)
-public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{
-	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile){
+@Mixin(LocalPlayer.class)
+public abstract class HookClientPlayerTick extends AbstractClientPlayer {
+	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
 		super(world, profile);
 	}
 	
-	@Inject(method = "livingTick", at = @At("HEAD"))
-	private void atHead(final CallbackInfo info){
-		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
+	@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 = "livingTick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/MovementInput;tickMovement(Z)V", ordinal = 0, shift = AFTER))
-	private void afterInputTick(final CallbackInfo info){
-		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
+	@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 = "livingTick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/player/AbstractClientPlayerEntity;livingTick()V", ordinal = 0, shift = AFTER))
-	private void afterSuperCall(final CallbackInfo info){
-		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
+	@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,37 +1,24 @@
 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.gui.screen.ControlsScreen;
-import net.minecraft.client.gui.widget.list.AbstractOptionList;
-import net.minecraft.client.gui.widget.list.KeyBindingList;
-import net.minecraft.client.gui.widget.list.KeyBindingList.CategoryEntry;
-import net.minecraft.client.gui.widget.list.KeyBindingList.Entry;
-import net.minecraft.client.gui.widget.list.KeyBindingList.KeyEntry;
+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 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.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(KeyBindingList.class)
-public abstract class HookControlsListWidget extends AbstractOptionList<Entry>{
-	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight){
+@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) {
 		super(client, width, height, top, bottom, itemHeight);
 	}
 	
-	@Inject(method = "<init>", at = @At("TAIL"))
-	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci){
-		getEventListeners().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;
-		});
+	@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());
 	}
 }

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

@@ -0,0 +1,61 @@
+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,30 +1,40 @@
 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.GameSettings;
-import net.minecraft.client.settings.KeyBinding;
+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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(GameSettings.class)
-public abstract class HookLoadGameOptions{
+@Mixin(Options.class)
+public abstract class HookLoadGameOptions {
 	private boolean hasLoaded = false;
 	
+	@Mutable
+	@Final
 	@Shadow
-	public KeyBinding[] keyBindings;
+	public KeyMapping[] keyMappings;
 	
-	@Inject(method = "loadOptions()V", at = @At("HEAD"))
-	private void load(final CallbackInfo info){
-		if (hasLoaded){
+	@Inject(method = "load()V", at = @At("HEAD"))
+	private void load(final CallbackInfo info) {
+		if (hasLoaded) {
+			return;
+		}
+		
+		final BetterControlsConfig config = BetterControlsCommon.getConfig();
+		if (config == null) {
 			return;
 		}
 		
 		hasLoaded = true;
-		keyBindings = ArrayUtils.addAll(keyBindings, 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,28 +0,0 @@
-package chylex.bettercontrols.mixin;
-import chylex.bettercontrols.gui.ScreenPatcher;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.AccessibilityScreen;
-import net.minecraft.client.gui.screen.ControlsScreen;
-import net.minecraft.client.gui.screen.Screen;
-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;
-
-@Mixin(value = Minecraft.class, priority = 100)
-public abstract class HookOpenScreen{
-	@Inject(method = "displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
-	private void openScreen(final Screen ignore, final CallbackInfo ci){
-		final Screen screen = MINECRAFT.currentScreen;
-		
-		if (screen != null && !Screen.hasAltDown()){
-			if (screen.getClass() == ControlsScreen.class){
-				ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
-			}
-			else if (screen.getClass() == AccessibilityScreen.class){
-				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityScreen)screen);
-			}
-		}
-	}
-}

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

@@ -1,25 +1,26 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.world.World;
+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;
 
-@Mixin(PlayerEntity.class)
-public abstract class HookPlayerFlightSpeed extends LivingEntity{
-	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world){
+@SuppressWarnings("SameReturnValue")
+@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/entity/player/PlayerEntity;isSprinting()Z"),
-		slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerAbilities;getFlySpeed()F"))
+		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 PlayerEntity player){
+	private boolean disableVanillaSprintBoost(final Player player) {
 		return false;
 	}
 }

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

@@ -1,7 +1,7 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.settings.ToggleableKeyBinding;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.ToggleKeyMapping;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -10,26 +10,26 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.function.BooleanSupplier;
 
-@Mixin(ToggleableKeyBinding.class)
-public abstract class HookStickyKeyBindingState extends KeyBinding{
+@Mixin(ToggleKeyMapping.class)
+public abstract class HookStickyKeyBindingState extends KeyMapping {
 	@Shadow
 	@Final
-	private BooleanSupplier getterToggle;
+	private BooleanSupplier needsToggle;
 	
-	public HookStickyKeyBindingState(final String translationKey, final int code, final String category){
+	public HookStickyKeyBindingState(final String translationKey, final int code, final String category) {
 		super(translationKey, code, category);
 	}
 	
-	@Inject(method = "setPressed(Z)V", at = @At("HEAD"), cancellable = true)
-	public void setPressed(final boolean pressed, final CallbackInfo info){
-		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){
+	@Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
+	public void setPressed(final boolean pressed, final CallbackInfo info) {
+		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
 			((AccessKeyBindingFields)this).setPressedField(pressed);
 			info.cancel();
 		}
 	}
 	
 	@Override
-	public boolean isKeyDown(){
-		return super.isKeyDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && getterToggle.getAsBoolean());
+	public boolean isDown() {
+		return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
 	}
 }

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

@@ -0,0 +1,23 @@
+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,66 +1,66 @@
 package chylex.bettercontrols.player;
-import chylex.bettercontrols.BetterControlsMod;
+import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.player.LocalPlayer;
 
-final class FlightHelper{
-	private FlightHelper(){}
+final class FlightHelper {
+	private FlightHelper() {}
 	
 	private static final float BASE_FLIGHT_SPEED = 0.05F;
 	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
-	private static BetterControlsConfig cfg(){
-		return BetterControlsMod.config;
+	private static BetterControlsConfig cfg() {
+		return BetterControlsCommon.getConfig();
 	}
 	
-	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
-		return player.abilities.isFlying && (player.isCreative() || player.isSpectator());
+	static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
+		return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
 	}
 	
-	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
-		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.isFlying;
+	static boolean shouldFlyOnGround(final LocalPlayer player) {
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
 	}
 	
-	static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost){
-		if (player.isCreative()){
-			if (boost){
+	static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
+		if (player.isCreative()) {
+			if (boost) {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
 			}
-			else{
+			else {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()){
-			if (boost){
+		else if (player.isSpectator()) {
+			if (boost) {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
 			}
-			else{
+			else {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
 			}
 		}
-		else{
+		else {
 			return 0F;
 		}
 	}
 	
-	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){
-		if (player.isCreative()){
-			if (isSprinting){
+	static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting) {
+		if (player.isCreative()) {
+			if (isSprinting) {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
 			}
-			else{
+			else {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()){
-			if (isSprinting){
+		else if (player.isSpectator()) {
+			if (isSprinting) {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
 			}
-			else{
+			else {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorDefault;
 			}
 		}
-		else{
+		else {
 			return 0F;
 		}
 	}

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

@@ -1,5 +1,5 @@
 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;
@@ -7,39 +7,43 @@ import chylex.bettercontrols.input.ToggleTracker;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
 import chylex.bettercontrols.mixin.AccessCameraFields;
 import chylex.bettercontrols.mixin.AccessClientPlayerFields;
-import chylex.bettercontrols.mixin.AccessGameRendererFields;
 import chylex.bettercontrols.mixin.AccessPlayerFields;
 import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
-import chylex.bettercontrols.util.Key;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.util.MovementInput;
+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{
+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 ClientPlayerEntity player){
-		if (ticker.ref.get() != player){
+	public static PlayerTicker get(final LocalPlayer player) {
+		if (ticker.ref.get() != player) {
 			ticker = new PlayerTicker(player);
 		}
 		
 		return ticker;
 	}
 	
-	private static BetterControlsConfig cfg(){
-		return BetterControlsMod.config;
+	private static BetterControlsConfig cfg() {
+		return BetterControlsCommon.getConfig();
 	}
 	
-	private final WeakReference<ClientPlayerEntity> ref;
+	private final WeakReference<LocalPlayer> ref;
 	
-	private PlayerTicker(final ClientPlayerEntity player){
+	private PlayerTicker(final LocalPlayer player) {
 		this.ref = new WeakReference<>(player);
 		setup();
 	}
@@ -62,79 +66,79 @@ public final class PlayerTicker{
 	private boolean holdingSneakWhileTouchingGround = false;
 	private int temporaryFlyOnGroundTimer = 0;
 	
-	private void setup(){
+	private void setup() {
 		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
-		BooleanSupplier getter = sprint.getToggleGetter();
+		BooleanSupplier getter = sprint.getNeedsToggle();
 		
-		if (getter instanceof SprintPressGetter){
-			getter = ((SprintPressGetter)getter).getWrapped();
+		if (getter instanceof final SprintPressGetter g) {
+			getter = g.wrapped();
 		}
 		
-		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
+		sprint.setNeedsToggle(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(final ClientPlayerEntity player){
-		if (FlightHelper.shouldFlyOnGround(player)){
+	public void atHead(final LocalPlayer player) {
+		if (FlightHelper.shouldFlyOnGround(player)) {
 			player.setOnGround(false);
 		}
 		
-		if (!cfg().doubleTapForwardToSprint){
-			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
+		if (!cfg().doubleTapForwardToSprint) {
+			((AccessClientPlayerFields)player).setSprintTriggerTime(0);
 		}
 		
-		if (!cfg().doubleTapJumpToToggleFlight){
-			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
+		if (!cfg().doubleTapJumpToToggleFlight) {
+			((AccessPlayerFields)player).setJumpTriggerTime(0);
 		}
 		
 		final SprintMode sprintMode = cfg().sprintMode;
 		final boolean wasSprintToggled = OPTIONS.toggleSprint;
 		final boolean isSprintToggled = toggleSprint.tick();
 		
-		if (temporarySprintTimer > 0){
+		if (temporarySprintTimer > 0) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			
 			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
+			if (!KEY_SPRINT.isDown() && KEY_FORWARD.isDown()) {
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
-			else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
+			else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (isSprintToggled){
+		if (isSprintToggled) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 		}
-		else if (wasSprintToggled){
+		else if (wasSprintToggled) {
 			stopSprintingAfterReleasingSprintKey = true;
 			waitingForSprintKeyRelease = true;
 		}
-		else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
-			if (Key.isPressed(KEY_SPRINT)){
-				if (!waitingForSprintKeyRelease){
+		else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
+			if (KEY_SPRINT.isDown()) {
+				if (!waitingForSprintKeyRelease) {
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
 				}
 			}
-			else{
-				if (player.isSprinting() && !waitingForSprintKeyRelease){
+			else {
+				if (player.isSprinting() && !waitingForSprintKeyRelease) {
 					stopSprintingAfterReleasingSprintKey = false;
 				}
 				
 				waitingForSprintKeyRelease = false;
 			}
 		}
-		else if (sprintMode == SprintMode.HOLD){
-			if (Key.isPressed(KEY_SPRINT)){
+		else if (sprintMode == SprintMode.HOLD) {
+			if (KEY_SPRINT.isDown()) {
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
+		if (stopSprintingAfterReleasingSprintKey && !KEY_SPRINT.isDown()) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -143,163 +147,163 @@ public final class PlayerTicker{
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final MovementInput input){
-		if (MINECRAFT.currentScreen == null){
-			input.forwardKeyDown |= toggleWalkForward.tick();
+	public void afterInputAssignsPressingForward(final Input input) {
+		if (MINECRAFT.screen == null) {
+			input.up |= toggleWalkForward.tick();
 		}
 	}
 	
-	public void afterInputTick(final ClientPlayerEntity player){
-		final MovementInput input = player.movementInput;
+	public void afterInputTick(final LocalPlayer player) {
+		final Input input = player.input;
 		
-		if (MINECRAFT.currentScreen == null && !player.abilities.isFlying){
-			input.jump |= toggleJump.tick();
+		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
-			final boolean boost = Key.isPressed(KEY_SPRINT);
+		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.abilities.setFlySpeed(flightSpeed);
+			if (flightSpeed > 0F) {
+				player.getAbilities().setFlyingSpeed(flightSpeed);
 			}
 			
-			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getRenderViewEntity()){
+			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
 				int direction = 0;
 				
-				if (input.sneaking){
+				if (input.shiftKeyDown) {
 					--direction;
 				}
 				
-				if (input.jump){
+				if (input.jumping) {
 					++direction;
 				}
 				
-				if (direction != 0){
-					player.setMotion(player.getMotion().add(0D, flightSpeed * verticalVelocity * direction, 0D));
+				if (direction != 0) {
+					player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
 				}
 			}
 		}
 		
-		if (cfg().resumeSprintingAfterHittingObstacle){
-			if (wasHittingObstacle != player.collidedHorizontally){
-				if (!wasHittingObstacle){
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
+		if (cfg().resumeSprintingAfterHittingObstacle) {
+			if (wasHittingObstacle != player.horizontalCollision) {
+				if (!wasHittingObstacle) {
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
 				}
-				else if (wasSprintingBeforeHittingObstacle){
+				else if (wasSprintingBeforeHittingObstacle) {
 					wasSprintingBeforeHittingObstacle = false;
 					temporarySprintTimer = 10;
 				}
 				
 				// collision also stops when the player lets go of movement keys
-				wasHittingObstacle = player.collidedHorizontally;
+				wasHittingObstacle = player.horizontalCollision;
 			}
 		}
-		else{
-			wasHittingObstacle = player.collidedHorizontally;
+		else {
+			wasHittingObstacle = player.horizontalCollision;
 			wasSprintingBeforeHittingObstacle = false;
 		}
-		
-		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
-			((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
-		}
 	}
 	
-	public void afterSuperCall(final ClientPlayerEntity player){
-		if (FlightHelper.shouldFlyOnGround(player)){
-			final boolean isSneaking = player.isSneaking();
+	public void afterSuperCall(final LocalPlayer player) {
+		if (FlightHelper.shouldFlyOnGround(player)) {
+			final boolean isSneaking = player.isShiftKeyDown();
 			final boolean isOnGround = player.isOnGround();
 			
-			if (!isSneaking){
+			if (!isSneaking) {
 				wasSneakingBeforeTouchingGround = false;
 			}
-			else if (!isOnGround){
+			else if (!isOnGround) {
 				wasSneakingBeforeTouchingGround = true;
 			}
 			
-			if (!isOnGround){
+			if (!isOnGround) {
 				holdingSneakWhileTouchingGround = false;
 			}
-			else{
+			else {
 				boolean cancelLanding = true;
 				
-				if (!wasSneakingBeforeTouchingGround){
-					if (isSneaking){
+				if (!wasSneakingBeforeTouchingGround) {
+					if (isSneaking) {
 						holdingSneakWhileTouchingGround = true;
 					}
-					else if (holdingSneakWhileTouchingGround){
-						player.abilities.isFlying = false;
-						player.sendPlayerAbilities();
+					else if (holdingSneakWhileTouchingGround) {
+						player.getAbilities().flying = false;
+						player.onUpdateAbilities();
 						cancelLanding = false;
 					}
 				}
 				
-				if (cancelLanding){
+				if (cancelLanding) {
 					player.setOnGround(false);
 				}
 			}
 		}
-		else{
+		else {
 			wasSneakingBeforeTouchingGround = false;
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
-			final MovementInput input = player.movementInput;
+		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
+			final Input input = player.input;
 			
-			if (input.moveForward == 0F && input.moveStrafe == 0F){
-				player.setMotion(player.getMotion().mul(0.0, 1.0, 0.0));
+			if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
+				player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
 			}
 			
-			if (!input.jump && !input.sneaking){
-				player.setMotion(player.getMotion().mul(1.0, 0.0, 1.0));
+			if (!input.jumping && !input.shiftKeyDown) {
+				player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
 			}
 		}
 		
-		if (player.isCreative()){
-			if (Key.wasPressed(cfg().keyToggleFlight)){
-				final boolean isFlying = !player.abilities.isFlying;
+		if (player.isCreative()) {
+			if (cfg().keyToggleFlight.consumeClick()) {
+				final boolean isFlying = !player.getAbilities().flying;
 				
-				player.abilities.isFlying = isFlying;
-				player.sendPlayerAbilities();
+				player.getAbilities().flying = isFlying;
+				player.onUpdateAbilities();
 				
-				if (isFlying){
+				if (isFlying) {
 					temporaryFlyOnGroundTimer = 10;
 				}
 			}
 			
-			if (temporaryFlyOnGroundTimer > 0){
-				if (player.isSneaking()){
+			if (temporaryFlyOnGroundTimer > 0) {
+				if (player.isShiftKeyDown()) {
 					temporaryFlyOnGroundTimer = 0;
 				}
-				else{
+				else {
 					--temporaryFlyOnGroundTimer;
 					player.setOnGround(false);
 				}
 			}
 		}
-		else{
+		else {
 			temporaryFlyOnGroundTimer = 0;
 		}
 		
-		if (!cfg().sneakingMovesCameraSmoothly){
-			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getActiveRenderInfo();
+		if (!cfg().sneakingMovesCameraSmoothly) {
+			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
 			
-			if (camera.getFocusedEntity() == player){
-				camera.setCameraY(player.getEyeHeight());
+			if (camera.getEntity() == player) {
+				((AccessCameraFields)camera).setEyeHeight(player.getEyeHeight());
 			}
 		}
 		
-		if (Key.wasPressed(cfg().keyResetAllToggles)){
+		if (cfg().keyResetAllToggles.consumeClick()) {
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (Key.isPressed(cfg().keyOpenMenu)){
-			MINECRAFT.displayGuiScreen(new BetterControlsScreen(null));
+		if (cfg().keyOpenMenu.isDown()) {
+			MINECRAFT.setScreen(new BetterControlsScreen(null));
 		}
 	}
+	
+	public boolean shouldResetFOV(final LocalPlayer player) {
+		return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
+	}
 }

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

@@ -1,21 +1,9 @@
 package chylex.bettercontrols.player;
 import java.util.function.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;
-	}
-	
+record SprintPressGetter(BooleanSupplier wrapped, BooleanSupplier or) implements BooleanSupplier {
 	@Override
-	public boolean getAsBoolean(){
+	public boolean getAsBoolean() {
 		return wrapped.getAsBoolean() || or.getAsBoolean();
 	}
 }

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

@@ -1,47 +0,0 @@
-package chylex.bettercontrols.util;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.util.InputMappings;
-import net.minecraft.client.util.InputMappings.Input;
-import net.minecraft.util.text.ITextComponent;
-
-public final class Key{
-	private Key(){}
-	
-	public static final Input INVALID = InputMappings.INPUT_INVALID;
-	
-	public static boolean isUnbound(final KeyBinding binding){
-		return binding.isInvalid();
-	}
-	
-	public static boolean isPressed(final KeyBinding binding){
-		return binding.isKeyDown();
-	}
-	
-	public static boolean wasPressed(final KeyBinding binding){
-		return binding.isPressed();
-	}
-	
-	public static ITextComponent getBoundKeyText(final KeyBinding binding){
-		return binding.func_238171_j_();
-	}
-	
-	public static void bind(final KeyBinding binding, final Input input){
-		binding.bind(input);
-	}
-	
-	public static String writeBinding(final KeyBinding binding){
-		return binding.getTranslationKey();
-	}
-	
-	public static void readBinding(final KeyBinding binding, final String serialized){
-		bind(binding, InputMappings.getInputByName(serialized));
-	}
-	
-	public static Input inputFromMouse(final int button){
-		return InputMappings.Type.MOUSE.getOrMakeInput(button);
-	}
-	
-	public static Input inputFromKeyboard(final int keyCode, final int scanCode){
-		return InputMappings.getInputByCode(keyCode, scanCode);
-	}
-}

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

@@ -1,19 +0,0 @@
-package chylex.bettercontrols.util;
-import net.minecraft.util.text.StringTextComponent;
-
-public final class LiteralText extends StringTextComponent{
-	public static LiteralText text(final String text){
-		return new LiteralText(text);
-	}
-	
-	private final String msg;
-	
-	public LiteralText(final String msg){
-		super(msg);
-		this.msg = msg;
-	}
-	
-	public LiteralText copy(){
-		return new LiteralText(msg);
-	}
-}

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

@@ -1,16 +0,0 @@
-package chylex.bettercontrols.util;
-import net.minecraft.client.GameSettings;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-
-public final class Statics{
-	private Statics(){}
-	
-	public static final Minecraft MINECRAFT = Minecraft.getInstance();
-	public static final GameSettings OPTIONS = MINECRAFT.gameSettings;
-	
-	public static final KeyBinding KEY_SPRINT = OPTIONS.keyBindSprint;
-	public static final KeyBinding KEY_SNEAK = OPTIONS.keyBindSneak;
-	public static final KeyBinding KEY_FORWARD = OPTIONS.keyBindForward;
-	public static final KeyBinding KEY_JUMP = OPTIONS.keyBindJump;
-}

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

src/main/resources/pack.mcmeta

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