Release v1.2.0a for Minecraft 1.16.3+

Fix crash when installed on a server
Update README
2025-08-17 16:31:49 +02:00 · 2021-08-22 06:21:05 +02:00 · 2021-07-09 18:14:20 +02:00 · 2020-12-11 01:52:02 +01:00 · 2020-12-11 01:50:36 +01:00 · 2020-12-11 01:50:03 +01:00
56 changed files with 792 additions and 585 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+github: chylex
+patreon: chylex
+ko_fi: chylex
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,10 @@ bin/
 .classpath
 .project

+# forge
+
+logs/
+
 # fabric

 run/
--- a/README.md
+++ b/README.md
@@ -1,3 +1,81 @@
-# Better Controls
+Better Controls
+===============

-WIP
+![Logo](https://raw.githubusercontent.com/chylex/Better-Controls/master/logo.png "Depiction of Zero Regrets")
+
+Better Controls is a reimagining of [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting) with even more customizability. It features several new keybindings and many configurable options for how sprinting, sneaking, and flying should behave.
+
+Better Controls only focuses on complementing vanilla mechanics rather than adding new mechanics (such as [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting)'s option to allow sprinting in all directions) that only work on client side and server owners must explicitly opt in to enable them. By not having such features in Better Controls, it significantly reduces complexity by not having a server side version of the mod, and not needing a way to completely disable the mod while the game is running.
+
+Another major difference is the amount and granularity of options. Better Controls could be considered an *advanced controls mod* - by default, none of the keybinds are bound, and all options are set to match vanilla behavior. To take full advantage, go into *Options - Controls - Better Controls*, check out all of the available options, and figure out the best configuration for you.
+
+## Features
+
+The mod adds **Toggle Keybinds** for sprinting, sneaking, flying (creative mode), walking, and jumping. You can use modifier keys (`Control` / `Shift` / `Alt`) for each, including for example setting `Control` to Sneak, and `Control + Y` to Toggle Sneak. If you press the original key, the toggle will be canceled (in the previous example, you can Toggle Sneak by pressing `Control + Y`, and stop sneaking by simply tapping Sneak). Note that the vanilla options for toggling sprinting/sneaking are disabled to avoid conflicts with the custom keybinds.
+
+You can also bind a key that resets all **Toggle Keybinds** at once. That makes it easy to for ex. turn on walking, jumping, and sprinting, and then turn all of them off again by pressing one key instead of three.
+
+#### Sprinting
+
+* **Sprint Key Mode** changes how the Sprint key behaves. You can choose between *Tap To Start Sprinting*, *Tap To Start / Stop Sprinting*, and *Hold To Sprint*.
+* **Double Tap 'Walk Forwards' To Sprint** can be turned off to prevent accidental sprinting.
+* **Resume Sprinting After Hitting Obstacle** automatically presses the Sprint key once you are no longer touching any blocks (helpful when climbing hills, especially if the previous option is enabled).
+
+#### Sneaking
+
+* **Move Camera Smoothly** lets you disable the smooth movement when sneaking or unsneaking.
+
+#### Flying
+
+* **Double Tap 'Jump' To Fly** can be turned off to prevent accidental flight toggling.
+* **Disable Flight Inertia** stops you instantly when you stop holding movement keys.
+* **Disable Field Of View Changing** prevents sprinting, potions, and other factors from changing the FOV while flying in creative and spectator mode.
+* **Fly On Ground** lets you fly while touching the ground in creative mode (and also lets you stop flying by tapping Sneak while touching the ground).
+* **Flight Speed Multiplier** (0.25x - 8x) changes how fast you fly in creative and spectator mode.
+* **Vertical Speed Boost** (up to +300%) adds additional vertical speed boost while flying in creative and spectator mode.
+
+Both speed boosts can be configured separately for sprinting, which will be active when the Sprint key is held. Unlike in vanilla, the sprinting flight boost works in all directions.
+
+## Installation
+
+The following mod loaders are supported:
+
+* **[Fabric](https://fabricmc.net/use/)** (note: this mod does not require Fabric API)
+* **[Forge](https://files.minecraftforge.net/)**
+
+After you install the mod loader of your choice, [download the mod](https://www.curseforge.com/minecraft/mc-mods/better-controls/files) and place the `.jar` file into `.minecraft/mods`.
+
+### Minecraft Updates
+
+The mod will attempt to load on new versions of Minecraft (including snapshots) as they come out. I made it that way so that if the mod works on a newly released version of Minecraft without any changes, I can simply mark it as compatible and you don't have to wait for an update.
+
+While this is convenient, there is potential for bugs which can affect server play. If you plan to use the mod on a server, please always use the latest version of the mod, and wait until I either mark the version as compatible with new Minecraft updates, or release a new version of the mod that is marked as compatible.
+
+### Compatibility
+
+* Better Controls is a client-side mod, it will do nothing when installed on a server.
+* If you run into a conflict with another mod that modifies the *Controls* screen, hold Alt while opening *Controls* to prevent Better Controls from adding its button. If another mod prevents the button from appearing, you can install [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu) which adds a mod list with configuration buttons for mods.
+
+## Screenshot
+
+![Options Menu Screenshot](https://repo.chylex.com/better-controls.png)
+
+Source Code
+===========
+
+The `main` branch includes the latest version for Fabric. Older versions and their Forge equivalents are in branches named `fabric/<version>` and `forge/<version>`.
+
+## Contributing
+
+All contributions should target the `main` branch, unless the contribution is specifically made for older versions. Every feature must be portable to Forge to ensure parity, unless the feature adds integration with another mod that is only compatible with one mod loader. Integrations for Forge-only mods should target the most recent `forge/<version>` branch.
+
+For any larger contributions, please [open an issue](https://github.com/chylex/Better-Controls/issues/new) first before you make a PR.
+
+Please keep in mind that this mod is designed to be very simple and easy to test. Over the years, [Better Sprinting](https://github.com/chylex/Better-Sprinting) has gained a fair amount of bloat that requires extensive testing before every release, and it is the reason why I will not be accepting PRs which add:
+
+* **Translations**
+  * If you want to translate the mod, you are welcome to create a separate version of it. Unfortunately, I've always ran into enough problems with maintaining and testing community mod translations that I will not be adding official support for localization.
+* **Server-side code**
+  * Better Controls will always be exclusively client-side. The server-side support in Better Sprinting is a major time sink which requires testing 3 separate client/server configurations per mod loader, and is the main reason I decided to drop support in favor of this mod.
+* **Singleplayer-only features**
+  * Better Controls intends to add accessibility options that can be used on servers, so features that only work in singleplayer or anything that could be used for cheating on servers will not be accepted.
--- a/build.gradle
+++ b/build.gradle
@@ -1,41 +1,100 @@
-plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
-	id 'maven-publish'
+buildscript {
+	repositories {
+		maven { url = 'https://files.minecraftforge.net/maven' }
+		maven { url = "https://repo.spongepowered.org/maven" }
+		mavenCentral()
 	}
 	
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
 	dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-}
-
-processResources {
-	inputs.property "version", project.version
-	
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
-		expand "version": project.version
-	}
-	
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
+		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
 	}
 }

-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+repositories {
+	maven {
+		url "https://maven.tterrag.com/"
+	}
 }

-version = 'v' + version
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'eclipse'
+
+def mcversion = "1.16.4"
+def forgeversion = "35.0.1"
+
+def prefixName = 'displayName = '
+def prefixVersion = 'version = '
+
+def metaLines = file('src/main/resources/META-INF/mods.toml').readLines()
+def metaName = metaLines.find { line -> line.startsWith(prefixName) }.substring(prefixName.length())[1..-2]
+def metaVersion = metaLines.find { line -> line.startsWith(prefixVersion) }.substring(prefixVersion.length())[1..-2]
+
+group = 'chylex.bettercontrols'
+version = metaVersion
+archivesBaseName = metaName.replaceAll('\\s', '')
+
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+
+minecraft {
+	mappings channel: 'snapshot', version: '20201028-1.16.3'
+	
+	runs {
+		client {
+			workingDirectory file('run')
+			
+			property 'mixin.env.disableRefMap', 'true'
+			arg '-mixin.config=bettercontrols.mixins.json'
+			
+			mods {
+				bettercontrols {
+					source sourceSets.main
+				}
+			}
+		}
+		
+		server {
+			workingDirectory file('run')
+			
+			property 'mixin.env.disableRefMap', 'true'
+			arg '-mixin.config=bettercontrols.mixins.json'
+			
+			mods {
+				bettercontrols {
+					source sourceSets.main
+				}
+			}
+		}
+	}
+}
+
+dependencies {
+	minecraft 'net.minecraftforge:forge:' + mcversion + '-' + forgeversion
+}

 jar {
-	from "LICENSE"
-	exclude "io/github/prospector/"
+	archiveName = archivesBaseName + '-' + mcversion + '+v' + version + '.jar'
+	
+	from('./') {
+		include 'LICENSE'
+	}
+	
+	manifest {
+		attributes([
+			'Specification-Title'     : 'bettercontrols',
+			'Specification-Version'   : '1',
+			'Specification-Vendor'    : 'chylex',
+			
+			'Implementation-Title'    : metaName,
+			'Implementation-Version'  : metaVersion,
+			'Implementation-Vendor'   : 'chylex',
+			
+			'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+			
+			'MixinConfigs'            : 'bettercontrols.mixins.json'
+		])
+	}
+	
+	finalizedBy('reobfJar')
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-
-# Fabric Properties
-minecraft_version=1.16.3
-yarn_mappings=1.16.3+build.47
-loader_version=0.10.2+build.210
-
-# Mod Properties
-mod_version=1.1.0
-maven_group=chylex.bettercontrols
-archives_base_name=BetterControls-1.16.2+
-
-# https://fabricmc.net/use
-# https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+# 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
--- 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-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
--- a/53
+++ b/53
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh

-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

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

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -82,7 +66,6 @@ esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -126,11 +109,10 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
@@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=`expr $i + 1`
+        i=$((i+1))
    done
    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -177,9 +159,14 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=`save "$@"`
+APP_ARGS=$(save "$@")

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

+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -29,11 +13,8 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -84,7 +65,6 @@ set CMD_LINE_ARGS=%*

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-
@rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

--- a/src/main/resources/assets/bettercontrols/icon.png
+++ b/src/main/resources/assets/bettercontrols/icon.png
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +0,0 @@
-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,11 +1,33 @@
 package chylex.bettercontrols;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
+import chylex.bettercontrols.gui.BetterControlsScreen;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fml.network.FMLNetworkConstants;
+import org.apache.commons.lang3.tuple.Pair;

-public final class BetterControlsMod implements ClientModInitializer{
-	public static final BetterControlsConfig config = BetterControlsConfig.load(FabricLoader.getInstance().getConfigDir().resolve("BetterControls.json"));
+@Mod("bettercontrols")
+public final class BetterControlsMod{
+	public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
 	
-	@Override
-	public void onInitializeClient(){}
+	public BetterControlsMod(){
+		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> ClientLoader::createScreen);
+		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> 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);
+		}
+	}
 }
--- a/src/main/java/chylex/bettercontrols/compatibility/ModMenuSupport.java
+++ b/src/main/java/chylex/bettercontrols/compatibility/ModMenuSupport.java
@@ -1,11 +0,0 @@
-package chylex.bettercontrols.compatibility;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-
-public class ModMenuSupport implements ModMenuApi{
-	@Override
-	public ConfigScreenFactory<?> getModConfigScreenFactory(){
-		return BetterControlsScreen::new;
-	}
-}
--- a/src/main/java/chylex/bettercontrols/config/BetterControlsConfig.java
+++ b/src/main/java/chylex/bettercontrols/config/BetterControlsConfig.java
@@ -1,7 +1,6 @@
 package chylex.bettercontrols.config;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
-import net.minecraft.client.options.KeyBinding;
 import java.nio.file.Path;

 public final class BetterControlsConfig{
@@ -20,7 +19,8 @@ public final class BetterControlsConfig{
 	public boolean sneakingMovesCameraSmoothly = true;
 	
 	public final KeyBindingWithModifier keyToggleFlight = new KeyBindingWithModifier("key.bettercontrols.toggle_flight");
-	public SprintMode sprintModeWhileFlying = SprintMode.TAP_TO_START;
+	public boolean doubleTapJumpToToggleFlight = true;
+	public boolean disableFlightInertia = false;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
 	public float flightSpeedMpCreativeDefault = 1F;
@@ -44,8 +44,8 @@ public final class BetterControlsConfig{
 		return this;
 	}
 	
-	public KeyBinding[] getAllKeyBindings(){
-		return new KeyBinding[]{
+	public KeyBindingWithModifier[] getAllKeyBindings(){
+		return new KeyBindingWithModifier[]{
 			keyToggleSprint,
 			keyToggleSneak,
 			keyToggleFlight,
--- a/src/main/java/chylex/bettercontrols/config/ConfigSerializer.java
+++ b/src/main/java/chylex/bettercontrols/config/ConfigSerializer.java
@@ -11,7 +11,6 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import net.minecraft.util.math.MathHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import java.io.FileNotFoundException;
@@ -41,7 +40,8 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		Json.setBool(obj, "Sneak.SmoothCamera", cfg.sneakingMovesCameraSmoothly);
 		
 		Json.writeKeyBinding(obj, "Flight.KeyToggle.Creative", cfg.keyToggleFlight);
-		Json.setEnum(obj, "Flight.SprintMode", cfg.sprintModeWhileFlying);
+		Json.setBool(obj, "Flight.DoubleTapJump", cfg.doubleTapJumpToToggleFlight);
+		Json.setBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		Json.setBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		Json.setBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
 		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
@@ -79,17 +79,18 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		cfg.sneakingMovesCameraSmoothly = Json.getBool(obj, "Sneak.SmoothCamera", cfg.sneakingMovesCameraSmoothly);
 		
 		Json.readKeyBinding(obj, "Flight.KeyToggle.Creative", cfg.keyToggleFlight);
-		cfg.sprintModeWhileFlying = Json.getEnum(obj, "Flight.SprintMode", cfg.sprintModeWhileFlying, SprintMode.class);
+		cfg.doubleTapJumpToToggleFlight = Json.getBool(obj, "Flight.DoubleTapJump", cfg.doubleTapJumpToToggleFlight);
+		cfg.disableFlightInertia = Json.getBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		cfg.disableChangingFovWhileFlying = Json.getBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		cfg.flyOnGroundInCreative = Json.getBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		cfg.flightSpeedMpCreativeDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault), 0.25F, 8F);
-		cfg.flightSpeedMpCreativeSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting), 0.25F, 8F);
-		cfg.flightSpeedMpSpectatorDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault), 0.25F, 8F);
-		cfg.flightSpeedMpSpectatorSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting), 0.25F, 8F);
-		cfg.flightVerticalBoostCreativeDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault), 0F, 3F);
-		cfg.flightVerticalBoostCreativeSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting), 0F, 3F);
-		cfg.flightVerticalBoostSpectatorDefault = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault), 0F, 3F);
-		cfg.flightVerticalBoostSpectatorSprinting = MathHelper.clamp(Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting), 0F, 3F);
+		cfg.flightSpeedMpCreativeDefault = Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault, 0.25F, 8F);
+		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
+		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
+		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
+		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
+		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
+		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
+		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
--- a/src/main/java/chylex/bettercontrols/config/Json.java
+++ b/src/main/java/chylex/bettercontrols/config/Json.java
@@ -1,26 +1,19 @@
 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 net.minecraft.client.util.InputUtil;

 final class Json{
 	private Json(){}
 	
-	static void setInt(final JsonObject obj, final String key, final int value){
-		obj.addProperty(key, Integer.valueOf(value));
-	}
-	
-	static int getInt(final JsonObject obj, final String key, final int defaultValue){
-		return obj.has(key) ? obj.get(key).getAsInt() : defaultValue;
-	}
-	
 	static void setFloat(final JsonObject obj, final String key, final float value){
 		obj.addProperty(key, Float.valueOf(value));
 	}
 	
-	static float getFloat(final JsonObject obj, final String key, final float defaultValue){
-		return obj.has(key) ? obj.get(key).getAsFloat() : defaultValue;
+	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){
@@ -59,7 +52,7 @@ final class Json{
 	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.getBoundKeyTranslationKey());
+		obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
 		
 		if (keyBinding.getModifier() != null){
 			obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
@@ -68,7 +61,7 @@ final class Json{
 	
 	static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
 		if (obj.has(key + KEY_SUFFIX)){
-			keyBinding.setBoundKey(InputUtil.fromTranslationKey(obj.get(key + KEY_SUFFIX).getAsString()));
+			Key.readBinding(keyBinding, obj.get(key + KEY_SUFFIX).getAsString());
 		}
 		
 		if (obj.has(key + MOD_SUFFIX)){
--- a/src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java
+++ b/src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java
@@ -10,18 +10,17 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Element;
+import chylex.bettercontrols.util.Key;
+import chylex.bettercontrols.util.LiteralText;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.gui.DialogTexts;
+import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
-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.util.InputUtil;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.Text;
+import net.minecraft.client.gui.screen.SettingsScreen;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.settings.KeyBinding;
 import org.lwjgl.glfw.GLFW;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -31,9 +30,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 GameOptionsScreen{
-	public static final LiteralText TITLE = new LiteralText("Better Controls");
+public class BetterControlsScreen extends SettingsScreen{
+	public static final LiteralText TITLE = text("Better Controls");
 	
 	private static final int BOTTOM_PADDING = 3;
 	private static final int TEXT_PADDING_RIGHT = 4;
@@ -41,45 +42,45 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	private static final int ROW_HEIGHT = 22;
 	
 	private final List<Option<SprintMode>> SPRINT_MODE_OPTIONS = Arrays.asList(
-		new Option<>(SprintMode.TAP_TO_START, Text.of("Tap To Start Sprinting")),
-		new Option<>(SprintMode.TAP_TO_TOGGLE, Text.of("Tap To Start / Stop Sprinting")),
-		new Option<>(SprintMode.HOLD, Text.of("Hold To Sprint"))
+		new Option<>(SprintMode.TAP_TO_START, text("Tap To Start Sprinting")),
+		new Option<>(SprintMode.TAP_TO_TOGGLE, text("Tap To Start / Stop Sprinting")),
+		new Option<>(SprintMode.HOLD, text("Hold To Sprint"))
 	);
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<Element> elements){
+	private int generateSprintingOptions(int y, final List<IGuiEventListener> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Sprint"), cfg.keyToggleSprint);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Sprint Key Mode"));
+		generateLeftSideText(y, elements, text("Sprint Key Mode"));
 		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Double Tap 'Walk Forwards' To Sprint"));
+		generateLeftSideText(y, elements, text("Double Tap 'Walk Forwards' To Sprint"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Resume Sprinting After Hitting Obstacle"));
+		generateLeftSideText(y, elements, text("Resume Sprinting After Hitting Obstacle"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value));
 		
 		y += ROW_HEIGHT;
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<Element> elements){
+	private int generateSneakingOptions(int y, final List<IGuiEventListener> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Sneak"), cfg.keyToggleSneak);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Move Camera Smoothly"));
+		generateLeftSideText(y, elements, text("Move Camera Smoothly"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value));
 		
 		y += ROW_HEIGHT;
@@ -87,79 +88,84 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	}
 	
 	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
-	private int generateFlightOptions(int y, final List<Element> elements){
+	private int generateFlightOptions(int y, final List<IGuiEventListener> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
 		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
-			new Option<>(Float.valueOf(0.25F), Text.of("0.25x")),
-			new Option<>(Float.valueOf(0.50F), Text.of("0.5x")),
-			new Option<>(Float.valueOf(0.75F), Text.of("0.75x")),
-			new Option<>(Float.valueOf(1.00F), Text.of("1x")),
-			new Option<>(Float.valueOf(1.50F), Text.of("1.5x")),
-			new Option<>(Float.valueOf(2.00F), Text.of("2x")),
-			new Option<>(Float.valueOf(3.00F), Text.of("3x")),
-			new Option<>(Float.valueOf(4.00F), Text.of("4x")),
-			new Option<>(Float.valueOf(5.00F), Text.of("5x")),
-			new Option<>(Float.valueOf(6.00F), Text.of("6x")),
-			new Option<>(Float.valueOf(7.00F), Text.of("7x")),
-			new Option<>(Float.valueOf(8.00F), Text.of("8x"))
+			new Option<>(Float.valueOf(0.25F), text("0.25x")),
+			new Option<>(Float.valueOf(0.50F), text("0.5x")),
+			new Option<>(Float.valueOf(0.75F), text("0.75x")),
+			new Option<>(Float.valueOf(1.00F), text("1x")),
+			new Option<>(Float.valueOf(1.50F), text("1.5x")),
+			new Option<>(Float.valueOf(2.00F), text("2x")),
+			new Option<>(Float.valueOf(3.00F), text("3x")),
+			new Option<>(Float.valueOf(4.00F), text("4x")),
+			new Option<>(Float.valueOf(5.00F), text("5x")),
+			new Option<>(Float.valueOf(6.00F), text("6x")),
+			new Option<>(Float.valueOf(7.00F), text("7x")),
+			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
 		final List<Option<Float>> flightVerticalBoostOptions = Arrays.asList(
-			new Option<>(Float.valueOf(0.00F), Text.of("None")),
-			new Option<>(Float.valueOf(0.25F), Text.of("+25%")),
-			new Option<>(Float.valueOf(0.50F), Text.of("+50%")),
-			new Option<>(Float.valueOf(0.75F), Text.of("+75%")),
-			new Option<>(Float.valueOf(1.00F), Text.of("+100%")),
-			new Option<>(Float.valueOf(1.50F), Text.of("+150%")),
-			new Option<>(Float.valueOf(2.00F), Text.of("+200%")),
-			new Option<>(Float.valueOf(2.50F), Text.of("+250%")),
-			new Option<>(Float.valueOf(3.00F), Text.of("+300%"))
+			new Option<>(Float.valueOf(0.00F), text("None")),
+			new Option<>(Float.valueOf(0.25F), text("+25%")),
+			new Option<>(Float.valueOf(0.50F), text("+50%")),
+			new Option<>(Float.valueOf(0.75F), text("+75%")),
+			new Option<>(Float.valueOf(1.00F), text("+100%")),
+			new Option<>(Float.valueOf(1.50F), text("+150%")),
+			new Option<>(Float.valueOf(2.00F), text("+200%")),
+			new Option<>(Float.valueOf(2.50F), text("+250%")),
+			new Option<>(Float.valueOf(3.00F), text("+300%"))
 		);
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Flight (Creative)"), cfg.keyToggleFlight);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Sprint Key Mode While Flying"));
-		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintModeWhileFlying, value -> cfg.sprintModeWhileFlying = value));
+		generateLeftSideText(y, elements, text("Double Tap 'Jump' To Fly (Creative)"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Disable Field Of View Changing"));
+		generateLeftSideText(y, elements, text("Disable Flight Inertia"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value));
+		
+		y += ROW_HEIGHT;
+		
+		generateLeftSideText(y, elements, text("Disable Field Of View Changing"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Fly On Ground (Creative Mode)"));
+		generateLeftSideText(y, elements, text("Fly On Ground (Creative Mode)"));
 		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value));
 		
 		y += ROW_HEIGHT * 4 / 3;
 		
-		elements.add(new TextWidget(col4(2), y, COL4_W - TEXT_PADDING_RIGHT, Text.of("Creative"), CENTER));
-		elements.add(new TextWidget(col4(3), y, COL4_W - TEXT_PADDING_RIGHT, Text.of("Spectator"), CENTER));
+		elements.add(new TextWidget(col4(2), y, COL4_W - TEXT_PADDING_RIGHT, text("Creative"), CENTER));
+		elements.add(new TextWidget(col4(3), y, COL4_W - TEXT_PADDING_RIGHT, text("Spectator"), CENTER));
 		
 		y += ROW_HEIGHT * 7 / 8;
 		
-		generateLeftSideText(y, elements, Text.of("Speed Multiplier (Default)"));
+		generateLeftSideText(y, elements, text("Speed Multiplier (Default)"));
 		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
 		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Speed Multiplier (Sprinting)"));
+		generateLeftSideText(y, elements, text("Speed Multiplier (Sprinting)"));
 		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpCreativeSprinting, value -> cfg.flightSpeedMpCreativeSprinting = value));
 		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Vertical Speed Boost (Default)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Boost (Default)"));
 		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeDefault, value -> cfg.flightVerticalBoostCreativeDefault = value));
 		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
 		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, Text.of("Vertical Speed Boost (Sprinting)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
 		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
 		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
 		
@@ -167,22 +173,22 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<Element> elements){
+	private int generateMiscellaneousOptions(int y, final List<IGuiEventListener> elements){
 		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Toggle Jump"), cfg.keyToggleJump);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
 		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Reset All Toggles"), cfg.keyResetAllToggles);
+		generateKeyBindingWithModifierOption(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
 		
 		y += ROW_HEIGHT * 4 / 3;
 		
-		generateKeyBindingWithModifierOption(y, elements, Text.of("Open Better Controls Menu"), cfg.keyOpenMenu);
+		generateKeyBindingWithModifierOption(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
 		
 		y += ROW_HEIGHT;
 		return y;
@@ -191,13 +197,13 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	// Helpers
 	
 	private static final List<Option<ModifierKey>> MODIFIER_OPTIONS = Arrays.asList(
-		new Option<>(null, Text.of("(No Modifier)")),
-		new Option<>(ModifierKey.CONTROL, Text.of("Control")),
-		new Option<>(ModifierKey.SHIFT, Text.of("Shift")),
-		new Option<>(ModifierKey.ALT, Text.of("Alt"))
+		new Option<>(null, text("(No Modifier)")),
+		new Option<>(ModifierKey.CONTROL, text("Control")),
+		new Option<>(ModifierKey.SHIFT, text("Shift")),
+		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierOption(final int y, final List<Element> elements, final Text text, final KeyBindingWithModifier binding){
+	private void generateKeyBindingWithModifierOption(final int y, final List<IGuiEventListener> elements, final LiteralText text, final KeyBindingWithModifier binding){
 		final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
 		final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
@@ -208,7 +214,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static void generateLeftSideText(final int y, final List<Element> elements, final Text text){
+	private static void generateLeftSideText(final int y, final List<IGuiEventListener> elements, final LiteralText text){
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
 	
@@ -218,35 +224,35 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(final Screen parentScreen){
-		super(parentScreen, MinecraftClient.getInstance().options, TITLE);
+	public BetterControlsScreen(@Nullable final Screen parentScreen){
+		super(parentScreen, OPTIONS, TITLE);
 	}
 	
 	@Override
 	public void init(){
 		allKeyBindings.clear();
 		
-		final List<Element> elements = new ArrayList<>();
+		final List<IGuiEventListener> elements = new ArrayList<>();
 		int y = 0;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Sprinting"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
 		y = generateSprintingOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Sneaking"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sneaking"), CENTER));
 		y = generateSneakingOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Flying"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Flying"), CENTER));
 		y = generateFlightOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, Text.of("Miscellaneous"), CENTER));
+		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		addButton(new ButtonWidget(width / 2 - 99, height - 29, 200, 20, ScreenTexts.DONE, btn -> client.openScreen(parent)));
-		addChild(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
+		addButton(new Button(width / 2 - 99, height - 29, 200, 20, DialogTexts.GUI_DONE, btn -> minecraft.displayGuiScreen(parentScreen)));
+		addListener(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
-	public void removed(){
+	public void onClose(){
 		BetterControlsMod.config.save();
 	}
 	
@@ -254,7 +260,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
 		renderBackground(matrices);
 		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		drawCenteredText(matrices, textRenderer, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
+		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
 		super.render(matrices, mouseX, mouseY, delta);
 	}
 	
@@ -269,7 +275,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	@Override
 	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
 		if (editingKeyBinding != null){
-			editingKeyBinding.bindAndStopEditing(InputUtil.Type.MOUSE.createFromCode(button));
+			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
@@ -282,10 +288,10 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
 		if (editingKeyBinding != null){
 			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
-				editingKeyBinding.bindAndStopEditing(InputUtil.UNKNOWN_KEY);
+				editingKeyBinding.bindAndStopEditing(Key.INVALID);
 			}
 			else{
-				editingKeyBinding.bindAndStopEditing(InputUtil.fromKeyCode(keyCode, scanCode));
+				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
@@ -298,7 +304,7 @@ public class BetterControlsScreen extends GameOptionsScreen{
 	
 	private void onKeyBindingEditingFinished(){
 		editingKeyBinding = null;
-		KeyBinding.updateKeysByCode();
+		KeyBinding.resetKeyBindingArrayAndHash();
 		
 		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,56 +1,45 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import net.minecraft.client.MinecraftClient;
-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 net.minecraft.client.util.math.MatrixStack;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.gui.IGuiEventListener;
+import net.minecraft.client.gui.IRenderable;
+import net.minecraft.client.gui.widget.list.AbstractOptionList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;

-public final class OptionListWidget extends ElementListWidget<Entry>{
+public final class OptionListWidget extends AbstractOptionList<Entry>{
 	public static final int ROW_WIDTH = 408;
 	public static final int ROW_PADDING = 2;
 	
 	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
-	public static final int COL3_W = (ROW_WIDTH / 3) - ROW_PADDING;
 	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
-	public static final int COL6_W = (ROW_WIDTH / 6) - ROW_PADDING;
 	
 	public static int col2(final int column){
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col3(final int column){
-		return (column * ROW_WIDTH) / 3;
-	}
-	
 	public static int col4(final int column){
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	public static int col6(final int column){
-		return (column * ROW_WIDTH) / 6;
-	}
-	
-	private static Offset getElementOffset(final Element element){
+	private static Offset getElementOffset(final IGuiEventListener element){
 		if (element instanceof Widget){
 			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
 		}
-		else if (element instanceof AbstractButtonWidget){
-			return new Offset(((AbstractButtonWidget)element).x, ((AbstractButtonWidget)element).y);
+		else if (element instanceof net.minecraft.client.gui.widget.Widget){
+			return new Offset(((net.minecraft.client.gui.widget.Widget)element).x, ((net.minecraft.client.gui.widget.Widget)element).y);
 		}
 		else{
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface Widget extends Element, Drawable{
+	public interface Widget extends IGuiEventListener, IRenderable{
 		int getX();
 		int getY();
 		void setX(int x);
@@ -67,13 +56,13 @@ public final class OptionListWidget extends ElementListWidget<Entry>{
 		}
 	}
 	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<Element> widgets, final int innerHeight){
-		super(MinecraftClient.getInstance(), width, height, top, bottom, innerHeight);
+	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<IGuiEventListener> widgets, final int innerHeight){
+		super(MINECRAFT, width, height, top, bottom, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	protected int getRowLeft(){
+	public int getRowLeft(){
 		return super.getRowLeft() - ROW_PADDING;
 	}
 	
@@ -83,31 +72,31 @@ public final class OptionListWidget extends ElementListWidget<Entry>{
 	}
 	
 	@Override
-	protected int getScrollbarPositionX(){
+	protected int getScrollbarPosition(){
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	protected static final class Entry extends ElementListWidget.Entry<Entry>{
-		private final List<Element> elements;
-		private final Map<Element, Offset> offsets;
+	protected static final class Entry extends AbstractOptionList.Entry<Entry>{
+		private final List<IGuiEventListener> elements;
+		private final Map<IGuiEventListener, Offset> offsets;
 		
-		public Entry(final List<Element> elements){
+		public Entry(final List<IGuiEventListener> elements){
 			this.elements = new ArrayList<>(elements);
 			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
 		@Override
-		public List<? extends Element> children(){
+		public List<? extends IGuiEventListener> getEventListeners(){
 			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
 		public void render(final MatrixStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta){
-			for(final Element element : elements){
+			for(final IGuiEventListener element : elements){
 				final Offset offset = offsets.get(element);
 				
-				if (element instanceof AbstractButtonWidget){
-					final AbstractButtonWidget button = (AbstractButtonWidget)element;
+				if (element instanceof net.minecraft.client.gui.widget.Widget){
+					final net.minecraft.client.gui.widget.Widget button = (net.minecraft.client.gui.widget.Widget)element;
 					button.x = x + offset.x;
 					button.y = y + offset.y;
 				}
@@ -117,8 +106,8 @@ public final class OptionListWidget extends ElementListWidget<Entry>{
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Drawable){
-					((Drawable)element).render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof IRenderable){
+					((IRenderable)element).render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}
--- a/src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java
+++ b/src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java
@@ -1,28 +1,29 @@
 package chylex.bettercontrols.gui;
 import chylex.bettercontrols.mixin.AccessScreenButtons;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Element;
-import net.minecraft.client.gui.screen.options.AccessibilityOptionsScreen;
-import net.minecraft.client.gui.screen.options.ControlsOptionsScreen;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
-import net.minecraft.client.gui.widget.ButtonListWidget;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.OptionButtonWidget;
-import net.minecraft.client.options.Option;
+import net.minecraft.client.AbstractOption;
+import net.minecraft.client.gui.AccessibilityScreen;
+import net.minecraft.client.gui.IGuiEventListener;
+import net.minecraft.client.gui.INestedGuiEventHandler;
+import net.minecraft.client.gui.screen.ControlsScreen;
+import net.minecraft.client.gui.widget.button.AbstractButton;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.widget.button.OptionButton;
 import java.util.List;
+import java.util.function.Consumer;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;

 public final class ScreenPatcher{
 	private ScreenPatcher(){}
 	
-	public static void onControlsScreenOpened(final ControlsOptionsScreen screen){
+	public static void onControlsScreenOpened(final ControlsScreen screen){
 		final AccessScreenButtons accessor = (AccessScreenButtons)screen;
 		
-		final List<? extends Element> children = screen.children();
-		final List<AbstractButtonWidget> buttons = accessor.getButtons();
+		final List<? extends IGuiEventListener> children = screen.getEventListeners();
+		final List<AbstractButton> buttons = accessor.getButtons();
 		
-		final AbstractButtonWidget autoJump = buttons
+		final AbstractButton autoJump = buttons
 			.stream()
-			.filter(it -> it instanceof OptionButtonWidget && ((OptionButtonWidget)it).getOption() == Option.AUTO_JUMP)
+			.filter(it -> it instanceof OptionButton && ((OptionButton)it).func_238517_a_() == AbstractOption.AUTO_JUMP)
 			.findAny()
 			.orElse(null);
 		
@@ -30,28 +31,32 @@ public final class ScreenPatcher{
 			children.remove(autoJump);
 			buttons.remove(autoJump);
 			
-			accessor.callAddButton(new ButtonWidget(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.copy().append("..."), btn -> {
-				MinecraftClient.getInstance().openScreen(new BetterControlsScreen(screen));
+			accessor.callAddButton(new Button(autoJump.x, autoJump.y, autoJump.getWidth(), 20, BetterControlsScreen.TITLE.copy().appendString("..."), btn -> {
+				MINECRAFT.displayGuiScreen(new BetterControlsScreen(screen));
 			}));
 		}
 	}
 	
-	public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen){
-		final AccessScreenButtons accessor = (AccessScreenButtons)screen;
+	public static void onAccessibilityScreenOpened(final AccessibilityScreen screen){
+		walkChildren(screen.getEventListeners(), it -> {
+			if (it instanceof OptionButton){
+				final OptionButton button = (OptionButton)it;
+				final AbstractOption option = button.func_238517_a_();
 				
-		screen.children()
-			.stream()
-			.filter(it -> it instanceof ButtonListWidget)
-			.flatMap(it -> ((ButtonListWidget)it).children().stream())
-			.flatMap(it -> it.children().stream())
-			.filter(it -> it instanceof OptionButtonWidget)
-			.forEach(it -> {
-				final OptionButtonWidget button = (OptionButtonWidget)it;
-				final Option option = button.getOption();
-				
-				if (option == Option.SPRINT_TOGGLED || option == Option.SNEAK_TOGGLED){
+				if (option == AbstractOption.SPRINT || option == AbstractOption.SNEAK){
 					button.active = false;
 				}
+			}
 		});
 	}
+	
+	private static void walkChildren(final List<? extends IGuiEventListener> listeners, final Consumer<IGuiEventListener> callback){
+		for(final IGuiEventListener listener : listeners){
+			callback.accept(listener);
+			
+			if (listener instanceof INestedGuiEventHandler){
+				walkChildren(((INestedGuiEventHandler)listener).getEventListeners(), callback);
+			}
+		}
+	}
 }
--- a/src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java
@@ -1,14 +1,14 @@
 package chylex.bettercontrols.gui.elements;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.client.gui.screen.ScreenTexts;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.DialogTexts;
+import net.minecraft.client.gui.widget.button.Button;

-public final class BooleanValueWidget extends ButtonWidget{
+public final class BooleanValueWidget extends Button{
 	private final BooleanConsumer onChanged;
 	private boolean value;
 	
 	public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged){
-		super(x, y, width, height, currentValue ? ScreenTexts.ON : ScreenTexts.OFF, ignore -> {});
+		super(x, y, width, height, currentValue ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_OFF, ignore -> {});
 		this.value = currentValue;
 		this.onChanged = onChanged;
 	}
@@ -21,7 +21,7 @@ public final class BooleanValueWidget extends ButtonWidget{
 	public void onPress(){
 		super.onPress();
 		value = !value;
-		setMessage(value ? ScreenTexts.ON : ScreenTexts.OFF);
+		setMessage(value ? DialogTexts.OPTIONS_ON : DialogTexts.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,9 +1,9 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.button.Button;
 import java.util.List;
 import java.util.function.Consumer;

-public class CycleButtonWidget<T> extends ButtonWidget{
+public class CycleButtonWidget<T> extends Button{
 	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
--- a/src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java
@@ -1,10 +1,10 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.gui.widget.SliderWidget;
+import net.minecraft.client.gui.widget.AbstractSlider;
 import net.minecraft.util.math.MathHelper;
 import java.util.List;
 import java.util.function.Consumer;

-public final class DiscreteValueSliderWidget<T> extends SliderWidget{
+public final class DiscreteValueSliderWidget<T> extends AbstractSlider{
 	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
@@ -21,16 +21,16 @@ public final class DiscreteValueSliderWidget<T> extends SliderWidget{
 	}
 	
 	public Option<T> getSelectedOption(){
-		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, value)));
+		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, sliderValue)));
 	}
 	
 	@Override
-	protected void updateMessage(){
+	protected void func_230979_b_(){
 		setMessage(getSelectedOption().getText());
 	}
 	
 	@Override
-	protected void applyValue(){
+	protected void func_230972_a_(){
 		final T newSelectedValue = getSelectedOption().getValue();
 		
 		if (selectedValue != newSelectedValue){
--- a/src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java
@@ -1,31 +1,32 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.options.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import net.minecraft.util.Formatting;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.gui.widget.button.AbstractButton;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.util.InputMappings;
+import net.minecraft.util.text.IFormattableTextComponent;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.TranslationTextComponent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
+import static chylex.bettercontrols.util.Statics.OPTIONS;

-public final class KeyBindingWidget extends ButtonWidget{
+public final class KeyBindingWidget extends Button{
 	private final KeyBinding binding;
-	private final Text bindingName;
+	private final ITextComponent bindingName;
 	
-	private final List<AbstractButtonWidget> linkedButtons = new ArrayList<>(1);
+	private final List<AbstractButton> linkedButtons = new ArrayList<>(1);
 	
 	private final Consumer<KeyBindingWidget> onEditingStarted;
 	private boolean isEditing;
 	
 	public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyBinding binding, final Consumer<KeyBindingWidget> onEditingStarted){
-		super(x, y, width, height, LiteralText.EMPTY, btn -> {});
+		super(x, y, width, height, StringTextComponent.EMPTY, btn -> {});
 		this.binding = binding;
-		this.bindingName = new TranslatableText(binding.getTranslationKey());
+		this.bindingName = new TranslationTextComponent(binding.getTranslationKey());
 		this.onEditingStarted = onEditingStarted;
 		updateKeyBindingText();
 	}
@@ -34,14 +35,14 @@ public final class KeyBindingWidget extends ButtonWidget{
 		this(x, y, width, 20, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButtonWidget button){
+	public void linkButtonToBoundState(final AbstractButton button){
 		linkedButtons.add(button);
-		button.active = !binding.isUnbound();
+		button.active = !Key.isUnbound(binding);
 	}
 	
 	@Override
-	protected MutableText getNarrationMessage(){
-		return binding.isUnbound() ? new TranslatableText("narrator.controls.unbound", bindingName) : new TranslatableText("narrator.controls.bound", bindingName, super.getNarrationMessage());
+	protected IFormattableTextComponent getNarrationMessage(){
+		return Key.isUnbound(binding) ? new TranslationTextComponent("narrator.controls.unbound", bindingName) : new TranslationTextComponent("narrator.controls.bound", bindingName, super.getNarrationMessage());
 	}
 	
 	@Override
@@ -51,12 +52,12 @@ public final class KeyBindingWidget extends ButtonWidget{
 		updateKeyBindingText();
 	}
 	
-	public void bindAndStopEditing(final InputUtil.Key key){
-		binding.setBoundKey(key);
+	public void bindAndStopEditing(final InputMappings.Input key){
+		Key.bind(binding, key);
 		stopEditing();
 		
-		for(final AbstractButtonWidget button : linkedButtons){
-			button.active = !binding.isUnbound();
+		for(final AbstractButton button : linkedButtons){
+			button.active = !Key.isUnbound(binding);
 		}
 	}
 	
@@ -68,22 +69,23 @@ public final class KeyBindingWidget extends ButtonWidget{
 	public void updateKeyBindingText(){
 		boolean hasConflict = false;
 		
-		if (!binding.isUnbound()){
-			for(final KeyBinding other : MinecraftClient.getInstance().options.keysAll){
+		if (!Key.isUnbound(binding)){
+			for(final KeyBinding other : OPTIONS.keyBindings){
 				if (binding != other && binding.equals(other)){
 					hasConflict = true;
+					break;
 				}
 			}
 		}
 		
 		if (isEditing){
-			setMessage((new LiteralText("> ")).append(binding.getBoundKeyLocalizedText().shallowCopy().formatted(Formatting.YELLOW)).append(" <").formatted(Formatting.YELLOW));
+			setMessage((new StringTextComponent("> ")).append(Key.getBoundKeyText(binding).deepCopy().mergeStyle(TextFormatting.YELLOW)).appendString(" <").mergeStyle(TextFormatting.YELLOW));
 		}
 		else if (hasConflict){
-			setMessage(binding.getBoundKeyLocalizedText().shallowCopy().formatted(Formatting.RED));
+			setMessage(Key.getBoundKeyText(binding).deepCopy().mergeStyle(TextFormatting.RED));
 		}
 		else{
-			setMessage(binding.isUnbound() ? Text.of("(No Binding)") : binding.getBoundKeyLocalizedText());
+			setMessage(Key.isUnbound(binding) ? new StringTextComponent("(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,13 +1,13 @@
 package chylex.bettercontrols.gui.elements;
-import net.minecraft.text.Text;
+import chylex.bettercontrols.util.LiteralText;
 import java.util.List;
 import java.util.Objects;

 public final class Option<T>{
 	private final T value;
-	private final Text text;
+	private final LiteralText text;
 	
-	public Option(final T value, final Text text){
+	public Option(final T value, final LiteralText text){
 		this.value = value;
 		this.text = text;
 	}
@@ -16,7 +16,7 @@ public final class Option<T>{
 		return value;
 	}
 	
-	public Text getText(){
+	public LiteralText getText(){
 		return text;
 	}
 	
--- a/src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java
+++ b/src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java
@@ -1,25 +1,25 @@
 package chylex.bettercontrols.gui.elements;
 import chylex.bettercontrols.gui.OptionListWidget.Widget;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Text;
+import chylex.bettercontrols.util.LiteralText;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.gui.AbstractGui;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.util.IReorderingProcessor;
 import java.util.List;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;

-public final class TextWidget extends DrawableHelper implements Widget{
+public final class TextWidget extends AbstractGui implements Widget{
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
-	private final Text 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 Text 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,11 +28,11 @@ public final class TextWidget extends DrawableHelper implements Widget{
 		this.align = align;
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Text text, final int align){
+	public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align){
 		this(x, y, width, 20, text, align);
 	}
 	
-	public TextWidget(final int x, final int y, final int width, final Text text){
+	public TextWidget(final int x, final int y, final int width, final LiteralText text){
 		this(x, y, width, 20, text, LEFT);
 	}
 	
@@ -58,16 +58,16 @@ public final class TextWidget extends DrawableHelper implements Widget{
 	
 	@Override
 	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
-		final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-		final List<OrderedText> lines = textRenderer.wrapLines(text, width);
-		final int lineHeight = textRenderer.fontHeight + 1;
+		final FontRenderer textRenderer = MINECRAFT.fontRenderer;
+		final List<IReorderingProcessor> lines = textRenderer.trimStringToWidth(text, width);
+		final int lineHeight = textRenderer.FONT_HEIGHT + 1;
 		
-		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::getWidth).max().orElse(0) / 2) : x;
+		final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::func_243245_a).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 OrderedText line = lines.get(i);
-			textRenderer.drawWithShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+			final IReorderingProcessor line = lines.get(i);
+			textRenderer.func_238407_a_(matrices, 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,15 +1,15 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.options.KeyBinding;
-import net.minecraft.client.util.InputUtil.Type;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-import org.jetbrains.annotations.Nullable;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.util.InputMappings.Type;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
+import javax.annotation.Nullable;

 public class KeyBindingWithModifier extends KeyBinding{
 	public static final String CATEGORY = "key.categories.bettercontrols";
 	
-	public static boolean checkCategoryMatches(final Text text){
-		return text instanceof TranslatableText && CATEGORY.equals(((TranslatableText)text).getKey());
+	public static boolean checkCategoryMatches(final ITextComponent text){
+		return text instanceof TranslationTextComponent && CATEGORY.equals(((TranslationTextComponent)text).getKey());
 	}
 	
 	@Nullable
@@ -19,21 +19,22 @@ public class KeyBindingWithModifier extends KeyBinding{
 		super(translationKey, Type.KEYSYM, -1, CATEGORY);
 	}
 	
-	public void setModifier(final @Nullable ModifierKey modifier){
+	public void setModifier(@Nullable final ModifierKey modifier){
 		this.modifier = modifier;
 	}
 	
-	public @Nullable ModifierKey getModifier(){
+	@Nullable
+	public ModifierKey getModifier(){
 		return modifier;
 	}
 	
+	@Override
+	public boolean isKeyDown(){
+		return super.isKeyDown() && (modifier == null || modifier.isPressed());
+	}
+	
 	@Override
 	public boolean isPressed(){
 		return super.isPressed() && (modifier == null || modifier.isPressed());
 	}
-	
-	@Override
-	public boolean wasPressed(){
-		return super.wasPressed() && (modifier == null || modifier.isPressed());
-	}
 }
--- a/src/main/java/chylex/bettercontrols/input/ToggleTracker.java
+++ b/src/main/java/chylex/bettercontrols/input/ToggleTracker.java
@@ -1,5 +1,6 @@
 package chylex.bettercontrols.input;
-import net.minecraft.client.options.KeyBinding;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.settings.KeyBinding;

 public class ToggleTracker{
 	protected final KeyBinding bindingToggle;
@@ -43,7 +44,7 @@ public class ToggleTracker{
 	public boolean tick(){
 		final boolean isHoldingReset = isResetKeyPressed();
 		
-		if (bindingToggle.isPressed()){
+		if (Key.isPressed(bindingToggle)){
 			if (!waitForRelease){
 				if (skipNextToggle){
 					skipNextToggle = false;
@@ -78,7 +79,7 @@ public class ToggleTracker{
 	}
 	
 	protected boolean isResetKeyPressed(){
-		return bindingReset.isPressed();
+		return Key.isPressed(bindingReset);
 	}
 	
 	public void reset(){
--- a/src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java
+++ b/src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java
@@ -1,7 +1,7 @@
 package chylex.bettercontrols.input;
 import chylex.bettercontrols.mixin.AccessKeyBindingFields;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.settings.KeyBinding;
 import java.util.HashSet;
 import java.util.Set;

--- a/src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java
@@ -1,14 +1,14 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.render.Camera;
+import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

-@Mixin(Camera.class)
+@Mixin(ActiveRenderInfo.class)
 public interface AccessCameraFields{
-	@Accessor
+	@Accessor("renderViewEntity")
 	Entity getFocusedEntity();
 	
-	@Accessor
+	@Accessor("height")
 	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.network.ClientPlayerEntity;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(ClientPlayerEntity.class)
 public interface AccessClientPlayerFields{
-	@Accessor
+	@Accessor("sprintToggleTimer")
 	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,11 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.gui.screen.options.ControlsListWidget.CategoryEntry;
-import net.minecraft.text.Text;
+import net.minecraft.client.gui.widget.list.KeyBindingList.CategoryEntry;
+import net.minecraft.util.text.ITextComponent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(CategoryEntry.class)
 public interface AccessControlsListCategory{
-	@Accessor
-	Text getText();
+	@Accessor("labelText")
+	ITextComponent getText();
 }
--- 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.gui.screen.options.ControlsListWidget.KeyBindingEntry;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.gui.widget.list.KeyBindingList.KeyEntry;
+import net.minecraft.client.settings.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

-@Mixin(KeyBindingEntry.class)
+@Mixin(KeyEntry.class)
 public interface AccessControlsListKeyBinding{
-	@Accessor
+	@Accessor("keybinding")
 	KeyBinding getBinding();
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessGameRendererFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessGameRendererFields.java
@@ -1,10 +1,10 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(GameRenderer.class)
 public interface AccessGameRendererFields{
-	@Accessor
+	@Accessor("fovModifierHand")
 	void setMovementFovMultiplier(float value);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java
@@ -1,12 +1,12 @@
 package chylex.bettercontrols.mixin;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.settings.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.Map;

@Mixin(KeyBinding.class)
 public interface AccessKeyBindingFields{
-	@Accessor
+	@Accessor("CATEGORY_ORDER")
 	static Map<String, Integer> getCategoryOrderMap(){
 		throw new AssertionError();
 	}
--- a/src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java
@@ -0,0 +1,10 @@
+package chylex.bettercontrols.mixin;
+import net.minecraft.entity.player.PlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(PlayerEntity.class)
+public interface AccessPlayerFields{
+	@Accessor("flyToggleTimer")
+	void setTicksLeftToDoubleTapFlight(int value);
+}
--- a/src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java
+++ b/src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java
@@ -1,6 +1,7 @@
 package chylex.bettercontrols.mixin;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.AbstractButtonWidget;
+import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.widget.button.AbstractButton;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -9,8 +10,8 @@ import java.util.List;
@Mixin(Screen.class)
 public interface AccessScreenButtons{
 	@Accessor
-	List<AbstractButtonWidget> getButtons();
+	List<AbstractButton> getButtons();
 	
 	@Invoker
-	<T extends AbstractButtonWidget> T callAddButton(T button);
+	<T extends Widget> 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.options.StickyKeyBinding;
+import net.minecraft.client.settings.ToggleableKeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import java.util.function.BooleanSupplier;

-@Mixin(StickyKeyBinding.class)
+@Mixin(ToggleableKeyBinding.class)
 public interface AccessStickyKeyBindingStateGetter{
-	@Accessor
+	@Accessor("getterToggle")
 	BooleanSupplier getToggleGetter();
 	
-	@Accessor
+	@Accessor("getterToggle")
 	@Mutable
 	void setToggleGetter(final BooleanSupplier toggleGetter);
 }
--- a/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java
+++ b/src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java
@@ -1,20 +1,21 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.input.KeyboardInput;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.util.MovementInput;
+import net.minecraft.util.MovementInputFromOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;

-@Mixin(KeyboardInput.class)
+@Mixin(MovementInputFromOptions.class)
 public abstract class HookClientPlayerInputTick{
-	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/input/KeyboardInput;pressingForward:Z", ordinal = 0, shift = AFTER))
+	@Inject(method = "tickMovement(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/util/MovementInputFromOptions;forwardKeyDown:Z", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info){
-		final KeyboardInput input = (KeyboardInput)(Object)this;
-		final ClientPlayerEntity player = MinecraftClient.getInstance().player;
+		final MovementInput input = (MovementInput)(Object)this;
+		final ClientPlayerEntity player = MINECRAFT.player;
 		
 		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,8 +1,8 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,19 +16,19 @@ public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{
 		super(world, profile);
 	}
 	
-	@Inject(method = "tickMovement()V", at = @At("HEAD"))
+	@Inject(method = "livingTick", at = @At("HEAD"))
 	private void atHead(final CallbackInfo info){
 		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	@Inject(method = "livingTick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/MovementInput;tickMovement(Z)V", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info){
 		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		PlayerTicker.get(player).afterInputTick(player);
 	}
 	
-	@Inject(method = "tickMovement()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;tickMovement()V", ordinal = 0, shift = AFTER))
+	@Inject(method = "livingTick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/player/AbstractClientPlayerEntity;livingTick()V", ordinal = 0, shift = AFTER))
 	private void afterSuperCall(final CallbackInfo info){
 		final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this;
 		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.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 net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screen.ControlsScreen;
+import net.minecraft.client.gui.widget.list.AbstractOptionList;
+import net.minecraft.client.gui.widget.list.KeyBindingList;
+import net.minecraft.client.gui.widget.list.KeyBindingList.CategoryEntry;
+import net.minecraft.client.gui.widget.list.KeyBindingList.Entry;
+import net.minecraft.client.gui.widget.list.KeyBindingList.KeyEntry;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

-@Mixin(ControlsListWidget.class)
-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){
+@Mixin(KeyBindingList.class)
+public abstract class HookControlsListWidget extends AbstractOptionList<Entry>{
+	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight){
 		super(client, width, height, top, bottom, itemHeight);
 	}
 	
 	@Inject(method = "<init>", at = @At("TAIL"))
-	public void init(final ControlsOptionsScreen parent, final MinecraftClient client, final CallbackInfo ci){
-		children().removeIf(it -> {
+	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci){
+		getEventListeners().removeIf(it -> {
 			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())){
 				return true;
 			}
 			
-			if (it instanceof KeyBindingEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())){
+			if (it instanceof KeyEntry && 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,34 +1,30 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
-import net.minecraft.client.options.GameOptions;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.GameSettings;
+import net.minecraft.client.settings.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(GameOptions.class)
+@Mixin(GameSettings.class)
 public abstract class HookLoadGameOptions{
 	private boolean hasLoaded = false;
 	
-	@Mutable
-	@Final
 	@Shadow
-	public KeyBinding[] keysAll;
+	public KeyBinding[] keyBindings;
 	
-	@Inject(method = "load()V", at = @At("HEAD"))
+	@Inject(method = "loadOptions()V", at = @At("HEAD"))
 	private void load(final CallbackInfo info){
 		if (hasLoaded){
 			return;
 		}
 		
 		hasLoaded = true;
-		keysAll = ArrayUtils.addAll(keysAll, BetterControlsMod.config.getAllKeyBindings());
+		keyBindings = ArrayUtils.addAll(keyBindings, 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,27 +1,27 @@
 package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.gui.ScreenPatcher;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.AccessibilityScreen;
+import net.minecraft.client.gui.screen.ControlsScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.options.AccessibilityOptionsScreen;
-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;

-@Mixin(value = MinecraftClient.class, priority = 100)
+@Mixin(value = Minecraft.class, priority = 100)
 public abstract class HookOpenScreen{
-	@Inject(method = "openScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
+	@Inject(method = "displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL"))
 	private void openScreen(final Screen ignore, final CallbackInfo ci){
-		final MinecraftClient mc = MinecraftClient.getInstance();
-		final Screen screen = mc.currentScreen;
+		final Screen screen = MINECRAFT.currentScreen;
 		
 		if (screen != null && !Screen.hasAltDown()){
-			if (screen.getClass() == ControlsOptionsScreen.class){
-				ScreenPatcher.onControlsScreenOpened((ControlsOptionsScreen)screen);
+			if (screen.getClass() == ControlsScreen.class){
+				ScreenPatcher.onControlsScreenOpened((ControlsScreen)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
@@ -0,0 +1,25 @@
+package chylex.bettercontrols.mixin;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+
+@Mixin(PlayerEntity.class)
+public abstract class HookPlayerFlightSpeed extends LivingEntity{
+	protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world){
+		super(type, world);
+	}
+	
+	@Redirect(
+		method = "travel",
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSprinting()Z"),
+		slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerAbilities;getFlySpeed()F"))
+	)
+	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.options.KeyBinding;
-import net.minecraft.client.options.StickyKeyBinding;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.settings.ToggleableKeyBinding;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -10,11 +10,11 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.function.BooleanSupplier;

-@Mixin(StickyKeyBinding.class)
+@Mixin(ToggleableKeyBinding.class)
 public abstract class HookStickyKeyBindingState extends KeyBinding{
 	@Shadow
 	@Final
-	private BooleanSupplier toggleGetter;
+	private BooleanSupplier getterToggle;
 	
 	public HookStickyKeyBindingState(final String translationKey, final int code, final String category){
 		super(translationKey, code, category);
@@ -29,7 +29,7 @@ public abstract class HookStickyKeyBindingState extends KeyBinding{
 	}
 	
 	@Override
-	public boolean isPressed(){
-		return super.isPressed() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && toggleGetter.getAsBoolean());
+	public boolean isKeyDown(){
+		return super.isKeyDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && getterToggle.getAsBoolean());
 	}
 }
--- a/src/main/java/chylex/bettercontrols/player/FlightHelper.java
+++ b/src/main/java/chylex/bettercontrols/player/FlightHelper.java
@@ -1,13 +1,12 @@
 package chylex.bettercontrols.player;
 import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
-import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.entity.player.ClientPlayerEntity;

 final class FlightHelper{
 	private FlightHelper(){}
 	
 	private static final float BASE_FLIGHT_SPEED = 0.05F;
-	private static final float BASE_FLIGHT_SPEED_SPRINT_MP_INV = 0.5F; // sprinting doubles speed in PlayerEntity.travel
 	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
 	private static BetterControlsConfig cfg(){
@@ -15,25 +14,25 @@ final class FlightHelper{
 	}
 	
 	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
-		return player.abilities.flying && (player.isCreative() || player.isSpectator());
+		return player.abilities.isFlying && (player.isCreative() || player.isSpectator());
 	}
 	
 	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
-		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.flying;
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.isFlying;
 	}
 	
-	static float getFlightSpeed(final ClientPlayerEntity player){
+	static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost){
 		if (player.isCreative()){
-			if (player.isSprinting()){
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting * BASE_FLIGHT_SPEED_SPRINT_MP_INV;
+			if (boost){
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
 			}
 			else{
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
 			}
 		}
 		else if (player.isSpectator()){
-			if (player.isSprinting()){
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting * BASE_FLIGHT_SPEED_SPRINT_MP_INV;
+			if (boost){
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
 			}
 			else{
 				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
@@ -44,9 +43,9 @@ final class FlightHelper{
 		}
 	}
 	
-	static float getExtraVerticalVelocity(final ClientPlayerEntity player){
+	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){
 		if (player.isCreative()){
-			if (player.isSprinting()){
+			if (isSprinting){
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
 			}
 			else{
@@ -54,7 +53,7 @@ final class FlightHelper{
 			}
 		}
 		else if (player.isSpectator()){
-			if (player.isSprinting()){
+			if (isSprinting){
 				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
 			}
 			else{
--- a/src/main/java/chylex/bettercontrols/player/PlayerTicker.java
+++ b/src/main/java/chylex/bettercontrols/player/PlayerTicker.java
@@ -8,14 +8,19 @@ import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
 import chylex.bettercontrols.mixin.AccessCameraFields;
 import chylex.bettercontrols.mixin.AccessClientPlayerFields;
 import chylex.bettercontrols.mixin.AccessGameRendererFields;
+import chylex.bettercontrols.mixin.AccessPlayerFields;
 import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.input.KeyboardInput;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.options.GameOptions;
-import net.minecraft.util.math.MathHelper;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.util.MovementInput;
 import java.lang.ref.WeakReference;
 import java.util.function.BooleanSupplier;
+import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
+import static chylex.bettercontrols.util.Statics.KEY_JUMP;
+import static chylex.bettercontrols.util.Statics.KEY_SNEAK;
+import static chylex.bettercontrols.util.Statics.KEY_SPRINT;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;
+import static chylex.bettercontrols.util.Statics.OPTIONS;

 public final class PlayerTicker{
 	private static PlayerTicker ticker = new PlayerTicker(null);
@@ -28,10 +33,6 @@ public final class PlayerTicker{
 		return ticker;
 	}
 	
-	private static MinecraftClient mc(){
-		return MinecraftClient.getInstance();
-	}
-	
 	private static BetterControlsConfig cfg(){
 		return BetterControlsMod.config;
 	}
@@ -45,10 +46,10 @@ public final class PlayerTicker{
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, mc().options.keySprint, toggled -> mc().options.sprintToggled = toggled);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, mc().options.keySneak, toggled -> mc().options.sneakToggled = toggled);
-	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, mc().options.keyForward);
-	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, mc().options.keyJump);
+	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 toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
+	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
 	
 	private boolean waitingForSprintKeyRelease = false;
 	private boolean stopSprintingAfterReleasingSprintKey = false;
@@ -62,7 +63,7 @@ public final class PlayerTicker{
 	private int temporaryFlyOnGroundTimer = 0;
 	
 	private void setup(){
-		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)mc().options.keySprint;
+		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
 		BooleanSupplier getter = sprint.getToggleGetter();
 		
 		if (getter instanceof SprintPressGetter){
@@ -81,17 +82,12 @@ public final class PlayerTicker{
 			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
 		}
 		
-		final SprintMode sprintMode;
-		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
-			sprintMode = cfg().sprintModeWhileFlying;
-		}
-		else{
-			sprintMode = cfg().sprintMode;
+		if (!cfg().doubleTapJumpToToggleFlight){
+			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
 		}
 		
-		final GameOptions opts = mc().options;
-		final boolean wasSprintToggled = opts.sprintToggled;
+		final SprintMode sprintMode = cfg().sprintMode;
+		final boolean wasSprintToggled = OPTIONS.toggleSprint;
 		final boolean isSprintToggled = toggleSprint.tick();
 		
 		if (temporarySprintTimer > 0){
@@ -101,7 +97,7 @@ public final class PlayerTicker{
 			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!opts.keySprint.isPressed() && opts.keyForward.isPressed()){
+			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
 			else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
@@ -118,7 +114,7 @@ public final class PlayerTicker{
 			waitingForSprintKeyRelease = true;
 		}
 		else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
-			if (opts.keySprint.isPressed()){
+			if (Key.isPressed(KEY_SPRINT)){
 				if (!waitingForSprintKeyRelease){
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
@@ -133,12 +129,12 @@ public final class PlayerTicker{
 			}
 		}
 		else if (sprintMode == SprintMode.HOLD){
-			if (opts.keySprint.isPressed()){
+			if (Key.isPressed(KEY_SPRINT)){
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !opts.keySprint.isPressed()){
+		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -147,47 +143,49 @@ public final class PlayerTicker{
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final KeyboardInput input){
-		if (mc().currentScreen == null){
-			input.pressingForward |= toggleWalkForward.tick();
+	public void afterInputAssignsPressingForward(final MovementInput input){
+		if (MINECRAFT.currentScreen == null){
+			input.forwardKeyDown |= toggleWalkForward.tick();
 		}
 	}
 	
 	public void afterInputTick(final ClientPlayerEntity player){
-		if (mc().currentScreen == null && !player.abilities.flying){
-			player.input.jumping |= toggleJump.tick();
+		final MovementInput input = player.movementInput;
+		
+		if (MINECRAFT.currentScreen == null && !player.abilities.isFlying){
+			input.jump |= toggleJump.tick();
 		}
 		
 		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
-			final float flightSpeed = FlightHelper.getFlightSpeed(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.abilities.setFlySpeed(flightSpeed);
 			}
 			
-			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player);
-			
-			if (!MathHelper.approximatelyEquals(verticalVelocity, 0F) && player == mc().getCameraEntity()){
+			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getRenderViewEntity()){
 				int direction = 0;
 				
-				if (player.input.sneaking){
+				if (input.sneaking){
 					--direction;
 				}
 				
-				if (player.input.jumping){
+				if (input.jump){
 					++direction;
 				}
 				
 				if (direction != 0){
-					player.setVelocity(player.getVelocity().add(0D, flightSpeed * verticalVelocity * direction, 0D));
+					player.setMotion(player.getMotion().add(0D, flightSpeed * verticalVelocity * direction, 0D));
 				}
 			}
 		}
 		
 		if (cfg().resumeSprintingAfterHittingObstacle){
-			if (wasHittingObstacle != player.horizontalCollision){
+			if (wasHittingObstacle != player.collidedHorizontally){
 				if (!wasHittingObstacle){
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || mc().options.keySprint.isPressed();
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
 				}
 				else if (wasSprintingBeforeHittingObstacle){
 					wasSprintingBeforeHittingObstacle = false;
@@ -195,16 +193,16 @@ public final class PlayerTicker{
 				}
 				
 				// collision also stops when the player lets go of movement keys
-				wasHittingObstacle = player.horizontalCollision;
+				wasHittingObstacle = player.collidedHorizontally;
 			}
 		}
 		else{
-			wasHittingObstacle = player.horizontalCollision;
+			wasHittingObstacle = player.collidedHorizontally;
 			wasSprintingBeforeHittingObstacle = false;
 		}
 		
 		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
-			((AccessGameRendererFields)mc().gameRenderer).setMovementFovMultiplier(1F);
+			((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
 		}
 	}
 	
@@ -231,8 +229,8 @@ public final class PlayerTicker{
 						holdingSneakWhileTouchingGround = true;
 					}
 					else if (holdingSneakWhileTouchingGround){
-						player.abilities.flying = false;
-						player.sendAbilitiesUpdate();
+						player.abilities.isFlying = false;
+						player.sendPlayerAbilities();
 						cancelLanding = false;
 					}
 				}
@@ -247,12 +245,24 @@ public final class PlayerTicker{
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (player.isCreative()){
-			if (cfg().keyToggleFlight.wasPressed()){
-				final boolean isFlying = !player.abilities.flying;
+		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
+			final MovementInput input = player.movementInput;
 			
-				player.abilities.flying = isFlying;
-				player.sendAbilitiesUpdate();
+			if (input.moveForward == 0F && input.moveStrafe == 0F){
+				player.setMotion(player.getMotion().mul(0.0, 1.0, 0.0));
+			}
+			
+			if (!input.jump && !input.sneaking){
+				player.setMotion(player.getMotion().mul(1.0, 0.0, 1.0));
+			}
+		}
+		
+		if (player.isCreative()){
+			if (Key.wasPressed(cfg().keyToggleFlight)){
+				final boolean isFlying = !player.abilities.isFlying;
+				
+				player.abilities.isFlying = isFlying;
+				player.sendPlayerAbilities();
 				
 				if (isFlying){
 					temporaryFlyOnGroundTimer = 10;
@@ -274,22 +284,22 @@ public final class PlayerTicker{
 		}
 		
 		if (!cfg().sneakingMovesCameraSmoothly){
-			final AccessCameraFields camera = (AccessCameraFields)mc().gameRenderer.getCamera();
+			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getActiveRenderInfo();
 			
 			if (camera.getFocusedEntity() == player){
-				camera.setCameraY(player.getStandingEyeHeight());
+				camera.setCameraY(player.getEyeHeight());
 			}
 		}
 		
-		if (cfg().keyResetAllToggles.wasPressed()){
+		if (Key.wasPressed(cfg().keyResetAllToggles)){
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (cfg().keyOpenMenu.isPressed()){
-			mc().openScreen(new BetterControlsScreen(null));
+		if (Key.isPressed(cfg().keyOpenMenu)){
+			MINECRAFT.displayGuiScreen(new BetterControlsScreen(null));
 		}
 	}
 }
--- a/src/main/java/chylex/bettercontrols/util/Key.java
+++ b/src/main/java/chylex/bettercontrols/util/Key.java
@@ -0,0 +1,47 @@
+package chylex.bettercontrols.util;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.client.util.InputMappings;
+import net.minecraft.client.util.InputMappings.Input;
+import net.minecraft.util.text.ITextComponent;
+
+public final class Key{
+	private Key(){}
+	
+	public static final Input INVALID = InputMappings.INPUT_INVALID;
+	
+	public static boolean isUnbound(final KeyBinding binding){
+		return binding.isInvalid();
+	}
+	
+	public static boolean isPressed(final KeyBinding binding){
+		return binding.isKeyDown();
+	}
+	
+	public static boolean wasPressed(final KeyBinding binding){
+		return binding.isPressed();
+	}
+	
+	public static ITextComponent getBoundKeyText(final KeyBinding binding){
+		return binding.func_238171_j_();
+	}
+	
+	public static void bind(final KeyBinding binding, final Input input){
+		binding.bind(input);
+	}
+	
+	public static String writeBinding(final KeyBinding binding){
+		return binding.getTranslationKey();
+	}
+	
+	public static void readBinding(final KeyBinding binding, final String serialized){
+		bind(binding, InputMappings.getInputByName(serialized));
+	}
+	
+	public static Input inputFromMouse(final int button){
+		return InputMappings.Type.MOUSE.getOrMakeInput(button);
+	}
+	
+	public static Input inputFromKeyboard(final int keyCode, final int scanCode){
+		return InputMappings.getInputByCode(keyCode, scanCode);
+	}
+}
--- a/src/main/java/chylex/bettercontrols/util/LiteralText.java
+++ b/src/main/java/chylex/bettercontrols/util/LiteralText.java
@@ -0,0 +1,19 @@
+package chylex.bettercontrols.util;
+import net.minecraft.util.text.StringTextComponent;
+
+public final class LiteralText extends StringTextComponent{
+	public static LiteralText text(final String text){
+		return new LiteralText(text);
+	}
+	
+	private final String msg;
+	
+	public LiteralText(final String msg){
+		super(msg);
+		this.msg = msg;
+	}
+	
+	public LiteralText copy(){
+		return new LiteralText(msg);
+	}
+}
--- a/src/main/java/chylex/bettercontrols/util/Statics.java
+++ b/src/main/java/chylex/bettercontrols/util/Statics.java
@@ -0,0 +1,16 @@
+package chylex.bettercontrols.util;
+import net.minecraft.client.GameSettings;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.KeyBinding;
+
+public final class Statics{
+	private Statics(){}
+	
+	public static final Minecraft MINECRAFT = Minecraft.getInstance();
+	public static final GameSettings OPTIONS = MINECRAFT.gameSettings;
+	
+	public static final KeyBinding KEY_SPRINT = OPTIONS.keyBindSprint;
+	public static final KeyBinding KEY_SNEAK = OPTIONS.keyBindSneak;
+	public static final KeyBinding KEY_FORWARD = OPTIONS.keyBindForward;
+	public static final KeyBinding KEY_JUMP = OPTIONS.keyBindJump;
+}
--- a/src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java
+++ b/src/main/java/io/github/prospector/modmenu/api/ConfigScreenFactory.java
@@ -1,8 +0,0 @@
-package io.github.prospector.modmenu.api;
-import net.minecraft.client.gui.screen.Screen;
-
-@SuppressWarnings("unused")
-@FunctionalInterface
-public interface ConfigScreenFactory<S extends Screen>{
-	S create(Screen var1);
-}
--- a/src/main/java/io/github/prospector/modmenu/api/ModMenuApi.java
+++ b/src/main/java/io/github/prospector/modmenu/api/ModMenuApi.java
@@ -1,14 +0,0 @@
-package io.github.prospector.modmenu.api;
-import com.google.common.collect.ImmutableMap;
-import java.util.Map;
-
-@SuppressWarnings("unused")
-public interface ModMenuApi{
-	default ConfigScreenFactory<?> getModConfigScreenFactory(){
-		return ignore -> null;
-	}
-	
-	default Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories(){
-		return ImmutableMap.of();
-	}
-}
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,30 @@
+modLoader = "javafml"
+loaderVersion = "[31,)"
+
+authors = "chylex"
+license = "MPL-2.0"
+issueTrackerURL = "https://github.com/chylex/Better-Controls/issues"
+
+[[mods]]
+modId = "bettercontrols"
+version = "1.2.0a"
+displayName = "Better Controls"
+logoFile = "icon.png"
+description = '''
+Adds many powerful key bindings and options to control your movement.
+The features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
+'''
+
+[[dependencies.bettercontrols]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.16.3,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.bettercontrols]]
+modId = "forge"
+mandatory = true
+versionRange = "[31,)"
+ordering = "NONE"
+side = "BOTH"
--- a/src/main/resources/bettercontrols.mixins.json
+++ b/src/main/resources/bettercontrols.mixins.json
@@ -3,13 +3,14 @@
  "minVersion": "0.8",
  "package": "chylex.bettercontrols.mixin",
  "compatibilityLevel": "JAVA_8",
-  "mixins": [
+  "client": [
    "AccessCameraFields",
    "AccessClientPlayerFields",
    "AccessControlsListCategory",
    "AccessControlsListKeyBinding",
    "AccessGameRendererFields",
    "AccessKeyBindingFields",
+    "AccessPlayerFields",
    "AccessScreenButtons",
    "AccessStickyKeyBindingStateGetter",
    "HookClientPlayerInputTick",
@@ -17,6 +18,7 @@
    "HookControlsListWidget",
    "HookLoadGameOptions",
    "HookOpenScreen",
+    "HookPlayerFlightSpeed",
    "HookStickyKeyBindingState"
  ],
  "injectors": {
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,33 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "bettercontrols",
-  "version": "${version}",
-  
-  "name": "Better Controls",
-  "description": "Adds many powerful key bindings and options to control your movement.\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.",
-  "icon": "assets/bettercontrols/icon.png",
-  "license": "MPL-2.0",
-  
-  "authors": [ "chylex" ],
-  "contact": {
-    "homepage": "",
-    "sources": "https://github.com/chylex/Better-Controls",
-    "issues": "https://github.com/chylex/Better-Controls/issues"
-  },
-  
-  "environment": "client",
-  "entrypoints": {
-    "client": [ "chylex.bettercontrols.BetterControlsMod" ],
-    "modmenu": [ "chylex.bettercontrols.compatibility.ModMenuSupport" ]
-  },
-  
-  "mixins": [{
-    "config": "bettercontrols.mixins.json",
-    "environment": "client"
-  }],
-  
-  "depends": {
-    "fabricloader": ">=0.7.4",
-    "minecraft": ">=1.16.2"
-  }
-}
--- a/src/main/resources/icon.png
+++ b/src/main/resources/icon.png
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,7 @@
+{
+    "pack": {
+        "description": "Better Controls",
+        "pack_format": 5,
+        "_comment": ""
+    }
+}
Author	SHA1	Message	Date
chylex	2617208482	Release v1.2.0a for Minecraft 1.16.3+	2021-08-22 06:21:05 +02:00
chylex	b74818fc4c	Fix crash when installed on a server	2021-07-09 18:14:20 +02:00
chylex	fa92d958b7	Update README	2020-12-11 01:52:02 +01:00
chylex	b254d724cd	Release v1.2.0 for Minecraft 1.16.3+	2020-12-11 01:50:36 +01:00
chylex	22892d5654	Fix tapping sneak to stop flying on ground not working when flight inertia is disabled	2020-12-11 01:50:03 +01:00
chylex	473e2e6609	Add option to disable double tapping 'Jump' key to flight Fixes #6	2020-12-10 18:42:12 +01:00
chylex	fe95cee3d9	Change flight to 'Hold to Sprint' mode at all times & fix not boost unless flying forward	2020-12-10 07:08:54 +01:00
chylex	cde46814d8	Add option to disable flight inertia after releasing movement keys Fixes #2	2020-12-10 07:06:50 +01:00
chylex	3812f83f85	Add logs folder to .gitignore	2020-12-10 07:00:57 +01:00
chylex	4c3978d762	Minor code tweaks	2020-12-10 07:00:13 +01:00
chylex	349e0ebb3f	Add README	2020-12-10 06:58:07 +01:00
chylex	eb81c5f635	Fix compile error in 1.16.4 (apparently override visibility is forwards compatible so 1.16.2+ build still works)	2020-11-04 02:46:25 +01:00
chylex	5031d83962	Limit version to 1.16.3+ because 1.16.2 doesn't work	2020-10-30 22:58:32 +01:00
chylex	72f4c6702d	Port to Forge	2020-10-30 16:57:17 +01:00