Release v1.2.0a for Minecraft 1.16.3+

Fixes #6

.github/FUNDING.yml

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

.gitignore

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

Fabric/build.gradle.kts

@@ -1,71 +0,0 @@
-import net.fabricmc.loom.configuration.ide.RunConfigSettings
-import org.gradle.jvm.tasks.Jar
-
-val modId: String by project
-val modSides: String by project
-val minecraftVersion: String by project
-val fabricVersion: String by project
-
-plugins {
-	id("fabric-loom")
-}
-
-dependencies {
-	minecraft("com.mojang:minecraft:$minecraftVersion")
-	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
-	mappings(loom.officialMojangMappings())
-}
-
-loom {
-	runs {
-		val runJvmArgs: Set<String> by project
-		
-		configureEach {
-			runDir("../run")
-			vmArgs(runJvmArgs)
-			ideConfigGenerated(true)
-		}
-		
-		fun side(name: String, configure: RunConfigSettings.() -> Unit) {
-			if (modSides == "both" || modSides == name) {
-				named(name, configure)
-			}
-			else {
-				findByName(name)?.let(::remove)
-			}
-		}
-		
-		side("client") {
-			configName = "Fabric Client"
-			client()
-		}
-		
-		side("server") {
-			configName = "Fabric Server"
-			server()
-		}
-	}
-	
-	mixin {
-		defaultRefmapName.set("$modId.refmap.json")
-	}
-}
-
-tasks.processResources {
-	filesMatching("fabric.mod.json") {
-		expand(inputs.properties)
-	}
-}
-
-tasks.jar {
-	exclude("com/terraformersmc/modmenu/")
-}
-
-tasks.register<Jar>("uncompressedRemapJar") {
-	group = "fabric"
-	
-	from(tasks.remapJar.map { it.outputs.files.map(::zipTree) })
-	
-	archiveClassifier.set("uncompressed")
-	entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
-}

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

@@ -1,12 +0,0 @@
-package chylex.bettercontrols;
-
-import chylex.bettercontrols.config.BetterControlsConfig;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
-
-public final class BetterControlsMod implements ClientModInitializer {
-	@Override
-	public void onInitializeClient() {
-		BetterControlsCommon.setConfig(BetterControlsConfig.load(FabricLoader.getInstance().getConfigDir().resolve("BetterControls.json")));
-	}
-}

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

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

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

@@ -1,9 +0,0 @@
-package com.terraformersmc.modmenu.api;
-
-import net.minecraft.client.gui.screens.Screen;
-
-@SuppressWarnings("unused")
-@FunctionalInterface
-public interface ConfigScreenFactory<S extends Screen> {
-	S create(Screen parent);
-}

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

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

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

@@ -1,36 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "${id}",
-  "name": "${name}",
-  "description": "${description}",
-  "version": "${version}",
-  "license": "${license}",
-  
-  "icon": "assets/${id}/logo.png",
-  
-  "authors": [
-    "${author}"
-  ],
-  
-  "contact": {
-    "homepage": "https://chylex.com",
-    "issues": "${issuesURL}",
-    "sources": "${sourcesURL}"
-  },
-  
-  "environment": "${sidesForFabric}",
-  "entrypoints": {
-    "client": [ "chylex.bettercontrols.BetterControlsMod" ],
-    "modmenu": [ "chylex.bettercontrols.compatibility.ModMenuSupport" ]
-  },
-  
-  "mixins": [{
-    "config": "${id}.mixins.json",
-    "environment": "${sidesForFabric}"
-  }],
-  
-  "depends": {
-    "fabricloader": ">=${minimumFabricVersion}",
-    "minecraft": ">=${minimumMinecraftVersion}"
-  }
-}

NeoForge/build.gradle.kts

@@ -1,51 +0,0 @@
-import net.neoforged.moddevgradle.dsl.RunModel
-
-val modId: String by project
-val modSides: String by project
-val neoForgeVersion: String by project
-
-plugins {
-	id("net.neoforged.moddev")
-}
-
-neoForge {
-	version = neoForgeVersion
-	
-	mods {
-		register(modId) {
-			sourceSet(sourceSets.main.get())
-			sourceSet(rootProject.sourceSets.main.get())
-		}
-	}
-	
-	runs {
-		val runJvmArgs: Set<String> by project
-		
-		configureEach {
-			gameDirectory = file("../run")
-			jvmArguments.addAll(runJvmArgs)
-		}
-		
-		fun side(name: String, configure: RunModel.() -> Unit) {
-			if (modSides == "both" || modSides == name) {
-				register(name, configure)
-			}
-		}
-		
-		side("client") {
-			ideName.set("NeoForge Client")
-			client()
-		}
-		
-		side("server") {
-			ideName.set("NeoForge Server")
-			server()
-		}
-	}
-}
-
-tasks.processResources {
-	filesMatching("META-INF/neoforge.mods.toml") {
-		expand(inputs.properties)
-	}
-}

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

@@ -1,27 +0,0 @@
-package chylex.bettercontrols;
-
-import chylex.bettercontrols.config.BetterControlsConfig;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.ModContainer;
-import net.neoforged.fml.ModLoadingContext;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.fml.loading.FMLPaths;
-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
-import javax.annotation.Nullable;
-
-@Mod("bettercontrols")
-public final class BetterControlsMod {
-	public BetterControlsMod() {
-		if (FMLEnvironment.dist == Dist.CLIENT) {
-			BetterControlsCommon.setConfig(BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json")));
-			ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> BetterControlsMod::createOptionsScreen);
-		}
-	}
-	
-	private static BetterControlsScreen createOptionsScreen(ModContainer modContainer, @Nullable Screen parentScreen) {
-		return new BetterControlsScreen(parentScreen);
-	}
-}

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

@@ -1,31 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[0,)"
-
-license = "${license}"
-issueTrackerURL = "${issuesURL}"
-
-[[mods]]
-modId = "${id}"
-displayName = "${name}"
-displayURL = "${sourcesURL}"
-description = "${description}"
-authors = "${author}"
-version = "${version}"
-logoFile = "assets/${id}/logo.png"
-
-[[mixins]]
-config = "${id}.mixins.json"
-
-[[dependencies.${id}]]
-modId = "minecraft"
-type = "required"
-versionRange = "[${minimumMinecraftVersion},)"
-ordering = "NONE"
-side = "${sidesForNeoForge}"
-
-[[dependencies.${id}]]
-modId = "neoforge"
-type = "required"
-versionRange = "[${minimumNeoForgeVersion},)"
-ordering = "NONE"
-side = "${sidesForNeoForge}"

README.md

