Fix typo in filename

Closes #17

.github/FUNDING.yml

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

Fabric/build.gradle.kts

@@ -1,10 +1,13 @@
+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 {
-	idea
+	id("fabric-loom")
-	id("fabric-loom") version "0.9-SNAPSHOT"
 }
 
 dependencies {
@@ -15,23 +18,36 @@ dependencies {
 
 loom {
 	runs {
-		named("client") {
+		val runJvmArgs: Set<String> by project
-			configName = "Fabric Client"
+		
-			client()
+		configureEach {
-			runDir("run")
+			runDir("../run")
+			vmArgs(runJvmArgs)
 			ideConfigGenerated(true)
 		}
 		
-		named("server") {
+		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()
-			runDir("run")
-			ideConfigGenerated(true)
 		}
 	}
 	
 	mixin {
-		add(sourceSets.main.get(), "$modId.refmap.json")
+		defaultRefmapName.set("$modId.refmap.json")
 	}
 }
 
@@ -42,9 +58,14 @@ tasks.processResources {
 }
 
 tasks.jar {
-	exclude("io/github/prospector/")
+	exclude("com/terraformersmc/modmenu/")
 }
 
-tasks.remapJar {
+tasks.register<Jar>("uncompressedRemapJar") {
-	archiveVersion.set(tasks.jar.get().archiveVersion)
+	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,4 +1,5 @@
 package chylex.bettercontrols;
+
 import chylex.bettercontrols.config.BetterControlsConfig;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;

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

@@ -1,7 +1,8 @@
 package chylex.bettercontrols.compatibility;
+
 import chylex.bettercontrols.gui.BetterControlsScreen;
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
+import com.terraformersmc.modmenu.api.ModMenuApi;
 
 public class ModMenuSupport implements ModMenuApi {
 	@Override

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

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

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

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

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

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

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

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

Forge/build.gradle.kts

@@ -1,95 +0,0 @@
-import net.minecraftforge.gradle.userdev.UserDevExtension
-import org.gradle.api.file.DuplicatesStrategy.INCLUDE
-import org.spongepowered.asm.gradle.plugins.MixinExtension
-
-val modId: String by project
-val minecraftVersion: String by project
-val forgeVersion: String by project
-val mixinVersion: String by project
-
-buildscript {
-	repositories {
-		maven("https://maven.minecraftforge.net")
-		maven("https://repo.spongepowered.org/maven")
-		mavenCentral()
-	}
-	
-	dependencies {
-		classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = "5.1.+") { isChanging = true }
-		classpath(group = "org.spongepowered", name = "mixingradle", version = "0.7-SNAPSHOT")
-	}
-}
-
-plugins {
-	java
-	eclipse
-}
-
-apply {
-	plugin("net.minecraftforge.gradle")
-	plugin("org.spongepowered.mixin")
-}
-
-dependencies {
-	"minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")
-	
-	if (System.getProperty("idea.sync.active") != "true") {
-		annotationProcessor("org.spongepowered:mixin:$mixinVersion:processor")
-	}
-}
-
-configure<UserDevExtension> {
-	mappings("official", minecraftVersion)
-	
-	runs {
-		create("client") {
-			taskName = "Client"
-			workingDirectory(rootProject.file("run"))
-			ideaModule("${rootProject.name}.${project.name}.main")
-			
-			property("mixin.env.remapRefMap", "true")
-			property("mixin.env.refMapRemappingFile", "$projectDir/build/createSrgToMcp/output.srg")
-			arg("-mixin.config=$modId.mixins.json")
-			
-			mods {
-				create(modId) {
-					source(sourceSets.main.get())
-					source(rootProject.sourceSets.main.get())
-				}
-			}
-		}
-		
-		create("server") {
-			taskName = "Server"
-			workingDirectory(rootProject.file("run"))
-			ideaModule("${rootProject.name}.${project.name}.main")
-			
-			property("mixin.env.remapRefMap", "true")
-			property("mixin.env.refMapRemappingFile", "$projectDir/build/createSrgToMcp/output.srg")
-			arg("-mixin.config=$modId.mixins.json")
-			
-			mods {
-				create(modId) {
-					source(sourceSets.main.get())
-					source(rootProject.sourceSets.main.get())
-				}
-			}
-		}
-	}
-}
-
-configure<MixinExtension> {
-	add(sourceSets.main.get(), "$modId.refmap.json")
-}
-
-tasks.processResources {
-	from(sourceSets.main.get().resources.srcDirs) {
-		include("META-INF/mods.toml")
-		expand(inputs.properties)
-		duplicatesStrategy = INCLUDE
-	}
-}
-
-tasks.jar {
-	finalizedBy("reobfJar")
-}

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

@@ -1,32 +0,0 @@
-package chylex.bettercontrols;
-import chylex.bettercontrols.config.BetterControlsConfig;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.fmlclient.ConfigGuiHandler.ConfigGuiFactory;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
-
-@Mod("bettercontrols")
-public final class BetterControlsMod {
-	public BetterControlsMod() {
-		BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> 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);
-		}
-	}
-}

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

@@ -1,30 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[37,)"
-
-authors = "chylex"
-license = "MPL-2.0"
-issueTrackerURL = "https://github.com/chylex/Better-Controls/issues"
-
-[[mods]]
-modId = "bettercontrols"
-version = "${version}"
-displayName = "${name}"
-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.17.1,)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.bettercontrols]]
-modId = "forge"
-mandatory = true
-versionRange = "[37,)"
-ordering = "NONE"
-side = "BOTH"

NeoForge/build.gradle.kts

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

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

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

@@ -11,28 +11,33 @@ Another major difference is the amount and granularity of options. Better Contro
 
 ## Features
 
-The mod adds **Toggle Keybinds** for sprinting, sneaking, flying (creative mode), walking, and jumping. You can use modifier keys (`Control` / `Shift` / `Alt`) for each, including for example setting `Control` to Sneak, and `Control + Y` to Toggle Sneak. If you press the original key, the toggle will be canceled (in the previous example, you can Toggle Sneak by pressing `Control + Y`, and stop sneaking by simply tapping Sneak). Note that the vanilla options for toggling sprinting/sneaking are disabled to avoid conflicts with the custom keybinds.
+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 to prevent accidental sprinting.
+* **Double Tap 'Walk Forwards' To Sprint** can be turned off.
-* **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).
+* **Resume Sprinting After Hitting Obstacle** re-activates sprinting once you are no longer touching any blocks.
 
 #### Sneaking
 
-* **Move Camera Smoothly** lets you disable the smooth movement when sneaking or unsneaking.
+* **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 to prevent accidental flight toggling.
+* **Double Tap 'Jump' To Fly** can be turned off.
-* **Disable Flight Inertia** stops you instantly when you stop holding movement keys.
+* **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 (and also lets you stop flying by tapping Sneak while touching the ground).
+* **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 how fast you fly in creative and spectator mode.
+* **Flight Speed Multiplier** (0.25x - 8x) changes flight speed in creative and spectator mode.
-* **Vertical Speed Boost** (up to +300%) adds additional vertical speed boost while flying 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.
 
