Remove some utility classes & unify with Fabric codebase

Fixes #6

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+github: chylex
+patreon: chylex
+ko_fi: chylex

.gitignore

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

README.md

@@ -1,3 +1,81 @@
-# Better Controls
+Better Controls
+===============
 
-WIP
+![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 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.
+
+## Features
+
+The mod adds **Toggle Keybinds** for sprinting, sneaking, flying (creative mode), walking, and jumping. You can use modifier keys (`Control` / `Shift` / `Alt`) for each, including for example setting `Control` to Sneak, and `Control + Y` to Toggle Sneak. If you press the original key, the toggle will be canceled (in the previous example, you can Toggle Sneak by pressing `Control + Y`, and stop sneaking by simply tapping Sneak). Note that the vanilla options for toggling sprinting/sneaking are disabled to avoid conflicts with the custom keybinds.
+
+You can also bind a key that resets all **Toggle Keybinds** at once. That makes it easy to for ex. turn on walking, jumping, and sprinting, and then turn all of them off again by pressing one key instead of three.
+
+#### Sprinting
+
+* **Sprint Key Mode** changes how the Sprint key behaves. You can choose between *Tap To Start Sprinting*, *Tap To Start / Stop Sprinting*, and *Hold To Sprint*.
+* **Double Tap 'Walk Forwards' To Sprint** can be turned off to prevent accidental sprinting.
+* **Resume Sprinting After Hitting Obstacle** automatically presses the Sprint key once you are no longer touching any blocks (helpful when climbing hills, especially if the previous option is enabled).
+
+#### Sneaking
+
+* **Move Camera Smoothly** lets you disable the smooth movement when sneaking or unsneaking.
+
+#### Flying
+
+* **Double Tap 'Jump' To Fly** can be turned off to prevent accidental flight toggling.
+* **Disable Flight Inertia** stops you instantly when you stop holding movement keys.
+* **Disable Field Of View Changing** prevents sprinting, potions, and other factors from changing the FOV while flying in creative and spectator mode.
+* **Fly On Ground** lets you fly while touching the ground in creative mode (and also lets you stop flying by tapping Sneak while touching the ground).
+* **Flight Speed Multiplier** (0.25x - 8x) changes how fast you fly in creative and spectator mode.
+* **Vertical Speed Boost** (up to +300%) adds additional vertical speed boost while flying in creative and spectator mode.
+
+Both speed boosts can be configured separately for sprinting, which will be active when the Sprint key is held. Unlike in vanilla, the sprinting flight boost works in all directions.
+
+## Installation
+
+The following mod loaders are supported:
+
+* **[Fabric](https://fabricmc.net/use/)** (note: this mod does not require Fabric API)
+* **[Forge](https://files.minecraftforge.net/)**
+
+After you install the mod loader of your choice, [download the mod](https://www.curseforge.com/minecraft/mc-mods/better-controls/files) and place the `.jar` file into `.minecraft/mods`.
+
+### Minecraft Updates
+
+The mod will attempt to load on new versions of Minecraft (including snapshots) as they come out. I made it that way so that if the mod works on a newly released version of Minecraft without any changes, I can simply mark it as compatible and you don't have to wait for an update.
+
+While this is convenient, there is potential for bugs which can affect server play. If you plan to use the mod on a server, please always use the latest version of the mod, and wait until I either mark the version as compatible with new Minecraft updates, or release a new version of the mod that is marked as compatible.
+
+### 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.
+
+## Screenshot
+
+![Options Menu Screenshot](https://repo.chylex.com/better-controls.png)
+
+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>`.
+
+## 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.
+
+For any larger contributions, please [open an issue](https://github.com/chylex/Better-Controls/issues/new) first before you make a PR.
+
+Please keep in mind that this mod is designed to be very simple and easy to test. Over the years, [Better Sprinting](https://github.com/chylex/Better-Sprinting) has gained a fair amount of bloat that requires extensive testing before every release, and it is the reason why I will not be accepting PRs which add:
+
+* **Translations**
+  * If you want to translate the mod, you are welcome to create a separate version of it. Unfortunately, I've always ran into enough problems with maintaining and testing community mod translations that I will not be adding official support for localization.
+* **Server-side code**
+  * Better Controls will always be exclusively client-side. The server-side support in Better Sprinting is a major time sink which requires testing 3 separate client/server configurations per mod loader, and is the main reason I decided to drop support in favor of this mod.
+* **Singleplayer-only features**
+  * Better Controls intends to add accessibility options that can be used on servers, so features that only work in singleplayer or anything that could be used for cheating on servers will not be accepted.

build.gradle

@@ -1,41 +1,94 @@
-plugins {
+buildscript {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	repositories {
-	id 'maven-publish'
+		maven { url = 'https://files.minecraftforge.net/maven' }
+		maven { url = "https://repo.spongepowered.org/maven" }
+		mavenCentral()
+	}
+	
+	dependencies {
+		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
+	}
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+apply plugin: 'net.minecraftforge.gradle'
-targetCompatibility = JavaVersion.VERSION_1_8
+apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'eclipse'
 
-archivesBaseName = project.archives_base_name
+def mcversion = "1.17.1"
-version = project.mod_version
+def forgeversion = "37.0.75"
-group = project.maven_group
+
+def prefixName = 'displayName = '
+def prefixVersion = 'version = '
+
+def metaLines = file('src/main/resources/META-INF/mods.toml').readLines()
+def metaName = metaLines.find { line -> line.startsWith(prefixName) }.substring(prefixName.length())[1..-2]
+def metaVersion = metaLines.find { line -> line.startsWith(prefixVersion) }.substring(prefixVersion.length())[1..-2]
+
+group = 'chylex.bettercontrols'
+version = metaVersion
+archivesBaseName = metaName.replaceAll('\\s', '')
+
+java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+
+minecraft {
+	mappings channel: 'official', version: '1.17.1'
+	
+	runs {
+		client {
+			workingDirectory file('run')
+			
+			property 'mixin.env.disableRefMap', 'true'
+			arg '-mixin.config=bettercontrols.mixins.json'
+			
+			mods {
+				bettercontrols {
+					source sourceSets.main
+				}
+			}
+		}
+		
+		server {
+			workingDirectory file('run')
+			
+			property 'mixin.env.disableRefMap', 'true'
+			arg '-mixin.config=bettercontrols.mixins.json'
+			
+			mods {
+				bettercontrols {
+					source sourceSets.main
+				}
+			}
+		}
+	}
+}
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	minecraft 'net.minecraftforge:forge:' + mcversion + '-' + forgeversion
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 }
 
-processResources {
-	inputs.property "version", project.version
-	
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
-		expand "version": project.version
-	}
-	
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
-}
-
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
-}
-
-version = 'v' + version
-
 jar {
-	from "LICENSE"
+	archiveName = archivesBaseName + '-' + mcversion + '+v' + version + '.jar'
-	exclude "io/github/prospector/"
+	
+	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')
 }

gradle.properties

@@ -1,15 +1,4 @@
-# Done to increase the memory available to gradle.
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-org.gradle.jvmargs=-Xmx1G
+# This is required to provide enough memory for the Minecraft decompilation process.
-
+org.gradle.jvmargs=-Xmx3G
-# Fabric Properties
+org.gradle.daemon=false
-minecraft_version=1.16.3
-yarn_mappings=1.16.3+build.47
-loader_version=0.10.2+build.210
-
-# Mod Properties
-mod_version=1.1.0
-maven_group=chylex.bettercontrols
-archives_base_name=BetterControls-1.16.2+
-
-# https://fabricmc.net/use
-# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

@@ -40,7 +40,7 @@ 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.
@@ -54,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%
@@ -64,21 +64,6 @@ 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
 
@@ -86,7 +71,7 @@ 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

@@ -1,10 +0,0 @@
-pluginManagement {
-	repositories {
-		jcenter()
-		maven {
-			name = 'Fabric'
-			url = 'https://maven.fabricmc.net/'
-		}
-		gradlePluginPortal()
-	}
-}

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

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

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

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

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

@@ -1,11 +1,10 @@
 package chylex.bettercontrols.config;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
-import net.minecraft.client.options.KeyBinding;
 import java.nio.file.Path;
 
-public final class BetterControlsConfig{
+public final class BetterControlsConfig {
-	public static BetterControlsConfig load(final Path path){
+	public static BetterControlsConfig load(final Path path) {
 		return ConfigSerializer.deserialize(path).setPath(path);
 	}
 	
@@ -20,7 +19,8 @@ public final class BetterControlsConfig{
 	public boolean sneakingMovesCameraSmoothly = true;
 	
 	public final KeyBindingWithModifier keyToggleFlight = new KeyBindingWithModifier("key.bettercontrols.toggle_flight");
-	public SprintMode sprintModeWhileFlying = SprintMode.TAP_TO_START;
+	public boolean doubleTapJumpToToggleFlight = true;
+	public boolean disableFlightInertia = false;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
 	public float flightSpeedMpCreativeDefault = 1F;
@@ -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 KeyBinding[] getAllKeyBindings(){
+	public KeyBindingWithModifier[] getAllKeyBindings() {
-		return new KeyBinding[]{
+		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

@@ -11,7 +11,6 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import net.minecraft.util.math.MathHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import java.io.FileNotFoundException;
@@ -22,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);
@@ -41,7 +40,8 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		Json.setBool(obj, "Sneak.SmoothCamera", cfg.sneakingMovesCameraSmoothly);
 		
 		Json.writeKeyBinding(obj, "Flight.KeyToggle.Creative", cfg.keyToggleFlight);
-		Json.setEnum(obj, "Flight.SprintMode", cfg.sprintModeWhileFlying);
+		Json.setBool(obj, "Flight.DoubleTapJump", cfg.doubleTapJumpToToggleFlight);
+		Json.setBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		Json.setBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		Json.setBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
 		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
@@ -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;
 		}
 		
@@ -79,17 +79,18 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		cfg.sneakingMovesCameraSmoothly = Json.getBool(obj, "Sneak.SmoothCamera", cfg.sneakingMovesCameraSmoothly);
 		
 		Json.readKeyBinding(obj, "Flight.KeyToggle.Creative", cfg.keyToggleFlight);
-		cfg.sprintModeWhileFlying = Json.getEnum(obj, "Flight.SprintMode", cfg.sprintModeWhileFlying, SprintMode.class);
+		cfg.doubleTapJumpToToggleFlight = Json.getBool(obj, "Flight.DoubleTapJump", cfg.doubleTapJumpToToggleFlight);
+		cfg.disableFlightInertia = Json.getBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		cfg.disableChangingFovWhileFlying = Json.getBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		cfg.flyOnGroundInCreative = Json.getBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		cfg.flightSpeedMpCreativeDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault), 0.25F, 8F);
+		cfg.flightSpeedMpCreativeDefault = Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault, 0.25F, 8F);
-		cfg.flightSpeedMpCreativeSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting), 0.25F, 8F);
+		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
-		cfg.flightSpeedMpSpectatorDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault), 0.25F, 8F);
+		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
-		cfg.flightSpeedMpSpectatorSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting), 0.25F, 8F);
+		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
-		cfg.flightVerticalBoostCreativeDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault), 0F, 3F);
+		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
-		cfg.flightVerticalBoostCreativeSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting), 0F, 3F);
+		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
-		cfg.flightVerticalBoostSpectatorDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault), 0F, 3F);
+		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
-		cfg.flightVerticalBoostSpectatorSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting), 0F, 3F);
+		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -99,19 +100,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config){
+	static void serialize(final Path path, final BetterControlsConfig config) {
-		try(final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))){
+		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){
+	static BetterControlsConfig deserialize(final Path path) {
-		try(final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))){
+		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 FileNotFoundException | NoSuchFileException ignored) {
-		}catch(final IOException e){
+		} catch (final IOException e) {
 			logger.error("Error reading BetterControls configuration file!", e);
 		}
 		

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

@@ -2,51 +2,44 @@ package chylex.bettercontrols.config;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import com.google.gson.JsonObject;
-import net.minecraft.client.util.InputUtil;
+import com.mojang.blaze3d.platform.InputConstants;
 
-final class Json{
+final class Json {
-	private Json(){}
+	private Json() {}
 	
-	static void setInt(final JsonObject obj, final String key, final int value){
+	static void setFloat(final JsonObject obj, final String key, final float value) {
-		obj.addProperty(key, Integer.valueOf(value));
-	}
-	
-	static int getInt(final JsonObject obj, final String key, final int defaultValue){
-		return obj.has(key) ? obj.get(key).getAsInt() : defaultValue;
-	}
-	
-	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){
+	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue) {
-		return obj.has(key) ? obj.get(key).getAsFloat() : defaultValue;
+		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){
+	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass) {
-		if (!obj.has(key)){
+		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){
+			for (final T constant : constants) {
-				if (constant.name().equalsIgnoreCase(value)){
+				if (constant.name().equalsIgnoreCase(value)) {
 					return constant;
 				}
 			}
@@ -58,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){
+	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
-		obj.addProperty(key + KEY_SUFFIX, keyBinding.getBoundKeyTranslationKey());
+		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){
+	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
-		if (obj.has(key + KEY_SUFFIX)){
+		if (obj.has(key + KEY_SUFFIX)) {
-			keyBinding.setBoundKey(InputUtil.fromTranslationKey(obj.get(key + KEY_SUFFIX).getAsString()));
+			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

@@ -10,18 +10,18 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import net.minecraft.client.MinecraftClient;
+import com.mojang.blaze3d.platform.InputConstants;
-import net.minecraft.client.gui.Element;
+import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screen.options.GameOptionsScreen;
+import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.screens.OptionsSubScreen;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.util.InputUtil;
+import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.network.chat.Component;
-import net.minecraft.text.LiteralText;
+import net.minecraft.network.chat.TextComponent;
-import net.minecraft.text.Text;
 import org.lwjgl.glfw.GLFW;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,9 +31,14 @@ import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
+import static chylex.bettercontrols.util.Statics.OPTIONS;
 
-public class BetterControlsScreen extends GameOptionsScreen{
+public class BetterControlsScreen extends OptionsSubScreen {
-	public static final LiteralText TITLE = new LiteralText("Better Controls");
+	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;
@@ -41,45 +46,45 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	private static final int ROW_HEIGHT = 22;
 	
 	private final List<Option<SprintMode>> SPRINT_MODE_OPTIONS = Arrays.asList(
-		new Option<>(SprintMode.TAP_TO_START, Text.of("Tap To Start Sprinting")),
+		new Option<>(SprintMode.TAP_TO_START, text("Tap To Start Sprinting")),
-		new Option<>(SprintMode.TAP_TO_TOGGLE, Text.of("Tap To Start / Stop Sprinting")),
+		new Option<>(SprintMode.TAP_TO_TOGGLE, text("Tap To Start / Stop Sprinting")),
-		new Option<>(SprintMode.HOLD, Text.of("Hold To Sprint"))
+		new Option<>(SprintMode.HOLD, text("Hold To Sprint"))
 	);
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<Element> elements){
+	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Sprint"), cfg.keyToggleSprint);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Sprint Key Mode"));
+		generateLeftSideText(y, elements, text("Sprint Key Mode"));
 		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Double Tap 'Walk Forwards' To Sprint"));
+		generateLeftSideText(y, elements, text("Double Tap 'Walk Forwards' To Sprint"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Resume Sprinting After Hitting Obstacle"));
+		generateLeftSideText(y, elements, text("Resume Sprinting After Hitting Obstacle"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value));
 		
 		y += ROW_HEIGHT;
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<Element> elements){
+	private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Sneak"), cfg.keyToggleSneak);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Move Camera Smoothly"));
+		generateLeftSideText(y, elements, text("Move Camera Smoothly"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value));
 		
 		y += ROW_HEIGHT;
@@ -87,79 +92,84 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	}
 	
 	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
-	private int generateFlightOptions(int y, final List<Element> elements){
+	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
-			new Option<>(Float.valueOf(0.25F), Text.of("0.25x")),
+			new Option<>(Float.valueOf(0.25F), text("0.25x")),
-			new Option<>(Float.valueOf(0.50F), Text.of("0.5x")),
+			new Option<>(Float.valueOf(0.50F), text("0.5x")),
-			new Option<>(Float.valueOf(0.75F), Text.of("0.75x")),
+			new Option<>(Float.valueOf(0.75F), text("0.75x")),
-			new Option<>(Float.valueOf(1.00F), Text.of("1x")),
+			new Option<>(Float.valueOf(1.00F), text("1x")),
-			new Option<>(Float.valueOf(1.50F), Text.of("1.5x")),
+			new Option<>(Float.valueOf(1.50F), text("1.5x")),
-			new Option<>(Float.valueOf(2.00F), Text.of("2x")),
+			new Option<>(Float.valueOf(2.00F), text("2x")),
-			new Option<>(Float.valueOf(3.00F), Text.of("3x")),
+			new Option<>(Float.valueOf(3.00F), text("3x")),
-			new Option<>(Float.valueOf(4.00F), Text.of("4x")),
+			new Option<>(Float.valueOf(4.00F), text("4x")),
-			new Option<>(Float.valueOf(5.00F), Text.of("5x")),
+			new Option<>(Float.valueOf(5.00F), text("5x")),
-			new Option<>(Float.valueOf(6.00F), Text.of("6x")),
+			new Option<>(Float.valueOf(6.00F), text("6x")),
-			new Option<>(Float.valueOf(7.00F), Text.of("7x")),
+			new Option<>(Float.valueOf(7.00F), text("7x")),
-			new Option<>(Float.valueOf(8.00F), Text.of("8x"))
+			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
 		final List<Option<Float>> flightVerticalBoostOptions = Arrays.asList(
-			new Option<>(Float.valueOf(0.00F), Text.of("None")),
+			new Option<>(Float.valueOf(0.00F), text("None")),
-			new Option<>(Float.valueOf(0.25F), Text.of("+25%")),
+			new Option<>(Float.valueOf(0.25F), text("+25%")),
-			new Option<>(Float.valueOf(0.50F), Text.of("+50%")),
+			new Option<>(Float.valueOf(0.50F), text("+50%")),
-			new Option<>(Float.valueOf(0.75F), Text.of("+75%")),
+			new Option<>(Float.valueOf(0.75F), text("+75%")),
-			new Option<>(Float.valueOf(1.00F), Text.of("+100%")),
+			new Option<>(Float.valueOf(1.00F), text("+100%")),
-			new Option<>(Float.valueOf(1.50F), Text.of("+150%")),
+			new Option<>(Float.valueOf(1.50F), text("+150%")),
-			new Option<>(Float.valueOf(2.00F), Text.of("+200%")),
+			new Option<>(Float.valueOf(2.00F), text("+200%")),
-			new Option<>(Float.valueOf(2.50F), Text.of("+250%")),
+			new Option<>(Float.valueOf(2.50F), text("+250%")),
-			new Option<>(Float.valueOf(3.00F), Text.of("+300%"))
+			new Option<>(Float.valueOf(3.00F), text("+300%"))
 		);
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Flight (Creative)"), cfg.keyToggleFlight);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Sprint Key Mode While Flying"));
+		generateLeftSideText(y, elements, text("Double Tap 'Jump' To Fly (Creative)"));
-		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintModeWhileFlying, value -> cfg.sprintModeWhileFlying = value));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Disable Field Of View Changing"));
+		generateLeftSideText(y, elements, text("Disable Flight Inertia"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value));
+		
+		y += ROW_HEIGHT;
+		
+		generateLeftSideText(y, elements, text("Disable Field Of View Changing"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Fly On Ground (Creative Mode)"));
+		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;
 		
-		elements.add(new TextWidget(col4(2), y, COL4_W - TEXT_PADDING_RIGHT, Text.of("Creative"), CENTER));
+		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.of("Spectator"), 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.of("Speed Multiplier (Default)"));
+		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));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Speed Multiplier (Sprinting)"));
+		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));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Vertical Speed Boost (Default)"));
+		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));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Vertical Speed Boost (Sprinting)"));
+		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));
 		
@@ -167,22 +177,22 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<Element> elements){
+	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Jump"), cfg.keyToggleJump);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
 		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Reset All Toggles"), cfg.keyResetAllToggles);
+		generateKeyBindingWithModifierOption(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
 		
 		y += ROW_HEIGHT * 4 / 3;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Open Better Controls Menu"), cfg.keyOpenMenu);
+		generateKeyBindingWithModifierOption(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
 		
 		y += ROW_HEIGHT;
 		return y;
@@ -191,15 +201,15 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	// Helpers
 	
 	private static final List<Option<ModifierKey>> MODIFIER_OPTIONS = Arrays.asList(
-		new Option<>(null, Text.of("(No Modifier)")),
+		new Option<>(null, text("(No Modifier)")),
-		new Option<>(ModifierKey.CONTROL, Text.of("Control")),
+		new Option<>(ModifierKey.CONTROL, text("Control")),
-		new Option<>(ModifierKey.SHIFT, Text.of("Shift")),
+		new Option<>(ModifierKey.SHIFT, text("Shift")),
-		new Option<>(ModifierKey.ALT, Text.of("Alt"))
+		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<Element> elements, final Text text, final KeyBindingWithModifier binding){
+	private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
 		final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
-		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
+		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -208,7 +218,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static void generateLeftSideText(final int y, final List<Element> elements, final Text text){
+	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));
 	}
 	
@@ -218,48 +228,48 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(final Screen parentScreen){
+	public BetterControlsScreen(@Nullable final Screen parentScreen) {
-		super(parentScreen, MinecraftClient.getInstance().options, TITLE);
+		super(parentScreen, OPTIONS, TITLE);
 	}
 	
 	@Override
-	public void init(){
+	public void init() {
 		allKeyBindings.clear();
 		
-		final List<Element> elements = new ArrayList<>();
+		final List<GuiEventListener> elements = new ArrayList<>();
 		int y = 0;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Sprinting"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
 		y = generateSprintingOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Sneaking"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sneaking"), CENTER));
 		y = generateSneakingOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Flying"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Flying"), CENTER));
 		y = generateFlightOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Miscellaneous"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		addButton(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, ScreenTexts.DONE, btn -> client.openScreen(parent)));
+		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
-		addChild(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+		addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
-	public void removed(){
+	public void removed() {
 		BetterControlsMod.config.save();
 	}
 	
 	@Override
-	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
+	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
 		renderBackground(matrices);
 		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		drawCenteredText(matrices, textRenderer, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
+		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
 		super.render(matrices, mouseX, mouseY, delta);
 	}
 	
-	private void startEditingKeyBinding(final KeyBindingWidget widget){
+	private void startEditingKeyBinding(final KeyBindingWidget widget) {
-		if (editingKeyBinding != null){
+		if (editingKeyBinding != null) {
 			editingKeyBinding.stopEditing();
 		}
 		
@@ -267,40 +277,40 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	}
 	
 	@Override
-	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
+	public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
-		if (editingKeyBinding != null){
+		if (editingKeyBinding != null) {
-			editingKeyBinding.bindAndStopEditing(InputUtil.Type.MOUSE.createFromCode(button));
+			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){
+	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
-		if (editingKeyBinding != null){
+		if (editingKeyBinding != null) {
-			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
+			if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-				editingKeyBinding.bindAndStopEditing(InputUtil.UNKNOWN_KEY);
+				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
 			}
-			else{
+			else {
-				editingKeyBinding.bindAndStopEditing(InputUtil.fromKeyCode(keyCode, scanCode));
+				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.updateKeysByCode();
+		KeyMapping.resetMapping();
 		
-		for(final KeyBindingWidget widget : allKeyBindings){
+		for (final KeyBindingWidget widget : allKeyBindings) {
 			widget.updateKeyBindingText();
 		}
 	}

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

@@ -1,124 +1,122 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import net.minecraft.client.MinecraftClient;
+import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.Drawable;
+import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.narration.NarratableEntry;
 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 ElementListWidget<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 COL3_W = (ROW_WIDTH / 3) - ROW_PADDING;
 	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
-	public static final int COL6_W = (ROW_WIDTH / 6) - ROW_PADDING;
 	
-	public static int col2(final int column){
+	public static int col2(final int column) {
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col3(final int column){
+	public static int col4(final int column) {
-		return (column * ROW_WIDTH) / 3;
-	}
-	
-	public static int col4(final int column){
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	public static int col6(final int column){
+	private static Offset getElementOffset(final GuiEventListener element) {
-		return (column * ROW_WIDTH) / 6;
+		if (element instanceof OptionWidget) {
+			return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
 		}
-	
+		else if (element instanceof AbstractWidget) {
-	private static Offset getElementOffset(final Element element){
+			return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
-		if (element instanceof Widget){
-			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
 		}
-		else if (element instanceof AbstractButtonWidget){
+		else {
-			return new Offset(((AbstractButtonWidget)element).x, ((AbstractButtonWidget)element).y);
-		}
-		else{
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface Widget extends Element, Drawable{
+	public interface OptionWidget extends GuiEventListener, Widget {
 		int getX();
 		int getY();
 		void setX(int x);
 		void setY(int y);
 	}
 	
-	private static final class Offset{
+	private static final class Offset {
 		public final int x;
 		public final int y;
 		
-		private Offset(final int x, final int y){
+		private Offset(final int x, final int y) {
 			this.x = x;
 			this.y = y;
 		}
 	}
 	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<Element> widgets, final int innerHeight){
+	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
-		super(MinecraftClient.getInstance(), width, height, top, bottom, innerHeight);
+		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	protected int getRowLeft(){
+	public int getRowLeft() {
 		return super.getRowLeft() - ROW_PADDING;
 	}
 	
 	@Override
-	public int getRowWidth(){
+	public int getRowWidth() {
 		return ROW_WIDTH;
 	}
 	
 	@Override
-	protected int getScrollbarPositionX(){
+	protected int getScrollbarPosition() {
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	protected static final class Entry extends ElementListWidget.Entry<Entry>{
+	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
-		private final List<Element> elements;
+		private final List<GuiEventListener> elements;
-		private final Map<Element, Offset> offsets;
+		private final List<NarratableEntry> narratables;
+		private final Map<GuiEventListener, Offset> offsets;
 		
-		public Entry(final List<Element> 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 Element> children(){
+		public 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){
+		public List<? extends NarratableEntry> narratables() {
-			for(final Element element : elements){
+			return Collections.unmodifiableList(narratables);
+		}
+		
+		@Override
+		public void render(final PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
+			for (final GuiEventListener element : elements) {
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof AbstractButtonWidget){
+				if (element instanceof AbstractWidget) {
-					final AbstractButtonWidget button = (AbstractButtonWidget)element;
+					final AbstractWidget button = (AbstractWidget)element;
 					button.x = x + offset.x;
 					button.y = y + offset.y;
 				}
-				else if (element instanceof Widget){
+				else if (element instanceof OptionWidget) {
-					final Widget widget = (Widget)element;
+					final OptionWidget widget = (OptionWidget)element;
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Drawable){
+				if (element instanceof Widget) {
-					((Drawable)element).render(matrices, mouseX, mouseY, tickDelta);
+					((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

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

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

@@ -1,27 +1,27 @@
 package chylex.bettercontrols.gui.elements;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.network.chat.CommonComponents;
 
-public final class BooleanValueWidget extends ButtonWidget{
+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){
+	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 ? ScreenTexts.ON : ScreenTexts.OFF, ignore -> {});
+		super(x, y, width, height, currentValue ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
 		this.value = currentValue;
 		this.onChanged = onChanged;
 	}
 	
-	public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged){
+	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(){
+	public void onPress() {
 		super.onPress();
 		value = !value;
-		setMessage(value ? ScreenTexts.ON : ScreenTexts.OFF);
+		setMessage(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
 		onChanged.accept(value);
 	}
 }

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

@@ -1,29 +1,29 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.components.Button;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class CycleButtonWidget<T> extends ButtonWidget{
+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){
+	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){
+	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(){
+	public void onPress() {
 		int nextIndex = options.indexOf(Option.find(options, selectedValue)) + 1;
 		
-		if (nextIndex >= options.size()){
+		if (nextIndex >= options.size()) {
 			nextIndex = 0;
 		}
 		

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

@@ -1,39 +1,39 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.Mth;
 import java.util.List;
 import java.util.function.Consumer;
 
-public final class DiscreteValueSliderWidget<T> extends SliderWidget{
+public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 	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){
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
 		super(x, y, width, height, Option.find(options, selectedValue).getText(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
 	}
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
 		this(x, y, width, 20, options, selectedValue, onChanged);
 	}
 	
-	public Option<T> getSelectedOption(){
+	public Option<T> getSelectedOption() {
-		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, value)));
+		return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
 	}
 	
 	@Override
-	protected void updateMessage(){
+	protected void updateMessage() {
 		setMessage(getSelectedOption().getText());
 	}
 	
 	@Override
-	protected void applyValue(){
+	protected void applyValue() {
 		final T newSelectedValue = getSelectedOption().getValue();
 		
-		if (selectedValue != newSelectedValue){
+		if (selectedValue != newSelectedValue) {
 			selectedValue = newSelectedValue;
 			onChanged.accept(newSelectedValue);
 		}

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

@@ -1,89 +1,90 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.MinecraftClient;
+import com.mojang.blaze3d.platform.InputConstants;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.ChatFormatting;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.gui.components.AbstractButton;
-import net.minecraft.client.util.InputUtil;
+import net.minecraft.client.gui.components.Button;
-import net.minecraft.text.LiteralText;
+import net.minecraft.network.chat.Component;
-import net.minecraft.text.MutableText;
+import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.TextComponent;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.network.chat.TranslatableComponent;
-import net.minecraft.util.Formatting;
 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 ButtonWidget{
+public final class KeyBindingWidget extends Button {
-	private final KeyBinding binding;
+	private final KeyMapping binding;
-	private final Text bindingName;
+	private final Component bindingName;
 	
-	private final List<AbstractButtonWidget> linkedButtons = new ArrayList<>(1);
+	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){
+	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, LiteralText.EMPTY, btn -> {});
+		super(x, y, width, height, TextComponent.EMPTY, btn -> {});
 		this.binding = binding;
-		this.bindingName = new TranslatableText(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){
+	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, binding, onEditingStarted);
+		this(x, y, width, 20, bindingName, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButtonWidget button){
+	public void linkButtonToBoundState(final AbstractButton button) {
 		linkedButtons.add(button);
 		button.active = !binding.isUnbound();
 	}
 	
 	@Override
-	protected MutableText getNarrationMessage(){
+	protected MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableText("narrator.controls.unbound", bindingName) : new TranslatableText("narrator.controls.bound", bindingName, super.getNarrationMessage());
+		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 InputUtil.Key key){
+	public void bindAndStopEditing(final InputConstants.Key key) {
-		binding.setBoundKey(key);
+		binding.setKey(key);
 		stopEditing();
 		
-		for(final AbstractButtonWidget button : linkedButtons){
+		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 (!binding.isUnbound()){
+		if (!binding.isUnbound()) {
-			for(final KeyBinding other : MinecraftClient.getInstance().options.keysAll){
+			for (final KeyMapping other : OPTIONS.keyMappings) {
-				if (binding != other && binding.equals(other)){
+				if (binding != other && binding.equals(other)) {
 					hasConflict = true;
+					break;
 				}
 			}
 		}
 		
-		if (isEditing){
+		if (isEditing) {
-			setMessage((new LiteralText("> ")).append(binding.getBoundKeyLocalizedText().shallowCopy().formatted(Formatting.YELLOW)).append(" <").formatted(Formatting.YELLOW));
+			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
 		}
-		else if (hasConflict){
+		else if (hasConflict) {
-			setMessage(binding.getBoundKeyLocalizedText().shallowCopy().formatted(Formatting.RED));
+			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
 		}
-		else{
+		else {
-			setMessage(binding.isUnbound() ? Text.of("(No Binding)") : binding.getBoundKeyLocalizedText());
+			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
 		}
 	}
 }

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

@@ -1,26 +1,26 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
 import java.util.List;
 import java.util.Objects;
 
-public final class Option<T>{
+public final class Option<T> {
 	private final T value;
-	private final Text text;
+	private final Component text;
 	
-	public Option(final T value, final Text text){
+	public Option(final T value, final Component text) {
 		this.value = value;
 		this.text = text;
 	}
 	
-	public T getValue(){
+	public T getValue() {
 		return value;
 	}
 	
-	public Text getText(){
+	public Component getText() {
 		return text;
 	}
 	
-	public static <T> Option<T> find(final List<Option<T>> options, final T value){
+	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));
 	}
 }

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

@@ -1,25 +1,25 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.gui.OptionListWidget.Widget;
+import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
-import net.minecraft.client.MinecraftClient;
+import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.network.chat.Component;
-import net.minecraft.text.OrderedText;
+import net.minecraft.util.FormattedCharSequence;
-import net.minecraft.text.Text;
 import java.util.List;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class TextWidget extends DrawableHelper implements Widget{
+public final class TextWidget extends GuiComponent implements OptionWidget {
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
-	private final Text 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 Text 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 +28,46 @@ public final class TextWidget extends DrawableHelper implements Widget{
 		this.align = align;
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Text 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 Text 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){
+	public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+		final Font textRenderer = MINECRAFT.font;
-		final List<OrderedText> lines = textRenderer.wrapLines(text, width);
+		final List<FormattedCharSequence> lines = textRenderer.split(text, width);
-		final int lineHeight = textRenderer.fontHeight + 1;
+		final int lineHeight = textRenderer.lineHeight + 1;
 		
-		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::getWidth).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++){
+		for (int i = 0; i < lines.size(); i++) {
-			final OrderedText line = lines.get(i);
+			final FormattedCharSequence line = lines.get(i);
-			textRenderer.drawWithShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

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

@@ -1,39 +1,40 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.options.KeyBinding;
+import com.mojang.blaze3d.platform.InputConstants.Type;
-import net.minecraft.client.util.InputUtil.Type;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.text.Text;
+import net.minecraft.network.chat.Component;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.network.chat.TranslatableComponent;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;
 
-public class KeyBindingWithModifier extends KeyBinding{
+public class KeyBindingWithModifier extends KeyMapping {
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final Text text){
+	public static boolean checkCategoryMatches(final Component text) {
-		return text instanceof TranslatableText && CATEGORY.equals(((TranslatableText)text).getKey());
+		return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)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(final @Nullable ModifierKey modifier){
+	public void setModifier(@Nullable final ModifierKey modifier) {
 		this.modifier = modifier;
 	}
 	
-	public @Nullable ModifierKey getModifier(){
+	@Nullable
+	public ModifierKey getModifier() {
 		return modifier;
 	}
 	
 	@Override
-	public boolean isPressed(){
+	public boolean isDown() {
-		return super.isPressed() && (modifier == null || modifier.isPressed());
+		return super.isDown() && (modifier == null || modifier.isPressed());
 	}
 	
 	@Override
-	public boolean wasPressed(){
+	public boolean consumeClick() {
-		return super.wasPressed() && (modifier == null || modifier.isPressed());
+		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{
+public enum ModifierKey {
-	CONTROL(0){
+	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){
+	public static ModifierKey getById(final int id) {
-		switch(id){
+		return switch (id) {
-			case 0: return CONTROL;
+			case 0 -> CONTROL;
-			case 1: return SHIFT;
+			case 1 -> SHIFT;
-			case 2: return ALT;
+			case 2 -> ALT;
-			default: return null;
+			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,9 +1,9 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.KeyMapping;
 
-public class ToggleTracker{
+public class ToggleTracker {
-	protected final KeyBinding bindingToggle;
+	protected final KeyMapping bindingToggle;
-	protected final KeyBinding bindingReset;
+	protected final KeyMapping bindingReset;
 	
 	protected boolean isToggled;
 	
@@ -11,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;
 	}
@@ -40,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 (bindingToggle.isPressed()){
+		if (bindingToggle.isDown()) {
-			if (!waitForRelease){
+			if (!waitForRelease) {
-				if (skipNextToggle){
+				if (skipNextToggle) {
 					skipNextToggle = false;
 				}
-				else{
+				else {
 					isToggled = !isToggled;
 				}
 				
@@ -56,32 +56,32 @@ public class ToggleTracker{
 				hasToggledWhileHoldingReset = isHoldingReset;
 			}
 		}
-		else{
+		else {
 			waitForRelease = false;
 		}
 		
-		if (isToggled){
+		if (isToggled) {
-			if (hasToggledWhileHoldingReset && !isHoldingReset){
+			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(){
+	protected boolean isResetKeyPressed() {
-		return bindingReset.isPressed();
+		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.options.KeyBinding;
+import net.minecraft.client.KeyMapping;
 import java.util.HashSet;
 import java.util.Set;
 
-public final class ToggleTrackerForStickyKey extends ToggleTracker{
+public final class ToggleTrackerForStickyKey extends ToggleTracker {
-	private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
+	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.render.Camera;
+import net.minecraft.client.Camera;
-import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Camera.class)
-public interface AccessCameraFields{
+public interface AccessCameraFields {
-	@Accessor
+	@Accessor("eyeHeight")
-	Entity getFocusedEntity();
-	
-	@Accessor
 	void setCameraY(float y);
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,19 +1,19 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.options.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)
+@Mixin(KeyMapping.class)
-public interface AccessKeyBindingFields{
+public interface AccessKeyBindingFields {
-	@Accessor
+	@Accessor("CATEGORY_SORT_ORDER")
-	static Map<String, Integer> getCategoryOrderMap(){
+	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/AccessOptionFields.java

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

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

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

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

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

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

@@ -1,16 +1,16 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.options.StickyKeyBinding;
+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(StickyKeyBinding.class)
+@Mixin(ToggleKeyMapping.class)
-public interface AccessStickyKeyBindingStateGetter{
+public interface AccessStickyKeyBindingStateGetter {
-	@Accessor
+	@Accessor("needsToggle")
 	BooleanSupplier getToggleGetter();
 	
-	@Accessor
+	@Accessor("needsToggle")
 	@Mutable
 	void setToggleGetter(final BooleanSupplier toggleGetter);
 }

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

@@ -0,0 +1,27 @@
+package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.player.PlayerTicker;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.player.LocalPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;
+
+@SuppressWarnings("MethodMayBeStatic")
+@Mixin(AbstractClientPlayer.class)
+public abstract class HookClientPlayerFOV {
+	@Redirect(
+		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.player;
+		return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
+	}
+}

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

@@ -1,22 +1,23 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.player.Input;
-import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.player.KeyboardInput;
-import net.minecraft.client.network.ClientPlayerEntity;
+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(KeyboardInput.class)
-public abstract class HookClientPlayerInputTick{
+public abstract class HookClientPlayerInputTick {
-	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/KeyboardInput;pressingForward:Z", ordinal = 0, shift = AFTER))
+	@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){
+	private void afterInputTick(final CallbackInfo info) {
-		final KeyboardInput input = (KeyboardInput)(Object)this;
+		final Input input = (Input)(Object)this;
-		final ClientPlayerEntity player = MinecraftClient.getInstance().player;
+		final LocalPlayer player = MINECRAFT.player;
 		
-		if (player != null){
+		if (player != null) {
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);
 		}
 	}

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

@@ -1,36 +1,36 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.world.ClientWorld;
+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)
+@Mixin(LocalPlayer.class)
-public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{
+public abstract class HookClientPlayerTick extends AbstractClientPlayer {
-	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile){
+	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
 		super(world, profile);
 	}
 	
-	@Inject(method = "tickMovement()V", at = @At("HEAD"))
+	@Inject(method = "aiStep()V", at = @At("HEAD"))
-	private void atHead(final CallbackInfo info){
+	private void atHead(final CallbackInfo info) {
-		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
+		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	@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){
+	private void afterInputTick(final CallbackInfo info) {
-		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
+		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).afterInputTick(player);
 	}
 	
-	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;tickMovement()V", ordinal = 0, shift = AFTER))
+	@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){
+	private void afterSuperCall(final CallbackInfo info) {
-		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
+		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).afterSuperCall(player);
 	}
 }

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

@@ -1,33 +1,33 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.options.ControlsListWidget;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screen.options.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screens.controls.ControlList;
-import net.minecraft.client.gui.screen.options.ControlsListWidget.Entry;
+import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
-import net.minecraft.client.gui.screen.options.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.gui.screens.controls.ControlList.Entry;
-import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
+import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
-import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.gui.screens.controls.ControlsScreen;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ControlsListWidget.class)
+@Mixin(ControlList.class)
-public abstract class HookControlsListWidget extends ElementListWidget<Entry>{
+public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(final MinecraftClient client, final int width, final int height, final int top, final int bottom, final int itemHeight){
+	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
 		super(client, width, height, top, bottom, itemHeight);
 	}
 	
 	@Inject(method = "<init>", at = @At("TAIL"))
-	public void init(final ControlsOptionsScreen parent, final MinecraftClient client, final CallbackInfo ci){
+	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
 		children().removeIf(it -> {
-			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())){
+			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())) {
 				return true;
 			}
 			
-			if (it instanceof KeyBindingEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())){
+			if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
 				return true;
 			}
 			

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

@@ -1,34 +1,30 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
-import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.options.KeyBinding;
+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(GameOptions.class)
+@Mixin(Options.class)
-public abstract class HookLoadGameOptions{
+public abstract class HookLoadGameOptions {
 	private boolean hasLoaded = false;
 	
-	@Mutable
-	@Final
 	@Shadow
-	public KeyBinding[] keysAll;
+	public KeyMapping[] keyMappings;
 	
 	@Inject(method = "load()V", at = @At("HEAD"))
-	private void load(final CallbackInfo info){
+	private void load(final CallbackInfo info) {
-		if (hasLoaded){
+		if (hasLoaded) {
 			return;
 		}
 		
 		hasLoaded = true;
-		keysAll = ArrayUtils.addAll(keysAll, BetterControlsMod.config.getAllKeyBindings());
+		keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
 		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }

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

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

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

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

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

@@ -1,7 +1,7 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.KeyMapping;
-import net.minecraft.client.options.StickyKeyBinding;
+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(StickyKeyBinding.class)
+@Mixin(ToggleKeyMapping.class)
-public abstract class HookStickyKeyBindingState extends KeyBinding{
+public abstract class HookStickyKeyBindingState extends KeyMapping {
 	@Shadow
 	@Final
-	private BooleanSupplier toggleGetter;
+	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)
+	@Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
-	public void setPressed(final boolean pressed, final CallbackInfo info){
+	public void setPressed(final boolean pressed, final CallbackInfo info) {
-		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){
+		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
 			((AccessKeyBindingFields)this).setPressedField(pressed);
 			info.cancel();
 		}
 	}
 	
 	@Override
-	public boolean isPressed(){
+	public boolean isDown() {
-		return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.getAsBoolean());
+		return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
 	}
 }

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

@@ -1,67 +1,66 @@
 package chylex.bettercontrols.player;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.player.LocalPlayer;
 
-final class FlightHelper{
+final class FlightHelper {
-	private FlightHelper(){}
+	private FlightHelper() {}
 	
 	private static final float BASE_FLIGHT_SPEED = 0.05F;
-	private static final float BASE_FLIGHT_SPEED_SPRINT_MP_INV = 0.5F; // sprinting doubles speed in PlayerEntity.travel
 	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
-	private static BetterControlsConfig cfg(){
+	private static BetterControlsConfig cfg() {
 		return BetterControlsMod.config;
 	}
 	
-	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
+	static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
-		return player.abilities.flying && (player.isCreative() || player.isSpectator());
+		return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
 	}
 	
-	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
+	static boolean shouldFlyOnGround(final LocalPlayer player) {
-		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.flying;
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
 	}
 	
-	static float getFlightSpeed(final ClientPlayerEntity player){
+	static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
-		if (player.isCreative()){
+		if (player.isCreative()) {
-			if (player.isSprinting()){
+			if (boost) {
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting * BASE_FLIGHT_SPEED_SPRINT_MP_INV;
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
 			}
-			else{
+			else {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()){
+		else if (player.isSpectator()) {
-			if (player.isSprinting()){
+			if (boost) {
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting * BASE_FLIGHT_SPEED_SPRINT_MP_INV;
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
 			}
-			else{
+			else {
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
 			}
 		}
-		else{
+		else {
 			return 0F;
 		}
 	}
 	
-	static float getExtraVerticalVelocity(final ClientPlayerEntity player){
+	static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting) {
-		if (player.isCreative()){
+		if (player.isCreative()) {
-			if (player.isSprinting()){
+			if (isSprinting) {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
 			}
-			else{
+			else {
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()){
+		else if (player.isSpectator()) {
-			if (player.isSprinting()){
+			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

@@ -7,48 +7,48 @@ 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 net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Camera;
-import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.player.Input;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.options.GameOptions;
-import net.minecraft.util.math.MathHelper;
 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 PlayerTicker ticker = new PlayerTicker(null);
 	
-	public static PlayerTicker get(final ClientPlayerEntity player){
+	public static PlayerTicker get(final LocalPlayer player) {
-		if (ticker.ref.get() != player){
+		if (ticker.ref.get() != player) {
 			ticker = new PlayerTicker(player);
 		}
 		
 		return ticker;
 	}
 	
-	private static MinecraftClient mc(){
+	private static BetterControlsConfig cfg() {
-		return MinecraftClient.getInstance();
-	}
-	
-	private static BetterControlsConfig cfg(){
 		return BetterControlsMod.config;
 	}
 	
-	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();
 	}
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, mc().options.keySprint, toggled -> mc().options.sprintToggled = toggled);
+	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, mc().options.keySneak, toggled -> mc().options.sneakToggled = toggled);
+	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
-	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, mc().options.keyForward);
+	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
-	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, mc().options.keyJump);
+	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
 	
 	private boolean waitingForSprintKeyRelease = false;
 	private boolean stopSprintingAfterReleasingSprintKey = false;
@@ -61,84 +61,79 @@ public final class PlayerTicker{
 	private boolean holdingSneakWhileTouchingGround = false;
 	private int temporaryFlyOnGroundTimer = 0;
 	
-	private void setup(){
+	private void setup() {
-		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)mc().options.keySprint;
+		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
 		BooleanSupplier getter = sprint.getToggleGetter();
 		
-		if (getter instanceof SprintPressGetter){
+		if (getter instanceof SprintPressGetter) {
 			getter = ((SprintPressGetter)getter).getWrapped();
 		}
 		
 		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(final ClientPlayerEntity player){
+	public void atHead(final LocalPlayer player) {
-		if (FlightHelper.shouldFlyOnGround(player)){
+		if (FlightHelper.shouldFlyOnGround(player)) {
 			player.setOnGround(false);
 		}
 		
-		if (!cfg().doubleTapForwardToSprint){
+		if (!cfg().doubleTapForwardToSprint) {
 			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
 		}
 		
-		final SprintMode sprintMode;
+		if (!cfg().doubleTapJumpToToggleFlight) {
-		
+			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
-			sprintMode = cfg().sprintModeWhileFlying;
-		}
-		else{
-			sprintMode = cfg().sprintMode;
 		}
 		
-		final GameOptions opts = mc().options;
+		final SprintMode sprintMode = cfg().sprintMode;
-		final boolean wasSprintToggled = opts.sprintToggled;
+		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 (!opts.keySprint.isPressed() && opts.keyForward.isPressed()){
+			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){
+		else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
-			if (opts.keySprint.isPressed()){
+			if (KEY_SPRINT.isDown()) {
-				if (!waitingForSprintKeyRelease){
+				if (!waitingForSprintKeyRelease) {
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
 				}
 			}
-			else{
+			else {
-				if (player.isSprinting() && !waitingForSprintKeyRelease){
+				if (player.isSprinting() && !waitingForSprintKeyRelease) {
 					stopSprintingAfterReleasingSprintKey = false;
 				}
 				
 				waitingForSprintKeyRelease = false;
 			}
 		}
-		else if (sprintMode == SprintMode.HOLD){
+		else if (sprintMode == SprintMode.HOLD) {
-			if (opts.keySprint.isPressed()){
+			if (KEY_SPRINT.isDown()) {
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !opts.keySprint.isPressed()){
+		if (stopSprintingAfterReleasingSprintKey && !KEY_SPRINT.isDown()) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -147,49 +142,51 @@ public final class PlayerTicker{
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final KeyboardInput input){
+	public void afterInputAssignsPressingForward(final Input input) {
-		if (mc().currentScreen == null){
+		if (MINECRAFT.screen == null) {
-			input.pressingForward |= toggleWalkForward.tick();
+			input.up |= toggleWalkForward.tick();
 		}
 	}
 	
-	public void afterInputTick(final ClientPlayerEntity player){
+	public void afterInputTick(final LocalPlayer player) {
-		if (mc().currentScreen == null && !player.abilities.flying){
+		final Input input = player.input;
-			player.input.jumping |= toggleJump.tick();
+		
+		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
+		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			final float flightSpeed = FlightHelper.getFlightSpeed(player);
+			final boolean boost = KEY_SPRINT.isDown();
+			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
+			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
 			
-			if (flightSpeed > 0F){
+			if (flightSpeed > 0F) {
-				player.abilities.setFlySpeed(flightSpeed);
+				player.getAbilities().setFlyingSpeed(flightSpeed);
 			}
 			
-			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player);
+			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
-			
-			if (!MathHelper.approximatelyEquals(verticalVelocity, 0F) && player == mc().getCameraEntity()){
 				int direction = 0;
 				
-				if (player.input.sneaking){
+				if (input.shiftKeyDown) {
 					--direction;
 				}
 				
-				if (player.input.jumping){
+				if (input.jumping) {
 					++direction;
 				}
 				
-				if (direction != 0){
+				if (direction != 0) {
-					player.setVelocity(player.getVelocity().add(0D, flightSpeed * verticalVelocity * direction, 0D));
+					player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
 				}
 			}
 		}
 		
-		if (cfg().resumeSprintingAfterHittingObstacle){
+		if (cfg().resumeSprintingAfterHittingObstacle) {
-			if (wasHittingObstacle != player.horizontalCollision){
+			if (wasHittingObstacle != player.horizontalCollision) {
-				if (!wasHittingObstacle){
+				if (!wasHittingObstacle) {
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || mc().options.keySprint.isPressed();
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
 				}
-				else if (wasSprintingBeforeHittingObstacle){
+				else if (wasSprintingBeforeHittingObstacle) {
 					wasSprintingBeforeHittingObstacle = false;
 					temporarySprintTimer = 10;
 				}
@@ -198,98 +195,110 @@ public final class PlayerTicker{
 				wasHittingObstacle = player.horizontalCollision;
 			}
 		}
-		else{
+		else {
 			wasHittingObstacle = player.horizontalCollision;
 			wasSprintingBeforeHittingObstacle = false;
 		}
-		
-		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
-			((AccessGameRendererFields)mc().gameRenderer).setMovementFovMultiplier(1F);
-		}
 	}
 	
-	public void afterSuperCall(final ClientPlayerEntity player){
+	public void afterSuperCall(final LocalPlayer player) {
-		if (FlightHelper.shouldFlyOnGround(player)){
+		if (FlightHelper.shouldFlyOnGround(player)) {
-			final boolean isSneaking = player.isSneaking();
+			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 (!wasSneakingBeforeTouchingGround) {
-					if (isSneaking){
+					if (isSneaking) {
 						holdingSneakWhileTouchingGround = true;
 					}
-					else if (holdingSneakWhileTouchingGround){
+					else if (holdingSneakWhileTouchingGround) {
-						player.abilities.flying = false;
+						player.getAbilities().flying = false;
-						player.sendAbilitiesUpdate();
+						player.onUpdateAbilities();
 						cancelLanding = false;
 					}
 				}
 				
-				if (cancelLanding){
+				if (cancelLanding) {
 					player.setOnGround(false);
 				}
 			}
 		}
-		else{
+		else {
 			wasSneakingBeforeTouchingGround = false;
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (player.isCreative()){
+		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
-			if (cfg().keyToggleFlight.wasPressed()){
+			final Input input = player.input;
-				final boolean isFlying = !player.abilities.flying;
 			
-				player.abilities.flying = isFlying;
+			if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
-				player.sendAbilitiesUpdate();
+				player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
+			}
 			
-				if (isFlying){
+			if (!input.jumping && !input.shiftKeyDown) {
+				player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
+			}
+		}
+		
+		if (player.isCreative()) {
+			if (cfg().keyToggleFlight.consumeClick()) {
+				final boolean isFlying = !player.getAbilities().flying;
+				
+				player.getAbilities().flying = isFlying;
+				player.onUpdateAbilities();
+				
+				if (isFlying) {
 					temporaryFlyOnGroundTimer = 10;
 				}
 			}
 			
-			if (temporaryFlyOnGroundTimer > 0){
+			if (temporaryFlyOnGroundTimer > 0) {
-				if (player.isSneaking()){
+				if (player.isShiftKeyDown()) {
 					temporaryFlyOnGroundTimer = 0;
 				}
-				else{
+				else {
 					--temporaryFlyOnGroundTimer;
 					player.setOnGround(false);
 				}
 			}
 		}
-		else{
+		else {
 			temporaryFlyOnGroundTimer = 0;
 		}
 		
-		if (!cfg().sneakingMovesCameraSmoothly){
+		if (!cfg().sneakingMovesCameraSmoothly) {
-			final AccessCameraFields camera = (AccessCameraFields)mc().gameRenderer.getCamera();
+			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
 			
-			if (camera.getFocusedEntity() == player){
+			if (camera.getEntity() == player) {
-				camera.setCameraY(player.getStandingEyeHeight());
+				((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
 			}
 		}
 		
-		if (cfg().keyResetAllToggles.wasPressed()){
+		if (cfg().keyResetAllToggles.consumeClick()) {
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (cfg().keyOpenMenu.isPressed()){
+		if (cfg().keyOpenMenu.isDown()) {
-			mc().openScreen(new BetterControlsScreen(null));
+			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,21 @@
 package chylex.bettercontrols.player;
 import java.util.function.BooleanSupplier;
 
-final class SprintPressGetter implements BooleanSupplier{
+final class SprintPressGetter implements BooleanSupplier {
 	private final BooleanSupplier wrapped;
 	private final BooleanSupplier or;
 	
-	public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or){
+	public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or) {
 		this.wrapped = wrapped;
 		this.or = or;
 	}
 	
-	public BooleanSupplier getWrapped(){
+	public BooleanSupplier getWrapped() {
 		return wrapped;
 	}
 	
 	@Override
-	public boolean getAsBoolean(){
+	public boolean getAsBoolean() {
 		return wrapped.getAsBoolean() || or.getAsBoolean();
 	}
 }

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

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

src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java

@@ -1,8 +0,0 @@
-package io.github.prospector.modmenu.api;
-import net.minecraft.client.gui.screen.Screen;
-
-@SuppressWarnings("unused")
-@FunctionalInterface
-public interface ConfigScreenFactory<S extends Screen>{
-	S create(Screen var1);
-}

src/main/java/io/github/prospector/modmenu/api/ModMenuApi.java

@@ -1,14 +0,0 @@
-package io.github.prospector.modmenu.api;
-import com.google.common.collect.ImmutableMap;
-import java.util.Map;
-
-@SuppressWarnings("unused")
-public interface ModMenuApi{
-	default ConfigScreenFactory<?> getModConfigScreenFactory(){
-		return ignore -> null;
-	}
-	
-	default Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories(){
-		return ImmutableMap.of();
-	}
-}

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

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

src/main/resources/bettercontrols.mixins.json

@@ -2,21 +2,25 @@
   "required": true,
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
-  "mixins": [
+  "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
     "AccessControlsListCategory",
     "AccessControlsListKeyBinding",
-    "AccessGameRendererFields",
+    "AccessCycleButtonFields",
     "AccessKeyBindingFields",
+    "AccessOptionFields",
+    "AccessPlayerFields",
     "AccessScreenButtons",
     "AccessStickyKeyBindingStateGetter",
+    "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
     "HookControlsListWidget",
     "HookLoadGameOptions",
     "HookOpenScreen",
+    "HookPlayerFlightSpeed",
     "HookStickyKeyBindingState"
   ],
   "injectors": {

src/main/resources/fabric.mod.json

@@ -1,33 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "bettercontrols",
-  "version": "${version}",
-  
-  "name": "Better Controls",
-  "description": "Adds many powerful key bindings and options to control your movement.\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.",
-  "icon": "assets/bettercontrols/icon.png",
-  "license": "MPL-2.0",
-  
-  "authors": [ "chylex" ],
-  "contact": {
-    "homepage": "",
-    "sources": "https://github.com/chylex/Better-Controls",
-    "issues": "https://github.com/chylex/Better-Controls/issues"
-  },
-  
-  "environment": "client",
-  "entrypoints": {
-    "client": [ "chylex.bettercontrols.BetterControlsMod" ],
-    "modmenu": [ "chylex.bettercontrols.compatibility.ModMenuSupport" ]
-  },
-  
-  "mixins": [{
-    "config": "bettercontrols.mixins.json",
-    "environment": "client"
-  }],
-  
-  "depends": {
-    "fabricloader": ">=0.7.4",
-    "minecraft": ">=1.16.2"
-  }
-}

src/main/resources/pack.mcmeta

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