@@ -3,41 +3,36 @@ Better Controls
 
 ![Logo](https://raw.githubusercontent.com/chylex/Better-Controls/master/logo.png "Depiction of Zero Regrets")
 
-[Better Controls](https://www.curseforge.com/minecraft/mc-mods/better-controls) is a reimagining of [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting) with even more customizability. It features several new keybindings and many configurable options for how sprinting, sneaking, and flying should behave.
+Better Controls is a reimagining of [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting) with even more customizability. It features several new keybindings and many configurable options for how sprinting, sneaking, and flying should behave.
 
-Better Controls only focuses on complementing vanilla mechanics, rather than adding new mechanics (such as [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting)'s option to allow sprinting in all directions) that only work on client side and server owners must explicitly opt in to enable them. By not having such features in Better Controls, it significantly reduces complexity by not having a server side version of the mod, and not needing a way to completely disable the mod while the game is running.
+Better Controls only focuses on complementing vanilla mechanics rather than adding new mechanics (such as [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting)'s option to allow sprinting in all directions) that only work on client side and server owners must explicitly opt in to enable them. By not having such features in Better Controls, it significantly reduces complexity by not having a server side version of the mod, and not needing a way to completely disable the mod while the game is running.
 
 Another major difference is the amount and granularity of options. Better Controls could be considered an *advanced controls mod* - by default, none of the keybinds are bound, and all options are set to match vanilla behavior. To take full advantage, go into *Options - Controls - Better Controls*, check out all of the available options, and figure out the best configuration for you.
 
 ## 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 `Control`). Note that the vanilla options for toggling sprinting/sneaking are disabled to avoid conflicts with the custom keybinds.
+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.
-* **Resume Sprinting After Hitting Obstacle** re-activates sprinting once you are no longer touching any blocks.
+* **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** can be turned off to disable the smooth movement when sneaking or unsneaking.
-
-#### Gliding
-
-* **Start a Glide** with a dedicated key.
-* **Double Tap 'Jump' To Glide** can be turned off.
+* **Move Camera Smoothly** lets you disable the smooth movement when sneaking or unsneaking.
 
 #### Flying
 
-* **Double Tap 'Jump' To Fly** can be turned off.
-* **Flight Inertia Multiplier** changes how quickly you stop moving in the air when you stop holding movement keys.
+* **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. Stop flying by tapping Sneak while touching the ground.
-* **Flight Speed Multiplier** (0.25x - 8x) changes flight speed in creative and spectator mode.
-* **Vertical Speed Boost** (up to +300%) adds additional vertical flight speed boost 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.
 
@@ -46,9 +41,9 @@ Both speed boosts can be configured separately for sprinting, which will be acti
 The following mod loaders are supported:
 
 * **[Fabric](https://fabricmc.net/use/)** (note: this mod does not require Fabric API)
-* **[NeoForge](https://neoforged.net/)**
+* **[Forge](https://files.minecraftforge.net/)**
 
-After you install the mod loader of your choice, download the mod from [CurseForge](https://www.curseforge.com/minecraft/mc-mods/better-controls/files) or [Modrinth](https://modrinth.com/mod/better-controls/versions) and place the `.jar` file into `.minecraft/mods`.
+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
 
@@ -59,7 +54,7 @@ While this is convenient, there is potential for bugs which can affect server pl
 ### Compatibility
 
 * Better Controls is a client-side mod, it will do nothing when installed on a server.
-* If you run into a conflict with another mod that modifies the *Controls* screen, hold Alt while opening *Controls* to prevent Better Controls from adding its button. If another mod prevents the button from appearing, a button to open the mod's configuration is available in the Mods menu (for Fabric, install [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu)).
+* If you run into a conflict with another mod that modifies the *Controls* screen, hold Alt while opening *Controls* to prevent Better Controls from adding its button. If another mod prevents the button from appearing, you can install [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu) which adds a mod list with configuration buttons for mods.
 
 ## Screenshot
 
@@ -68,15 +63,11 @@ While this is convenient, there is potential for bugs which can affect server pl
 Source Code
 ===========
 
-The `main` branch includes both the Fabric and NeoForge version in a single project. The project uses Mojang mappings. The root project contains common source code and resource files, and the `Fabric` and `NeoForge` folders are subprojects with loader-specific files.
-
-The `main` branch always has the latest development version. Before updating to a new Minecraft version, a new branch is created from the `main` branch (for example, before the mod is updated to `1.18`, a branch named `1.17` will be created). Further development of older versions may continue in these branches in case backports or version-specific fixes are needed.
-
-Older versions from before the merge of the Fabric and Forge versions can be found in branches named `fabric/<version>` and `forge/<version>`.
+The `main` branch includes the latest version for Fabric. Older versions and their Forge equivalents are in branches named `fabric/<version>` and `forge/<version>`.
 
 ## Contributing
 
-All contributions should target the `main` branch and work in both Fabric and NeoForge, unless the contribution is specifically targeting older versions or a specific mod loader.
+All contributions should target the `main` branch, unless the contribution is specifically made for older versions. Every feature must be portable to Forge to ensure parity, unless the feature adds integration with another mod that is only compatible with one mod loader. Integrations for Forge-only mods should target the most recent `forge/<version>` branch.
 
 For any larger contributions, please [open an issue](https://github.com/chylex/Better-Controls/issues/new) first before you make a PR.
 

build.gradle

@@ -0,0 +1,100 @@
+buildscript {
+	repositories {
+		maven { url = 'https://files.minecraftforge.net/maven' }
+		maven { url = "https://repo.spongepowered.org/maven" }
+		mavenCentral()
+	}
+	
+	dependencies {
+		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
+	}
+}
+
+repositories {
+	maven {
+		url "https://maven.tterrag.com/"
+	}
+}
+
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'eclipse'
+
+def mcversion = "1.16.4"
+def forgeversion = "35.0.1"
+
+def prefixName = 'displayName = '
+def prefixVersion = 'version = '
+
+def metaLines = file('src/main/resources/META-INF/mods.toml').readLines()
+def metaName = metaLines.find { line -> line.startsWith(prefixName) }.substring(prefixName.length())[1..-2]
+def metaVersion = metaLines.find { line -> line.startsWith(prefixVersion) }.substring(prefixVersion.length())[1..-2]
+
+group = 'chylex.bettercontrols'
+version = metaVersion
+archivesBaseName = metaName.replaceAll('\\s', '')
+
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+
+minecraft {
+	mappings channel: 'snapshot', version: '20201028-1.16.3'
+	
+	runs {
+		client {
+			workingDirectory file('run')
+			
+			property 'mixin.env.disableRefMap', 'true'
+			arg '-mixin.config=bettercontrols.mixins.json'
+			
+			mods {
+				bettercontrols {
+					source sourceSets.main
+				}
+			}
+		}
+		
+		server {
+			workingDirectory file('run')
+			
+			property 'mixin.env.disableRefMap', 'true'
+			arg '-mixin.config=bettercontrols.mixins.json'
+			
+			mods {
+				bettercontrols {
+					source sourceSets.main
+				}
+			}
+		}
+	}
+}
+
+dependencies {
+	minecraft 'net.minecraftforge:forge:' + mcversion + '-' + forgeversion
+}
+
+jar {
+	archiveName = archivesBaseName + '-' + mcversion + '+v' + version + '.jar'
+	
+	from('./') {
+		include 'LICENSE'
+	}
+	
+	manifest {
+		attributes([
+			'Specification-Title'     : 'bettercontrols',
+			'Specification-Version'   : '1',
+			'Specification-Vendor'    : 'chylex',
+			
+			'Implementation-Title'    : metaName,
+			'Implementation-Version'  : metaVersion,
+			'Implementation-Vendor'   : 'chylex',
+			
+			'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+			
+			'MixinConfigs'            : 'bettercontrols.mixins.json'
+		])
+	}
+	
+	finalizedBy('reobfJar')
+}

build.gradle.kts

@@ -1,217 +0,0 @@
-@file:Suppress("ConvertLambdaToReference")
-
-import org.gradle.jvm.tasks.Jar
-
-val modId: String by project
-val modName: String by project
-val modDescription: String by project
-val modAuthor: String by project
-val modVersion: String by project
-val modLicense: String by project
-val modSourcesURL: String by project
-val modIssuesURL: String by project
-val modSides: String by project
-
-val minecraftVersion: String by project
-val mixinVersion: String by project
-val mixinExtrasVersion: String by project
-
-val minimumMinecraftVersion: String by project
-val minimumNeoForgeVersion: String by project
-val minimumFabricVersion: String by project
-
-val modNameStripped = modName.replace(" ", "")
-
-plugins {
-	idea
-	`java-library`
-	id("fabric-loom")
-}
-
-idea {
-	module {
-		excludeDirs.add(file("gradle"))
-		excludeDirs.add(file("run"))
-		
-		if (findProject(":NeoForge") == null) {
-			excludeDirs.add(file("NeoForge"))
-		}
-		
-		if (findProject(":Fabric") == null) {
-			excludeDirs.add(file("Fabric"))
-		}
-	}
-}
-
-repositories {
-	mavenCentral()
-}
-
-base {
-	archivesName.set("$modNameStripped-Common")
-}
-
-loom {
-	runs {
-		named("client") {
-			ideConfigGenerated(false)
-		}
-		
-		findByName("server")?.let(::remove)
-	}
-}
-
-dependencies {
-	minecraft("com.mojang:minecraft:$minecraftVersion")
-	mappings(loom.officialMojangMappings())
-	
-	compileOnly("net.fabricmc:sponge-mixin:$mixinVersion")
-	compileOnly("io.github.llamalad7:mixinextras-common:$mixinExtrasVersion")
-	
-	api("com.google.code.findbugs:jsr305:3.0.2")
-}
-
-allprojects {
-	group = "com.$modAuthor.$modId"
-	version = modVersion
-	
-	apply(plugin = "java-library")
-	
-	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
-	}
-	
-	tasks.withType<JavaCompile> {
-		options.encoding = "UTF-8"
-		options.release.set(21)
-	}
-	
-	val runJvmArgs = mutableSetOf<String>().also {
-		extra["runJvmArgs"] = it
-	}
-	
-	if (project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.orNull == "JetBrains") {
-		runJvmArgs.add("-XX:+AllowEnhancedClassRedefinition")
-	}
-	
-	dependencies {
-		implementation("org.jetbrains:annotations:24.1.0")
-	}
-	
-	tasks.withType<ProcessResources> {
-		val (sidesForNeoForge, sidesForFabric) = when (modSides) {
-			"both"   -> Pair("BOTH", "*")
-			"client" -> Pair("CLIENT", "client")
-			"server" -> Pair("SERVER", "server")
-			else     -> error("Invalid modSides value: $modSides")
-		}
-		
-		inputs.property("id", modId)
-		inputs.property("name", modName)
-		inputs.property("description", modDescription)
-		inputs.property("version", modVersion)
-		inputs.property("author", modAuthor)
-		inputs.property("license", modLicense)
-		inputs.property("sourcesURL", modSourcesURL)
-		inputs.property("issuesURL", modIssuesURL)
-		inputs.property("sidesForNeoForge", sidesForNeoForge)
-		inputs.property("sidesForFabric", sidesForFabric)
-		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
-		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
-		inputs.property("minimumFabricVersion", minimumFabricVersion)
-		
-		from(rootProject.file("logo.png")) {
-			into("assets/$modId")
-		}
-	}
-	
-	tasks.withType<AbstractArchiveTask>().configureEach {
-		isPreserveFileTimestamps = false
-		isReproducibleFileOrder = true
-	}
-}
-
-subprojects {
-	dependencies {
-		implementation(project(rootProject.path, configuration = "namedElements"))
-	}
-	
-	base {
-		archivesName.set("$modNameStripped-${project.name}")
-	}
-	
-	tasks.compileJava {
-		source({ rootProject.sourceSets.main.get().allSource })
-	}
-	
-	tasks.processResources {
-		from(rootProject.sourceSets.main.get().resources) {
-			expand(inputs.properties)
-		}
-	}
-	
-	tasks.jar {
-		entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
-		
-		manifest {
-			packageInformation(modId, "$modNameStripped-${project.name}")
-		}
-	}
-	
-	tasks.test {
-		onlyIf { false }
-	}
-}
-
-fun Manifest.packageInformation(specificationTitle: String, implementationTitle: String) {
-	attributes(
-		"Specification-Title" to specificationTitle,
-		"Specification-Vendor" to modAuthor,
-		"Specification-Version" to "1",
-		"Implementation-Title" to implementationTitle,
-		"Implementation-Vendor" to modAuthor,
-		"Implementation-Version" to modVersion,
-	)
-}
-
-val multiloaderSources = sourceSets.register("multiloader")
-
-val multiloaderJar = tasks.register<Jar>("multiloaderJar") {
-	group = "build"
-	
-	archiveBaseName.set(modNameStripped)
-	archiveVersion.set("$minecraftVersion+v$modVersion")
-	
-	destinationDirectory = layout.buildDirectory.dir("dist")
-	
-	fun includeJar(project: Project, jarTaskName: String) {
-		from(project.tasks.named(jarTaskName).map { it.outputs }) {
-			into("jars")
-			rename { "$modNameStripped-${project.name}.jar" }
-		}
-	}
-	
-	findProject(":NeoForge")?.let { includeJar(it, "jar") }
-	findProject(":Fabric")?.let { includeJar(it, "uncompressedRemapJar") }
-	
-	from(rootProject.file("LICENSE"))
-	from(multiloaderSources.map { it.output })
-	
-	manifest {
-		packageInformation("$modId-multiloader", modNameStripped)
-		attributes("FMLModType" to "GAMELIBRARY")
-	}
-}
-
-tasks.named<ProcessResources>("processMultiloaderResources").configure {
-	inputs.property("group", project.group)
-	inputs.property("jarPrefix", modNameStripped)
-	
-	filesMatching(listOf("fabric.mod.json", "META-INF/jarjar/metadata.json")) {
-		expand(inputs.properties)
-	}
-}
-
-tasks.assemble {
-	finalizedBy(multiloaderJar)
-}

docs/CURSEFORGE.md

@@ -1,61 +0,0 @@
-**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 `Control`). 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.
-* **Resume Sprinting After Hitting Obstacle** re-activates sprinting once you are no longer touching any blocks.
-
-#### Sneaking
-
-* **Move Camera Smoothly** can be turned off to disable the smooth movement when sneaking or unsneaking.
-
-#### Gliding
-
-* **Start a Glide** with a dedicated key.
-* **Double Tap 'Jump' To Glide** can be turned off.
-
-#### Flying
-
-* **Double Tap 'Jump' To Fly** can be turned off.
-* **Flight Inertia Multiplier** changes how quickly you stop moving in the air 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. Stop flying by tapping Sneak while touching the ground.
-* **Flight Speed Multiplier** (0.25x - 8x) changes flight speed in creative and spectator mode.
-* **Vertical Speed Boost** (up to +300%) adds additional vertical flight speed boost 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)
-* **[NeoForge](https://neoforged.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, a button to open the mod's configuration is available in the Mods menu (for Fabric, install [Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu)).
-
-## Screenshot
-
-![Options Menu Screenshot](https://repo.chylex.com/better-controls.png)

docs/MODRINTH.md

@@ -1,61 +0,0 @@
-**Better Controls** is a reimagining of [Better Sprinting](https://modrinth.com/mod/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://modrinth.com/mod/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 `Control`). 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.
-* **Resume Sprinting After Hitting Obstacle** re-activates sprinting once you are no longer touching any blocks.
-
-#### Sneaking
-
-* **Move Camera Smoothly** can be turned off to disable the smooth movement when sneaking or unsneaking.
-
-#### Gliding
-
-* **Start a Glide** with a dedicated key.
-* **Double Tap 'Jump' To Glide** can be turned off.
-
-#### Flying
-
-* **Double Tap 'Jump' To Fly** can be turned off.
-* **Flight Inertia Multiplier** changes how quickly you stop moving in the air 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. Stop flying by tapping Sneak while touching the ground.
-* **Flight Speed Multiplier** (0.25x - 8x) changes flight speed in creative and spectator mode.
-* **Vertical Speed Boost** (up to +300%) adds additional vertical flight speed boost 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)
-* **[NeoForge](https://neoforged.net/)**
-
-After you install the mod loader of your choice, [download the mod](https://modrinth.com/mod/better-controls/versions) 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, a button to open the mod's configuration is available in the Mods menu (for Fabric, install [Mod Menu](https://modrinth.com/mod/modmenu)).
-
-## Screenshot
-
-![Options Menu Screenshot](https://cdn.modrinth.com/data/ANpj0aBF/images/9fed66f9f60a8d880fba24f5333ed7e11d1a7ae2.png)

gradle.properties

@@ -1,33 +1,4 @@
-# Mod
-modId=bettercontrols
-modName=Better Controls
-modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
-modAuthor=chylex
-modVersion=1.6.0
-modLicense=MPL-2.0
-modSourcesURL=https://github.com/chylex/Better-Controls
-modIssuesURL=https://github.com/chylex/Better-Controls/issues
-modSides=client
-
-# Dependencies
-minecraftVersion=1.21.5
-neoForgeVersion=21.5.0-beta
-neoModDevVersion=2.0.88
-fabricVersion=0.16.14
-loomVersion=1.9
-mixinVersion=0.12.5+mixin.0.8.5
-mixinExtrasVersion=0.4.1
-
-# https://projects.neoforged.net/neoforged/neoforge
-# https://projects.neoforged.net/neoforged/moddevgradle
-# https://fabricmc.net/develop/
-# https://github.com/FabricMC/fabric-loom/releases
-
-# Constraints
-minimumMinecraftVersion=1.21.5
-minimumNeoForgeVersion=21.5.0-beta
-minimumFabricVersion=0.15.0
-
-# Gradle
+# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
+# This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

gradlew

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

gradlew.bat

@@ -1,22 +1,4 @@
-@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
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,29 +9,25 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+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
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,36 +35,48 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -1,29 +0,0 @@
-rootProject.name = "Better-Controls"
-
-pluginManagement {
-	repositories {
-		gradlePluginPortal()
-		maven(url = "https://maven.neoforged.net/releases") { name = "NeoForge" }
-		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
-	}
-	
-	plugins {
-		val neoModDevVersion = settings.extra.get("neoModDevVersion") as? String
-		if (neoModDevVersion != null) {
-			id("net.neoforged.moddev") version neoModDevVersion
-		}
-		
-		val loomVersion = settings.extra.get("loomVersion") as? String
-		if (loomVersion != null) {
-			id("fabric-loom") version "$loomVersion-SNAPSHOT"
-		}
-	}
-}
-
-if (settings.extra.has("neoForgeVersion")) {
-	include("NeoForge")
-}
-
-if (settings.extra.has("fabricVersion")) {
-	include("Fabric")
-}

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

@@ -1,17 +0,0 @@
-package chylex.bettercontrols;
-
-import chylex.bettercontrols.config.BetterControlsConfig;
-
-public final class BetterControlsCommon {
-	private static BetterControlsConfig config;
-	
-	public static BetterControlsConfig getConfig() {
-		return config;
-	}
-	
-	static void setConfig(BetterControlsConfig config) {
-		BetterControlsCommon.config = config;
-	}
-	
-	private BetterControlsCommon() {}
-}

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

@@ -0,0 +1,33 @@
+package chylex.bettercontrols;
+import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.gui.BetterControlsScreen;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screen.Screen;
+import net.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;
+
+@Mod("bettercontrols")
+public final class BetterControlsMod{
+	public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
+	
+	public BetterControlsMod(){
+		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> ClientLoader::createScreen);
+		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+	}
+	
+	private static final class ClientLoader {
+		public static BetterControlsConfig loadConfig() {
+			return BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json"));
+		}
+		
+		public static BetterControlsScreen createScreen(final Minecraft mc, final Screen parentScreen) {
+			return new BetterControlsScreen(parentScreen);
+		}
+	}
+}

src/main/java/chylex/bettercontrols/Mixins.java

@@ -1,42 +0,0 @@
-package chylex.bettercontrols;
-
-import chylex.bettercontrols.mixin.AccessCameraFields;
-import chylex.bettercontrols.mixin.AccessClientPlayerFields;
-import chylex.bettercontrols.mixin.AccessKeyMappingFields;
-import chylex.bettercontrols.mixin.AccessPlayerFields;
-import chylex.bettercontrols.mixin.AccessToggleKeyMappingFields;
-import net.minecraft.client.Camera;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.ToggleKeyMapping;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.player.Player;
-
-@SuppressWarnings("CastToIncompatibleInterface")
-public final class Mixins {
-	private Mixins() {}
-	
-	@SuppressWarnings("unchecked")
-	public static <T> T me(Object object) {
-		return (T) object;
-	}
-	
-	public static AccessCameraFields cameraFields(Camera camera) {
-		return (AccessCameraFields) camera;
-	}
-	
-	public static AccessClientPlayerFields clientPlayerFields(LocalPlayer localPlayer) {
-		return (AccessClientPlayerFields) localPlayer;
-	}
-	
-	public static AccessKeyMappingFields keyMappingFields(KeyMapping keyMapping) {
-		return (AccessKeyMappingFields) keyMapping;
-	}
-	
-	public static AccessPlayerFields playerFields(Player player) {
-		return (AccessPlayerFields) player;
-	}
-	
-	public static AccessToggleKeyMappingFields toggleKeyMappingFields(ToggleKeyMapping toggleKeyMapping) {
-		return (AccessToggleKeyMappingFields) toggleKeyMapping;
-	}
-}

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

@@ -1,23 +1,14 @@
 package chylex.bettercontrols.config;
-
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
 import java.nio.file.Path;
 
-public final class BetterControlsConfig {
-	public static BetterControlsConfig load(Path path) {
-		BetterControlsConfig cfg = ConfigSerializer.read(path);
-		cfg.path = path;
-		
-		if (cfg.wasMigrated) {
-			cfg.save();
-		}
-		
-		return cfg;
+public final class BetterControlsConfig{
+	public static BetterControlsConfig load(final Path path){
+		return ConfigSerializer.deserialize(path).setPath(path);
 	}
 	
 	private Path path;
-	boolean wasMigrated = false;
 	
 	public final KeyBindingWithModifier keyToggleSprint = new KeyBindingWithModifier("key.bettercontrols.toggle_sprint");
 	public SprintMode sprintMode = SprintMode.TAP_TO_START;
@@ -27,32 +18,34 @@ public final class BetterControlsConfig {
 	public final KeyBindingWithModifier keyToggleSneak = new KeyBindingWithModifier("key.bettercontrols.toggle_sneak");
 	public boolean sneakingMovesCameraSmoothly = true;
 	
-	public final KeyBindingWithModifier keyStartGlide = new KeyBindingWithModifier("key.bettercontrols.start_glide");
-	public boolean doubleTapJumpToGlide = true;
-	
 	public final KeyBindingWithModifier keyToggleFlight = new KeyBindingWithModifier("key.bettercontrols.toggle_flight");
 	public boolean doubleTapJumpToToggleFlight = true;
-	public float flightInertiaMultiplier = 1F;
+	public boolean disableFlightInertia = false;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
-	public float flightHorizontalSpeedMpCreativeDefault = 1F;
-	public float flightHorizontalSpeedMpCreativeSprinting = 2F;
-	public float flightHorizontalSpeedMpSpectatorDefault = 1F;
-	public float flightHorizontalSpeedMpSpectatorSprinting = 2F;
-	public float flightVerticalSpeedMpCreativeDefault = 1F;
-	public float flightVerticalSpeedMpCreativeSprinting = 2F;
-	public float flightVerticalSpeedMpSpectatorDefault = 1F;
-	public float flightVerticalSpeedMpSpectatorSprinting = 2F;
+	public float flightSpeedMpCreativeDefault = 1F;
+	public float flightSpeedMpCreativeSprinting = 2F;
+	public float flightSpeedMpSpectatorDefault = 1F;
+	public float flightSpeedMpSpectatorSprinting = 2F;
+	public float flightVerticalBoostCreativeDefault = 0F;
+	public float flightVerticalBoostCreativeSprinting = 0F;
+	public float flightVerticalBoostSpectatorDefault = 0F;
+	public float flightVerticalBoostSpectatorSprinting = 0F;
 	
 	public final KeyBindingWithModifier keyToggleWalkForward = new KeyBindingWithModifier("key.bettercontrols.toggle_forward");
 	public final KeyBindingWithModifier keyToggleJump = new KeyBindingWithModifier("key.bettercontrols.toggle_jump");
 	public final KeyBindingWithModifier keyResetAllToggles = new KeyBindingWithModifier("key.bettercontrols.reset_all_toggles");
 	public final KeyBindingWithModifier keyOpenMenu = new KeyBindingWithModifier("key.bettercontrols.open_menu");
 	
-	BetterControlsConfig() {}
+	BetterControlsConfig(){}
 	
-	public KeyBindingWithModifier[] getAllKeyBindings() {
-		return new KeyBindingWithModifier[] {
+	private BetterControlsConfig setPath(final Path path){
+		this.path = path;
+		return this;
+	}
+	
+	public KeyBindingWithModifier[] getAllKeyBindings(){
+		return new KeyBindingWithModifier[]{
 			keyToggleSprint,
 			keyToggleSneak,
 			keyToggleFlight,
@@ -63,7 +56,7 @@ public final class BetterControlsConfig {
 		};
 	}
 	
-	public void save() {
-		ConfigSerializer.write(path, this);
+	public void save(){
+		ConfigSerializer.serialize(path, this);
 	}
 }

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

@@ -1,5 +1,4 @@
 package chylex.bettercontrols.config;
-
 import chylex.bettercontrols.input.SprintMode;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -12,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.Mth;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import java.io.FileNotFoundException;
@@ -23,15 +21,15 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 
-final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig> {
+final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig>{
 	private static final Logger logger = LogManager.getLogger();
 	private static final Gson gson = new GsonBuilder().registerTypeAdapter(BetterControlsConfig.class, new ConfigSerializer()).setPrettyPrinting().create();
 	
-	private ConfigSerializer() {}
+	private ConfigSerializer(){}
 	
 	@Override
-	public JsonElement serialize(BetterControlsConfig cfg, Type typeOfSrc, JsonSerializationContext context) {
-		JsonObject obj = new JsonObject();
+	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context){
+		final JsonObject obj = new JsonObject();
 		
 		Json.writeKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
 		Json.setEnum(obj, "Sprint.Mode", cfg.sprintMode);
@@ -41,22 +39,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		Json.writeKeyBinding(obj, "Sneak.KeyToggle", cfg.keyToggleSneak);
 		Json.setBool(obj, "Sneak.SmoothCamera", cfg.sneakingMovesCameraSmoothly);
 		
-		Json.writeKeyBinding(obj, "Glide.KeyStart", cfg.keyStartGlide);
-		Json.setBool(obj, "Glide.DoubleTapJump", cfg.doubleTapJumpToGlide);
-		
 		Json.writeKeyBinding(obj, "Flight.KeyToggle.Creative", cfg.keyToggleFlight);
 		Json.setBool(obj, "Flight.DoubleTapJump", cfg.doubleTapJumpToToggleFlight);
-		Json.setFloat(obj, "Flight.InertiaMultiplier", cfg.flightInertiaMultiplier);
+		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.flightHorizontalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault);
+		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting);
+		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault);
+		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting);
 		
 		Json.writeKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.writeKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -67,18 +62,14 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 	}
 	
 	@Override
-	public BetterControlsConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-		BetterControlsConfig cfg = new BetterControlsConfig();
-		JsonObject obj = json.getAsJsonObject();
+	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException{
+		final BetterControlsConfig cfg = new BetterControlsConfig();
+		final JsonObject obj = json.getAsJsonObject();
 		
-		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()) {
+		if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()){
 			cfg.sprintMode = SprintMode.TAP_TO_TOGGLE;
 		}
 		
-		if (obj.has("Flight.DisableInertia") && obj.get("Flight.DisableInertia").getAsBoolean()) {
-			cfg.flightInertiaMultiplier = 0F;
-		}
-		
 		Json.readKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
 		cfg.sprintMode = Json.getEnum(obj, "Sprint.Mode", cfg.sprintMode, SprintMode.class);
 		cfg.doubleTapForwardToSprint = Json.getBool(obj, "Sprint.DoubleTapForward", cfg.doubleTapForwardToSprint);
@@ -87,22 +78,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		Json.readKeyBinding(obj, "Sneak.KeyToggle", cfg.keyToggleSneak);
 		cfg.sneakingMovesCameraSmoothly = Json.getBool(obj, "Sneak.SmoothCamera", cfg.sneakingMovesCameraSmoothly);
 		
-		Json.readKeyBinding(obj, "Glide.KeyStart", cfg.keyStartGlide);
-		cfg.doubleTapJumpToGlide = Json.getBool(obj, "Glide.DoubleTapJump", cfg.doubleTapJumpToGlide);
-		
 		Json.readKeyBinding(obj, "Flight.KeyToggle.Creative", cfg.keyToggleFlight);
 		cfg.doubleTapJumpToToggleFlight = Json.getBool(obj, "Flight.DoubleTapJump", cfg.doubleTapJumpToToggleFlight);
-		cfg.flightInertiaMultiplier = Json.getFloat(obj, "Flight.InertiaMultiplier", cfg.flightInertiaMultiplier, 0F, 1F);
+		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.flightHorizontalSpeedMpCreativeDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		cfg.flightHorizontalSpeedMpCreativeSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		cfg.flightHorizontalSpeedMpSpectatorDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		cfg.flightHorizontalSpeedMpSpectatorSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		cfg.flightVerticalSpeedMpCreativeDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Default", "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		cfg.flightVerticalSpeedMpCreativeSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Sprinting", "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		cfg.flightVerticalSpeedMpSpectatorDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Default", "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		cfg.flightVerticalSpeedMpSpectatorSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Sprinting", "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
+		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);
@@ -112,50 +100,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	private static float readHorizontalSpeedMultiplier(JsonObject obj, String key, float defaultValue) {
-		return Json.getFloat(obj, key, defaultValue, 0.25F, 8F);
-	}
-	
-	private static float readVerticalSpeedMultiplier(JsonObject obj, BetterControlsConfig cfg, String newKey, String legacyBoostKey, float defaultValue) {
-		if (obj.has(newKey)) {
-			return Json.getFloat(obj, newKey, defaultValue, 0.25F, 8F);
-		}
-		else if (obj.has(legacyBoostKey)) {
-			cfg.wasMigrated = true;
-			
-			float value = 1F + Json.getFloat(obj, legacyBoostKey, 0F, 0F, 3F);
-			// 1.25x, 1.75x, 2.5x, and 3.5x are not supported
-			if (Mth.equal(value, 1.25F) || Mth.equal(value, 1.75F)) {
-				return 1.5F;
-			}
-			else if (Mth.equal(value, 2.5F)) {
-				return 2F;
-			}
-			else if (Mth.equal(value, 3.5F)) {
-				return 3F;
-			}
-			else {
-				return value;
-			}
-		}
-		else {
-			return defaultValue;
-		}
-	}
-	
-	static void write(Path path, BetterControlsConfig config) {
-		try (JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
+	static void serialize(final Path path, final BetterControlsConfig config){
+		try(final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))){
 			gson.getAdapter(BetterControlsConfig.class).write(writer, config);
-		} catch (IOException e) {
+		}catch(final IOException e){
 			logger.error("Error saving BetterControls configuration file!", e);
 		}
 	}
 	
-	static BetterControlsConfig read(Path path) {
-		try (JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
+	static BetterControlsConfig deserialize(final Path path){
+		try(final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))){
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
-		} catch (FileNotFoundException | NoSuchFileException ignored) {
-		} catch (IOException e) {
+		}catch(final FileNotFoundException | NoSuchFileException ignored){
+		}catch(final IOException e){
 			logger.error("Error reading BetterControls configuration file!", e);
 		}
 		

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

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

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

@@ -1,7 +1,8 @@
 package chylex.bettercontrols.gui;
-
-import chylex.bettercontrols.BetterControlsCommon;
+import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.gui.elements.BooleanValueWidget;
+import chylex.bettercontrols.gui.elements.CycleButtonWidget;
 import chylex.bettercontrols.gui.elements.DiscreteValueSliderWidget;
 import chylex.bettercontrols.gui.elements.KeyBindingWidget;
 import chylex.bettercontrols.gui.elements.Option;
@@ -9,36 +10,31 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
-import com.google.common.collect.ImmutableList;
-import com.mojang.blaze3d.platform.InputConstants;
-import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.options.OptionsSubScreen;
-import net.minecraft.network.chat.Component;
-import org.jetbrains.annotations.Nullable;
+import chylex.bettercontrols.util.Key;
+import chylex.bettercontrols.util.LiteralText;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.gui.DialogTexts;
+import net.minecraft.client.gui.IGuiEventListener;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.SettingsScreen;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.settings.KeyBinding;
 import org.lwjgl.glfw.GLFW;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Consumer;
 import static chylex.bettercontrols.gui.OptionListWidget.COL2_W;
 import static chylex.bettercontrols.gui.OptionListWidget.COL4_W;
 import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
-import static net.minecraft.network.chat.Component.literal;
+import static chylex.bettercontrols.util.LiteralText.text;
+import static chylex.bettercontrols.util.Statics.OPTIONS;
 
-public class BetterControlsScreen extends OptionsSubScreen {
-	private static Component text(String text) {
-		return literal(text);
-	}
-	
-	public static final Component TITLE = text("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;
@@ -53,60 +49,49 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, List<GuiEventListener> elements) {
-		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+	private int generateSprintingOptions(int y, final List<IGuiEventListener> elements){
+		final BetterControlsConfig cfg = BetterControlsMod.config;
+		
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		y += ROW_HEIGHT;
 		
-		generateCycleOptionRow(y, elements, text("Sprint Key Mode"), SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value);
+		generateLeftSideText(y, elements, text("Sprint Key Mode"));
+		elements.add(new CycleButtonWidget<>(col2(1), y, COL2_W, SPRINT_MODE_OPTIONS, cfg.sprintMode, value -> cfg.sprintMode = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Double Tap 'Walk Forwards' To Sprint"), cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value);
+		generateLeftSideText(y, elements, text("Double Tap 'Walk Forwards' To Sprint"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapForwardToSprint, value -> cfg.doubleTapForwardToSprint = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Resume Sprinting After Hitting Obstacle"), cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value);
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Resume Sprinting After Hitting Obstacle"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.resumeSprintingAfterHittingObstacle, value -> cfg.resumeSprintingAfterHittingObstacle = value));
 		
+		y += ROW_HEIGHT;
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, List<GuiEventListener> elements) {
-		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+	private int generateSneakingOptions(int y, final List<IGuiEventListener> elements){
+		final BetterControlsConfig cfg = BetterControlsMod.config;
+		
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Move Camera Smoothly"), cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value);
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Move Camera Smoothly"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.sneakingMovesCameraSmoothly, value -> cfg.sneakingMovesCameraSmoothly = value));
 		
+		y += ROW_HEIGHT;
 		return y;
 	}
 	
-	private int generateGlidingOptions(int y, List<GuiEventListener> elements) {
-		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
+	private int generateFlightOptions(int y, final List<IGuiEventListener> elements){
+		final BetterControlsConfig cfg = BetterControlsMod.config;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Start a Glide"), cfg.keyStartGlide);
-		y += ROW_HEIGHT;
-		
-		generateBooleanOptionRow(y, elements, text("Double Tap 'Jump' To Start a Glide"), cfg.doubleTapJumpToGlide, value -> cfg.doubleTapJumpToGlide = value);
-		y += ROW_HEIGHT;
-		
-		return y;
-	}
-	
-	private int generateFlightOptions(int y, List<GuiEventListener> elements) {
-		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
-		
-		ImmutableList<Option<Float>> flightInertiaOptions = ImmutableList.of(
-			new Option<>(Float.valueOf(0.00F), text("0x")),
-			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"))
-		);
-		
-		ImmutableList<Option<Float>> flightSpeedOptions = ImmutableList.of(
+		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
 			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")),
@@ -121,65 +106,91 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
+		final List<Option<Float>> flightVerticalBoostOptions = Arrays.asList(
+			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("Toggle Flight (Creative)"), cfg.keyToggleFlight);
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Double Tap 'Jump' To Fly (Creative)"), cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value);
+		generateLeftSideText(y, elements, text("Double Tap 'Jump' To Fly (Creative)"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.doubleTapJumpToToggleFlight, value -> cfg.doubleTapJumpToToggleFlight = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Flight Inertia Multiplier"));
-		elements.add(new DiscreteValueSliderWidget<>(col2(1), y, COL2_W, text("Flight Inertia Multiplier"), flightInertiaOptions, cfg.flightInertiaMultiplier, value -> cfg.flightInertiaMultiplier = value));
+		generateLeftSideText(y, elements, text("Disable Flight Inertia"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Disable Field Of View Changing"), cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value);
+		generateLeftSideText(y, elements, text("Disable Field Of View Changing"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value));
+		
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Fly On Ground (Creative)"), cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value);
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Fly On Ground (Creative Mode)"));
+		elements.add(new BooleanValueWidget(col2(1), y, COL2_W, cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value));
+		
+		y += ROW_HEIGHT * 4 / 3;
 		
-		y += ROW_HEIGHT / 3;
 		elements.add(new TextWidget(col4(2), y, COL4_W - TEXT_PADDING_RIGHT, text("Creative"), CENTER));
 		elements.add(new TextWidget(col4(3), y, COL4_W - TEXT_PADDING_RIGHT, text("Spectator"), CENTER));
+		
 		y += ROW_HEIGHT * 7 / 8;
 		
-		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeDefault, value -> cfg.flightHorizontalSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorDefault, value -> cfg.flightHorizontalSpeedMpSpectatorDefault = value));
+		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("Horizontal Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeSprinting, value -> cfg.flightHorizontalSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorSprinting, value -> cfg.flightHorizontalSpeedMpSpectatorSprinting = value));
+		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("Vertical Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeDefault, value -> cfg.flightVerticalSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorDefault, value -> cfg.flightVerticalSpeedMpSpectatorDefault = value));
+		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("Vertical Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeSprinting, value -> cfg.flightVerticalSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorSprinting, value -> cfg.flightVerticalSpeedMpSpectatorSprinting = value));
-		y += ROW_HEIGHT;
+		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
 		
+		y += ROW_HEIGHT;
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, List<GuiEventListener> elements) {
-		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+	private int generateMiscellaneousOptions(int y, final List<IGuiEventListener> elements){
+		final BetterControlsConfig cfg = BetterControlsMod.config;
+		
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
+		generateKeyBindingWithModifierOption(y, elements, text("Toggle Jump"), cfg.keyToggleJump);
+		
 		y += ROW_HEIGHT;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
+		generateKeyBindingWithModifierOption(y, elements, text("Reset All Toggles"), cfg.keyResetAllToggles);
+		
 		y += ROW_HEIGHT * 4 / 3;
 		
-		generateKeyBindingWithModifierRow(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
-		y += ROW_HEIGHT;
+		generateKeyBindingWithModifierOption(y, elements, text("Open Better Controls Menu"), cfg.keyOpenMenu);
 		
+		y += ROW_HEIGHT;
 		return y;
 	}
 	
@@ -192,9 +203,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierRow(int y, List<GuiEventListener> elements, Component text, KeyBindingWithModifier binding) {
-		var modifierButton = Option.button(col4(2), y, COL4_W, text.plainCopy().append(" Modifier"), MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
-		var bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
+	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);
 		
 		generateLeftSideText(y, elements, text);
@@ -203,20 +214,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static <T> void generateCycleOptionRow(int y, List<GuiEventListener> elements, Component text, List<Option<T>> options, T initialValue, Consumer<T> onValueChanged) {
-		generateLeftSideText(y, elements, text);
-		elements.add(Option.button(col2(1), y, COL2_W, text, options, initialValue, onValueChanged));
-	}
-	
-	private static void generateBooleanOptionRow(int y, List<GuiEventListener> elements, Component text, boolean initialValue, BooleanConsumer onValueChanged) {
-		generateLeftSideText(y, elements, text);
-		elements.add(CycleButton.onOffBuilder()
-			.displayOnlyValue()
-			.withInitialValue(Boolean.valueOf(initialValue))
-			.create(col2(1), y, COL2_W, 20, text, (btn, newValue) -> onValueChanged.accept(newValue.booleanValue())));
-	}
-	
-	private static void generateLeftSideText(int y, List<GuiEventListener> elements, Component 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));
 	}
 	
@@ -226,16 +224,15 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	@SuppressWarnings("DataFlowIssue")
-	public BetterControlsScreen(@Nullable Screen parentScreen) {
-		super(parentScreen, Minecraft.getInstance().options, TITLE);
+	public BetterControlsScreen(@Nullable final Screen parentScreen){
+		super(parentScreen, OPTIONS, TITLE);
 	}
 	
 	@Override
-	protected void addContents() {
+	public void init(){
 		allKeyBindings.clear();
 		
-		List<GuiEventListener> elements = new ArrayList<>();
+		final List<IGuiEventListener> elements = new ArrayList<>();
 		int y = 0;
 		
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@@ -244,37 +241,31 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		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("Gliding"), CENTER));
-		y = generateGlidingOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
-		
 		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("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		optionsWidget = addRenderableWidget(new OptionListWidget(width, layout.getContentHeight(), layout.getHeaderHeight(), y - TITLE_MARGIN_TOP + BOTTOM_PADDING, elements));
+		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
-	protected void addOptions() {}
-	
-	@Override
-	protected void repositionElements() {
-		super.repositionElements();
-		
-		if (optionsWidget != null) {
-			optionsWidget.updateSize(width, layout);
-		}
+	public void onClose(){
+		BetterControlsMod.config.save();
 	}
 	
 	@Override
-	public void removed() {
-		BetterControlsCommon.getConfig().save();
+	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
+		renderBackground(matrices);
+		optionsWidget.render(matrices, mouseX, mouseY, delta);
+		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
+		super.render(matrices, mouseX, mouseY, delta);
 	}
 	
-	private void startEditingKeyBinding(KeyBindingWidget widget) {
-		if (editingKeyBinding != null) {
+	private void startEditingKeyBinding(final KeyBindingWidget widget){
+		if (editingKeyBinding != null){
 			editingKeyBinding.stopEditing();
 		}
 		
@@ -282,40 +273,40 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@Override
-	public boolean mouseClicked(double mouseX, double mouseY, int button) {
-		if (editingKeyBinding != null) {
-			editingKeyBinding.bindAndStopEditing(InputConstants.Type.MOUSE.getOrCreate(button));
+	public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
+		if (editingKeyBinding != null){
+			editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else {
+		else{
 			return super.mouseClicked(mouseX, mouseY, button);
 		}
 	}
 	
 	@Override
-	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-		if (editingKeyBinding != null) {
-			if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
-				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
+	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
+		if (editingKeyBinding != null){
+			if (keyCode == GLFW.GLFW_KEY_ESCAPE){
+				editingKeyBinding.bindAndStopEditing(Key.INVALID);
 			}
-			else {
-				editingKeyBinding.bindAndStopEditing(InputConstants.getKey(keyCode, scanCode));
+			else{
+				editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
 			}
 			
 			onKeyBindingEditingFinished();
 			return true;
 		}
-		else {
+		else{
 			return super.keyPressed(keyCode, scanCode, modifiers);
 		}
 	}
 	
-	private void onKeyBindingEditingFinished() {
+	private void onKeyBindingEditingFinished(){
 		editingKeyBinding = null;
-		KeyMapping.resetMapping();
+		KeyBinding.resetKeyBindingArrayAndHash();
 		
-		for (KeyBindingWidget widget : allKeyBindings) {
+		for(final KeyBindingWidget widget : allKeyBindings){
 			widget.updateKeyBindingText();
 		}
 	}

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

@@ -1,146 +1,113 @@
 package chylex.bettercontrols.gui;
-
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+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 static java.util.stream.Collectors.toMap;
+import java.util.stream.Collectors;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
+public final class OptionListWidget extends AbstractOptionList<Entry>{
 	public static final int ROW_WIDTH = 408;
+	public static final int ROW_PADDING = 2;
 	
-	private static final int ROW_HORIZONTAL_PADDING = 2;
-	private static final int SCROLL_MULTIPLIER = 18;
+	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
+	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
 	
-	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_HORIZONTAL_PADDING;
-	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_HORIZONTAL_PADDING;
-	
-	public static int col2(int column) {
+	public static int col2(final int column){
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col4(int column) {
+	public static int col4(final int column){
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	private static Offset getElementOffset(GuiEventListener element) {
-		if (element instanceof OptionWidget widget) {
-			return new Offset(widget.getX(), widget.getY(), widget.getHeight());
+	private static Offset getElementOffset(final IGuiEventListener element){
+		if (element instanceof Widget){
+			return new Offset(((Widget)element).getX(), ((Widget)element).getY());
 		}
-		else if (element instanceof AbstractWidget widget) {
-			return new Offset(widget.getX(), widget.getY(), widget.getHeight());
+		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, 0);
+		else{
+			return new Offset(0, 0);
 		}
 	}
 	
-	public interface OptionWidget extends GuiEventListener, Renderable {
-		void setX(int x);
+	public interface Widget extends IGuiEventListener, IRenderable{
 		int getX();
-		
-		void setY(int y);
 		int getY();
-		
-		int getHeight();
+		void setX(int x);
+		void setY(int y);
 	}
 	
-	private record Offset(int x, int y, int height) {}
+	private static final class Offset{
+		public final int x;
+		public final int y;
 		
-	@SuppressWarnings("ThisEscapedInObjectConstruction")
-	public OptionListWidget(int width, int height, int top, int innerHeight, List<GuiEventListener> widgets) {
-		super(Minecraft.getInstance(), width, height, top, innerHeight);
-		addEntry(new Entry(this, widgets));
+		private Offset(final int x, final int y){
+			this.x = x;
+			this.y = y;
+		}
+	}
+	
+	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<IGuiEventListener> widgets, final int innerHeight){
+		super(MINECRAFT, width, height, top, bottom, innerHeight);
+		addEntry(new Entry(widgets));
 	}
 	
 	@Override
-	public int getRowLeft() {
-		return super.getRowLeft() - ROW_HORIZONTAL_PADDING;
+	public int getRowLeft(){
+		return super.getRowLeft() - ROW_PADDING;
 	}
 	
 	@Override
-	public int getRowWidth() {
+	public int getRowWidth(){
 		return ROW_WIDTH;
 	}
 	
 	@Override
-	protected int scrollBarX() {
+	protected int getScrollbarPosition(){
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
-	@Override
-	public boolean mouseScrolled(double x, double y, double xAmount, double yAmount) {
-		setScrollAmount(scrollAmount() - yAmount * SCROLL_MULTIPLIER);
-		return true;
+	protected static final class Entry extends AbstractOptionList.Entry<Entry>{
+		private final List<IGuiEventListener> elements;
+		private final Map<IGuiEventListener, Offset> offsets;
+		
+		public Entry(final List<IGuiEventListener> elements){
+			this.elements = new ArrayList<>(elements);
+			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
 		@Override
-	protected void ensureVisible(@NotNull Entry entry) {
-		// Scrolling to focused item is implemented in Entry.
-	}
-	
-	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
-		private final OptionListWidget parentWidget;
-		private final List<GuiEventListener> elements;
-		private final List<NarratableEntry> narratables;
-		private final Map<GuiEventListener, Offset> offsets;
-		
-		public Entry(OptionListWidget parentWidget, List<GuiEventListener> elements) {
-			this.parentWidget = parentWidget;
-			this.elements = List.copyOf(elements);
-			this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry)e).toList();
-			this.offsets = elements.stream().collect(toMap(Function.identity(), OptionListWidget::getElementOffset));
+		public List<? extends IGuiEventListener> getEventListeners(){
+			return Collections.unmodifiableList(elements);
 		}
 		
 		@Override
-		public void setFocused(@Nullable GuiEventListener element) {
-			super.setFocused(element);
+		public void render(final MatrixStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta){
+			for(final IGuiEventListener element : elements){
+				final Offset offset = offsets.get(element);
 				
-			if (Minecraft.getInstance().getLastInputType().isKeyboard()) {
-				Offset offset = offsets.get(element);
-				if (offset != null) {
-					parentWidget.setScrollAmount(offset.y + (offset.height * 0.5F) - (parentWidget.getHeight() * 0.5F) + 4);
+				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;
 				}
-			}
-		}
-		
-		@NotNull
-		@Override
-		public List<? extends GuiEventListener> children() {
-			return elements;
-		}
-		
-		@NotNull
-		@Override
-		public List<? extends NarratableEntry> narratables() {
-			return narratables;
-		}
-		
-		@Override
-		public void render(@NotNull GuiGraphics graphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-			for (GuiEventListener element : elements) {
-				Offset offset = offsets.get(element);
-				
-				if (element instanceof AbstractWidget widget) {
-					widget.setX(x + offset.x);
-					widget.setY(y + offset.y);
-				}
-				else if (element instanceof OptionWidget widget) {
+				else if (element instanceof Widget){
+					final Widget widget = (Widget)element;
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof Renderable renderable) {
-					renderable.render(graphics, mouseX, mouseY, tickDelta);
+				if (element instanceof IRenderable){
+					((IRenderable)element).render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

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

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

@@ -0,0 +1,27 @@
+package chylex.bettercontrols.gui.elements;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import net.minecraft.client.gui.DialogTexts;
+import net.minecraft.client.gui.widget.button.Button;
+
+public final class BooleanValueWidget extends Button{
+	private final BooleanConsumer onChanged;
+	private boolean value;
+	
+	public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged){
+		super(x, y, width, height, currentValue ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_OFF, ignore -> {});
+		this.value = currentValue;
+		this.onChanged = onChanged;
+	}
+	
+	public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged){
+		this(x, y, width, 20, currentValue, onChanged);
+	}
+	
+	@Override
+	public void onPress(){
+		super.onPress();
+		value = !value;
+		setMessage(value ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_OFF);
+		onChanged.accept(value);
+	}
+}

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

@@ -0,0 +1,36 @@
+package chylex.bettercontrols.gui.elements;
+import net.minecraft.client.gui.widget.button.Button;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class CycleButtonWidget<T> extends Button{
+	private final List<Option<T>> options;
+	private final Consumer<T> onChanged;
+	private T selectedValue;
+	
+	public CycleButtonWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+		super(x, y, width, height, Option.find(options, selectedValue).getText(), btn -> {});
+		this.options = options;
+		this.selectedValue = selectedValue;
+		this.onChanged = onChanged;
+	}
+	
+	public CycleButtonWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+		this(x, y, width, 20, options, selectedValue, onChanged);
+	}
+	
+	@Override
+	public void onPress(){
+		int nextIndex = options.indexOf(Option.find(options, selectedValue)) + 1;
+		
+		if (nextIndex >= options.size()){
+			nextIndex = 0;
+		}
+		
+		final Option<T> newSelectedOption = options.get(nextIndex);
+		
+		selectedValue = newSelectedOption.getValue();
+		onChanged.accept(selectedValue);
+		setMessage(newSelectedOption.getText());
+	}
+}

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

@@ -1,86 +1,41 @@
 package chylex.bettercontrols.gui.elements;
-
-import com.google.common.collect.ImmutableList;
-import net.minecraft.client.gui.components.AbstractSliderButton;
-import net.minecraft.client.gui.navigation.CommonInputs;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.util.Mth;
-import org.jetbrains.annotations.NotNull;
-import org.lwjgl.glfw.GLFW;
+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 AbstractSliderButton {
-	private final Component narration;
-	private final ImmutableList<Option<T>> options;
+public final class DiscreteValueSliderWidget<T> extends AbstractSlider{
+	private final List<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
-	public DiscreteValueSliderWidget(int x, int y, int width, int height, Component narration, ImmutableList<Option<T>> options, T selectedValue, Consumer<T> onChanged) {
-		super(x, y, width, height, Option.find(options, selectedValue).text(), getOptionValue(options, options.indexOf(Option.find(options, selectedValue))));
-		this.narration = narration;
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+		super(x, y, width, height, Option.find(options, selectedValue).getText(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
 	}
 	
-	public DiscreteValueSliderWidget(int x, int y, int width, Component narration, ImmutableList<Option<T>> options, T selectedValue, Consumer<T> onChanged) {
-		this(x, y, width, 20, narration, options, selectedValue, onChanged);
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
+		this(x, y, width, 20, options, selectedValue, onChanged);
 	}
 	
-	public Option<T> getSelectedOption() {
-		return options.get(getSelectedOptionIndex());
-	}
-	
-	private int getSelectedOptionIndex() {
-		return Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value));
+	public Option<T> getSelectedOption(){
+		return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, sliderValue)));
 	}
 	
 	@Override
-	protected void updateMessage() {
-		setMessage(getSelectedOption().text());
+	protected void func_230979_b_(){
+		setMessage(getSelectedOption().getText());
 	}
 	
 	@Override
-	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-		if (CommonInputs.selected(keyCode)) {
-			return super.keyPressed(keyCode, scanCode, modifiers);
-		}
+	protected void func_230972_a_(){
+		final T newSelectedValue = getSelectedOption().getValue();
 		
-		if (keyCode == GLFW.GLFW_KEY_LEFT || keyCode == GLFW.GLFW_KEY_RIGHT) {
-			int newOptionIndex = keyCode == GLFW.GLFW_KEY_LEFT
-				? getSelectedOptionIndex() - 1
-				: getSelectedOptionIndex() + 1;
-			
-			if (newOptionIndex >= 0 && newOptionIndex < options.size()) {
-				value = getOptionValue(options, newOptionIndex);
-				applyValue();
-				updateMessage();
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
-	
-	@Override
-	protected void applyValue() {
-		T newSelectedValue = getSelectedOption().value();
-		
-		if (selectedValue != newSelectedValue) {
+		if (selectedValue != newSelectedValue){
 			selectedValue = newSelectedValue;
 			onChanged.accept(newSelectedValue);
 		}
 	}
-	
-	@NotNull
-	@Override
-	protected MutableComponent createNarrationMessage() {
-		return Component.translatable("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
-	}
-	
-	private static <T> double getOptionValue(ImmutableList<Option<T>> options, int optionIndex) {
-		return optionIndex / (options.size() - 1.0);
-	}
 }

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

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

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

@@ -1,21 +1,26 @@
 package chylex.bettercontrols.gui.elements;
-
-import net.minecraft.client.gui.components.CycleButton;
-import net.minecraft.network.chat.Component;
+import chylex.bettercontrols.util.LiteralText;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Consumer;
 
-public record Option<T>(T value, Component text) {
-	public static <T> Option<T> find(List<Option<T>> options, T value) {
+public final class Option<T>{
+	private final T value;
+	private final LiteralText text;
+	
+	public Option(final T value, final LiteralText text){
+		this.value = value;
+		this.text = text;
+	}
+	
+	public T getValue(){
+		return value;
+	}
+	
+	public LiteralText getText(){
+		return text;
+	}
+	
+	public static <T> Option<T> find(final List<Option<T>> options, final T value){
 		return options.stream().filter(it -> Objects.equals(it.value, value)).findFirst().orElseGet(() -> options.get(0));
 	}
-	
-	public static <T> CycleButton<Option<T>> button(int x, int y, int width, Component text, List<Option<T>> options, T initialValue, Consumer<T> onValueChanged) {
-		return CycleButton.<Option<T>>builder(Option::text)
-			.displayOnlyValue()
-			.withValues(options)
-			.withInitialValue(find(options, initialValue))
-			.create(x, y, width, 20, text, (btn, newValue) -> onValueChanged.accept(newValue.value()));
-	}
 }

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

@@ -1,28 +1,25 @@
 package chylex.bettercontrols.gui.elements;
-
-import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.network.chat.Component;
-import net.minecraft.util.FormattedCharSequence;
-import org.jetbrains.annotations.NotNull;
+import chylex.bettercontrols.gui.OptionListWidget.Widget;
+import chylex.bettercontrols.util.LiteralText;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.gui.AbstractGui;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.util.IReorderingProcessor;
 import java.util.List;
+import static chylex.bettercontrols.util.Statics.MINECRAFT;
 
-public final class TextWidget implements OptionWidget {
+public final class TextWidget extends AbstractGui implements Widget{
 	public static final int LEFT = 0;
 	public static final int CENTER = 1;
 	
-	public static final int WHITE = 0xFF_FF_FF;
-	
-	private final Component text;
+	private final LiteralText text;
 	private int x;
 	private int y;
 	private final int width;
 	private final int height;
 	private final int align;
 	
-	public TextWidget(int x, int y, int width, int height, Component text, 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;
@@ -31,58 +28,46 @@ public final class TextWidget implements OptionWidget {
 		this.align = align;
 	}
 	
-	public TextWidget(int x, int y, int width, Component text, 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(int x, int y, int width, Component text) {
+	public TextWidget(final int x, final int y, final int width, final LiteralText text){
 		this(x, y, width, 20, text, LEFT);
 	}
 	
 	@Override
-	public void setX(int x) {
-		this.x = x;
-	}
-	
-	@Override
-	public int getX() {
+	public int getX(){
 		return x;
 	}
 	
 	@Override
-	public void setY(int y) {
-		this.y = y;
-	}
-	
-	@Override
-	public int getY() {
+	public int getY(){
 		return y;
 	}
 	
 	@Override
-	public int getHeight() {
-		return height;
+	public void setX(final int x){
+		this.x = x;
 	}
 	
 	@Override
-	public void setFocused(boolean focused) {}
-	
-	@Override
-	public boolean isFocused() {
-		return false;
+	public void setY(final int y){
+		this.y = y;
 	}
 	
 	@Override
-	public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-		Font textRenderer = Minecraft.getInstance().font;
-		List<FormattedCharSequence> lines = textRenderer.split(text, width);
-		final int lineHeight = textRenderer.lineHeight + 1;
+	public void render(final MatrixStack matrices, final int mouseX, final int mouseY, final float delta){
+		final FontRenderer textRenderer = MINECRAFT.fontRenderer;
+		final List<IReorderingProcessor> lines = textRenderer.trimStringToWidth(text, width);
+		final int lineHeight = textRenderer.FONT_HEIGHT + 1;
 		
-		int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::width).max().orElse(0) / 2) : x;
-		int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
+		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++) {
-			graphics.drawString(textRenderer, lines.get(i), finalX, finalY + (i * lineHeight), WHITE);
+		for(int i = 0; i < lines.size(); i++){
+			final IReorderingProcessor line = lines.get(i);
+			textRenderer.func_238407_a_(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

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

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

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

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

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

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

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

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

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

@@ -1,36 +1,35 @@
 package chylex.bettercontrols.input;
-
-import chylex.bettercontrols.Mixins;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.OptionInstance;
+import chylex.bettercontrols.mixin.AccessKeyBindingFields;
+import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
+import net.minecraft.client.settings.KeyBinding;
 import java.util.HashSet;
 import java.util.Set;
 
-public final class ToggleTrackerForStickyKey extends ToggleTracker {
-	private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
+public final class ToggleTrackerForStickyKey extends ToggleTracker{
+	private static final Set<KeyBinding> enabledOverrides = new HashSet<>();
 	
-	@SuppressWarnings("StaticMethodOnlyUsedInOneClass")
-	public static boolean isOverrideEnabled(KeyMapping binding) {
+	public static boolean isOverrideEnabled(final KeyBinding binding){
 		return enabledOverrides.contains(binding);
 	}
 	
-	private final OptionInstance<Boolean> toggleOption;
+	private final BooleanConsumer setToggleState;
 	
-	public ToggleTrackerForStickyKey(KeyMapping bindingToggle, KeyMapping bindingStickyReset, OptionInstance<Boolean> toggleOption) {
-		super(bindingToggle, bindingStickyReset, toggleOption.get().booleanValue());
-		this.toggleOption = toggleOption;
+	public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding bindingStickyReset, final BooleanConsumer setToggleState){
+		super(bindingToggle, bindingStickyReset);
+		this.setToggleState = setToggleState;
+		this.setToggleState.accept(false);
 		enabledOverrides.add(bindingStickyReset);
 	}
 	
 	@Override
-	public boolean tick() {
-		boolean isToggled = super.tick();
-		toggleOption.set(Boolean.valueOf(isToggled));
+	public boolean tick(){
+		final boolean isToggled = super.tick();
+		setToggleState.accept(isToggled);
 		return isToggled;
 	}
 	
 	@Override
-	protected boolean isResetKeyPressed() {
-		return Mixins.keyMappingFields(bindingReset).isPressedField();
+	protected boolean isResetKeyPressed(){
+		return ((AccessKeyBindingFields)bindingReset).isPressedField();
 	}
 }

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

@@ -1,11 +1,14 @@
 package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.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)
-public interface AccessCameraFields {
-	@Accessor
-	void setEyeHeight(float y);
+@Mixin(ActiveRenderInfo.class)
+public interface AccessCameraFields{
+	@Accessor("renderViewEntity")
+	Entity getFocusedEntity();
+	
+	@Accessor("height")
+	void setCameraY(float y);
 }

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

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

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

@@ -0,0 +1,11 @@
+package chylex.bettercontrols.mixin;
+import net.minecraft.client.gui.widget.list.KeyBindingList.CategoryEntry;
+import net.minecraft.util.text.ITextComponent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(CategoryEntry.class)
+public interface AccessControlsListCategory{
+	@Accessor("labelText")
+	ITextComponent getText();
+}

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

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

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

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

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

@@ -0,0 +1,19 @@
+package chylex.bettercontrols.mixin;
+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("CATEGORY_ORDER")
+	static Map<String, Integer> getCategoryOrderMap(){
+		throw new AssertionError();
+	}
+	
+	@Accessor("pressed")
+	boolean isPressedField();
+	
+	@Accessor("pressed")
+	void setPressedField(boolean value);
+}

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+package chylex.bettercontrols.mixin;
+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(ToggleableKeyBinding.class)
+public interface AccessStickyKeyBindingStateGetter{
+	@Accessor("getterToggle")
+	BooleanSupplier getToggleGetter();
+	
+	@Accessor("getterToggle")
+	@Mutable
+	void setToggleGetter(final BooleanSupplier toggleGetter);
+}

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

@@ -1,17 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import net.minecraft.client.ToggleKeyMapping;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import java.util.function.BooleanSupplier;
-
-@Mixin(ToggleKeyMapping.class)
-public interface AccessToggleKeyMappingFields {
-	@Accessor
-	BooleanSupplier getNeedsToggle();
-	
-	@Accessor
-	@Mutable
-	void setNeedsToggle(BooleanSupplier toggleGetter);
-}

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

@@ -1,27 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.Mixins;
-import chylex.bettercontrols.player.PlayerTicker;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(AbstractClientPlayer.class)
-public abstract class HookClientPlayerFOV {
-	@ModifyExpressionValue(
-		method = "getFieldOfViewModifier",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getWalkingSpeed()F")
-	)
-	private float overrideWalkingSpeed(float walkingSpeed) {
-		AbstractClientPlayer me = Mixins.me(this);
-		
-		if (me instanceof LocalPlayer localPlayer && PlayerTicker.shouldResetFOV(localPlayer)) {
-			return 0F;
-		}
-		else {
-			return walkingSpeed;
-		}
-	}
-}

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

@@ -1,27 +1,24 @@
 package chylex.bettercontrols.mixin;
-
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.KeyboardInput;
-import net.minecraft.client.player.LocalPlayer;
+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)
-@SuppressWarnings("MethodMayBeStatic")
-public abstract class HookClientPlayerInputTick {
-	@Inject(
-		method = "tick",
-		at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;keyPresses:Lnet/minecraft/world/entity/player/Input;", ordinal = 0, shift = AFTER)
-	)
-	private void afterInputTick(CallbackInfo info) {
-		LocalPlayer player = Minecraft.getInstance().player;
+@Mixin(MovementInputFromOptions.class)
+public abstract class HookClientPlayerInputTick{
+	@Inject(method = "tickMovement(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/util/MovementInputFromOptions;forwardKeyDown:Z", ordinal = 0, shift = AFTER))
+	private void afterInputTick(final CallbackInfo info){
+		final MovementInput input = (MovementInput)(Object)this;
+		final ClientPlayerEntity player = MINECRAFT.player;
 		
-		if (player != null) {
-			PlayerTicker.get(player).afterKeyboardInputAssigned(player);
+		if (player != null){
+			PlayerTicker.get(player).afterInputAssignsPressingForward(input);
 		}
 	}
 }

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

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

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

@@ -1,32 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.Mixins;
-import chylex.bettercontrols.player.FlightHelper;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Slice;
-
-@Mixin(LocalPlayer.class)
-public abstract class HookClientPlayerVerticalFlightSpeed extends LivingEntity {
-	protected HookClientPlayerVerticalFlightSpeed(EntityType<? extends LivingEntity> type, Level world) {
-		super(type, world);
-	}
-	
-	@ModifyExpressionValue(
-		method = "aiStep",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F"),
-		slice = @Slice(
-			from = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Abilities;flying:Z"),
-			to = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;setDeltaMovement(Lnet/minecraft/world/phys/Vec3;)V")
-		)
-	)
-	private float modifyVerticalFlightSpeed(float flyingSpeed) {
-		LocalPlayer me = Mixins.me(this);
-		return flyingSpeed * FlightHelper.getVerticalSpeedMultiplier(me);
-	}
-}

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

@@ -1,27 +1,37 @@
 package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.BetterControlsCommon;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.client.KeyMapping;
+import chylex.bettercontrols.BetterControlsMod;
+import chylex.bettercontrols.input.KeyBindingWithModifier;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.options.controls.KeyBindsList;
-import net.minecraft.client.gui.screens.options.controls.KeyBindsList.Entry;
+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(KeyBindsList.class)
-@SuppressWarnings("MethodMayBeStatic")
-public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(Minecraft client, int width, int height, int top, int itemHeight) {
-		super(client, width, height, top, 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);
 	}
 	
-	@WrapOperation(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))
-	private KeyMapping[] excludeOwnKeyBindings(Options options, Operation<KeyMapping[]> operation) {
-		return ArrayUtils.removeElements(operation.call(options), BetterControlsCommon.getConfig().getAllKeyBindings());
+	@Inject(method = "<init>", at = @At("TAIL"))
+	public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci){
+		getEventListeners().removeIf(it -> {
+			if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())){
+				return true;
+			}
+			
+			if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())){
+				return true;
+			}
+			
+			return false;
+		});
 	}
 }

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

@@ -1,39 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.Mixins;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.options.OptionsSubScreen;
-import net.minecraft.client.gui.screens.options.controls.ControlsScreen;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import java.util.List;
-
-@Mixin(ControlsScreen.class)
-public abstract class HookControlsScreen extends OptionsSubScreen {
-	public HookControlsScreen(Screen parentScreen, Options options, Component title) {
-		super(parentScreen, options, title);
-	}
-	
-	@Inject(method = "addOptions", at = @At("RETURN"))
-	public void afterAddOptions(CallbackInfo ci) {
-		if (list != null) {
-			ControlsScreen screen = Mixins.me(this);
-			MutableComponent buttonTitle = BetterControlsScreen.TITLE.plainCopy().append("...");
-			list.addSmall(List.of(Button.builder(buttonTitle, btn -> showOptionsScreen(screen)).build()));
-		}
-	}
-	
-	@Unique
-	private static void showOptionsScreen(ControlsScreen screen) {
-		Minecraft.getInstance().setScreen(new BetterControlsScreen(screen));
-	}
-}

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

@@ -1,43 +1,30 @@
 package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.BetterControlsCommon;
-import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.BetterControlsMod;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Options;
+import 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.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Options.class)
-public abstract class HookLoadGameOptions {
-	@Unique
+@Mixin(GameSettings.class)
+public abstract class HookLoadGameOptions{
 	private boolean hasLoaded = false;
 	
-	@Mutable
-	@Final
 	@Shadow
-	public KeyMapping[] keyMappings;
+	public KeyBinding[] keyBindings;
 	
-	@Inject(method = "load()V", at = @At("HEAD"))
-	private void load(CallbackInfo info) {
-		if (hasLoaded) {
-			return;
-		}
-		
-		BetterControlsConfig config = BetterControlsCommon.getConfig();
-		if (config == null) {
+	@Inject(method = "loadOptions()V", at = @At("HEAD"))
+	private void load(final CallbackInfo info){
+		if (hasLoaded){
 			return;
 		}
 		
 		hasLoaded = true;
-		keyMappings = ArrayUtils.addAll(keyMappings, config.getAllKeyBindings());
-		AccessKeyMappingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
+		keyBindings = ArrayUtils.addAll(keyBindings, BetterControlsMod.config.getAllKeyBindings());
+		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }

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

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

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

@@ -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;
+	}
+}

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

@@ -1,23 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.player.FlightHelper;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import net.minecraft.client.player.LocalPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Slice;
-
-@Mixin(LocalPlayer.class)
-@SuppressWarnings("MethodMayBeStatic")
-public abstract class HookPlayerGliding {
-	@ModifyExpressionValue(
-		method = "aiStep",
-		at = @At(value = "INVOKE:LAST", target = "Lnet/minecraft/world/entity/player/Input;jump()Z"),
-		slice = @Slice(
-			to = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;tryToStartFallFlying()Z")
-		)
-	)
-	private boolean shouldStartGliding(boolean isHoldingJump) {
-		return FlightHelper.shouldStartGliding(isHoldingJump);
-	}
-}

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

@@ -1,53 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.Mixins;
-import chylex.bettercontrols.player.FlightHelper;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.Level;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Slice;
-
-@Mixin(Player.class)
-public abstract class HookPlayerHorizontalFlightSpeed extends LivingEntity {
-	protected HookPlayerHorizontalFlightSpeed(EntityType<? extends LivingEntity> type, Level world) {
-		super(type, world);
-	}
-	
-	@SuppressWarnings("SimplifiableIfStatement")
-	@ModifyExpressionValue(
-		method = "getFlyingSpeed",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
-		slice = @Slice(
-			from = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/player/Abilities;flying:Z"),
-			to = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F")
-		)
-	)
-	private boolean disableVanillaSprintBoost(boolean isSprinting) {
-		Player me = Mixins.me(this);
-		
-		if (me instanceof LocalPlayer localPlayer && FlightHelper.isFlyingCreativeOrSpectator(localPlayer)) {
-			return false;
-		}
-		else {
-			return isSprinting;
-		}
-	}
-	
-	@ModifyReturnValue(method = "getFlyingSpeed", at = @At("RETURN"))
-	private float modifyHorizontalFlyingSpeed(float flyingSpeed) {
-		Player me = Mixins.me(this);
-		
-		if (me instanceof LocalPlayer localPlayer && localPlayer.getAbilities().flying) {
-			return flyingSpeed * FlightHelper.getHorizontalSpeedMultiplier(localPlayer);
-		}
-		else {
-			return flyingSpeed;
-		}
-	}
-}

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

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

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

@@ -1,23 +0,0 @@
-package chylex.bettercontrols.mixin;
-
-import chylex.bettercontrols.Mixins;
-import net.minecraft.client.OptionInstance;
-import net.minecraft.client.Options;
-import net.minecraft.client.gui.components.AbstractWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import java.util.function.Consumer;
-
-@Mixin(OptionInstance.class)
-public abstract class HookToggleOptionButtons {
-	@Inject(method = "createButton(Lnet/minecraft/client/Options;IIILjava/util/function/Consumer;)Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("RETURN"))
-	private <T> void disableToggleOptions(Options options, int x, int y, int width, Consumer<T> callback, CallbackInfoReturnable<AbstractWidget> cir) {
-		OptionInstance<?> me = Mixins.me(this);
-		
-		if (me == options.toggleCrouch() || me == options.toggleSprint()) {
-			cir.getReturnValue().active = false;
-		}
-	}
-}

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

@@ -1,52 +1,67 @@
 package chylex.bettercontrols.player;
+import chylex.bettercontrols.BetterControlsMod;
+import chylex.bettercontrols.config.BetterControlsConfig;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
-import static chylex.bettercontrols.BetterControlsCommon.getConfig;
+final class FlightHelper{
+	private FlightHelper(){}
 	
-public final class FlightHelper {
-	private FlightHelper() {}
+	private static final float BASE_FLIGHT_SPEED = 0.05F;
+	private static final float BASE_VERTICAL_VELOCITY = 3F;
 	
-	private static final KeyMapping KEY_SPRINT = Minecraft.getInstance().options.keySprint;
-	
-	private static boolean isSprinting() {
-		return KEY_SPRINT.isDown();
+	private static BetterControlsConfig cfg(){
+		return BetterControlsMod.config;
 	}
 	
-	public static boolean shouldStartGliding(boolean isHoldingJump) {
-		return getConfig().keyStartGlide.isDown() || (getConfig().doubleTapJumpToGlide && isHoldingJump);
+	static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){
+		return player.abilities.isFlying && (player.isCreative() || player.isSpectator());
 	}
 	
-	public static boolean isFlyingCreativeOrSpectator(LocalPlayer player) {
-		return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
+	static boolean shouldFlyOnGround(final ClientPlayerEntity player){
+		return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.isFlying;
 	}
 	
-	static boolean shouldFlyOnGround(LocalPlayer player) {
-		return getConfig().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
+	static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost){
+		if (player.isCreative()){
+			if (boost){
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
 			}
-	
-	public static float getHorizontalSpeedMultiplier(LocalPlayer player) {
-		if (player.isCreative()) {
-			return isSprinting() ? getConfig().flightHorizontalSpeedMpCreativeSprinting : getConfig().flightHorizontalSpeedMpCreativeDefault;
+			else{
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
 			}
-		else if (player.isSpectator()) {
-			return isSprinting() ? getConfig().flightHorizontalSpeedMpSpectatorSprinting : getConfig().flightHorizontalSpeedMpSpectatorDefault;
 		}
-		else {
-			return 1F;
+		else if (player.isSpectator()){
+			if (boost){
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
+			}
+			else{
+				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
+			}
+		}
+		else{
+			return 0F;
 		}
 	}
 	
-	public static float getVerticalSpeedMultiplier(LocalPlayer player) {
-		if (player.isCreative()) {
-			return isSprinting() ? getConfig().flightVerticalSpeedMpCreativeSprinting : getConfig().flightVerticalSpeedMpCreativeDefault;
+	static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){
+		if (player.isCreative()){
+			if (isSprinting){
+				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
 			}
-		else if (player.isSpectator()) {
-			return isSprinting() ? getConfig().flightVerticalSpeedMpSpectatorSprinting : getConfig().flightVerticalSpeedMpSpectatorDefault;
+			else{
+				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
 			}
-		else {
-			return 1F;
+		}
+		else if (player.isSpectator()){
+			if (isSprinting){
+				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
+			}
+			else{
+				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorDefault;
+			}
+		}
+		else{
+			return 0F;
 		}
 	}
 }

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

@@ -1,55 +1,55 @@
 package chylex.bettercontrols.player;
-
-import chylex.bettercontrols.Mixins;
+import chylex.bettercontrols.BetterControlsMod;
+import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import chylex.bettercontrols.input.SprintMode;
 import chylex.bettercontrols.input.ToggleTracker;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
-import chylex.bettercontrols.mixin.AccessToggleKeyMappingFields;
-import net.minecraft.client.Camera;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Options;
-import net.minecraft.client.ToggleKeyMapping;
-import net.minecraft.client.player.ClientInput;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.entity.player.Input;
+import chylex.bettercontrols.mixin.AccessCameraFields;
+import chylex.bettercontrols.mixin.AccessClientPlayerFields;
+import chylex.bettercontrols.mixin.AccessGameRendererFields;
+import chylex.bettercontrols.mixin.AccessPlayerFields;
+import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
+import chylex.bettercontrols.util.Key;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.util.MovementInput;
 import java.lang.ref.WeakReference;
 import java.util.function.BooleanSupplier;
-import static chylex.bettercontrols.BetterControlsCommon.getConfig;
-
-public final class PlayerTicker {
-	private static final Minecraft MINECRAFT = Minecraft.getInstance();
-	private static final Options OPTIONS = MINECRAFT.options;
-	
-	private static final ToggleKeyMapping KEY_SPRINT = (ToggleKeyMapping) OPTIONS.keySprint;
-	private static final KeyMapping KEY_SNEAK = OPTIONS.keyShift;
-	private static final KeyMapping KEY_FORWARD = OPTIONS.keyUp;
-	private static final KeyMapping KEY_JUMP = OPTIONS.keyJump;
+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);
 	
-	public static PlayerTicker get(LocalPlayer player) {
-		if (ticker.ref.get() != player) {
+	public static PlayerTicker get(final ClientPlayerEntity player){
+		if (ticker.ref.get() != player){
 			ticker = new PlayerTicker(player);
 		}
 		
 		return ticker;
 	}
 	
-	private final WeakReference<LocalPlayer> ref;
+	private static BetterControlsConfig cfg(){
+		return BetterControlsMod.config;
+	}
 	
-	private PlayerTicker(LocalPlayer player) {
+	private final WeakReference<ClientPlayerEntity> ref;
+	
+	private PlayerTicker(final ClientPlayerEntity player){
 		this.ref = new WeakReference<>(player);
 		setup();
 	}
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(getConfig().keyToggleSprint, KEY_SPRINT, OPTIONS.toggleSprint());
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(getConfig().keyToggleSneak, KEY_SNEAK, OPTIONS.toggleCrouch());
-	private final ToggleTracker toggleWalkForward = new ToggleTracker(getConfig().keyToggleWalkForward, KEY_FORWARD);
-	private final ToggleTracker toggleJump = new ToggleTracker(getConfig().keyToggleJump, KEY_JUMP);
+	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,79 +62,79 @@ public final class PlayerTicker {
 	private boolean holdingSneakWhileTouchingGround = false;
 	private int temporaryFlyOnGroundTimer = 0;
 	
-	private void setup() {
-		AccessToggleKeyMappingFields sprint = Mixins.toggleKeyMappingFields(KEY_SPRINT);
-		BooleanSupplier getter = sprint.getNeedsToggle();
+	private void setup(){
+		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
+		BooleanSupplier getter = sprint.getToggleGetter();
 		
-		if (getter instanceof SprintPressGetter g) {
-			getter = g.wrapped();
+		if (getter instanceof SprintPressGetter){
+			getter = ((SprintPressGetter)getter).getWrapped();
 		}
 		
-		sprint.setNeedsToggle(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
+		sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(LocalPlayer player) {
-		if (FlightHelper.shouldFlyOnGround(player)) {
+	public void atHead(final ClientPlayerEntity player){
+		if (FlightHelper.shouldFlyOnGround(player)){
 			player.setOnGround(false);
 		}
 		
-		if (!getConfig().doubleTapForwardToSprint) {
-			Mixins.clientPlayerFields(player).setSprintTriggerTime(0);
+		if (!cfg().doubleTapForwardToSprint){
+			((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
 		}
 		
-		if (!getConfig().doubleTapJumpToToggleFlight) {
-			Mixins.playerFields(player).setJumpTriggerTime(0);
+		if (!cfg().doubleTapJumpToToggleFlight){
+			((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
 		}
 		
-		SprintMode sprintMode = getConfig().sprintMode;
-		boolean wasSprintToggled = Boolean.TRUE.equals(OPTIONS.toggleSprint().get());
-		boolean isSprintToggled = toggleSprint.tick();
+		final SprintMode sprintMode = cfg().sprintMode;
+		final boolean wasSprintToggled = OPTIONS.toggleSprint;
+		final boolean isSprintToggled = toggleSprint.tick();
 		
-		if (temporarySprintTimer > 0) {
+		if (temporarySprintTimer > 0){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			
-			int nextTemporarySprintTimer = temporarySprintTimer - 1;
+			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
-			if (!KEY_SPRINT.isDown() && KEY_FORWARD.isDown()) {
+			if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
 				temporarySprintTimer = nextTemporarySprintTimer;
 			}
-			else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
+			else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (isSprintToggled) {
+		if (isSprintToggled){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 		}
-		else if (wasSprintToggled) {
+		else if (wasSprintToggled){
 			stopSprintingAfterReleasingSprintKey = true;
 			waitingForSprintKeyRelease = true;
 		}
-		else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
-			if (KEY_SPRINT.isDown()) {
-				if (!waitingForSprintKeyRelease) {
+		else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
+			if (Key.isPressed(KEY_SPRINT)){
+				if (!waitingForSprintKeyRelease){
 					waitingForSprintKeyRelease = true;
 					stopSprintingAfterReleasingSprintKey = player.isSprinting();
 				}
 			}
-			else {
-				if (player.isSprinting() && !waitingForSprintKeyRelease) {
+			else{
+				if (player.isSprinting() && !waitingForSprintKeyRelease){
 					stopSprintingAfterReleasingSprintKey = false;
 				}
 				
 				waitingForSprintKeyRelease = false;
 			}
 		}
-		else if (sprintMode == SprintMode.HOLD) {
-			if (KEY_SPRINT.isDown()) {
+		else if (sprintMode == SprintMode.HOLD){
+			if (Key.isPressed(KEY_SPRINT)){
 				stopSprintingAfterReleasingSprintKey = true;
 			}
 		}
 		
-		if (stopSprintingAfterReleasingSprintKey && !KEY_SPRINT.isDown()) {
+		if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			player.setSprinting(false);
@@ -143,151 +143,163 @@ public final class PlayerTicker {
 		toggleSneak.tick();
 	}
 	
-	public void afterKeyboardInputAssigned(LocalPlayer player) {
-		if (MINECRAFT.screen == null && toggleWalkForward.tick()) {
-			ClientInput input = player.input;
-			
-			input.keyPresses = new Input(
-				true,
-				input.keyPresses.backward(),
-				input.keyPresses.left(),
-				input.keyPresses.right(),
-				input.keyPresses.jump(),
-				input.keyPresses.shift(),
-				input.keyPresses.sprint()
-			);
+	public void afterInputAssignsPressingForward(final MovementInput input){
+		if (MINECRAFT.currentScreen == null){
+			input.forwardKeyDown |= toggleWalkForward.tick();
 		}
 	}
 	
-	public void afterInputTick(LocalPlayer player) {
-		if (MINECRAFT.screen == null && !player.getAbilities().flying && toggleJump.tick()) {
-			player.input.makeJump();
+	public void afterInputTick(final ClientPlayerEntity player){
+		final MovementInput input = player.movementInput;
+		
+		if (MINECRAFT.currentScreen == null && !player.abilities.isFlying){
+			input.jump |= toggleJump.tick();
 		}
 		
-		if (getConfig().resumeSprintingAfterHittingObstacle) {
-			if (wasHittingObstacle != player.horizontalCollision) {
-				if (!wasHittingObstacle) {
-					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
+		if (FlightHelper.isFlyingCreativeOrSpectator(player)){
+			final boolean boost = Key.isPressed(KEY_SPRINT);
+			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
+			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
+			
+			if (flightSpeed > 0F){
+				player.abilities.setFlySpeed(flightSpeed);
 			}
-				else if (wasSprintingBeforeHittingObstacle) {
+			
+			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getRenderViewEntity()){
+				int direction = 0;
+				
+				if (input.sneaking){
+					--direction;
+				}
+				
+				if (input.jump){
+					++direction;
+				}
+				
+				if (direction != 0){
+					player.setMotion(player.getMotion().add(0D, flightSpeed * verticalVelocity * direction, 0D));
+				}
+			}
+		}
+		
+		if (cfg().resumeSprintingAfterHittingObstacle){
+			if (wasHittingObstacle != player.collidedHorizontally){
+				if (!wasHittingObstacle){
+					wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
+				}
+				else if (wasSprintingBeforeHittingObstacle){
 					wasSprintingBeforeHittingObstacle = false;
 					temporarySprintTimer = 10;
 				}
 				
 				// collision also stops when the player lets go of movement keys
-				wasHittingObstacle = player.horizontalCollision;
+				wasHittingObstacle = player.collidedHorizontally;
 			}
 		}
-		else {
-			wasHittingObstacle = player.horizontalCollision;
+		else{
+			wasHittingObstacle = player.collidedHorizontally;
 			wasSprintingBeforeHittingObstacle = false;
 		}
+		
+		if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
+			((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
+		}
 	}
 	
-	public void afterSuperCall(LocalPlayer player) {
-		if (FlightHelper.shouldFlyOnGround(player)) {
-			boolean isSneaking = player.isShiftKeyDown();
-			boolean isOnGround = player.onGround();
+	public void afterSuperCall(final ClientPlayerEntity player){
+		if (FlightHelper.shouldFlyOnGround(player)){
+			final boolean isSneaking = player.isSneaking();
+			final boolean isOnGround = player.isOnGround();
 			
-			if (!isSneaking) {
+			if (!isSneaking){
 				wasSneakingBeforeTouchingGround = false;
 			}
-			else if (!isOnGround) {
+			else if (!isOnGround){
 				wasSneakingBeforeTouchingGround = true;
 			}
 			
-			if (!isOnGround) {
+			if (!isOnGround){
 				holdingSneakWhileTouchingGround = false;
 			}
-			else {
+			else{
 				boolean cancelLanding = true;
 				
-				if (!wasSneakingBeforeTouchingGround) {
-					if (isSneaking) {
+				if (!wasSneakingBeforeTouchingGround){
+					if (isSneaking){
 						holdingSneakWhileTouchingGround = true;
 					}
-					else if (holdingSneakWhileTouchingGround) {
-						player.getAbilities().flying = false;
-						player.onUpdateAbilities();
+					else if (holdingSneakWhileTouchingGround){
+						player.abilities.isFlying = false;
+						player.sendPlayerAbilities();
 						cancelLanding = false;
 					}
 				}
 				
-				if (cancelLanding) {
+				if (cancelLanding){
 					player.setOnGround(false);
 				}
 			}
 		}
-		else {
+		else{
 			wasSneakingBeforeTouchingGround = false;
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			float inertiaMultiplier = getConfig().flightInertiaMultiplier;
+		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
+			final MovementInput input = player.movementInput;
 			
-			if (inertiaMultiplier < 1F) {
-				ClientInput input = player.input;
-				Input keyPresses = input.keyPresses;
-				double inertiaMultiplierSqrt = Math.sqrt(inertiaMultiplier);
-				
-				if (!keyPresses.forward() && !keyPresses.backward() && !keyPresses.left() && !keyPresses.right()) {
-					player.setDeltaMovement(player.getDeltaMovement().multiply(inertiaMultiplierSqrt, 1.0, inertiaMultiplierSqrt));
+			if (input.moveForward == 0F && input.moveStrafe == 0F){
+				player.setMotion(player.getMotion().mul(0.0, 1.0, 0.0));
 			}
 			
-				if (!keyPresses.jump() && !keyPresses.shift()) {
-					player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, inertiaMultiplierSqrt, 1.0));
-				}
+			if (!input.jump && !input.sneaking){
+				player.setMotion(player.getMotion().mul(1.0, 0.0, 1.0));
 			}
 		}
 		
-		if (player.isCreative()) {
-			if (getConfig().keyToggleFlight.consumeClick()) {
-				boolean isFlying = !player.getAbilities().flying;
+		if (player.isCreative()){
+			if (Key.wasPressed(cfg().keyToggleFlight)){
+				final boolean isFlying = !player.abilities.isFlying;
 				
-				player.getAbilities().flying = isFlying;
-				player.onUpdateAbilities();
+				player.abilities.isFlying = isFlying;
+				player.sendPlayerAbilities();
 				
-				if (isFlying) {
+				if (isFlying){
 					temporaryFlyOnGroundTimer = 10;
 				}
 			}
 			
-			if (temporaryFlyOnGroundTimer > 0) {
-				if (player.isShiftKeyDown()) {
+			if (temporaryFlyOnGroundTimer > 0){
+				if (player.isSneaking()){
 					temporaryFlyOnGroundTimer = 0;
 				}
-				else {
+				else{
 					--temporaryFlyOnGroundTimer;
 					player.setOnGround(false);
 				}
 			}
 		}
-		else {
+		else{
 			temporaryFlyOnGroundTimer = 0;
 		}
 		
-		if (!getConfig().sneakingMovesCameraSmoothly) {
-			Camera camera = MINECRAFT.gameRenderer.getMainCamera();
+		if (!cfg().sneakingMovesCameraSmoothly){
+			final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getActiveRenderInfo();
 			
-			if (camera.getEntity() == player) {
-				Mixins.cameraFields(camera).setEyeHeight(player.getEyeHeight());
+			if (camera.getFocusedEntity() == player){
+				camera.setCameraY(player.getEyeHeight());
 			}
 		}
 		
-		if (getConfig().keyResetAllToggles.consumeClick()) {
+		if (Key.wasPressed(cfg().keyResetAllToggles)){
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (getConfig().keyOpenMenu.isDown()) {
-			MINECRAFT.setScreen(new BetterControlsScreen(null));
+		if (Key.isPressed(cfg().keyOpenMenu)){
+			MINECRAFT.displayGuiScreen(new BetterControlsScreen(null));
 		}
 	}
-	
-	public static boolean shouldResetFOV(LocalPlayer player) {
-		return getConfig().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
-	}
 }

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

@@ -1,10 +1,21 @@
 package chylex.bettercontrols.player;
-
 import java.util.function.BooleanSupplier;
 
-record SprintPressGetter(BooleanSupplier wrapped, BooleanSupplier or) implements BooleanSupplier {
+final class SprintPressGetter implements BooleanSupplier{
+	private final BooleanSupplier wrapped;
+	private final BooleanSupplier or;
+	
+	public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or){
+		this.wrapped = wrapped;
+		this.or = or;
+	}
+	
+	public BooleanSupplier getWrapped(){
+		return wrapped;
+	}
+	
 	@Override
-	public boolean getAsBoolean() {
+	public boolean getAsBoolean(){
 		return wrapped.getAsBoolean() || or.getAsBoolean();
 	}
 }

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);
+	}
+}

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);
+	}
+}

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;
+}

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

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

src/main/resources/bettercontrols.mixins.json

@@ -2,25 +2,24 @@
   "required": true,
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
-  "refmap": "bettercontrols.refmap.json",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "JAVA_8",
   "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
-    "AccessKeyMappingFields",
+    "AccessControlsListCategory",
+    "AccessControlsListKeyBinding",
+    "AccessGameRendererFields",
+    "AccessKeyBindingFields",
     "AccessPlayerFields",
-    "AccessToggleKeyMappingFields",
-    "HookClientPlayerFOV",
+    "AccessScreenButtons",
+    "AccessStickyKeyBindingStateGetter",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
-    "HookClientPlayerVerticalFlightSpeed",
     "HookControlsListWidget",
-    "HookControlsScreen",
     "HookLoadGameOptions",
-    "HookPlayerGliding",
-    "HookPlayerHorizontalFlightSpeed",
-    "HookStickyKeyBindingState",
-    "HookToggleOptionButtons"
+    "HookOpenScreen",
+    "HookPlayerFlightSpeed",
+    "HookStickyKeyBindingState"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/pack.mcmeta

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

src/multiloader/resources/META-INF/jarjar/metadata.json

@@ -1,13 +0,0 @@
-{
-  "jars": [{
-    "identifier": {
-      "group": "${group}",
-      "artifact": "${id}"
-    },
-    "version": {
-      "artifactVersion": "${version}",
-      "range": "[${version}]"
-    },
-    "path": "jars/${jarPrefix}-NeoForge.jar"
-  }]
-}

src/multiloader/resources/fabric.mod.json

@@ -1,34 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "${id}_multiloader",
-  "name": "${name} (Multiloader)",
-  "description": "${description}",
-  "version": "${version}",
-  "license": "${license}",
-  
-  "icon": "assets/${id}/logo.png",
-  
-  "authors": [
-    "${author}"
-  ],
-  
-  "contact": {
-    "homepage": "https://chylex.com",
-    "issues": "${issuesURL}",
-    "sources": "${sourcesURL}"
-  },
-  
-  "environment": "${sidesForFabric}",
-  
-  "jars": [{
-      "file": "jars/${jarPrefix}-Fabric.jar"
-  }],
-  
-  "custom": {
-    "modmenu": {
-      "parent": "${id}",
-      "badges": [ "library" ],
-      "update_checker": false
-    }
-  }
-}