Release v1.2.0 for Minecraft 1.15.x

Fix tapping sneak to stop flying on ground not working when flight inertia is disabled
Add option to disable double tapping 'Jump' key to flight
2025-08-17 16:31:49 +02:00 · 2020-12-10 05:52:43 +01:00 · 2020-12-10 05:52:22 +01:00 · 2020-12-09 17:23:54 +01:00 · 2020-12-09 17:13:46 +01:00 · 2020-12-09 17:13:17 +01:00
61 changed files with 911 additions and 958 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -24,10 +24,6 @@ bin/
 .classpath
 .project

-# forge
-
-logs/
-
 # fabric

 run/
--- a/README.md
+++ b/README.md
@@ -27,15 +27,12 @@ You can also bind a key that resets all **Toggle Keybinds** at once. That makes

 #### 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.
+* **Sprint Key Mode While Flying** changes how the Sprint key behaves during flight.
 * **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:
--- a/build.gradle
+++ b/build.gradle
@@ -1,94 +1,41 @@
-buildscript {
-	repositories {
-		maven { url = 'https://files.minecraftforge.net/maven' }
-		maven { url = "https://repo.spongepowered.org/maven" }
-		mavenCentral()
-	}
-	
-	dependencies {
-		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
-	}
+plugins {
+	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'maven-publish'
 }

-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
-apply plugin: 'eclipse'
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8

-def mcversion = "1.17.1"
-def forgeversion = "37.0.75"
-
-def prefixName = 'displayName = '
-def prefixVersion = 'version = '
-
-def metaLines = file('src/main/resources/META-INF/mods.toml').readLines()
-def metaName = metaLines.find { line -> line.startsWith(prefixName) }.substring(prefixName.length())[1..-2]
-def metaVersion = metaLines.find { line -> line.startsWith(prefixVersion) }.substring(prefixVersion.length())[1..-2]
-
-group = 'chylex.bettercontrols'
-version = metaVersion
-archivesBaseName = metaName.replaceAll('\\s', '')
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
-
-minecraft {
-	mappings channel: 'official', version: '1.17.1'
-	
-	runs {
-		client {
-			workingDirectory file('run')
-			
-			property 'mixin.env.disableRefMap', 'true'
-			arg '-mixin.config=bettercontrols.mixins.json'
-			
-			mods {
-				bettercontrols {
-					source sourceSets.main
-				}
-			}
-		}
-		
-		server {
-			workingDirectory file('run')
-			
-			property 'mixin.env.disableRefMap', 'true'
-			arg '-mixin.config=bettercontrols.mixins.json'
-			
-			mods {
-				bettercontrols {
-					source sourceSets.main
-				}
-			}
-		}
-	}
-}
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group

 dependencies {
-	minecraft 'net.minecraftforge:forge:' + mcversion + '-' + forgeversion
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 }

-jar {
-	archiveName = archivesBaseName + '-' + mcversion + '+v' + version + '.jar'
+processResources {
+	inputs.property "version", project.version
 	
-	from('./') {
-		include 'LICENSE'
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
+		expand "version": project.version
 	}
 	
-	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'
-		])
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
 	}