@@ -41,9 +46,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)
-* **[Forge](https://files.minecraftforge.net/)**
+* **[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`.
+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`.
 
 ### Minecraft Updates
 
@@ -63,7 +68,7 @@ While this is convenient, there is potential for bugs which can affect server pl
 Source Code
 ===========
 
-The `main` branch includes both the Fabric and Forge version in a single project. The project uses Mojang mappings. The root project contains common source code and resource files, and the `Fabric` and `Forge` folders are subprojects with loader-specific files.
+The `main` branch 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.
 
@@ -71,7 +76,7 @@ Older versions from before the merge of the Fabric and Forge versions can be fou
 
 ## Contributing
 
-All contributions should target the `main` branch and work in both Fabric and Forge, unless the contribution is specifically targeting older versions or a specific mod loader.
+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.
 
 For any larger contributions, please [open an issue](https://github.com/chylex/Better-Controls/issues/new) first before you make a PR.
 

build.gradle.kts

@@ -1,129 +1,217 @@
-import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
+@file:Suppress("ConvertLambdaToReference")
-import java.text.SimpleDateFormat
+
-import java.util.Date
+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(" ", "")
-val jarVersion = "$minecraftVersion+v$modVersion"
-
-buildscript {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-}
 
 plugins {
-	`java-library`
 	idea
-	id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
+	`java-library`
+	id("fabric-loom")
 }
 
 idea {
 	module {
-		excludeDirs.add(project.file("run"))
+		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 {
-	maven("https://repo.spongepowered.org/maven")
 	mavenCentral()
 }
 
-dependencies {
-	implementation("org.spongepowered:mixin:$mixinVersion")
-	api("com.google.code.findbugs:jsr305:3.0.2")
-}
-
 base {
 	archivesName.set("$modNameStripped-Common")
 }
 
-minecraft {
+loom {
-	version(minecraftVersion)
+	runs {
-	runs.clear()
+		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")
+	apply(plugin = "java-library")
-	
-	dependencies {
-		implementation("org.jetbrains:annotations:22.0.0")
-	}
 	
 	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(16))
+		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 	}
 	
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
-		options.release.set(16)
+		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 {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-	
 	dependencies {
-		implementation(rootProject)
+		implementation(project(rootProject.path, configuration = "namedElements"))
 	}
 	
 	base {
 		archivesName.set("$modNameStripped-${project.name}")
 	}
 	
-	tasks.withType<JavaCompile> {
+	tasks.compileJava {
 		source({ rootProject.sourceSets.main.get().allSource })
 	}
 	
 	tasks.processResources {
-		from(rootProject.sourceSets.main.get().resources)
+		from(rootProject.sourceSets.main.get().resources) {
-		
+			expand(inputs.properties)
-		inputs.property("name", modName)
+		}
-		inputs.property("version", modVersion)
 	}
 	
 	tasks.jar {
-		archiveVersion.set(jarVersion)
+		entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
-		
-		from(rootProject.file("LICENSE"))
 		
 		manifest {
+			packageInformation(modId, "$modNameStripped-${project.name}")
+		}
+	}
+	
+	tasks.test {
+		onlyIf { false }
+	}
+}
+
+fun Manifest.packageInformation(specificationTitle: String, implementationTitle: String) {
 	attributes(
-				"Specification-Title" to modId,
+		"Specification-Title" to specificationTitle,
 		"Specification-Vendor" to modAuthor,
 		"Specification-Version" to "1",
-				"Implementation-Title" to "$modNameStripped-${project.name}",
+		"Implementation-Title" to implementationTitle,
 		"Implementation-Vendor" to modAuthor,
 		"Implementation-Version" to modVersion,
-				"Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()),
-				"MixinConfigs" to "$modId.mixins.json"
 	)
 }
+
+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" }
 		}
 	}
 	
-val copyJars = tasks.register<Copy>("copyJars") {
+	findProject(":NeoForge")?.let { includeJar(it, "jar") }
-	duplicatesStrategy = EXCLUDE
+	findProject(":Fabric")?.let { includeJar(it, "uncompressedRemapJar") }
 	
-	for (subproject in subprojects) {
+	from(rootProject.file("LICENSE"))
-		dependsOn(subproject.tasks.build)
+	from(multiloaderSources.map { it.output })
-		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
+	
+	manifest {
+		packageInformation("$modId-multiloader", modNameStripped)
+		attributes("FMLModType" to "GAMELIBRARY")
+	}
 }
 
-	into(file("${project.buildDir}/dist"))
+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.build {
+tasks.assemble {
-	finalizedBy(copyJars)
+	finalizedBy(multiloaderJar)
 }

docs/CURSEFORGE.md

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

@@ -0,0 +1,61 @@
+**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,14 +1,32 @@
 # Mod
 modId=bettercontrols
 modName=Better Controls
+modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
 modAuthor=chylex
-modVersion=1.2.1
+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.17.1
+minecraftVersion=1.21.5
-forgeVersion=37.0.75
+neoForgeVersion=21.5.0-beta
-fabricVersion=0.11.7
+neoModDevVersion=2.0.88
-mixinVersion=0.8.4
+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
 org.gradle.jvmargs=-Xmx3G

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# 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.
@@ -15,69 +15,103 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+APP_BASE_NAME=${0##*/}
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,86 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    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.
 
 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-ARGV=("$@")
+# Collect all arguments for the java command, stacking in reverse order:
-eval set -- $DEFAULT_JVM_OPTS
+#   * 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.
 
-IFS=$'
+# For Cygwin or MSYS, switch paths to Windows format before running java
-' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
+if "$cygwin" || "$msys" ; then
-IFS=$'
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# 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:
+#   * 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"
+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

@@ -13,6 +13,8 @@
 @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
 @rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -3,13 +3,25 @@ rootProject.name = "Better-Controls"
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
+		maven(url = "https://maven.neoforged.net/releases") { name = "NeoForge" }
 		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
-		maven(url = "https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge Snapshots" }
+	}
+	
+	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("forgeVersion")) {
+if (settings.extra.has("neoForgeVersion")) {
-	include("Forge")
+	include("NeoForge")
 }
 
 if (settings.extra.has("fabricVersion")) {

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

@@ -9,7 +9,7 @@ public final class BetterControlsCommon {
 		return config;
 	}
 	
-	static void setConfig(final BetterControlsConfig config) {
+	static void setConfig(BetterControlsConfig config) {
 		BetterControlsCommon.config = config;
 	}
 	

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

@@ -0,0 +1,42 @@
+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,14 +1,23 @@
 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(final Path path) {
+	public static BetterControlsConfig load(Path path) {
-		return ConfigSerializer.deserialize(path).setPath(path);
+		BetterControlsConfig cfg = ConfigSerializer.read(path);
+		cfg.path = path;
+		
+		if (cfg.wasMigrated) {
+			cfg.save();
+		}
+		
+		return cfg;
 	}
 	
 	private Path path;
+	boolean wasMigrated = false;
 	
 	public final KeyBindingWithModifier keyToggleSprint = new KeyBindingWithModifier("key.bettercontrols.toggle_sprint");
 	public SprintMode sprintMode = SprintMode.TAP_TO_START;
@@ -18,19 +27,22 @@ 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 boolean disableFlightInertia = false;
+	public float flightInertiaMultiplier = 1F;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
-	public float flightSpeedMpCreativeDefault = 1F;
+	public float flightHorizontalSpeedMpCreativeDefault = 1F;
-	public float flightSpeedMpCreativeSprinting = 2F;
+	public float flightHorizontalSpeedMpCreativeSprinting = 2F;
-	public float flightSpeedMpSpectatorDefault = 1F;
+	public float flightHorizontalSpeedMpSpectatorDefault = 1F;
-	public float flightSpeedMpSpectatorSprinting = 2F;
+	public float flightHorizontalSpeedMpSpectatorSprinting = 2F;
-	public float flightVerticalBoostCreativeDefault = 0F;
+	public float flightVerticalSpeedMpCreativeDefault = 1F;
-	public float flightVerticalBoostCreativeSprinting = 0F;
+	public float flightVerticalSpeedMpCreativeSprinting = 2F;
-	public float flightVerticalBoostSpectatorDefault = 0F;
+	public float flightVerticalSpeedMpSpectatorDefault = 1F;
-	public float flightVerticalBoostSpectatorSprinting = 0F;
+	public float flightVerticalSpeedMpSpectatorSprinting = 2F;
 	
 	public final KeyBindingWithModifier keyToggleWalkForward = new KeyBindingWithModifier("key.bettercontrols.toggle_forward");
 	public final KeyBindingWithModifier keyToggleJump = new KeyBindingWithModifier("key.bettercontrols.toggle_jump");
@@ -39,11 +51,6 @@ public final class BetterControlsConfig {
 	
 	BetterControlsConfig() {}
 	
-	private BetterControlsConfig setPath(final Path path) {
-		this.path = path;
-		return this;
-	}
-	
 	public KeyBindingWithModifier[] getAllKeyBindings() {
 		return new KeyBindingWithModifier[] {
 			keyToggleSprint,
@@ -57,6 +64,6 @@ public final class BetterControlsConfig {
 	}
 	
 	public void save() {
-		ConfigSerializer.serialize(path, this);
+		ConfigSerializer.write(path, this);
 	}
 }

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.config;
+
 import chylex.bettercontrols.input.SprintMode;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -11,6 +12,7 @@ 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;
@@ -28,8 +30,8 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 	private ConfigSerializer() {}
 	
 	@Override
-	public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context) {
+	public JsonElement serialize(BetterControlsConfig cfg, Type typeOfSrc, JsonSerializationContext context) {
-		final JsonObject obj = new JsonObject();
+		JsonObject obj = new JsonObject();
 		
 		Json.writeKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
 		Json.setEnum(obj, "Sprint.Mode", cfg.sprintMode);
@@ -39,19 +41,22 @@ 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.setBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
+		Json.setFloat(obj, "Flight.InertiaMultiplier", cfg.flightInertiaMultiplier);
 		Json.setBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		Json.setBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.writeKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.writeKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -62,14 +67,18 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 	}
 	
 	@Override
-	public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
+	public BetterControlsConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-		final BetterControlsConfig cfg = new BetterControlsConfig();
+		BetterControlsConfig cfg = new BetterControlsConfig();
-		final JsonObject obj = json.getAsJsonObject();
+		JsonObject obj = json.getAsJsonObject();
 		
 		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);
@@ -78,19 +87,22 @@ 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.disableFlightInertia = Json.getBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
+		cfg.flightInertiaMultiplier = Json.getFloat(obj, "Flight.InertiaMultiplier", cfg.flightInertiaMultiplier, 0F, 1F);
 		cfg.disableChangingFovWhileFlying = Json.getBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		cfg.flyOnGroundInCreative = Json.getBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		cfg.flightSpeedMpCreativeDefault = Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpCreativeDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpCreativeSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpSpectatorDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpSpectatorSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
+		cfg.flightVerticalSpeedMpCreativeDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Default", "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
+		cfg.flightVerticalSpeedMpCreativeSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Sprinting", "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
+		cfg.flightVerticalSpeedMpSpectatorDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Default", "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
+		cfg.flightVerticalSpeedMpSpectatorSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Sprinting", "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -100,19 +112,50 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config) {
+	private static float readHorizontalSpeedMultiplier(JsonObject obj, String key, float defaultValue) {
-		try (final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
+		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))) {
 			gson.getAdapter(BetterControlsConfig.class).write(writer, config);
-		} catch (final IOException e) {
+		} catch (IOException e) {
 			logger.error("Error saving BetterControls configuration file!", e);
 		}
 	}
 	
-	static BetterControlsConfig deserialize(final Path path) {
+	static BetterControlsConfig read(Path path) {
-		try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
+		try (JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
-		} catch (final FileNotFoundException | NoSuchFileException ignored) {
+		} catch (FileNotFoundException | NoSuchFileException ignored) {
-		} catch (final IOException e) {
+		} catch (IOException e) {
 			logger.error("Error reading BetterControls configuration file!", e);
 		}
 		

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

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

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.gui;
+
 import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.elements.DiscreteValueSliderWidget;
@@ -8,20 +9,16 @@ 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 com.mojang.blaze3d.vertex.PoseStack;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.OptionsSubScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.screens.options.OptionsSubScreen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 import java.util.ArrayList;
@@ -34,10 +31,11 @@ import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
+import static net.minecraft.network.chat.Component.literal;
 
 public class BetterControlsScreen extends OptionsSubScreen {
-	private static TextComponent text(final String text) {
+	private static Component text(String text) {
-		return new TextComponent(text);
+		return literal(text);
 	}
 	
 	public static final Component TITLE = text("Better Controls");
@@ -55,8 +53,8 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	// Options
 	
-	private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
+	private int generateSprintingOptions(int y, List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
 		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
 		y += ROW_HEIGHT;
@@ -73,8 +71,8 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
+	private int generateSneakingOptions(int y, List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
 		generateKeyBindingWithModifierRow(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
 		y += ROW_HEIGHT;
@@ -85,11 +83,30 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
+	private int generateGlidingOptions(int y, List<GuiEventListener> elements) {
-	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
+		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
-		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
-		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
+		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(
 			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")),
@@ -104,31 +121,20 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
-		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%"))
-		);
-		
 		generateKeyBindingWithModifierRow(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);
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Disable Flight Inertia"), cfg.disableFlightInertia, value -> cfg.disableFlightInertia = value);
+		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));
 		y += ROW_HEIGHT;
 		
 		generateBooleanOptionRow(y, elements, text("Disable Field Of View Changing"), cfg.disableChangingFovWhileFlying, value -> cfg.disableChangingFovWhileFlying = value);
 		y += ROW_HEIGHT;
 		
-		generateBooleanOptionRow(y, elements, text("Fly On Ground (Creative Mode)"), cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value);
+		generateBooleanOptionRow(y, elements, text("Fly On Ground (Creative)"), cfg.flyOnGroundInCreative, value -> cfg.flyOnGroundInCreative = value);
 		y += ROW_HEIGHT;
 		
 		y += ROW_HEIGHT / 3;
@@ -136,31 +142,31 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(col4(3), y, COL4_W - TEXT_PADDING_RIGHT, text("Spectator"), CENTER));
 		y += ROW_HEIGHT * 7 / 8;
 		
-		generateLeftSideText(y, elements, text("Speed Multiplier (Default)"));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(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("Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorDefault, value -> cfg.flightHorizontalSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Speed Multiplier (Sprinting)"));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightSpeedMpCreativeSprinting, value -> cfg.flightSpeedMpCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(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("Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = 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));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (Default)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Boost in Creative Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeDefault, value -> cfg.flightVerticalBoostCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(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 Boost in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorDefault, value -> cfg.flightVerticalSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Boost when Sprinting in Creative Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(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 Boost when Sprinting in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = 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;
 		
 		return y;
 	}
 	
-	private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
+	private int generateMiscellaneousOptions(int y, List<GuiEventListener> elements) {
-		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
+		BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
 		generateKeyBindingWithModifierRow(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
 		y += ROW_HEIGHT;
@@ -186,9 +192,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		new Option<>(ModifierKey.ALT, text("Alt"))
 	);
 	
-	private void generateKeyBindingWithModifierRow(final int y, final List<GuiEventListener> elements, final Component text, final KeyBindingWithModifier binding) {
+	private void generateKeyBindingWithModifierRow(int y, List<GuiEventListener> elements, Component text, KeyBindingWithModifier binding) {
-		final var modifierButton = Option.button(col4(2), y, COL4_W, text.plainCopy().append(" Modifier"), MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
+		var modifierButton = Option.button(col4(2), y, COL4_W, text.plainCopy().append(" Modifier"), MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
-		final var bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
+		var bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, text, binding, this::startEditingKeyBinding);
 		bindingButton.linkButtonToBoundState(modifierButton);
 		
 		generateLeftSideText(y, elements, text);
@@ -197,12 +203,12 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		allKeyBindings.add(bindingButton);
 	}
 	
-	private static <T> void generateCycleOptionRow(final int y, final List<GuiEventListener> elements, final Component text, final List<Option<T>> options, final T initialValue, final Consumer<T> onValueChanged) {
+	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(final int y, final List<GuiEventListener> elements, final Component text, final boolean initialValue, final BooleanConsumer 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()
@@ -210,7 +216,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			.create(col2(1), y, COL2_W, 20, text, (btn, newValue) -> onValueChanged.accept(newValue.booleanValue())));
 	}
 	
-	private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final Component text) {
+	private static void generateLeftSideText(int y, List<GuiEventListener> elements, Component text) {
 		elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
 	}
 	
@@ -220,15 +226,16 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
-	public BetterControlsScreen(@Nullable final Screen parentScreen) {
+	@SuppressWarnings("DataFlowIssue")
+	public BetterControlsScreen(@Nullable Screen parentScreen) {
 		super(parentScreen, Minecraft.getInstance().options, TITLE);
 	}
 	
 	@Override
-	public void init() {
+	protected void addContents() {
 		allKeyBindings.clear();
 		
-		final List<GuiEventListener> elements = new ArrayList<>();
+		List<GuiEventListener> elements = new ArrayList<>();
 		int y = 0;
 		
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@@ -237,14 +244,28 @@ 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;
 		
-		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
+		optionsWidget = addRenderableWidget(new OptionListWidget(width, layout.getContentHeight(), layout.getHeaderHeight(), y - TITLE_MARGIN_TOP + BOTTOM_PADDING, elements));
-		addWidget(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);
+		}
 	}
 	
 	@Override
@@ -252,15 +273,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		BetterControlsCommon.getConfig().save();
 	}
 	
-	@Override
+	private void startEditingKeyBinding(KeyBindingWidget widget) {
-	public void render(final @NotNull PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		renderBackground(matrices);
-		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
-		super.render(matrices, mouseX, mouseY, delta);
-	}
-	
-	private void startEditingKeyBinding(final KeyBindingWidget widget) {
 		if (editingKeyBinding != null) {
 			editingKeyBinding.stopEditing();
 		}
@@ -269,7 +282,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@Override
-	public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
+	public boolean mouseClicked(double mouseX, double mouseY, int button) {
 		if (editingKeyBinding != null) {
 			editingKeyBinding.bindAndStopEditing(InputConstants.Type.MOUSE.getOrCreate(button));
 			onKeyBindingEditingFinished();
@@ -281,7 +294,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@Override
-	public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
+	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 		if (editingKeyBinding != null) {
 			if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
 				editingKeyBinding.bindAndStopEditing(InputConstants.UNKNOWN);
@@ -302,7 +315,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		editingKeyBinding = null;
 		KeyMapping.resetMapping();
 		
-		for (final KeyBindingWidget widget : allKeyBindings) {
+		for (KeyBindingWidget widget : allKeyBindings) {
 			widget.updateKeyBindingText();
 		}
 	}

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

@@ -1,64 +1,70 @@
 package chylex.bettercontrols.gui;
+
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import com.mojang.blaze3d.vertex.PoseStack;
 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.Widget;
+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 java.util.ArrayList;
+import org.jetbrains.annotations.Nullable;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toMap;
 
 public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
 	public static final int ROW_WIDTH = 408;
-	public static final int ROW_PADDING = 2;
 	
-	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
+	private static final int ROW_HORIZONTAL_PADDING = 2;
-	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
+	private static final int SCROLL_MULTIPLIER = 18;
 	
-	public static int col2(final int column) {
+	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) {
 		return (column * ROW_WIDTH) / 2;
 	}
 	
-	public static int col4(final int column) {
+	public static int col4(int column) {
 		return (column * ROW_WIDTH) / 4;
 	}
 	
-	private static Offset getElementOffset(final GuiEventListener element) {
+	private static Offset getElementOffset(GuiEventListener element) {
-		if (element instanceof final OptionWidget widget) {
+		if (element instanceof OptionWidget widget) {
-			return new Offset(widget.getX(), widget.getY());
+			return new Offset(widget.getX(), widget.getY(), widget.getHeight());
 		}
-		else if (element instanceof final AbstractWidget widget) {
+		else if (element instanceof AbstractWidget widget) {
-			return new Offset(widget.x, widget.y);
+			return new Offset(widget.getX(), widget.getY(), widget.getHeight());
 		}
 		else {
-			return new Offset(0, 0);
+			return new Offset(0, 0, 0);
 		}
 	}
 	
-	public interface OptionWidget extends GuiEventListener, Widget {
+	public interface OptionWidget extends GuiEventListener, Renderable {
-		int getX();
-		int getY();
 		void setX(int x);
+		int getX();
+		
 		void setY(int y);
+		int getY();
+		
+		int getHeight();
 	}
 	
-	private record Offset(int x, int y) {}
+	private record Offset(int x, int y, int height) {}
 	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
+	@SuppressWarnings("ThisEscapedInObjectConstruction")
-		super(Minecraft.getInstance(), width, height, top, bottom, innerHeight);
+	public OptionListWidget(int width, int height, int top, int innerHeight, List<GuiEventListener> widgets) {
-		addEntry(new Entry(widgets));
+		super(Minecraft.getInstance(), width, height, top, innerHeight);
+		addEntry(new Entry(this, widgets));
 	}
 	
 	@Override
 	public int getRowLeft() {
-		return super.getRowLeft() - ROW_PADDING;
+		return super.getRowLeft() - ROW_HORIZONTAL_PADDING;
 	}
 	
 	@Override
@@ -67,47 +73,74 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	}
 	
 	@Override
-	protected int getScrollbarPosition() {
+	protected int scrollBarX() {
 		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;
+	}
+	
+	@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(final List<GuiEventListener> elements) {
+		public Entry(OptionListWidget parentWidget, List<GuiEventListener> elements) {
-			this.elements = new ArrayList<>(elements);
+			this.parentWidget = parentWidget;
-			this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry)e).collect(Collectors.toList());
+			this.elements = List.copyOf(elements);
-			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
+			this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry)e).toList();
+			this.offsets = elements.stream().collect(toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
 		@Override
-		public @NotNull List<? extends GuiEventListener> children() {
+		public void setFocused(@Nullable GuiEventListener element) {
-			return Collections.unmodifiableList(elements);
+			super.setFocused(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);
+				}
+			}
+		}
+		
+		@NotNull
+		@Override
+		public List<? extends GuiEventListener> children() {
+			return elements;
+		}
+		
+		@NotNull
+		@Override
+		public List<? extends NarratableEntry> narratables() {
+			return narratables;
 		}
 		
 		@Override
-		public @NotNull List<? extends NarratableEntry> narratables() {
+		public void render(@NotNull GuiGraphics graphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-			return Collections.unmodifiableList(narratables);
+			for (GuiEventListener element : elements) {
-		}
+				Offset offset = offsets.get(element);
 				
-		@Override
+				if (element instanceof AbstractWidget widget) {
-		public void render(final @NotNull PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
+					widget.setX(x + offset.x);
-			for (final GuiEventListener element : elements) {
+					widget.setY(y + offset.y);
-				final Offset offset = offsets.get(element);
-				
-				if (element instanceof final AbstractWidget widget) {
-					widget.x = x + offset.x;
-					widget.y = y + offset.y;
 				}
-				else if (element instanceof final OptionWidget widget) {
+				else if (element instanceof OptionWidget widget) {
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof final Widget widget) {
+				if (element instanceof Renderable renderable) {
-					widget.render(matrices, mouseX, mouseY, tickDelta);
+					renderable.render(graphics, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,33 +1,39 @@
 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.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
-import java.util.List;
+import org.lwjgl.glfw.GLFW;
 import java.util.function.Consumer;
 
 public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 	private final Component narration;
-	private final List<Option<T>> options;
+	private final ImmutableList<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final Component narration, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
+	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(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
+		super(x, y, width, height, Option.find(options, selectedValue).text(), getOptionValue(options, options.indexOf(Option.find(options, selectedValue))));
 		this.narration = narration;
 		this.options = options;
 		this.selectedValue = selectedValue;
 		this.onChanged = onChanged;
 	}
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final Component narration, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
+	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 Option<T> getSelectedOption() {
-		return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
+		return options.get(getSelectedOptionIndex());
+	}
+	
+	private int getSelectedOptionIndex() {
+		return Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value));
 	}
 	
 	@Override
@@ -35,9 +41,32 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 		setMessage(getSelectedOption().text());
 	}
 	
+	@Override
+	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+		if (CommonInputs.selected(keyCode)) {
+			return super.keyPressed(keyCode, scanCode, modifiers);
+		}
+		
+		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() {
-		final T newSelectedValue = getSelectedOption().value();
+		T newSelectedValue = getSelectedOption().value();
 		
 		if (selectedValue != newSelectedValue) {
 			selectedValue = newSelectedValue;
@@ -45,8 +74,13 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 		}
 	}
 	
+	@NotNull
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
+	protected MutableComponent createNarrationMessage() {
-		return new TranslatableComponent("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
+		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,4 +1,5 @@
 package chylex.bettercontrols.gui.elements;
+
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
@@ -7,8 +8,6 @@ import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,26 +22,27 @@ public final class KeyBindingWidget extends Button {
 	private final Consumer<KeyBindingWidget> onEditingStarted;
 	private boolean isEditing;
 	
-	public KeyBindingWidget(final int x, final int y, final int width, final int height, final Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
+	public KeyBindingWidget(int x, int y, int width, int height, Component bindingName, KeyMapping binding, Consumer<KeyBindingWidget> onEditingStarted) {
-		super(x, y, width, height, TextComponent.EMPTY, btn -> {});
+		super(x, y, width, height, Component.empty(), btn -> {}, DEFAULT_NARRATION);
 		this.binding = binding;
 		this.bindingName = bindingName;
 		this.onEditingStarted = onEditingStarted;
 		updateKeyBindingText();
 	}
 	
-	public KeyBindingWidget(final int x, final int y, final int width, final Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
+	public KeyBindingWidget(int x, int y, int width, Component bindingName, KeyMapping binding, Consumer<KeyBindingWidget> onEditingStarted) {
 		this(x, y, width, 20, bindingName, binding, onEditingStarted);
 	}
 	
-	public void linkButtonToBoundState(final AbstractButton button) {
+	public void linkButtonToBoundState(AbstractButton button) {
 		linkedButtons.add(button);
 		button.active = !binding.isUnbound();
 	}
 	
+	@NotNull
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
+	protected MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
+		return binding.isUnbound() ? Component.translatable("narrator.controls.unbound", bindingName) : Component.translatable("narrator.controls.bound", bindingName, super.createNarrationMessage());
 	}
 	
 	@Override
@@ -52,11 +52,11 @@ public final class KeyBindingWidget extends Button {
 		updateKeyBindingText();
 	}
 	
-	public void bindAndStopEditing(final InputConstants.Key key) {
+	public void bindAndStopEditing(InputConstants.Key key) {
 		binding.setKey(key);
 		stopEditing();
 		
-		for (final AbstractButton button : linkedButtons) {
+		for (AbstractButton button : linkedButtons) {
 			button.active = !binding.isUnbound();
 		}
 	}
@@ -70,7 +70,7 @@ public final class KeyBindingWidget extends Button {
 		boolean hasConflict = false;
 		
 		if (!binding.isUnbound()) {
-			for (final KeyMapping other : Minecraft.getInstance().options.keyMappings) {
+			for (KeyMapping other : Minecraft.getInstance().options.keyMappings) {
 				if (binding != other && binding.same(other)) {
 					hasConflict = true;
 					break;
@@ -79,13 +79,13 @@ public final class KeyBindingWidget extends Button {
 		}
 		
 		if (isEditing) {
-			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
+			setMessage(Component.literal("> ").append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
 		}
 		else if (hasConflict) {
 			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
 		}
 		else {
-			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
+			setMessage(binding.isUnbound() ? Component.literal("(No Binding)") : binding.getTranslatedKeyMessage());
 		}
 	}
 }

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.gui.elements;
+
 import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.network.chat.Component;
 import java.util.List;
@@ -6,11 +7,11 @@ import java.util.Objects;
 import java.util.function.Consumer;
 
 public record Option<T>(T value, Component text) {
-	public static <T> Option<T> find(final List<Option<T>> options, final T value) {
+	public static <T> Option<T> find(List<Option<T>> options, T value) {
 		return options.stream().filter(it -> Objects.equals(it.value, value)).findFirst().orElseGet(() -> options.get(0));
 	}
 	
-	public static <T> CycleButton<Option<T>> button(final int x, final int y, final int width, final Component text, final List<Option<T>> options, final T initialValue, final Consumer<T> onValueChanged) {
+	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)

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

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

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import com.mojang.blaze3d.platform.InputConstants.Type;
 import net.minecraft.client.KeyMapping;
 import org.jetbrains.annotations.Nullable;
@@ -9,11 +10,11 @@ public class KeyBindingWithModifier extends KeyMapping {
 	@Nullable
 	private ModifierKey modifier = null;
 	
-	public KeyBindingWithModifier(final String translationKey) {
+	public KeyBindingWithModifier(String translationKey) {
 		super(translationKey, Type.KEYSYM, -1, CATEGORY);
 	}
 	
-	public void setModifier(@Nullable final ModifierKey modifier) {
+	public void setModifier(@Nullable ModifierKey modifier) {
 		this.modifier = modifier;
 	}
 	

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import net.minecraft.client.gui.screens.Screen;
 
 public enum ModifierKey {
@@ -25,13 +26,13 @@ public enum ModifierKey {
 	
 	public final int id;
 	
-	ModifierKey(final int id) {
+	ModifierKey(int id) {
 		this.id = id;
 	}
 	
 	public abstract boolean isPressed();
 	
-	public static ModifierKey getById(final int id) {
+	public static ModifierKey getById(int id) {
 		return switch (id) {
 			case 0 -> CONTROL;
 			case 1 -> SHIFT;

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

@@ -1,19 +1,24 @@
 package chylex.bettercontrols.input;
+
 import net.minecraft.client.KeyMapping;
 
 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;
 	
-	public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset) {
+	protected ToggleTracker(KeyMapping bindingToggle, KeyMapping bindingReset, boolean initialState) {
 		this.bindingToggle = bindingToggle;
 		this.bindingReset = bindingReset;
+		this.isToggled = initialState;
+	}
+	
+	public ToggleTracker(KeyMapping bindingToggle, KeyMapping bindingReset) {
+		this(bindingToggle, bindingReset, false);
 	}
 	
 	/*
@@ -41,7 +46,7 @@ public class ToggleTracker {
 	 */
 	
 	public boolean tick() {
-		final boolean isHoldingReset = isResetKeyPressed();
+		boolean isHoldingReset = isResetKeyPressed();
 		
 		if (bindingToggle.isDown()) {
 			if (!waitForRelease) {

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

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

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.client.Camera;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

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

@@ -1,11 +1,13 @@
 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)
-public interface AccessKeyBindingFields {
+@SuppressWarnings("StaticMethodOnlyUsedInOneClass")
+public interface AccessKeyMappingFields {
 	@Accessor("CATEGORY_SORT_ORDER")
 	static Map<String, Integer> getCategoryOrderMap() {
 		throw new AssertionError();

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

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

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

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

@@ -1,26 +1,27 @@
 package chylex.bettercontrols.mixin;
 
+import chylex.bettercontrols.Mixins;
 import chylex.bettercontrols.player.PlayerTicker;
-import net.minecraft.client.Minecraft;
+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;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.Slice;
 
 @Mixin(AbstractClientPlayer.class)
 public abstract class HookClientPlayerFOV {
-	@Redirect(
+	@ModifyExpressionValue(
 		method = "getFieldOfViewModifier",
-		at = @At(value = "INVOKE", target = "Ljava/lang/Float;isNaN(F)Z"),
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getWalkingSpeed()F")
-		slice = @Slice(
-			from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getWalkingSpeed()F"),
-			to = @At(value = "INVOKE", target = "Ljava/lang/Float;isInfinite(F)Z")
 	)
-	)
+	private float overrideWalkingSpeed(float walkingSpeed) {
-	private boolean resetFOV(final float movementSpeed) {
+		AbstractClientPlayer me = Mixins.me(this);
-		final LocalPlayer player = Minecraft.getInstance().player;
+		
-		return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
+		if (me instanceof LocalPlayer localPlayer && PlayerTicker.shouldResetFOV(localPlayer)) {
+			return 0F;
+		}
+		else {
+			return walkingSpeed;
+		}
 	}
 }

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

@@ -1,7 +1,7 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.player.PlayerTicker;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.Input;
 import net.minecraft.client.player.KeyboardInput;
 import net.minecraft.client.player.LocalPlayer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -11,15 +11,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(KeyboardInput.class)
+@SuppressWarnings("MethodMayBeStatic")
 public abstract class HookClientPlayerInputTick {
-	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
+	@Inject(
-	private void afterInputTick(final CallbackInfo info) {
+		method = "tick",
-		@SuppressWarnings("ConstantConditions")
+		at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;keyPresses:Lnet/minecraft/world/entity/player/Input;", ordinal = 0, shift = AFTER)
-		final Input input = (Input)(Object)this;
+	)
-		final LocalPlayer player = Minecraft.getInstance().player;
+	private void afterInputTick(CallbackInfo info) {
+		LocalPlayer player = Minecraft.getInstance().player;
 		
 		if (player != null) {
-			PlayerTicker.get(player).afterInputAssignsPressingForward(input);
+			PlayerTicker.get(player).afterKeyboardInputAssigned(player);
 		}
 	}
 }

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

@@ -1,4 +1,6 @@
 package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.Mixins;
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -12,28 +14,25 @@ import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(LocalPlayer.class)
 public abstract class HookClientPlayerTick extends AbstractClientPlayer {
-	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
+	protected HookClientPlayerTick(ClientLevel world, GameProfile profile) {
 		super(world, profile);
 	}
 	
 	@Inject(method = "aiStep()V", at = @At("HEAD"))
-	private void atHead(final CallbackInfo info) {
+	private void atHead(CallbackInfo info) {
-		@SuppressWarnings("ConstantConditions")
+		LocalPlayer player = Mixins.me(this);
-		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/ClientInput;tick()V", ordinal = 0, shift = AFTER))
-	private void afterInputTick(final CallbackInfo info) {
+	private void afterInputTick(CallbackInfo info) {
-		@SuppressWarnings("ConstantConditions")
+		LocalPlayer player = Mixins.me(this);
-		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).afterInputTick(player);
 	}
 	
 	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;aiStep()V", ordinal = 0, shift = AFTER))
-	private void afterSuperCall(final CallbackInfo info) {
+	private void afterSuperCall(CallbackInfo info) {
-		@SuppressWarnings("ConstantConditions")
+		LocalPlayer player = Mixins.me(this);
-		final LocalPlayer player = (LocalPlayer)(Object)this;
 		PlayerTicker.get(player).afterSuperCall(player);
 	}
 }

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

@@ -0,0 +1,32 @@
+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,24 +1,27 @@
 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 net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.controls.ControlList;
+import net.minecraft.client.gui.screens.options.controls.KeyBindsList;
-import net.minecraft.client.gui.screens.controls.ControlList.Entry;
+import net.minecraft.client.gui.screens.options.controls.KeyBindsList.Entry;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(ControlList.class)
+@Mixin(KeyBindsList.class)
+@SuppressWarnings("MethodMayBeStatic")
 public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
+	public HookControlsListWidget(Minecraft client, int width, int height, int top, int itemHeight) {
-		super(client, width, height, top, bottom, itemHeight);
+		super(client, width, height, top, itemHeight);
 	}
 	
-	@Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))
+	@WrapOperation(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))
-	private KeyMapping[] excludeOwnKeyBindings(final Options options) {
+	private KeyMapping[] excludeOwnKeyBindings(Options options, Operation<KeyMapping[]> operation) {
-		return ArrayUtils.removeElements(options.keyMappings, BetterControlsCommon.getConfig().getAllKeyBindings());
+		return ArrayUtils.removeElements(operation.call(options), BetterControlsCommon.getConfig().getAllKeyBindings());
 	}
 }

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

@@ -1,28 +1,39 @@
 package chylex.bettercontrols.mixin;
 
+import chylex.bettercontrols.Mixins;
 import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.CycleOption;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.Option;
 import net.minecraft.client.Options;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
+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.Redirect;
+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 {
+public abstract class HookControlsScreen extends OptionsSubScreen {
-	@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/CycleOption;createButton(Lnet/minecraft/client/Options;III)Lnet/minecraft/client/gui/components/AbstractWidget;"))
+	public HookControlsScreen(Screen parentScreen, Options options, Component title) {
-	private AbstractWidget replaceAutoJumpButton(final CycleOption<?> option, final Options options, final int x, final int y, final int width) {
+		super(parentScreen, options, title);
-		if (option == Option.AUTO_JUMP && !Screen.hasAltDown()) {
-			@SuppressWarnings("ConstantConditions")
-			final ControlsScreen screen = (ControlsScreen)(Object)this;
-			return new Button(x, y, width, 20, BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> Minecraft.getInstance().setScreen(new BetterControlsScreen(screen)));
 	}
 	
-		return option.createButton(options, x, y, width);
+	@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,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
@@ -9,12 +10,14 @@ 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
 	private boolean hasLoaded = false;
 	
 	@Mutable
@@ -23,18 +26,18 @@ public abstract class HookLoadGameOptions {
 	public KeyMapping[] keyMappings;
 	
 	@Inject(method = "load()V", at = @At("HEAD"))
-	private void load(final CallbackInfo info) {
+	private void load(CallbackInfo info) {
 		if (hasLoaded) {
 			return;
 		}
 		
-		final BetterControlsConfig config = BetterControlsCommon.getConfig();
+		BetterControlsConfig config = BetterControlsCommon.getConfig();
 		if (config == null) {
 			return;
 		}
 		
 		hasLoaded = true;
 		keyMappings = ArrayUtils.addAll(keyMappings, config.getAllKeyBindings());
-		AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
+		AccessKeyMappingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
 	}
 }

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

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

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

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

@@ -0,0 +1,53 @@
+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,4 +1,6 @@
 package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.Mixins;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.ToggleKeyMapping;
@@ -16,14 +18,14 @@ public abstract class HookStickyKeyBindingState extends KeyMapping {
 	@Final
 	private BooleanSupplier needsToggle;
 	
-	public HookStickyKeyBindingState(final String translationKey, final int code, final String category) {
+	public HookStickyKeyBindingState(String translationKey, int code, String category) {
 		super(translationKey, code, category);
 	}
 	
 	@Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
-	public void setPressed(final boolean pressed, final CallbackInfo info) {
+	public void setPressed(boolean pressed, CallbackInfo info) {
 		if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
-			((AccessKeyBindingFields)this).setPressedField(pressed);
+			Mixins.keyMappingFields(this).setPressedField(pressed);
 			info.cancel();
 		}
 	}

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

@@ -1,23 +1,23 @@
 package chylex.bettercontrols.mixin;
 
-import net.minecraft.client.CycleOption;
+import chylex.bettercontrols.Mixins;
-import net.minecraft.client.Option;
+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(CycleOption.class)
+@Mixin(OptionInstance.class)
 public abstract class HookToggleOptionButtons {
-	@Inject(method = "createButton", at = @At("RETURN"))
+	@Inject(method = "createButton(Lnet/minecraft/client/Options;IIILjava/util/function/Consumer;)Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("RETURN"))
-	private void disableToggleOptions(final Options options, final int x, final int y, final int width, final CallbackInfoReturnable<AbstractWidget> ci) {
+	private <T> void disableToggleOptions(Options options, int x, int y, int width, Consumer<T> callback, CallbackInfoReturnable<AbstractWidget> cir) {
-		@SuppressWarnings("ConstantConditions")
+		OptionInstance<?> me = Mixins.me(this);
-		final CycleOption<?> me = (CycleOption<?>)(Object)this;
 		
-		if (me == Option.TOGGLE_CROUCH || me == Option.TOGGLE_SPRINT) {
+		if (me == options.toggleCrouch() || me == options.toggleSprint()) {
-			ci.getReturnValue().active = false;
+			cir.getReturnValue().active = false;
 		}
 	}
 }

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

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

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

@@ -1,35 +1,35 @@
 package chylex.bettercontrols.player;
-import chylex.bettercontrols.BetterControlsCommon;
+
-import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.Mixins;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import chylex.bettercontrols.input.SprintMode;
 import chylex.bettercontrols.input.ToggleTracker;
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
-import chylex.bettercontrols.mixin.AccessCameraFields;
+import chylex.bettercontrols.mixin.AccessToggleKeyMappingFields;
-import chylex.bettercontrols.mixin.AccessClientPlayerFields;
-import chylex.bettercontrols.mixin.AccessPlayerFields;
-import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
 import net.minecraft.client.Camera;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
-import net.minecraft.client.player.Input;
+import net.minecraft.client.ToggleKeyMapping;
+import net.minecraft.client.player.ClientInput;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.player.Input;
 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 KeyMapping KEY_SPRINT = OPTIONS.keySprint;
+	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;
 	
 	private static PlayerTicker ticker = new PlayerTicker(null);
 	
-	public static PlayerTicker get(final LocalPlayer player) {
+	public static PlayerTicker get(LocalPlayer player) {
 		if (ticker.ref.get() != player) {
 			ticker = new PlayerTicker(player);
 		}
@@ -37,23 +37,19 @@ public final class PlayerTicker {
 		return ticker;
 	}
 	
-	private static BetterControlsConfig cfg() {
-		return BetterControlsCommon.getConfig();
-	}
-	
 	private final WeakReference<LocalPlayer> ref;
 	
-	private PlayerTicker(final LocalPlayer player) {
+	private PlayerTicker(LocalPlayer player) {
 		this.ref = new WeakReference<>(player);
 		setup();
 	}
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
+	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(getConfig().keyToggleSprint, KEY_SPRINT, OPTIONS.toggleSprint());
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
+	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(getConfig().keyToggleSneak, KEY_SNEAK, OPTIONS.toggleCrouch());
-	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
+	private final ToggleTracker toggleWalkForward = new ToggleTracker(getConfig().keyToggleWalkForward, KEY_FORWARD);
-	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
+	private final ToggleTracker toggleJump = new ToggleTracker(getConfig().keyToggleJump, KEY_JUMP);
 	
 	private boolean waitingForSprintKeyRelease = false;
 	private boolean stopSprintingAfterReleasingSprintKey = false;
@@ -67,38 +63,38 @@ public final class PlayerTicker {
 	private int temporaryFlyOnGroundTimer = 0;
 	
 	private void setup() {
-		final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
+		AccessToggleKeyMappingFields sprint = Mixins.toggleKeyMappingFields(KEY_SPRINT);
 		BooleanSupplier getter = sprint.getNeedsToggle();
 		
-		if (getter instanceof final SprintPressGetter g) {
+		if (getter instanceof SprintPressGetter g) {
 			getter = g.wrapped();
 		}
 		
 		sprint.setNeedsToggle(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
 	}
 	
-	public void atHead(final LocalPlayer player) {
+	public void atHead(LocalPlayer player) {
 		if (FlightHelper.shouldFlyOnGround(player)) {
 			player.setOnGround(false);
 		}
 		
-		if (!cfg().doubleTapForwardToSprint) {
+		if (!getConfig().doubleTapForwardToSprint) {
-			((AccessClientPlayerFields)player).setSprintTriggerTime(0);
+			Mixins.clientPlayerFields(player).setSprintTriggerTime(0);
 		}
 		
-		if (!cfg().doubleTapJumpToToggleFlight) {
+		if (!getConfig().doubleTapJumpToToggleFlight) {
-			((AccessPlayerFields)player).setJumpTriggerTime(0);
+			Mixins.playerFields(player).setJumpTriggerTime(0);
 		}
 		
-		final SprintMode sprintMode = cfg().sprintMode;
+		SprintMode sprintMode = getConfig().sprintMode;
-		final boolean wasSprintToggled = OPTIONS.toggleSprint;
+		boolean wasSprintToggled = Boolean.TRUE.equals(OPTIONS.toggleSprint().get());
-		final boolean isSprintToggled = toggleSprint.tick();
+		boolean isSprintToggled = toggleSprint.tick();
 		
 		if (temporarySprintTimer > 0) {
 			stopSprintingAfterReleasingSprintKey = false;
 			waitingForSprintKeyRelease = false;
 			
-			final int nextTemporarySprintTimer = temporarySprintTimer - 1;
+			int nextTemporarySprintTimer = temporarySprintTimer - 1;
 			temporarySprintTimer = 0;
 			
 			if (!KEY_SPRINT.isDown() && KEY_FORWARD.isDown()) {
@@ -147,46 +143,28 @@ public final class PlayerTicker {
 		toggleSneak.tick();
 	}
 	
-	public void afterInputAssignsPressingForward(final Input input) {
+	public void afterKeyboardInputAssigned(LocalPlayer player) {
-		if (MINECRAFT.screen == null) {
+		if (MINECRAFT.screen == null && toggleWalkForward.tick()) {
-			input.up |= 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 afterInputTick(final LocalPlayer player) {
+	public void afterInputTick(LocalPlayer player) {
-		final Input input = player.input;
+		if (MINECRAFT.screen == null && !player.getAbilities().flying && toggleJump.tick()) {
-		
+			player.input.makeJump();
-		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
-			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
+		if (getConfig().resumeSprintingAfterHittingObstacle) {
-			final boolean boost = KEY_SPRINT.isDown();
-			final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
-			final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
-			
-			if (flightSpeed > 0F) {
-				player.getAbilities().setFlyingSpeed(flightSpeed);
-			}
-			
-			if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
-				int direction = 0;
-				
-				if (input.shiftKeyDown) {
-					--direction;
-				}
-				
-				if (input.jumping) {
-					++direction;
-				}
-				
-				if (direction != 0) {
-					player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
-				}
-			}
-		}
-		
-		if (cfg().resumeSprintingAfterHittingObstacle) {
 			if (wasHittingObstacle != player.horizontalCollision) {
 				if (!wasHittingObstacle) {
 					wasSprintingBeforeHittingObstacle = player.isSprinting() || KEY_SPRINT.isDown();
@@ -206,10 +184,10 @@ public final class PlayerTicker {
 		}
 	}
 	
-	public void afterSuperCall(final LocalPlayer player) {
+	public void afterSuperCall(LocalPlayer player) {
 		if (FlightHelper.shouldFlyOnGround(player)) {
-			final boolean isSneaking = player.isShiftKeyDown();
+			boolean isSneaking = player.isShiftKeyDown();
-			final boolean isOnGround = player.isOnGround();
+			boolean isOnGround = player.onGround();
 			
 			if (!isSneaking) {
 				wasSneakingBeforeTouchingGround = false;
@@ -245,21 +223,27 @@ public final class PlayerTicker {
 			holdingSneakWhileTouchingGround = false;
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
+		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			final Input input = player.input;
+			float inertiaMultiplier = getConfig().flightInertiaMultiplier;
 			
-			if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
+			if (inertiaMultiplier < 1F) {
-				player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
+				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.jumping && !input.shiftKeyDown) {
+				if (!keyPresses.jump() && !keyPresses.shift()) {
-				player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
+					player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, inertiaMultiplierSqrt, 1.0));
+				}
 			}
 		}
 		
 		if (player.isCreative()) {
-			if (cfg().keyToggleFlight.consumeClick()) {
+			if (getConfig().keyToggleFlight.consumeClick()) {
-				final boolean isFlying = !player.getAbilities().flying;
+				boolean isFlying = !player.getAbilities().flying;
 				
 				player.getAbilities().flying = isFlying;
 				player.onUpdateAbilities();
@@ -283,27 +267,27 @@ public final class PlayerTicker {
 			temporaryFlyOnGroundTimer = 0;
 		}
 		
-		if (!cfg().sneakingMovesCameraSmoothly) {
+		if (!getConfig().sneakingMovesCameraSmoothly) {
-			final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
+			Camera camera = MINECRAFT.gameRenderer.getMainCamera();
 			
 			if (camera.getEntity() == player) {
-				((AccessCameraFields)camera).setEyeHeight(player.getEyeHeight());
+				Mixins.cameraFields(camera).setEyeHeight(player.getEyeHeight());
 			}
 		}
 		
-		if (cfg().keyResetAllToggles.consumeClick()) {
+		if (getConfig().keyResetAllToggles.consumeClick()) {
 			toggleSprint.reset();
 			toggleSneak.reset();
 			toggleWalkForward.reset();
 			toggleJump.reset();
 		}
 		
-		if (cfg().keyOpenMenu.isDown()) {
+		if (getConfig().keyOpenMenu.isDown()) {
 			MINECRAFT.setScreen(new BetterControlsScreen(null));
 		}
 	}
 	
-	public boolean shouldResetFOV(final LocalPlayer player) {
+	public static boolean shouldResetFOV(LocalPlayer player) {
-		return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
+		return getConfig().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
 	}
 }

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.player;
+
 import java.util.function.BooleanSupplier;
 
 record SprintPressGetter(BooleanSupplier wrapped, BooleanSupplier or) implements BooleanSupplier {

src/main/resources/bettercontrols.mixins.json

@@ -3,20 +3,22 @@
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
   "refmap": "bettercontrols.refmap.json",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
-    "AccessKeyBindingFields",
+    "AccessKeyMappingFields",
     "AccessPlayerFields",
-    "AccessStickyKeyBindingStateGetter",
+    "AccessToggleKeyMappingFields",
     "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
+    "HookClientPlayerVerticalFlightSpeed",
     "HookControlsListWidget",
     "HookControlsScreen",
     "HookLoadGameOptions",
-    "HookPlayerFlightSpeed",
+    "HookPlayerGliding",
+    "HookPlayerHorizontalFlightSpeed",
     "HookStickyKeyBindingState",
     "HookToggleOptionButtons"
   ],

src/main/resources/pack.mcmeta

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

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

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

src/multiloader/resources/fabric.mod.json

@@ -0,0 +1,34 @@
+{
+  "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
+    }
+  }
+}