-	
-	finalizedBy('reobfJar')
+}
+
+tasks.withType(JavaCompile) {
+	options.encoding = "UTF-8"
+}
+
+version = 'v' + version
+
+jar {
+	from "LICENSE"
+	exclude "io/github/prospector/"
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,15 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+
+# Fabric Properties
+minecraft_version=1.15.2
+yarn_mappings=1.15.2+build.17
+loader_version=0.10.2+build.210
+
+# Mod Properties
+mod_version=1.2.0
+maven_group=chylex.bettercontrols
+archives_base_name=BetterControls-1.15.x
+
+# https://fabricmc.net/use
+# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/259
+++ b/259
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

 #
-# Copyright <20> 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #

 ##############################################################################
-#
-#   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/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,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
@@ -132,7 +98,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
@@ -140,95 +106,80 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# 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" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-    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
+    # 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

-# 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.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`

-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' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/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 execute
+if "%ERRORLEVEL%" == "0" goto init

 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 execute
+if exist "%JAVA_EXE%" goto init

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,6 +64,21 @@ 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

@@ -71,7 +86,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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

 :end
@rem End local scope for the variables with windows NT shell
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1,10 @@
+pluginManagement {
+	repositories {
+		jcenter()
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		gradlePluginPortal()
+	}
+}
--- a/src/main/java/chylex/bettercontrols/BetterControlsMod.java
+++ b/src/main/java/chylex/bettercontrols/BetterControlsMod.java
@@ -1,33 +1,11 @@
 package chylex.bettercontrols;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.fmlclient.ConfigGuiHandler.ConfigGuiFactory;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;

-@Mod("bettercontrols")
-public final class BetterControlsMod {
-	public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
+public final class BetterControlsMod implements ClientModInitializer{
+	public static final BetterControlsConfig config = BetterControlsConfig.load(FabricLoader.getInstance().getConfigDir().resolve("BetterControls.json"));
 	
-	public BetterControlsMod() {
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
-	}
-	
-	private static final class ClientLoader {
-		public static BetterControlsConfig loadConfig() {
-			return BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json"));
-		}
-		
-		public static BetterControlsScreen createScreen(final Minecraft mc, final Screen parentScreen) {
-			return new BetterControlsScreen(parentScreen);
-		}
-	}
+	@Override
+	public void onInitializeClient(){}
 }
--- a/src/main/java/chylex/bettercontrols/compatibility/ModMenuSupport.java
+++ b/src/main/java/chylex/bettercontrols/compatibility/ModMenuSupport.java
@@ -0,0 +1,16 @@
+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 String getModId(){
+		return "bettercontrols";
+	}
+	
+	@Override
+	public ConfigScreenFactory<?> getModConfigScreenFactory(){
+		return BetterControlsScreen::new;
+	}
+}
--- a/src/main/java/chylex/bettercontrols/config/BetterControlsConfig.java
+++ b/src/main/java/chylex/bettercontrols/config/BetterControlsConfig.java
@@ -3,8 +3,8 @@ import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
 import java.nio.file.Path;

-public final class BetterControlsConfig {
-	public static BetterControlsConfig load(final Path path) {
+public final class BetterControlsConfig{
+	public static BetterControlsConfig load(final Path path){
 		return ConfigSerializer.deserialize(path).setPath(path);
 	}
 	
@@ -37,15 +37,15 @@ public final class BetterControlsConfig {
 	public final KeyBindingWithModifier keyResetAllToggles = new KeyBindingWithModifier("key.bettercontrols.reset_all_toggles");
 	public final KeyBindingWithModifier keyOpenMenu = new KeyBindingWithModifier("key.bettercontrols.open_menu");
 	
-	BetterControlsConfig() {}
+	BetterControlsConfig(){}
 	
-	private BetterControlsConfig setPath(final Path path) {
+	private BetterControlsConfig setPath(final Path path){
 		this.path = path;
 		return this;
 	}
 	
-	public KeyBindingWithModifier[] getAllKeyBindings() {
-		return new KeyBindingWithModifier[] {
+	public KeyBindingWithModifier[] getAllKeyBindings(){
+		return new KeyBindingWithModifier[]{
 			keyToggleSprint,
 			keyToggleSneak,
 			keyToggleFlight,
@@ -56,7 +56,7 @@ public final class BetterControlsConfig {
 		};
 	}
 	
-	public void save() {
+	public void save(){
 		ConfigSerializer.serialize(path, this);
 	}
 }
--- a/src/main/java/chylex/bettercontrols/config/ConfigSerializer.java
+++ b/src/main/java/chylex/bettercontrols/config/ConfigSerializer.java
@@ -21,14 +21,14 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;

-final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig> {
+final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig>{
 	private static final Logger logger = LogManager.getLogger();
 	private static final Gson gson = new GsonBuilder().registerTypeAdapter(BetterControlsConfig.class, new ConfigSerializer()).setPrettyPrinting().create();
 	
-	private ConfigSerializer() {}
+	private ConfigSerializer(){}
 	
 	@Override
-	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context) {
+	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context){
 		final JsonObject obj = new JsonObject();
 		
 		Json.writeKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
@@ -62,11 +62,11 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 	}
 	
 	@Override
-	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
+	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException{
 		final BetterControlsConfig cfg = new BetterControlsConfig();
 		final JsonObject obj = json.getAsJsonObject();
 		
-		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()) {
+		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()){
 			cfg.sprintMode = SprintMode.TAP_TO_TOGGLE;
 		}
 		
@@ -100,19 +100,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config) {
-		try (final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
+	static void serialize(final Path path, final BetterControlsConfig config){
+		try(final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))){
 			gson.getAdapter(BetterControlsConfig.class).write(writer, config);
-		} catch (final IOException e) {
+		}catch(final IOException e){
 			logger.error("Error saving BetterControls configuration file!", e);
 		}
 	}
 	
-	static BetterControlsConfig deserialize(final Path path) {
-		try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
+	static BetterControlsConfig deserialize(final Path path){
+		try(final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))){
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
-		} catch (final FileNotFoundException | NoSuchFileException ignored) {
-		} catch (final IOException e) {
+		}catch(final FileNotFoundException | NoSuchFileException ignored){
+		}catch(final IOException e){
 			logger.error("Error reading BetterControls configuration file!", e);
 		}
 		
--- a/src/main/java/chylex/bettercontrols/config/Json.java
+++ b/src/main/java/chylex/bettercontrols/config/Json.java
@@ -1,45 +1,45 @@
 package chylex.bettercontrols.config;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
+import chylex.bettercontrols.util.Key;
 import com.google.gson.JsonObject;
-import com.mojang.blaze3d.platform.InputConstants;

-final class Json {
-	private Json() {}
+final class Json{
+	private Json(){}
 	
-	static void setFloat(final JsonObject obj, final String key, final float value) {
+	static void setFloat(final JsonObject obj, final String key, final float value){
 		obj.addProperty(key, Float.valueOf(value));
 	}
 	
-	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue) {
+	static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue){
 		final float value = obj.has(key) ? obj.get(key).getAsFloat() : defaultValue;
 		return Math.max(minValue, Math.min(maxValue, value));
 	}
 	
-	static void setBool(final JsonObject obj, final String key, final boolean value) {
+	static void setBool(final JsonObject obj, final String key, final boolean value){
 		obj.addProperty(key, Boolean.valueOf(value));
 	}
 	
-	static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue) {
+	static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue){
 		return obj.has(key) ? obj.get(key).getAsBoolean() : defaultValue;
 	}
 	
-	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value) {
+	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value){
 		obj.addProperty(key, value.name());
 	}
 	
-	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass) {
-		if (!obj.has(key)) {
+	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass){
+		if (!obj.has(key)){
 			return defaultValue;
 		}
 		
 		final T[] constants = enumClass.getEnumConstants();
 		
-		if (constants != null) {
+		if (constants != null){
 			final String value = obj.get(key).getAsString();
 			
-			for (final T constant : constants) {
-				if (constant.name().equalsIgnoreCase(value)) {
+			for(final T constant : constants){
+				if (constant.name().equalsIgnoreCase(value)){
 					return constant;
 				}
 			}
@@ -51,24 +51,20 @@ final class Json {
 	private static final String KEY_SUFFIX = ".Key";
 	private static final String MOD_SUFFIX = ".Mod";
 	
-	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
-		obj.addProperty(key + KEY_SUFFIX, keyBinding.saveString());
+	static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
+		obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
 		
-		if (keyBinding.getModifier() != null) {
+		if (keyBinding.getModifier() != null){
 			obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
 		}
 	}
 	
-	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
-		if (obj.has(key + KEY_SUFFIX)) {
-			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?
-			}
+	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
+		if (obj.has(key + KEY_SUFFIX)){
+			Key.readBinding(keyBinding, obj.get(key + KEY_SUFFIX).getAsString());
 		}
 		
-		if (obj.has(key + MOD_SUFFIX)) {
+		if (obj.has(key + MOD_SUFFIX)){
 			keyBinding.setModifier(ModifierKey.getById(obj.get(key + MOD_SUFFIX).getAsInt()));
 		}
 	}
--- a/src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java
+++ b/src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java
@@ -10,18 +10,16 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.OptionsSubScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
+import chylex.bettercontrols.util.Key;
+import chylex.bettercontrols.util.LiteralText;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.options.GameOptionsScreen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.InputUtil;
 import org.lwjgl.glfw.GLFW;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,14 +29,11 @@ import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
+import static chylex.bettercontrols.util.LiteralText.text;
 import static chylex.bettercontrols.util.Statics.OPTIONS;

-public class BetterControlsScreen extends OptionsSubScreen {
-	private static TextComponent text(final String text) {
-		return new TextComponent(text);
-	}
-	
-	public static final Component TITLE = text("Better Controls");
+public class BetterControlsScreen extends GameOptionsScreen{
+	public static final LiteralText TITLE = text("Better Controls");
 	
 	private static final int BOTTOM_PADDING = 3;
 	private static final int TEXT_PADDING_RIGHT = 4;
@@ -53,7 +48,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
+	private int generateSprintingOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
@@ -77,7 +72,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
+	private int generateSneakingOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
@@ -92,7 +87,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
-	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
+	private int generateFlightOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
@@ -177,7 +172,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
+	private int generateMiscellaneousOptions(int y, final List<Element> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
@@ -207,9 +202,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
+	private void generateKeyBindingWithModifierOption(final int y, final List<Element> elements, final LiteralText text, final KeyBindingWithModifier binding){
 		final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
-		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
+		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -218,7 +213,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final Component text) {
+	private static void generateLeftSideText(final int y, final List<Element> elements, final LiteralText text){
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
 	
@@ -228,15 +223,15 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(@Nullable final Screen parentScreen) {
+	public BetterControlsScreen(final Screen parentScreen){
 		super(parentScreen, OPTIONS, TITLE);
 	}
 	
 	@Override
-	public void init() {
+	public void init(){
 		allKeyBindings.clear();
 		
-		final List<GuiEventListener> elements = new ArrayList<>();
+		final List<Element> elements = new ArrayList<>();
 		int y = 0;
 		
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@@ -251,25 +246,25 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
-		addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+		addButton(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, I18n.translate("gui.done"), btn -> minecraft.openScreen(parent)));
+		children.add(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 PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		renderBackground(matrices);
-		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
-		super.render(matrices, mouseX, mouseY, delta);
+	public void render(final int mouseX, final int mouseY, final float delta){
+		renderBackground();
+		optionsWidget.render(mouseX, mouseY, delta);
+		drawCenteredString(font, title.asFormattedString(), width / 2, 8, (255 << 16) | (255 << 8) | 255);
+		super.render(mouseX, mouseY, delta);
 	}
 	
-	private void startEditingKeyBinding(final KeyBindingWidget widget) {
-		if (editingKeyBinding != null) {
+	private void startEditingKeyBinding(final KeyBindingWidget widget){
+		if (editingKeyBinding != null){
 			editingKeyBinding.stopEditing();
 		}
 		
@@ -277,40 +272,40 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@Override
-	public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
-		if (editingKeyBinding != null) {
-			editingKeyBinding.bindAndStopEditing(InputConstants.Type.MOUSE.getOrCreate(button));
+	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
+		if (editingKeyBinding != null){
+			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else {
+		else{
 			return super.mouseClicked(mouseX, mouseY, button);
 		}
 	}
 	
 	@Override
-	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
-		if (editingKeyBinding != null) {
-			if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
+	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
+		if (editingKeyBinding != null){
+			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
+				editingKeyBinding.bindAndStopEditing(Key.INVALID);
 			}
-			else {
-				editingKeyBinding.bindAndStopEditing(InputConstants.getKey(keyCode, scanCode));
+			else{
+				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else {
+		else{
 			return super.keyPressed(keyCode, scanCode, modifiers);
 		}
 	}
 	
-	private void onKeyBindingEditingFinished() {
+	private void onKeyBindingEditingFinished(){
 		editingKeyBinding = null;
-		KeyMapping.resetMapping();
+		KeyBinding.updateKeysByCode();
 		
-		for (final KeyBindingWidget widget : allKeyBindings) {
+		for(final KeyBindingWidget widget : allKeyBindings){
 			widget.updateKeyBindingText();
 		}
 	}
--- a/src/main/java/chylex/bettercontrols/gui/OptionListWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/OptionListWidget.java
@@ -1,11 +1,9 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
+import net.minecraft.client.gui.Drawable;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.ElementListWidget;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -14,109 +12,102 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import static chylex.bettercontrols.util.Statics.MINECRAFT;

-public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
+public final class OptionListWidget extends ElementListWidget<Entry>{
 	public static final int ROW_WIDTH = 408;
 	public static final int ROW_PADDING = 2;
 	
 	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
 	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
 	
-	public static int col2(final int column) {
+	public static int col2(final int column){
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col4(final int column) {
+	public static int col4(final int column){
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	private static Offset getElementOffset(final GuiEventListener element) {
-		if (element instanceof OptionWidget) {
-			return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
+	private static Offset getElementOffset(final Element element){
+		if (element instanceof Widget){
+			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
 		}
-		else if (element instanceof AbstractWidget) {
-			return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
+		else if (element instanceof AbstractButtonWidget){
+			return new Offset(((AbstractButtonWidget)element).x, ((AbstractButtonWidget)element).y);
 		}
-		else {
+		else{
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface OptionWidget extends GuiEventListener, Widget {
+	public interface Widget extends Element, Drawable{
 		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<GuiEventListener> widgets, final int innerHeight) {
+	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<Element> widgets, final int innerHeight){
 		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	public int getRowLeft() {
+	protected int getRowLeft(){
 		return super.getRowLeft() - ROW_PADDING;
 	}
 	
 	@Override
-	public int getRowWidth() {
+	public int getRowWidth(){
 		return ROW_WIDTH;
 	}
 	
 	@Override
-	protected int getScrollbarPosition() {
+	protected int getScrollbarPosition(){
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
-		private final List<GuiEventListener> elements;
-		private final List<NarratableEntry> narratables;
-		private final Map<GuiEventListener, Offset> offsets;
+	protected static final class Entry extends ElementListWidget.Entry<Entry>{
+		private final List<Element> elements;
+		private final Map<Element, Offset> offsets;
 		
-		public Entry(final List<GuiEventListener> elements) {
+		public Entry(final List<Element> 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 GuiEventListener> children() {
+		public List<? extends Element> children(){
 			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
-		public List<? extends NarratableEntry> narratables() {
-			return Collections.unmodifiableList(narratables);
-		}
-		
-		@Override
-		public void render(final PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
-			for (final GuiEventListener element : elements) {
+		public void render(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 Element element : elements){
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof AbstractWidget) {
-					final AbstractWidget button = (AbstractWidget)element;
+				if (element instanceof AbstractButtonWidget){
+					final AbstractButtonWidget button = (AbstractButtonWidget)element;
 					button.x = x + offset.x;
 					button.y = y + offset.y;
 				}
-				else if (element instanceof OptionWidget) {
-					final OptionWidget widget = (OptionWidget)element;
+				else if (element instanceof Widget){
+					final Widget widget = (Widget)element;
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Widget) {
-					((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof Drawable){
+					((Drawable)element).render(mouseX, mouseY, tickDelta);
 				}
 			}
 		}
--- a/src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java
+++ b/src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java
@@ -1,61 +1,63 @@
 package chylex.bettercontrols.gui;
-import chylex.bettercontrols.mixin.AccessCycleButtonFields;
-import chylex.bettercontrols.mixin.AccessOptionFields;
+import chylex.bettercontrols.mixin.AccessOptionButtonWidgetOption;
 import chylex.bettercontrols.mixin.AccessScreenButtons;
-import net.minecraft.client.Option;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.components.events.ContainerEventHandler;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.ParentElement;
+import net.minecraft.client.gui.screen.options.AccessibilityScreen;
+import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
+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 {
-	private ScreenPatcher() {}
+public final class ScreenPatcher{
+	private ScreenPatcher(){}
 	
-	public static void onControlsScreenOpened(final ControlsScreen screen) {
+	public static void onControlsScreenOpened(final ControlsOptionsScreen screen){
 		final AccessScreenButtons accessor = (AccessScreenButtons)screen;
-		final List<? extends GuiEventListener> children = screen.children();
 		
-		final CycleButton<?> autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
+		final List<? extends Element> children = screen.children();
+		final List<AbstractButtonWidget> buttons = accessor.getButtons();
 		
-		if (autoJump != null) {
-			final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
-				MINECRAFT.setScreen(new BetterControlsScreen(screen));
-			});
+		final AbstractButtonWidget autoJump = buttons
+			.stream()
+			.filter(it -> it instanceof OptionButtonWidget && ((AccessOptionButtonWidgetOption)it).getOption() == Option.AUTO_JUMP)
+			.findAny()
+			.orElse(null);
+		
+		if (autoJump != null){
+			children.remove(autoJump);
+			buttons.remove(autoJump);
 			
-			accessor.callRemoveWidget(autoJump);
-			accessor.callAddRenderableWidget(widget);
+			accessor.callAddButton(new ButtonWidget(autoJump.x, autoJump.y, autoJump.getWidth(), 20, BetterControlsScreen.TITLE.copy().append("...").asFormattedString(), btn -> {
+				MINECRAFT.openScreen(new BetterControlsScreen(screen));
+			}));
 		}
 	}
 	
-	public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen) {
+	public static void onAccessibilityScreenOpened(final AccessibilityScreen screen){
 		walkChildren(screen.children(), it -> {
-			getOptionButton(it, Option.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
-			getOptionButton(it, Option.TOGGLE_CROUCH).ifPresent(button -> button.active = false);
+			if (it instanceof OptionButtonWidget){
+				final OptionButtonWidget button = (OptionButtonWidget)it;
+				final Option option =  ((AccessOptionButtonWidgetOption)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) {
+	private static void walkChildren(final List<? extends Element> elements, final Consumer<Element> callback){
+		for(final Element element : elements){
 			callback.accept(element);
 			
-			if (element instanceof ContainerEventHandler) {
-				walkChildren(((ContainerEventHandler)element).children(), callback);
+			if (element instanceof ParentElement){
+				walkChildren(((ParentElement)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();
-		}
-	}
 }
--- a/src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java
+++ b/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.components.Button;
-import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.resource.language.I18n;

-public final class BooleanValueWidget extends Button {
+public final class BooleanValueWidget extends ButtonWidget{
 	private final BooleanConsumer onChanged;
 	private boolean value;
 	
-	public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged) {
-		super(x, y, width, height, currentValue ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
+	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, I18n.translate(currentValue ? "options.on" : "options.off"), ignore -> {});
 		this.value = currentValue;
 		this.onChanged = onChanged;
 	}
 	
-	public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged) {
+	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 ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
+		setMessage(I18n.translate(value ? "options.on" : "options.off"));
 		onChanged.accept(value);
 	}
 }
--- a/src/main/java/chylex/bettercontrols/gui/elements/CycleButtonWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/CycleButtonWidget.java
@@ -1,29 +1,29 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.widget.ButtonWidget;
 import java.util.List;
 import java.util.function.Consumer;

-public class CycleButtonWidget<T> extends Button {
+public class CycleButtonWidget<T> extends ButtonWidget{
 	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
-	public CycleButtonWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
-		super(x, y, width, height, Option.find(options, selectedValue).getText(), btn -> {});
+	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().asFormattedString(), 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;
 		}
 		
@@ -31,6 +31,6 @@ public class CycleButtonWidget<T> extends Button {
 		
 		selectedValue = newSelectedOption.getValue();
 		onChanged.accept(selectedValue);
-		setMessage(newSelectedOption.getText());
+		setMessage(newSelectedOption.getText().asFormattedString());
 	}
 }
--- a/src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java
@@ -1,39 +1,40 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.util.Mth;
+import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.util.math.MathHelper;
 import java.util.List;
 import java.util.function.Consumer;

-public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
+public final class DiscreteValueSliderWidget<T> extends SliderWidget{
 	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
-		super(x, y, width, height, Option.find(options, selectedValue).getText(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+		super(x, y, width, height, options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
+		updateMessage();
 	}
 	
-	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() {
-		return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
+	public Option<T> getSelectedOption(){
+		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, value)));
 	}
 	
 	@Override
-	protected void updateMessage() {
-		setMessage(getSelectedOption().getText());
+	protected void updateMessage(){
+		setMessage(getSelectedOption().getText().asFormattedString());
 	}
 	
 	@Override
-	protected void applyValue() {
+	protected void applyValue(){
 		final T newSelectedValue = getSelectedOption().getValue();
 		
-		if (selectedValue != newSelectedValue) {
+		if (selectedValue != newSelectedValue){
 			selectedValue = newSelectedValue;
 			onChanged.accept(newSelectedValue);
 		}
--- a/src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java
@@ -1,90 +1,88 @@
 package chylex.bettercontrols.gui.elements;
-import com.mojang.blaze3d.platform.InputConstants;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.components.AbstractButton;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.InputUtil;
+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 Button {
-	private final KeyMapping binding;
-	private final Component bindingName;
+public final class KeyBindingWidget extends ButtonWidget{
+	private final KeyBinding binding;
+	private final String bindingName;
 	
-	private final List<AbstractButton> linkedButtons = new ArrayList<>(1);
+	private final List<AbstractButtonWidget> 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 Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
-		super(x, y, width, height, TextComponent.EMPTY, btn -> {});
+	public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted){
+		super(x, y, width, height, "", btn -> {});
 		this.binding = binding;
-		this.bindingName = bindingName;
+		this.bindingName = I18n.translate(binding.getId());
 		this.onEditingStarted = onEditingStarted;
 		updateKeyBindingText();
 	}
 	
-	public KeyBindingWidget(final int x, final int y, final int width, final Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
-		this(x, y, width, 20, bindingName, binding, onEditingStarted);
+	public KeyBindingWidget(final int x, final int y, final int width, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted){
+		this(x, y, width, 20, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButton button) {
+	public void linkButtonToBoundState(final AbstractButtonWidget button){
 		linkedButtons.add(button);
-		button.active = !binding.isUnbound();
+		button.active = !Key.isUnbound(binding);
 	}
 	
 	@Override
-	protected MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
+	protected String getNarrationMessage(){
+		return Key.isUnbound(binding) ? I18n.translate("narrator.controls.unbound", bindingName) : I18n.translate("narrator.controls.bound", bindingName, super.getNarrationMessage());
 	}
 	
 	@Override
-	public void onPress() {
+	public void onPress(){
 		isEditing = true;
 		onEditingStarted.accept(this);
 		updateKeyBindingText();
 	}
 	
-	public void bindAndStopEditing(final InputConstants.Key key) {
-		binding.setKey(key);
+	public void bindAndStopEditing(final InputUtil.KeyCode key){
+		Key.bind(binding, key);
 		stopEditing();
 		
-		for (final AbstractButton button : linkedButtons) {
-			button.active = !binding.isUnbound();
+		for(final AbstractButtonWidget button : linkedButtons){
+			button.active = !Key.isUnbound(binding);
 		}
 	}
 	
-	public void stopEditing() {
+	public void stopEditing(){
 		isEditing = false;
 		updateKeyBindingText();
 	}
 	
-	public void updateKeyBindingText() {
+	public void updateKeyBindingText(){
 		boolean hasConflict = false;
 		
-		if (!binding.isUnbound()) {
-			for (final KeyMapping other : OPTIONS.keyMappings) {
-				if (binding != other && binding.equals(other)) {
+		if (!Key.isUnbound(binding)){
+			for(final KeyBinding other : OPTIONS.keysAll){
+				if (binding != other && binding.equals(other)){
 					hasConflict = true;
 					break;
 				}
 			}
 		}
 		
-		if (isEditing) {
-			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
+		if (isEditing){
+			setMessage(Formatting.WHITE + "> " + Formatting.YELLOW + binding.getLocalizedName() + Formatting.WHITE + " <");
 		}
-		else if (hasConflict) {
-			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
+		else if (hasConflict){
+			setMessage(Formatting.RED + Key.getBoundKeyText(binding));
 		}
-		else {
-			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
+		else{
+			setMessage(Key.isUnbound(binding) ? "(No Binding)" : Key.getBoundKeyText(binding));
 		}
 	}
 }
--- a/src/main/java/chylex/bettercontrols/gui/elements/Option.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/Option.java
@@ -1,26 +1,26 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.network.chat.Component;
+import chylex.bettercontrols.util.LiteralText;
 import java.util.List;
 import java.util.Objects;

-public final class Option<T> {
+public final class Option<T>{
 	private final T value;
-	private final Component text;
+	private final LiteralText text;
 	
-	public Option(final T value, final Component text) {
+	public Option(final T value, final LiteralText text){
 		this.value = value;
 		this.text = text;
 	}
 	
-	public T getValue() {
+	public T getValue(){
 		return value;
 	}
 	
-	public Component getText() {
+	public LiteralText 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));
 	}
 }
--- a/src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java
@@ -1,25 +1,23 @@
 package chylex.bettercontrols.gui.elements;
-import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.FormattedCharSequence;
+import chylex.bettercontrols.gui.OptionListWidget.Widget;
+import chylex.bettercontrols.util.LiteralText;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
 import java.util.List;
-import static chylex.bettercontrols.util.Statics.MINECRAFT;

-public final class TextWidget extends GuiComponent implements OptionWidget {
+public final class TextWidget extends DrawableHelper implements Widget{
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
-	private final Component text;
+	private final LiteralText 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 Component text, final int align) {
+	public TextWidget(final int x, final int y, final int width, final int height, final LiteralText text, final int align){
 		this.x = x;
 		this.y = y;
 		this.width = width;
@@ -28,46 +26,46 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 		this.align = align;
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Component text, final int align) {
+	public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align){
 		this(x, y, width, 20, text, align);
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Component text) {
+	public TextWidget(final int x, final int y, final int width, final LiteralText 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 PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		final Font textRenderer = MINECRAFT.font;
-		final List<FormattedCharSequence> lines = textRenderer.split(text, width);
-		final int lineHeight = textRenderer.lineHeight + 1;
+	public void render(final int mouseX, final int mouseY, final float delta){
+		final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+		final List<String> lines = textRenderer.wrapStringToWidthAsList(text.asFormattedString(), width);
+		final int lineHeight = textRenderer.fontHeight + 1;
 		
-		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::width).max().orElse(0) / 2) : x;
+		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::getStringWidth).max().orElse(0) / 2) : x;
 		final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
 		
-		for (int i = 0; i < lines.size(); i++) {
-			final FormattedCharSequence line = lines.get(i);
-			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+		for(int i = 0; i < lines.size(); i++){
+			final String line = lines.get(i);
+			textRenderer.drawWithShadow(line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }
--- a/src/main/java/chylex/bettercontrols/input/KeyBindingWithModifier.java
+++ b/src/main/java/chylex/bettercontrols/input/KeyBindingWithModifier.java
@@ -1,40 +1,39 @@
 package chylex.bettercontrols.input;
-import com.mojang.blaze3d.platform.InputConstants.Type;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
-import javax.annotation.Nullable;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.client.util.InputUtil.Type;
+import org.jetbrains.annotations.Nullable;

-public class KeyBindingWithModifier extends KeyMapping {
+public class KeyBindingWithModifier extends KeyBinding{
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final Component text) {
-		return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)text).getKey());
+	public static boolean checkCategoryMatches(final String name){
+		return I18n.translate(CATEGORY).equals(name);
 	}
 	
 	@Nullable
 	private ModifierKey modifier = null;
 	
-	public KeyBindingWithModifier(final String translationKey) {
+	public KeyBindingWithModifier(final String translationKey){
 		super(translationKey, Type.KEYSYM, -1, CATEGORY);
 	}
 	
-	public void setModifier(@Nullable final ModifierKey modifier) {
+	public void setModifier(@Nullable final ModifierKey modifier){
 		this.modifier = modifier;
 	}
 	
 	@Nullable
-	public ModifierKey getModifier() {
+	public ModifierKey getModifier(){
 		return modifier;
 	}
 	
 	@Override
-	public boolean isDown() {
-		return super.isDown() && (modifier == null || modifier.isPressed());
+	public boolean isPressed(){
+		return super.isPressed() && (modifier == null || modifier.isPressed());
 	}
 	
 	@Override
-	public boolean consumeClick() {
-		return super.consumeClick() && (modifier == null || modifier.isPressed());
+	public boolean wasPressed(){
+		return super.wasPressed() && (modifier == null || modifier.isPressed());
 	}
 }
--- a/src/main/java/chylex/bettercontrols/input/ModifierKey.java
+++ b/src/main/java/chylex/bettercontrols/input/ModifierKey.java
@@ -1,42 +1,42 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screen.Screen;

-public enum ModifierKey {
-	CONTROL(0) {
+public enum ModifierKey{
+	CONTROL(0){
 		@Override
-		public boolean isPressed() {
+		public boolean isPressed(){
 			return Screen.hasControlDown();
 		}
 	},
 	
-	SHIFT(1) {
+	SHIFT(1){
 		@Override
-		public boolean isPressed() {
+		public boolean isPressed(){
 			return Screen.hasShiftDown();
 		}
 	},
 	
-	ALT(2) {
+	ALT(2){
 		@Override
-		public boolean isPressed() {
+		public boolean isPressed(){
 			return Screen.hasAltDown();
 		}
 	};
 	
 	public final int id;
 	
-	ModifierKey(final int id) {
+	ModifierKey(final int id){
 		this.id = id;
 	}
 	
 	public abstract boolean isPressed();
 	
-	public static ModifierKey getById(final int id) {
-		return switch (id) {
-			case 0 -> CONTROL;
-			case 1 -> SHIFT;
-			case 2 -> ALT;
-			default -> null;
-		};
+	public static ModifierKey getById(final int id){
+		switch(id){
+			case 0: return CONTROL;
+			case 1: return SHIFT;
+			case 2: return ALT;
+			default: return null;
+		}
 	}
 }
--- a/src/main/java/chylex/bettercontrols/input/SprintMode.java
+++ b/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
--- a/src/main/java/chylex/bettercontrols/input/ToggleTracker.java
+++ b/src/main/java/chylex/bettercontrols/input/ToggleTracker.java
@@ -1,9 +1,10 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.KeyMapping;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.options.KeyBinding;

-public class ToggleTracker {
-	protected final KeyMapping bindingToggle;
-	protected final KeyMapping bindingReset;
+public class ToggleTracker{
+	protected final KeyBinding bindingToggle;
+	protected final KeyBinding bindingReset;
 	
 	protected boolean isToggled;
 	
@@ -11,7 +12,7 @@ public class ToggleTracker {
 	private boolean hasToggledWhileHoldingReset;
 	private boolean skipNextToggle;
 	
-	public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset) {
+	public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset){
 		this.bindingToggle = bindingToggle;
 		this.bindingReset = bindingReset;
 	}
@@ -40,15 +41,15 @@ public class ToggleTracker {
 	 *   +CTRL, +G, -CTRL, +CTRL, +G, +G  -->  toggled on
 	 */
 	
-	public boolean tick() {
+	public boolean tick(){
 		final boolean isHoldingReset = isResetKeyPressed();
 		
-		if (bindingToggle.isDown()) {
-			if (!waitForRelease) {
-				if (skipNextToggle) {
+		if (Key.isPressed(bindingToggle)){
+			if (!waitForRelease){
+				if (skipNextToggle){
 					skipNextToggle = false;
 				}
-				else {
+				else{
 					isToggled = !isToggled;
 				}
 				
@@ -56,32 +57,32 @@ public class ToggleTracker {
 				hasToggledWhileHoldingReset = isHoldingReset;
 			}
 		}
-		else {
+		else{
 			waitForRelease = false;
 		}
 		
-		if (isToggled) {
-			if (hasToggledWhileHoldingReset && !isHoldingReset) {
+		if (isToggled){
+			if (hasToggledWhileHoldingReset && !isHoldingReset){
 				hasToggledWhileHoldingReset = false;
 			}
-			else if (!hasToggledWhileHoldingReset && isHoldingReset) {
+			else if (!hasToggledWhileHoldingReset && isHoldingReset){
 				isToggled = false;
 				skipNextToggle = true;
 			}
 		}
 		
-		if (skipNextToggle && !isHoldingReset) {
+		if (skipNextToggle && !isHoldingReset){
 			skipNextToggle = false;
 		}
 		
 		return isToggled;
 	}
 	
-	protected boolean isResetKeyPressed() {
-		return bindingReset.isDown();
+	protected boolean isResetKeyPressed(){
+		return Key.isPressed(bindingReset);
 	}
 	
-	public void reset() {
+	public void reset(){
 		isToggled = false;
 		waitForRelease = false;
 	}
--- a/src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java
+++ b/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.KeyMapping;
+import net.minecraft.client.options.KeyBinding;
 import java.util.HashSet;
 import java.util.Set;

-public final class ToggleTrackerForStickyKey extends ToggleTracker {
-	private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
+public final class ToggleTrackerForStickyKey extends ToggleTracker{
+	private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
 	
-	public static boolean isOverrideEnabled(final KeyMapping binding) {
+	public static boolean isOverrideEnabled(final KeyBinding binding){
 		return enabledOverrides.contains(binding);
 	}
 	
 	private final BooleanConsumer setToggleState;
 	
-	public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState) {
+	public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding 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();
 	}
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java
@@ -1,10 +1,14 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.Camera;
+import net.minecraft.client.render.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 {
-	@Accessor("eyeHeight")
+public interface AccessCameraFields{
+	@Accessor
+	Entity getFocusedEntity();
+	
+	@Accessor
 	void setCameraY(float y);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessClientPlayerFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessClientPlayerFields.java
@@ -1,10 +1,10 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.network.ClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

-@Mixin(LocalPlayer.class)
-public interface AccessClientPlayerFields {
-	@Accessor("sprintTriggerTime")
+@Mixin(ClientPlayerEntity.class)
+public interface AccessClientPlayerFields{
+	@Accessor("field_3935")
 	void setTicksLeftToDoubleTapSprint(int value);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessControlsListCategory.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessControlsListCategory.java
@@ -1,11 +1,10 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
-import net.minecraft.network.chat.Component;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.CategoryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(CategoryEntry.class)
-public interface AccessControlsListCategory {
-	@Accessor("name")
-	Component getText();
+public interface AccessControlsListCategory{
+	@Accessor
+	String getName();
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessControlsListKeyBinding.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessControlsListKeyBinding.java
@@ -1,11 +1,11 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.options.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

-@Mixin(KeyEntry.class)
-public interface AccessControlsListKeyBinding {
-	@Accessor("key")
-	KeyMapping getBinding();
+@Mixin(KeyBindingEntry.class)
+public interface AccessControlsListKeyBinding{
+	@Accessor
+	KeyBinding getBinding();
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java
@@ -1,12 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(CycleButton.class)
-public interface AccessCycleButtonFields {
-	@Accessor("name")
-	Component getName();
-}
--- a/src/main/java/chylex/bettercontrols/mixin/AccessGameRendererFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessGameRendererFields.java
@@ -0,0 +1,10 @@
+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);
+}
--- a/src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java
@@ -1,19 +1,19 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.KeyMapping;
+import net.minecraft.client.options.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.Map;

-@Mixin(KeyMapping.class)
-public interface AccessKeyBindingFields {
-	@Accessor("CATEGORY_SORT_ORDER")
-	static Map<String, Integer> getCategoryOrderMap() {
+@Mixin(KeyBinding.class)
+public interface AccessKeyBindingFields{
+	@Accessor
+	static Map<String, Integer> getCategoryOrderMap(){
 		throw new AssertionError();
 	}
 	
-	@Accessor("isDown")
+	@Accessor("pressed")
 	boolean isPressedField();
 	
-	@Accessor("isDown")
+	@Accessor("pressed")
 	void setPressedField(boolean value);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessOptionButtonWidgetOption.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessOptionButtonWidgetOption.java
@@ -0,0 +1,11 @@
+package chylex.bettercontrols.mixin;
+import net.minecraft.client.gui.widget.OptionButtonWidget;
+import net.minecraft.client.options.Option;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(OptionButtonWidget.class)
+public interface AccessOptionButtonWidgetOption{
+	@Accessor
+	Option getOption();
+}
--- a/src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java
@@ -1,12 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.Option;
-import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Option.class)
-public interface AccessOptionFields {
-	@Accessor("caption")
-	Component getCaption();
-}
--- a/src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java
@@ -1,10 +1,10 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

-@Mixin(Player.class)
-public interface AccessPlayerFields {
-	@Accessor("jumpTriggerTime")
+@Mixin(PlayerEntity.class)
+public interface AccessPlayerFields{
+	@Accessor("field_7489")
 	void setTicksLeftToDoubleTapFlight(int value);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java
@@ -1,16 +1,16 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.AbstractButtonWidget;
 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 {
-	@Invoker
-	<T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);
+public interface AccessScreenButtons{
+	@Accessor
+	List<AbstractButtonWidget> getButtons();
 	
 	@Invoker
-	void callRemoveWidget(GuiEventListener widget);
+	<T extends AbstractButtonWidget> T callAddButton(T button);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessStickyKeyBindingStateGetter.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessStickyKeyBindingStateGetter.java
@@ -1,16 +1,16 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.ToggleKeyMapping;
+import net.minecraft.client.options.StickyKeyBinding;
 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(ToggleKeyMapping.class)
-public interface AccessStickyKeyBindingStateGetter {
-	@Accessor("needsToggle")
+@Mixin(StickyKeyBinding.class)
+public interface AccessStickyKeyBindingStateGetter{
+	@Accessor
 	BooleanSupplier getToggleGetter();
 	
-	@Accessor("needsToggle")
+	@Accessor
 	@Mutable
 	void setToggleGetter(final BooleanSupplier toggleGetter);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java
+++ b/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java
@@ -1,27 +0,0 @@
-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);
-	}
-}
--- a/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java
+++ b/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java
@@ -1,8 +1,7 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.player.Input;
-import net.minecraft.client.player.KeyboardInput;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.network.ClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -11,13 +10,13 @@ import static chylex.bettercontrols.util.Statics.MINECRAFT;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;

@Mixin(KeyboardInput.class)
-public abstract class HookClientPlayerInputTick {
-	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
-	private void afterInputTick(final CallbackInfo info) {
-		final Input input = (Input)(Object)this;
-		final LocalPlayer player = MINECRAFT.player;
+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))
+	private void afterInputTick(final CallbackInfo info){
+		final KeyboardInput input = (KeyboardInput)(Object)this;
+		final ClientPlayerEntity player = MINECRAFT.player;
 		
-		if (player != null) {
+		if (player != null){
 			PlayerTicker.get(player).afterInputAssignsPressingForward(input);
 		}
 	}
--- a/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerTick.java
+++ b/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.multiplayer.ClientLevel;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.world.ClientWorld;
 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(LocalPlayer.class)
-public abstract class HookClientPlayerTick extends AbstractClientPlayer {
-	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
+@Mixin(ClientPlayerEntity.class)
+public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{
+	protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile){
 		super(world, profile);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At("HEAD"))
-	private void atHead(final CallbackInfo info) {
-		final LocalPlayer player = (LocalPlayer)(Object)this;
+	@Inject(method = "tickMovement()V", at = @At("HEAD"))
+	private void atHead(final CallbackInfo info){
+		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
-	private void afterInputTick(final CallbackInfo info) {
-		final LocalPlayer player = (LocalPlayer)(Object)this;
+	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	private void afterInputTick(final CallbackInfo info){
+		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).afterInputTick(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;aiStep()V", ordinal = 0, shift = AFTER))
-	private void afterSuperCall(final CallbackInfo info) {
-		final LocalPlayer player = (LocalPlayer)(Object)this;
+	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;tickMovement()V", ordinal = 0, shift = AFTER))
+	private void afterSuperCall(final CallbackInfo info){
+		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).afterSuperCall(player);
 	}
 }
--- a/src/main/java/chylex/bettercontrols/mixin/HookControlsListWidget.java
+++ b/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.Minecraft;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.controls.ControlList;
-import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
-import net.minecraft.client.gui.screens.controls.ControlList.Entry;
-import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.options.ControlsListWidget;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.CategoryEntry;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.Entry;
+import net.minecraft.client.gui.screen.options.ControlsListWidget.KeyBindingEntry;
+import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
+import net.minecraft.client.gui.widget.ElementListWidget;
 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(ControlList.class)
-public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
+@Mixin(ControlsListWidget.class)
+public abstract class HookControlsListWidget extends ElementListWidget<Entry>{
+	public HookControlsListWidget(final MinecraftClient client, final int width, final int height, final int top, final int bottom, final int itemHeight){
 		super(client, width, height, top, bottom, itemHeight);
 	}
 	
 	@Inject(method = "<init>", at = @At("TAIL"))
-	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
+	public void init(final ControlsOptionsScreen parent, final MinecraftClient client, final CallbackInfo ci){
 		children().removeIf(it -> {
-			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())) {
+			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getName())){
 				return true;
 			}
 			
-			if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
+			if (it instanceof KeyBindingEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())){
 				return true;
 			}
 			
--- a/src/main/java/chylex/bettercontrols/mixin/HookLoadGameOptions.java
+++ b/src/main/java/chylex/bettercontrols/mixin/HookLoadGameOptions.java
@@ -1,30 +1,34 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Options;
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;
 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(Options.class)
-public abstract class HookLoadGameOptions {
+@Mixin(GameOptions.class)
+public abstract class HookLoadGameOptions{
 	private boolean hasLoaded = false;
 	
+	@Mutable
+	@Final
 	@Shadow
-	public KeyMapping[] keyMappings;
+	public KeyBinding[] keysAll;
 	
 	@Inject(method = "load()V", at = @At("HEAD"))
-	private void load(final CallbackInfo info) {
-		if (hasLoaded) {
+	private void load(final CallbackInfo info){
+		if (hasLoaded){
 			return;
 		}
 		
 		hasLoaded = true;
-		keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
+		keysAll = ArrayUtils.addAll(keysAll, BetterControlsMod.config.getAllKeyBindings());
 		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }
--- a/src/main/java/chylex/bettercontrols/mixin/HookOpenScreen.java
+++ b/src/main/java/chylex/bettercontrols/mixin/HookOpenScreen.java
@@ -1,28 +1,27 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.gui.ScreenPatcher;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.options.AccessibilityScreen;
+import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static chylex.bettercontrols.util.Statics.MINECRAFT;

-@SuppressWarnings("MethodMayBeStatic")
-@Mixin(value = Minecraft.class, priority = 100)
-public abstract class HookOpenScreen {
-	@Inject(method = "setScreen", at = @At("TAIL"))
-	private void openScreen(final Screen ignore, final CallbackInfo ci) {
-		final Screen screen = MINECRAFT.screen;
+@Mixin(value = MinecraftClient.class, priority = 100)
+public abstract class HookOpenScreen{
+	@Inject(method = "openScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
+	private void openScreen(final Screen ignore, final CallbackInfo ci){
+		final Screen screen = MINECRAFT.currentScreen;
 		
-		if (screen != null && !Screen.hasAltDown()) {
-			if (screen.getClass() == ControlsScreen.class) {
-				ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
+		if (screen != null && !Screen.hasAltDown()){
+			if (screen.getClass() == ControlsOptionsScreen.class){
+				ScreenPatcher.onControlsScreenOpened((ControlsOptionsScreen)screen);
 			}
-			else if (screen.getClass() == AccessibilityOptionsScreen.class) {
-				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);
+			else if (screen.getClass() == AccessibilityScreen.class){
+				ScreenPatcher.onAccessibilityScreenOpened((AccessibilityScreen)screen);
 			}
 		}
 	}
--- a/src/main/java/chylex/bettercontrols/mixin/HookPlayerFlightSpeed.java
+++ b/src/main/java/chylex/bettercontrols/mixin/HookPlayerFlightSpeed.java
@@ -1,26 +1,25 @@
 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 net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.World;
 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) {
+@Mixin(PlayerEntity.class)
+public abstract class HookPlayerFlightSpeed extends LivingEntity{
+	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World 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"))
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSprinting()Z"),
+		slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerAbilities;getFlySpeed()F"))
 	)
-	private boolean disableVanillaSprintBoost(final Player player) {
+	private boolean disableVanillaSprintBoost(final PlayerEntity player){
 		return false;
 	}
 }
--- a/src/main/java/chylex/bettercontrols/mixin/HookStickyKeyBindingState.java
+++ b/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.KeyMapping;
-import net.minecraft.client.ToggleKeyMapping;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.options.StickyKeyBinding;
 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(ToggleKeyMapping.class)
-public abstract class HookStickyKeyBindingState extends KeyMapping {
+@Mixin(StickyKeyBinding.class)
+public abstract class HookStickyKeyBindingState extends KeyBinding{
 	@Shadow
 	@Final
-	private BooleanSupplier needsToggle;
+	private BooleanSupplier toggleGetter;
 	
-	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 = "setDown", at = @At("HEAD"), cancellable = true)
-	public void setPressed(final boolean pressed, final CallbackInfo info) {
-		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
+	@Inject(method = "setPressed(Z)V", at = @At("HEAD"), cancellable = true)
+	public void setPressed(final boolean pressed, final CallbackInfo info){
+		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){
 			((AccessKeyBindingFields)this).setPressedField(pressed);
 			info.cancel();
 		}
 	}
 	
 	@Override
-	public boolean isDown() {
-		return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
+	public boolean isPressed(){
+		return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.getAsBoolean());
 	}
 }
--- a/src/main/java/chylex/bettercontrols/player/FlightHelper.java
+++ b/src/main/java/chylex/bettercontrols/player/FlightHelper.java
@@ -1,66 +1,66 @@
 package chylex.bettercontrols.player;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.network.ClientPlayerEntity;

-final class FlightHelper {
-	private FlightHelper() {}
+final class FlightHelper{
+	private FlightHelper(){}
 	
 	private static final float BASE_FLIGHT_SPEED = 0.05F;
 	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
-	private static BetterControlsConfig cfg() {
+	private static BetterControlsConfig cfg(){
 		return BetterControlsMod.config;
 	}
 	
-	static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
-		return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
+	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
+		return player.abilities.flying && (player.isCreative() || player.isSpectator());
 	}
 	
-	static boolean shouldFlyOnGround(final LocalPlayer player) {
-		return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
+	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.flying;
 	}
 	
-	static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
-		if (player.isCreative()) {
-			if (boost) {
+	static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost){
+		if (player.isCreative()){
+			if (boost){
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
 			}
-			else {
+			else{
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()) {
-			if (boost) {
+		else if (player.isSpectator()){
+			if (boost){
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
 			}
-			else {
+			else{
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
 			}
 		}
-		else {
+		else{
 			return 0F;
 		}
 	}
 	
-	static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting) {
-		if (player.isCreative()) {
-			if (isSprinting) {
+	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){
+		if (player.isCreative()){
+			if (isSprinting){
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
 			}
-			else {
+			else{
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
 			}
 		}
-		else if (player.isSpectator()) {
-			if (isSprinting) {
+		else if (player.isSpectator()){
+			if (isSprinting){
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
 			}
-			else {
+			else{
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorDefault;
 			}
 		}
-		else {
+		else{
 			return 0F;
 		}
 	}
--- a/src/main/java/chylex/bettercontrols/player/PlayerTicker.java
+++ b/src/main/java/chylex/bettercontrols/player/PlayerTicker.java
@@ -7,11 +7,13 @@ 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.Camera;
-import net.minecraft.client.player.Input;
-import net.minecraft.client.player.LocalPlayer;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.input.Input;
+import net.minecraft.client.input.KeyboardInput;
+import net.minecraft.client.network.ClientPlayerEntity;
 import java.lang.ref.WeakReference;
 import java.util.function.BooleanSupplier;
 import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
@@ -21,32 +23,32 @@ 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 LocalPlayer player) {
-		if (ticker.ref.get() != player) {
+	public static PlayerTicker get(final ClientPlayerEntity player){
+		if (ticker.ref.get() != player){
 			ticker = new PlayerTicker(player);
 		}
 		
 		return ticker;
 	}
 	
-	private static BetterControlsConfig cfg() {
+	private static BetterControlsConfig cfg(){
 		return BetterControlsMod.config;
 	}
 	
-	private final WeakReference<LocalPlayer> ref;
+	private final WeakReference<ClientPlayerEntity> ref;
 	
-	private PlayerTicker(final LocalPlayer player) {
+	private PlayerTicker(final ClientPlayerEntity player){
 		this.ref = new WeakReference<>(player);
 		setup();
 	}
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
+	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.sprintToggled = toggled);
+	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.sneakToggled = toggled);
 	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
 	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
 	
@@ -61,79 +63,79 @@ public final class PlayerTicker {
 	private boolean holdingSneakWhileTouchingGround = false;
 	private int temporaryFlyOnGroundTimer = 0;
 	
-	private void setup() {
+	private void setup(){
 		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
 		BooleanSupplier getter = sprint.getToggleGetter();
 		
-		if (getter instanceof SprintPressGetter) {
+		if (getter instanceof SprintPressGetter){
 			getter = ((SprintPressGetter)getter).getWrapped();
 		}
 		
 		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(final LocalPlayer player) {
-		if (FlightHelper.shouldFlyOnGround(player)) {
-			player.setOnGround(false);
+	public void atHead(final ClientPlayerEntity player){
+		if (FlightHelper.shouldFlyOnGround(player)){
+			player.onGround = false;
 		}
 		
-		if (!cfg().doubleTapForwardToSprint) {
+		if (!cfg().doubleTapForwardToSprint){
 			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
 		}
 		
-		if (!cfg().doubleTapJumpToToggleFlight) {
+		if (!cfg().doubleTapJumpToToggleFlight){
 			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
 		}
 		
 		final SprintMode sprintMode = cfg().sprintMode;
-		final boolean wasSprintToggled = OPTIONS.toggleSprint;
+		final boolean wasSprintToggled = OPTIONS.sprintToggled;
 		final boolean isSprintToggled = toggleSprint.tick();
 		
-		if (temporarySprintTimer > 0) {
+		if (temporarySprintTimer > 0){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			
 			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!KEY_SPRINT.isDown() && KEY_FORWARD.isDown()) {
+			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
-			else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
+			else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (isSprintToggled) {
+		if (isSprintToggled){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 		}
-		else if (wasSprintToggled) {
+		else if (wasSprintToggled){
 			stopSprintingAfterReleasingSprintKey = true;
 			waitingForSprintKeyRelease = true;
 		}
-		else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
-			if (KEY_SPRINT.isDown()) {
-				if (!waitingForSprintKeyRelease) {
+		else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
+			if (Key.isPressed(KEY_SPRINT)){
+				if (!waitingForSprintKeyRelease){
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
 				}
 			}
-			else {
-				if (player.isSprinting() && !waitingForSprintKeyRelease) {
+			else{
+				if (player.isSprinting() && !waitingForSprintKeyRelease){
 					stopSprintingAfterReleasingSprintKey = false;
 				}
 				
 				waitingForSprintKeyRelease = false;
 			}
 		}
-		else if (sprintMode == SprintMode.HOLD) {
-			if (KEY_SPRINT.isDown()) {
+		else if (sprintMode == SprintMode.HOLD){
+			if (Key.isPressed(KEY_SPRINT)){
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !KEY_SPRINT.isDown()) {
+		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -142,51 +144,51 @@ public final class PlayerTicker {
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final Input input) {
-		if (MINECRAFT.screen == null) {
-			input.up |= toggleWalkForward.tick();
+	public void afterInputAssignsPressingForward(final KeyboardInput input){
+		if (MINECRAFT.currentScreen == null){
+			input.pressingForward |= toggleWalkForward.tick();
 		}
 	}
 	
-	public void afterInputTick(final LocalPlayer player) {
+	public void afterInputTick(final ClientPlayerEntity player){
 		final Input input = player.input;
 		
-		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+		if (MINECRAFT.currentScreen == null && !player.abilities.flying){
 			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			final boolean boost = KEY_SPRINT.isDown();
+		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
+			final boolean boost = Key.isPressed(KEY_SPRINT);
 			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
 			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
 			
-			if (flightSpeed > 0F) {
-				player.getAbilities().setFlyingSpeed(flightSpeed);
+			if (flightSpeed > 0F){
+				player.abilities.setFlySpeed(flightSpeed);
 			}
 			
-			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
+			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()){
 				int direction = 0;
 				
-				if (input.shiftKeyDown) {
+				if (input.sneaking){
 					--direction;
 				}
 				
-				if (input.jumping) {
+				if (input.jumping){
 					++direction;
 				}
 				
-				if (direction != 0) {
-					player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
+				if (direction != 0){
+					player.setVelocity(player.getVelocity().add(0D, flightSpeed * verticalVelocity * direction, 0D));
 				}
 			}
 		}
 		
-		if (cfg().resumeSprintingAfterHittingObstacle) {
-			if (wasHittingObstacle != player.horizontalCollision) {
-				if (!wasHittingObstacle) {
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
+		if (cfg().resumeSprintingAfterHittingObstacle){
+			if (wasHittingObstacle != player.horizontalCollision){
+				if (!wasHittingObstacle){
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
 				}
-				else if (wasSprintingBeforeHittingObstacle) {
+				else if (wasSprintingBeforeHittingObstacle){
 					wasSprintingBeforeHittingObstacle = false;
 					temporarySprintTimer = 10;
 				}
@@ -195,110 +197,110 @@ public final class PlayerTicker {
 				wasHittingObstacle = player.horizontalCollision;
 			}
 		}
-		else {
+		else{
 			wasHittingObstacle = player.horizontalCollision;
 			wasSprintingBeforeHittingObstacle = false;
 		}
+		
+		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
+			((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
+		}
 	}
 	
-	public void afterSuperCall(final LocalPlayer player) {
-		if (FlightHelper.shouldFlyOnGround(player)) {
-			final boolean isSneaking = player.isShiftKeyDown();
-			final boolean isOnGround = player.isOnGround();
+	public void afterSuperCall(final ClientPlayerEntity player){
+		if (FlightHelper.shouldFlyOnGround(player)){
+			final boolean isSneaking = player.isSneaking();
+			final boolean isOnGround = player.onGround;
 			
-			if (!isSneaking) {
+			if (!isSneaking){
 				wasSneakingBeforeTouchingGround = false;
 			}
-			else if (!isOnGround) {
+			else if (!isOnGround){
 				wasSneakingBeforeTouchingGround = true;
 			}
 			
-			if (!isOnGround) {
+			if (!isOnGround){
 				holdingSneakWhileTouchingGround = false;
 			}
-			else {
+			else{
 				boolean cancelLanding = true;
 				
-				if (!wasSneakingBeforeTouchingGround) {
-					if (isSneaking) {
+				if (!wasSneakingBeforeTouchingGround){
+					if (isSneaking){
 						holdingSneakWhileTouchingGround = true;
 					}
-					else if (holdingSneakWhileTouchingGround) {
-						player.getAbilities().flying = false;
-						player.onUpdateAbilities();
+					else if (holdingSneakWhileTouchingGround){
+						player.abilities.flying = false;
+						player.sendAbilitiesUpdate();
 						cancelLanding = false;
 					}
 				}
 				
-				if (cancelLanding) {
-					player.setOnGround(false);
+				if (cancelLanding){
+					player.onGround = false;
 				}
 			}
 		}
-		else {
+		else{
 			wasSneakingBeforeTouchingGround = false;
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
+		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
 			final Input input = player.input;
 			
-			if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
-				player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
+			if (input.movementForward == 0F && input.movementSideways == 0F){
+				player.setVelocity(player.getVelocity().multiply(0.0, 1.0, 0.0));
 			}
 			
-			if (!input.jumping && !input.shiftKeyDown) {
-				player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
+			if (!input.jumping && !input.sneaking){
+				player.setVelocity(player.getVelocity().multiply(1.0, 0.0, 1.0));
 			}
 		}
 		
-		if (player.isCreative()) {
-			if (cfg().keyToggleFlight.consumeClick()) {
-				final boolean isFlying = !player.getAbilities().flying;
+		if (player.isCreative()){
+			if (Key.wasPressed(cfg().keyToggleFlight)){
+				final boolean isFlying = !player.abilities.flying;
 				
-				player.getAbilities().flying = isFlying;
-				player.onUpdateAbilities();
+				player.abilities.flying = isFlying;
+				player.sendAbilitiesUpdate();
 				
-				if (isFlying) {
+				if (isFlying){
 					temporaryFlyOnGroundTimer = 10;
 				}
 			}
 			
-			if (temporaryFlyOnGroundTimer > 0) {
-				if (player.isShiftKeyDown()) {
+			if (temporaryFlyOnGroundTimer > 0){
+				if (player.isSneaking()){
 					temporaryFlyOnGroundTimer = 0;
 				}
-				else {
+				else{
 					--temporaryFlyOnGroundTimer;
-					player.setOnGround(false);
+					player.onGround = false;
 				}
 			}
 		}
-		else {
+		else{
 			temporaryFlyOnGroundTimer = 0;
 		}
 		
-		if (!cfg().sneakingMovesCameraSmoothly) {
-			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
+		if (!cfg().sneakingMovesCameraSmoothly){
+			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getCamera();
 			
-			if (camera.getEntity() == player) {
-				((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
+			if (camera.getFocusedEntity() == player){
+				camera.setCameraY(player.getStandingEyeHeight());
 			}
 		}
 		
-		if (cfg().keyResetAllToggles.consumeClick()) {
+		if (Key.wasPressed(cfg().keyResetAllToggles)){
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (cfg().keyOpenMenu.isDown()) {
-			MINECRAFT.setScreen(new BetterControlsScreen(null));
+		if (Key.isPressed(cfg().keyOpenMenu)){
+			MINECRAFT.openScreen(new BetterControlsScreen(null));
 		}
 	}
-	
-	public boolean shouldResetFOV(final LocalPlayer player) {
-		return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
-	}
 }
--- a/src/main/java/chylex/bettercontrols/player/SprintPressGetter.java
+++ b/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();
 	}
 }
--- a/src/main/java/chylex/bettercontrols/util/Key.java
+++ b/src/main/java/chylex/bettercontrols/util/Key.java
@@ -0,0 +1,45 @@
+package chylex.bettercontrols.util;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+
+public final class Key{
+	private Key(){}
+	
+	public static final InputUtil.KeyCode INVALID = InputUtil.UNKNOWN_KEYCODE;
+	
+	public static boolean isUnbound(final KeyBinding binding){
+		return binding.isNotBound();
+	}
+	
+	public static boolean isPressed(final KeyBinding binding){
+		return binding.isPressed();
+	}
+	
+	public static boolean wasPressed(final KeyBinding binding){
+		return binding.wasPressed();
+	}
+	
+	public static String getBoundKeyText(final KeyBinding binding){
+		return binding.getLocalizedName();
+	}
+	
+	public static void bind(final KeyBinding binding, final InputUtil.KeyCode input){
+		binding.setKeyCode(input);
+	}
+	
+	public static String writeBinding(final KeyBinding binding){
+		return binding.getName();
+	}
+	
+	public static void readBinding(final KeyBinding binding, final String serialized){
+		bind(binding, InputUtil.fromName(serialized));
+	}
+	
+	public static InputUtil.KeyCode inputFromMouse(final int button){
+		return InputUtil.Type.MOUSE.createFromCode(button);
+	}
+	
+	public static InputUtil.KeyCode inputFromKeyboard(final int keyCode, final int scanCode){
+		return InputUtil.getKeyCode(keyCode, scanCode);
+	}
+}
--- a/src/main/java/chylex/bettercontrols/util/LiteralText.java
+++ b/src/main/java/chylex/bettercontrols/util/LiteralText.java
@@ -0,0 +1,11 @@
+package chylex.bettercontrols.util;
+
+public final class LiteralText extends net.minecraft.text.LiteralText{
+	public static LiteralText text(final String text){
+		return new LiteralText(text);
+	}
+	
+	public LiteralText(final String msg){
+		super(msg);
+	}
+}
--- a/src/main/java/chylex/bettercontrols/util/Statics.java
+++ b/src/main/java/chylex/bettercontrols/util/Statics.java
@@ -1,16 +1,16 @@
 package chylex.bettercontrols.util;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.options.KeyBinding;

-public final class Statics {
-	private Statics() {}
+public final class Statics{
+	private Statics(){}
 	
-	public static final Minecraft MINECRAFT = Minecraft.getInstance();
-	public static final Options OPTIONS = MINECRAFT.options;
+	public static final MinecraftClient MINECRAFT = MinecraftClient.getInstance();
+	public static final GameOptions 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;
+	public static final KeyBinding KEY_SPRINT = OPTIONS.keySprint;
+	public static final KeyBinding KEY_SNEAK = OPTIONS.keySneak;
+	public static final KeyBinding KEY_FORWARD = OPTIONS.keyForward;
+	public static final KeyBinding KEY_JUMP = OPTIONS.keyJump;
 }
--- a/src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java
+++ b/src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java
@@ -0,0 +1,8 @@
+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);
+}
--- a/src/main/java/io/github/prospector/modmenu/api/ModMenuApi.java
+++ b/src/main/java/io/github/prospector/modmenu/api/ModMenuApi.java
@@ -0,0 +1,16 @@
+package io.github.prospector.modmenu.api;
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+
+@SuppressWarnings("unused")
+public interface ModMenuApi{
+	String getModId();
+	
+	default ConfigScreenFactory<?> getModConfigScreenFactory(){
+		return ignore -> null;
+	}
+	
+	default Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories(){
+		return ImmutableMap.of();
+	}
+}
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,30 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[31,)"
-
-authors = "chylex"
-license = "MPL-2.0"
-issueTrackerURL = "https://github.com/chylex/Better-Controls/issues"
-
-[[mods]]
-modId = "bettercontrols"
-version = "1.2.0a"
-displayName = "Better Controls"
-logoFile = "icon.png"
-description = '''
-Adds many powerful key bindings and options to control your movement.
-The features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
-'''
-
-[[dependencies.bettercontrols]]
-modId = "minecraft"
-mandatory = true
-versionRange = "[1.16.3,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.bettercontrols]]
-modId = "forge"
-mandatory = true
-versionRange = "[31,)"
-ordering = "NONE"
-side = "BOTH"
--- a/src/main/resources/assets/bettercontrols/icon.png
+++ b/src/main/resources/assets/bettercontrols/icon.png
--- a/src/main/resources/bettercontrols.mixins.json
+++ b/src/main/resources/bettercontrols.mixins.json
@@ -2,19 +2,18 @@
  "required": true,
  "minVersion": "0.8",
  "package": "chylex.bettercontrols.mixin",
-  "compatibilityLevel": "JAVA_16",
-  "client": [
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
    "AccessCameraFields",
    "AccessClientPlayerFields",
    "AccessControlsListCategory",
    "AccessControlsListKeyBinding",
-    "AccessCycleButtonFields",
+    "AccessGameRendererFields",
    "AccessKeyBindingFields",
-    "AccessOptionFields",
+    "AccessOptionButtonWidgetOption",
    "AccessPlayerFields",
    "AccessScreenButtons",
    "AccessStickyKeyBindingStateGetter",
-    "HookClientPlayerFOV",
    "HookClientPlayerInputTick",
    "HookClientPlayerTick",
    "HookControlsListWidget",
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,33 @@
+{
+  "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.15.x"
+  }
+}
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -1,7 +0,0 @@
-{
-    "pack": {
-        "description": "Better Controls",
-        "pack_format": 5,
-        "_comment": ""
-    }
-}
Author	SHA1	Message	Date
chylex	d416883dbb	Release v1.2.0 for Minecraft 1.15.x	2020-12-10 05:52:43 +01:00
chylex	681fd75997	Fix tapping sneak to stop flying on ground not working when flight inertia is disabled	2020-12-10 05:52:22 +01:00
chylex	04408ddfb1	Add option to disable double tapping 'Jump' key to flight Fixes #6	2020-12-09 17:23:54 +01:00
chylex	15e314eb73	Change flight to 'Hold to Sprint' mode at all times & fix not boost unless flying forward	2020-12-09 17:13:46 +01:00
chylex	b292a3b621	Add option to disable flight inertia after releasing movement keys Fixes #2	2020-12-09 17:13:17 +01:00
chylex	4248293230	Minor code tweaks	2020-12-09 17:12:50 +01:00
chylex	9634c33ca2	Add README	2020-12-09 17:12:06 +01:00
chylex	54a6b4ea56	Refactor code to make porting easier	2020-12-09 17:04:36 +01:00
chylex	9437932b97	Release v1.1.0 for Minecraft 1.15.x	2020-10-27 17:28:37 +01:00
chylex	50c035bb91	Fix compile error after cherry-pick	2020-10-27 17:28:13 +01:00
chylex	81e135469e	Avoid sudden FOV jump when starting to fly with disabled FOV changing	2020-10-27 17:25:39 +01:00
chylex	188f66b4d3	Add options for vertical flight speed boost in creative/spectator and default/sprinting modes	2020-10-27 17:25:39 +01:00
chylex	ab4fa452f7	Add more flight speed options (5x and 7x)	2020-10-27 17:22:07 +01:00
chylex	116bbe241d	Add option to prevent FOV changing while flying	2020-10-27 17:21:23 +01:00
chylex	9baa7c4460	Add key binding to reset all toggles at once	2020-10-27 17:20:11 +01:00
chylex	7f258966de	Implement third sprinting mode (hold key to sprint) & option to change sprinting mode when flying	2020-10-27 17:20:11 +01:00
chylex	9af10ad04c	Release v1.0.1 for Minecraft 1.15.x	2020-10-19 21:15:32 +02:00
chylex	6e316eff89	Avoid wobble sprinting when resuming sprinting after hitting an obstacle, by simulating holding sprint for multiple ticks	2020-10-19 21:14:56 +02:00
chylex	21ee424cef	Fix not removing custom category from Controls screen	2020-10-18 16:54:40 +02:00
chylex	c7c5b67c3b	Fix sprinting not stopping when untoggling sometimes	2020-10-18 16:02:42 +02:00
chylex	06b2782372	Fix Mod Menu support	2020-10-18 15:37:12 +02:00
chylex	83b2dfdfa5	Backport to 1.15.x	2020-10-18 15:04:04 +02:00