Add CurseForge and Modrinth description text

Closes #33

Fabric/build.gradle.kts

@@ -1,9 +1,10 @@
+import org.gradle.jvm.tasks.Jar
+
 val modId: String by project
 val minecraftVersion: String by project
 val fabricVersion: String by project
 
 plugins {
-	idea
 	id("fabric-loom")
 }
 
@@ -15,23 +16,24 @@ dependencies {
 
 loom {
 	runs {
+		val runJvmArgs: Set<String> by project
+		
+		configureEach {
+			runDir("../run")
+			vmArgs(runJvmArgs)
+			ideConfigGenerated(true)
+		}
+		
 		named("client") {
 			configName = "Fabric Client"
 			client()
-			runDir("run")
-			ideConfigGenerated(true)
 		}
 		
-		named("server") {
-			configName = "Fabric Server"
-			server()
-			runDir("run")
-			ideConfigGenerated(true)
-		}
+		findByName("server")?.let(::remove)
 	}
 	
 	mixin {
-		add(sourceSets.main.get(), "$modId.refmap.json")
+		defaultRefmapName.set("$modId.refmap.json")
 	}
 }
 
@@ -45,6 +47,11 @@ tasks.jar {
 	exclude("com/terraformersmc/modmenu/")
 }
 
-tasks.remapJar {
-	archiveVersion.set(tasks.jar.get().archiveVersion)
+tasks.register<Jar>("uncompressedRemapJar") {
+	group = "fabric"
+	
+	from(tasks.remapJar.map { it.outputs.files.map(::zipTree) })
+
+	archiveClassifier.set("uncompressed")
+	entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
 }

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

@@ -1,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,11 +1,13 @@
 package chylex.bettercontrols.compatibility;
+
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
+import net.minecraft.client.Minecraft;
 
 public class ModMenuSupport implements ModMenuApi {
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory() {
-		return BetterControlsScreen::new;
+		return parentScreen -> new BetterControlsScreen(Minecraft.getInstance(), parentScreen);
 	}
 }

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

@@ -6,18 +6,19 @@
   "version": "${version}",
   "license": "${license}",
   
-  "icon": "assets/bettercontrols/icon.png",
+  "icon": "assets/${id}/logo.png",
   
   "authors": [
     "${author}"
   ],
   
   "contact": {
+    "homepage": "https://chylex.com",
     "issues": "${issuesURL}",
     "sources": "${sourcesURL}"
   },
   
-  "environment": "client",
+  "environment": "${sidesForFabric}",
   "entrypoints": {
     "client": [ "chylex.bettercontrols.BetterControlsMod" ],
     "modmenu": [ "chylex.bettercontrols.compatibility.ModMenuSupport" ]
@@ -25,7 +26,7 @@
   
   "mixins": [{
     "config": "${id}.mixins.json",
-    "environment": "client"
+    "environment": "${sidesForFabric}"
   }],
   
   "depends": {

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.client.ConfigScreenHandler.ConfigScreenFactory;
-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.network.NetworkConstants;
-
-@Mod("bettercontrols")
-public final class BetterControlsMod {
-	public BetterControlsMod() {
-		BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
-		ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.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);
-		}
-	}
-}

NeoForge/build.gradle.kts

@@ -0,0 +1,28 @@
+val neoForgeVersion: String by project
+
+plugins {
+	id("net.neoforged.gradle.userdev")
+	id("net.neoforged.gradle.mixin")
+}
+
+dependencies {
+	implementation("net.neoforged:neoforge:$neoForgeVersion")
+}
+
+runs {
+	val runJvmArgs: Set<String> by project
+	
+	configureEach {
+		workingDirectory = file("../run")
+		modSource(project.sourceSets.main.get())
+		jvmArguments(runJvmArgs)
+	}
+	
+	removeIf { it.name != "client" }
+}
+
+tasks.processResources {
+	filesMatching("META-INF/neoforge.mods.toml") {
+		expand(inputs.properties)
+	}
+}

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

@@ -0,0 +1,20 @@
+package chylex.bettercontrols;
+
+import chylex.bettercontrols.config.BetterControlsConfig;
+import chylex.bettercontrols.gui.BetterControlsScreen;
+import net.neoforged.api.distmarker.Dist;
+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;
+
+@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, () -> BetterControlsScreen::new);
+		}
+	}
+}

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

@@ -7,21 +7,25 @@ issueTrackerURL = "${issuesURL}"
 [[mods]]
 modId = "${id}"
 displayName = "${name}"
+displayURL = "${sourcesURL}"
 description = "${description}"
 authors = "${author}"
 version = "${version}"
-logoFile = "icon.png"
+logoFile = "assets/${id}/logo.png"
+
+[[mixins]]
+config = "${id}.mixins.json"
 
 [[dependencies.${id}]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 versionRange = "[${minimumMinecraftVersion},)"
 ordering = "NONE"
-side = "BOTH"
+side = "${sidesForNeoForge}"
 
 [[dependencies.${id}]]
-modId = "forge"
-mandatory = true
-versionRange = "[${minimumForgeVersion},)"
+modId = "neoforge"
+type = "required"
+versionRange = "[${minimumNeoForgeVersion},)"
 ordering = "NONE"
-side = "BOTH"
+side = "${sidesForNeoForge}"

README.md

@@ -41,9 +41,9 @@ Both speed boosts can be configured separately for sprinting, which will be acti
 The following mod loaders are supported:
 
 * **[Fabric](https://fabricmc.net/use/)** (note: this mod does not require Fabric API)
-* **[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 +63,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 +71,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,6 +1,6 @@
-import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
-import java.text.SimpleDateFormat
-import java.util.Date
+@file:Suppress("ConvertLambdaToReference")
+
+import org.gradle.jvm.tasks.Jar
 
 val modId: String by project
 val modName: String by project
@@ -10,37 +10,30 @@ 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 minimumMinecraftVersion: String by project
-val minimumForgeVersion: 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(file("gradle"))
 		excludeDirs.add(file("run"))
-		excludeDirs.add(file("Fabric/run"))
 		
-		if (findProject(":Forge") == null) {
-			excludeDirs.add(file("Forge"))
+		if (findProject(":NeoForge") == null) {
+			excludeDirs.add(file("NeoForge"))
 		}
 		
 		if (findProject(":Fabric") == null) {
@@ -50,62 +43,66 @@ idea {
 }
 
 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 {
-	version(minecraftVersion)
-	runs.clear()
+loom {
+	runs {
+		named("client") {
+			ideConfigGenerated(false)
+		}
+		
+		findByName("server")?.let(::remove)
+	}
+}
+
+dependencies {
+	minecraft("com.mojang:minecraft:$minecraftVersion")
+	mappings(loom.officialMojangMappings())
+	
+	compileOnly("net.fabricmc:sponge-mixin:$mixinVersion")
+	api("com.google.code.findbugs:jsr305:3.0.2")
 }
 
 allprojects {
 	group = "com.$modAuthor.$modId"
 	version = modVersion
 	
-	apply(plugin = "java")
-	
-	dependencies {
-		implementation("org.jetbrains:annotations:22.0.0")
-	}
+	apply(plugin = "java-library")
 	
 	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 	}
 	
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
-		options.release.set(17)
+		options.release.set(21)
 	}
-}
 	
-subprojects {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
+	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(rootProject)
+		implementation("org.jetbrains:annotations:24.1.0")
 	}
 	
-	base {
-		archivesName.set("$modNameStripped-${project.name}")
+	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")
 		}
 		
-	tasks.withType<JavaCompile> {
-		source({ rootProject.sourceSets.main.get().allSource })
-	}
-	
-	tasks.processResources {
 		inputs.property("id", modId)
 		inputs.property("name", modName)
 		inputs.property("description", modDescription)
@@ -114,31 +111,49 @@ subprojects {
 		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("minimumForgeVersion", minimumForgeVersion)
+		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
 		inputs.property("minimumFabricVersion", minimumFabricVersion)
 		
+		from(rootProject.file("logo.png")) {
+			into("assets/$modId")
+		}
+	}
+	
+	tasks.withType<AbstractArchiveTask>().configureEach {
+		isPreserveFileTimestamps = false
+		isReproducibleFileOrder = true
+	}
+}
+
+subprojects {
+	dependencies {
+		implementation(project(rootProject.path, configuration = "namedElements"))
+	}
+	
+	base {
+		archivesName.set("$modNameStripped-${project.name}")
+	}
+	
+	listOf("compileJava", "compileTestJava").forEach {
+		tasks.named<JavaCompile>(it) {
+			source({ rootProject.sourceSets.main.get().allSource })
+		}
+	}
+	
+	tasks.processResources {
 		from(rootProject.sourceSets.main.get().resources) {
 			expand(inputs.properties)
 		}
 	}
 	
 	tasks.jar {
-		archiveVersion.set(jarVersion)
-		
-		from(rootProject.file("LICENSE"))
+		entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
 		
 		manifest {
-			attributes(
-				"Specification-Title" to modId,
-				"Specification-Vendor" to modAuthor,
-				"Specification-Version" to "1",
-				"Implementation-Title" to "$modNameStripped-${project.name}",
-				"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"
-			)
+			packageInformation(modId, "$modNameStripped-${project.name}")
 		}
 	}
 	
@@ -147,34 +162,55 @@ subprojects {
 	}
 }
 
-tasks.register("setupIdea") {
-	group = "mod"
+fun Manifest.packageInformation(specificationTitle: String, implementationTitle: String) {
+	attributes(
+		"Specification-Title" to specificationTitle,
+		"Specification-Vendor" to modAuthor,
+		"Specification-Version" to "1",
+		"Implementation-Title" to implementationTitle,
+		"Implementation-Vendor" to modAuthor,
+		"Implementation-Version" to modVersion,
+	)
+}
 
-	dependsOn(tasks.findByName("decompile"))
+val multiloaderSources = sourceSets.register("multiloader")
 
-	val forge = findProject(":Forge")
-	if (forge != null) {
-		dependsOn(forge.tasks.getByName("genIntellijRuns"))
+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 fabric = findProject(":Fabric")
-	if (fabric != null) {
-		dependsOn(fabric.tasks.getByName("genSources"))
+	findProject(":NeoForge")?.let { includeJar(it, "jar") }
+	findProject(":Fabric")?.let { includeJar(it, "uncompressedRemapJar") }
+	
+	from(rootProject.file("LICENSE"))
+	from(multiloaderSources.map { it.output })
+	
+	manifest {
+		packageInformation("$modId-multiloader", modNameStripped)
+		attributes("FMLModType" to "GAMELIBRARY")
 	}
 }
 
-val copyJars = tasks.register<Copy>("copyJars") {
-	group = "build"
-	duplicatesStrategy = EXCLUDE
+tasks.named<ProcessResources>("processMultiloaderResources").configure {
+	inputs.property("group", project.group)
+	inputs.property("jarPrefix", modNameStripped)
 	
-	for (subproject in subprojects) {
-		dependsOn(subproject.tasks.assemble)
-		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
+	filesMatching(listOf("fabric.mod.json", "META-INF/jarjar/metadata.json")) {
+		expand(inputs.properties)
 	}
-	
-	into(file("${project.buildDir}/dist"))
 }
 
 tasks.assemble {
-	finalizedBy(copyJars)
+	finalizedBy(multiloaderJar)
 }

docs/CUIRSEFORGE.md

@@ -0,0 +1,56 @@
+**Better Controls** is a reimagining of [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting) with even more customizability. It features several new keybindings and many configurable options for how sprinting, sneaking, and flying should behave.
+
+Better Controls only focuses on complementing vanilla mechanics, rather than adding new mechanics (such as [Better Sprinting](https://www.curseforge.com/minecraft/mc-mods/better-sprinting)'s option to allow sprinting in all directions) that only work on client side and server owners must explicitly opt in to enable them. By not having such features in Better Controls, it significantly reduces complexity by not having a server side version of the mod, and not needing a way to completely disable the mod while the game is running.
+
+Another major difference is the amount and granularity of options. Better Controls could be considered an *advanced controls mod* - by default, none of the keybinds are bound, and all options are set to match vanilla behavior. To take full advantage, go into *Options - Controls - Better Controls*, check out all of the available options, and figure out the best configuration for you.
+
+## Features
+
+The mod adds **Toggle Keybinds** for sprinting, sneaking, flying (creative mode), walking, and jumping. You can use modifier keys (`Control` / `Shift` / `Alt`) for each, including for example setting `Control` to Sneak, and `Control + Y` to Toggle Sneak. If you press the original key, the toggle will be canceled (in the previous example, you can Toggle Sneak by pressing `Control + Y`, and stop sneaking by simply tapping Sneak). Note that the vanilla options for toggling sprinting/sneaking are disabled to avoid conflicts with the custom keybinds.
+
+You can also bind a key that resets all **Toggle Keybinds** at once. That makes it easy to for ex. turn on walking, jumping, and sprinting, and then turn all of them off again by pressing one key instead of three.
+
+#### Sprinting
+
+* **Sprint Key Mode** changes how the Sprint key behaves. You can choose between *Tap To Start Sprinting*, *Tap To Start / Stop Sprinting*, and *Hold To Sprint*.
+* **Double Tap 'Walk Forwards' To Sprint** can be turned off to prevent accidental sprinting.
+* **Resume Sprinting After Hitting Obstacle** automatically presses the Sprint key once you are no longer touching any blocks (helpful when climbing hills, especially if the previous option is enabled).
+
+#### Sneaking
+
+* **Move Camera Smoothly** lets you disable the smooth movement when sneaking or unsneaking.
+
+#### Flying
+
+* **Double Tap 'Jump' To Fly** can be turned off to prevent accidental flight toggling.
+* **Disable Flight Inertia** stops you instantly when you stop holding movement keys.
+* **Disable Field Of View Changing** prevents sprinting, potions, and other factors from changing the FOV while flying in creative and spectator mode.
+* **Fly On Ground** lets you fly while touching the ground in creative mode (and also lets you stop flying by tapping Sneak while touching the ground).
+* **Flight Speed Multiplier** (0.25x - 8x) changes how fast you fly in creative and spectator mode.
+* **Vertical Speed Boost** (up to +300%) adds additional vertical speed boost while flying in creative and spectator mode.
+
+Both speed boosts can be configured separately for sprinting, which will be active when the Sprint key is held. Unlike in vanilla, the sprinting flight boost works in all directions.
+
+## Installation
+
+The following mod loaders are supported:
+
+* **[Fabric](https://fabricmc.net/use/)** (note: this mod does not require Fabric API)
+* **[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,56 @@
+**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 Sneak). Note that the vanilla options for toggling sprinting/sneaking are disabled to avoid conflicts with the custom keybinds.
+
+You can also bind a key that resets all **Toggle Keybinds** at once. That makes it easy to for ex. turn on walking, jumping, and sprinting, and then turn all of them off again by pressing one key instead of three.
+
+#### Sprinting
+
+* **Sprint Key Mode** changes how the Sprint key behaves. You can choose between *Tap To Start Sprinting*, *Tap To Start / Stop Sprinting*, and *Hold To Sprint*.
+* **Double Tap 'Walk Forwards' To Sprint** can be turned off to prevent accidental sprinting.
+* **Resume Sprinting After Hitting Obstacle** automatically presses the Sprint key once you are no longer touching any blocks (helpful when climbing hills, especially if the previous option is enabled).
+
+#### Sneaking
+
+* **Move Camera Smoothly** lets you disable the smooth movement when sneaking or unsneaking.
+
+#### Flying
+
+* **Double Tap 'Jump' To Fly** can be turned off to prevent accidental flight toggling.
+* **Disable Flight Inertia** stops you instantly when you stop holding movement keys.
+* **Disable Field Of View Changing** prevents sprinting, potions, and other factors from changing the FOV while flying in creative and spectator mode.
+* **Fly On Ground** lets you fly while touching the ground in creative mode (and also lets you stop flying by tapping Sneak while touching the ground).
+* **Flight Speed Multiplier** (0.25x - 8x) changes how fast you fly in creative and spectator mode.
+* **Vertical Speed Boost** (up to +300%) adds additional vertical speed boost while flying in creative and spectator mode.
+
+Both speed boosts can be configured separately for sprinting, which will be active when the Sprint key is held. Unlike in vanilla, the sprinting flight boost works in all directions.
+
+## Installation
+
+The following mod loaders are supported:
+
+* **[Fabric](https://fabricmc.net/use/)** (note: this mod does not require Fabric API)
+* **[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

@@ -3,22 +3,28 @@ 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.4
+modVersion=1.4.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.19.4
-forgeVersion=45.0.6
-fabricVersion=0.14.17
-loomVersion=0.12
-mixinVersion=0.8.5
+minecraftVersion=1.21
+neoForgeVersion=21.0.0-beta
+neoGradleVersion=7.0.152
+fabricVersion=0.15.11
+loomVersion=1.7
+mixinVersion=0.12.5+mixin.0.8.5
+
+# https://projects.neoforged.net/neoforged/neogradle/
+# https://fabricmc.net/develop/
+# https://github.com/FabricMC/fabric-loom/releases
 
 # Constraints
-minimumMinecraftVersion=1.19.4
-minimumForgeVersion=45.0.0
-minimumFabricVersion=0.7.4
+minimumMinecraftVersion=1.21
+minimumNeoForgeVersion=21.0.0-beta
+minimumFabricVersion=0.12.3
 
 # 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.8-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.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  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"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,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 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    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.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 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
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# 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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-ARGV=("$@")
-eval set -- $DEFAULT_JVM_OPTS
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-IFS=$'
-' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
-IFS=$'
-' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-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

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,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 ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,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
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -3,19 +3,26 @@ 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 {
-		if (settings.extra.has("loomVersion")) {
-			id("fabric-loom") version "${settings.extra["loomVersion"]}-SNAPSHOT"
+		val neoGradleVersion = settings.extra.get("neoGradleVersion") as? String
+		if (neoGradleVersion != null) {
+			id("net.neoforged.gradle.userdev") version neoGradleVersion
+			id("net.neoforged.gradle.mixin") version neoGradleVersion
+		}
+		
+		val loomVersion = settings.extra.get("loomVersion") as? String
+		if (loomVersion != null) {
+			id("fabric-loom") version "$loomVersion-SNAPSHOT"
 		}
 	}
 }
 
-if (settings.extra.has("forgeVersion")) {
-	include("Forge")
+if (settings.extra.has("neoForgeVersion")) {
+	include("NeoForge")
 }
 
 if (settings.extra.has("fabricVersion")) {

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) {
-		return ConfigSerializer.deserialize(path).setPath(path);
+		final 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;
@@ -23,14 +32,14 @@ public final class BetterControlsConfig {
 	public boolean disableFlightInertia = false;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
-	public float flightSpeedMpCreativeDefault = 1F;
-	public float flightSpeedMpCreativeSprinting = 2F;
-	public float flightSpeedMpSpectatorDefault = 1F;
-	public float flightSpeedMpSpectatorSprinting = 2F;
-	public float flightVerticalBoostCreativeDefault = 0F;
-	public float flightVerticalBoostCreativeSprinting = 0F;
-	public float flightVerticalBoostSpectatorDefault = 0F;
-	public float flightVerticalBoostSpectatorSprinting = 0F;
+	public float flightHorizontalSpeedMpCreativeDefault = 1F;
+	public float flightHorizontalSpeedMpCreativeSprinting = 2F;
+	public float flightHorizontalSpeedMpSpectatorDefault = 1F;
+	public float flightHorizontalSpeedMpSpectatorSprinting = 2F;
+	public float flightVerticalSpeedMpCreativeDefault = 1F;
+	public float flightVerticalSpeedMpCreativeSprinting = 2F;
+	public float flightVerticalSpeedMpSpectatorDefault = 1F;
+	public float flightVerticalSpeedMpSpectatorSprinting = 2F;
 	
 	public final KeyBindingWithModifier keyToggleWalkForward = new KeyBindingWithModifier("key.bettercontrols.toggle_forward");
 	public final KeyBindingWithModifier keyToggleJump = new KeyBindingWithModifier("key.bettercontrols.toggle_jump");
@@ -39,11 +48,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 +61,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;
@@ -44,14 +46,14 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		Json.setBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		Json.setBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		Json.setBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.writeKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.writeKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -83,14 +85,14 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		cfg.disableFlightInertia = Json.getBool(obj, "Flight.DisableInertia", cfg.disableFlightInertia);
 		cfg.disableChangingFovWhileFlying = Json.getBool(obj, "Flight.DisableChangingFOV", cfg.disableChangingFovWhileFlying);
 		cfg.flyOnGroundInCreative = Json.getBool(obj, "Flight.FlyOnGround.Creative", cfg.flyOnGroundInCreative);
-		cfg.flightSpeedMpCreativeDefault = Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault, 0.25F, 8F);
-		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
-		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
-		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
-		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
-		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
-		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
-		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
+		cfg.flightHorizontalSpeedMpCreativeDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
+		cfg.flightHorizontalSpeedMpCreativeSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
+		cfg.flightHorizontalSpeedMpSpectatorDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
+		cfg.flightHorizontalSpeedMpSpectatorSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
+		cfg.flightVerticalSpeedMpCreativeDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Default", "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
+		cfg.flightVerticalSpeedMpCreativeSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Sprinting", "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
+		cfg.flightVerticalSpeedMpSpectatorDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Default", "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
+		cfg.flightVerticalSpeedMpSpectatorSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Sprinting", "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -100,7 +102,38 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	static void serialize(final Path path, final BetterControlsConfig config) {
+	private static float readHorizontalSpeedMultiplier(final JsonObject obj, final String key, final float defaultValue) {
+		return Json.getFloat(obj, key, defaultValue, 0.25F, 8F);
+	}
+	
+	private static float readVerticalSpeedMultiplier(final JsonObject obj, final BetterControlsConfig cfg, final String newKey, final String legacyBoostKey, final float defaultValue) {
+		if (obj.has(newKey)) {
+			return Json.getFloat(obj, newKey, defaultValue, 0.25F, 8F);
+		}
+		else if (obj.has(legacyBoostKey)) {
+			cfg.wasMigrated = true;
+			
+			final 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(final Path path, final BetterControlsConfig config) {
 		try (final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
 			gson.getAdapter(BetterControlsConfig.class).write(writer, config);
 		} catch (final IOException e) {
@@ -108,7 +141,7 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		}
 	}
 	
-	static BetterControlsConfig deserialize(final Path path) {
+	static BetterControlsConfig read(final Path path) {
 		try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
 		} catch (final FileNotFoundException | NoSuchFileException ignored) {

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;

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;
@@ -10,18 +11,14 @@ 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 org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 import java.util.ArrayList;
@@ -104,18 +101,6 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
-		final ImmutableList<Option<Float>> flightVerticalBoostOptions = ImmutableList.of(
-			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;
 		
@@ -136,24 +121,24 @@ 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)"));
-		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(3), y, COL4_W, text("Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Default)"));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeDefault, value -> cfg.flightHorizontalSpeedMpCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorDefault, value -> cfg.flightHorizontalSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("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(3), y, COL4_W, text("Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = value));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Sprinting)"));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeSprinting, value -> cfg.flightHorizontalSpeedMpCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorSprinting, value -> cfg.flightHorizontalSpeedMpSpectatorSprinting = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (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(3), y, COL4_W, text("Vertical Speed Boost in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Default)"));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeDefault, value -> cfg.flightVerticalSpeedMpCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorDefault, value -> cfg.flightVerticalSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (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(3), y, COL4_W, text("Vertical Speed Boost when Sprinting in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Sprinting)"));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeSprinting, value -> cfg.flightVerticalSpeedMpCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorSprinting, value -> cfg.flightVerticalSpeedMpSpectatorSprinting = value));
 		y += ROW_HEIGHT;
 		
 		return y;
@@ -221,12 +206,12 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
 	@SuppressWarnings("DataFlowIssue")
-	public BetterControlsScreen(@Nullable final Screen parentScreen) {
-		super(parentScreen, Minecraft.getInstance().options, TITLE);
+	public BetterControlsScreen(final Minecraft mc, @Nullable final Screen parentScreen) {
+		super(parentScreen, mc.options, TITLE);
 	}
 	
 	@Override
-	public void init() {
+	protected void addContents() {
 		allKeyBindings.clear();
 		
 		final List<GuiEventListener> elements = new ArrayList<>();
@@ -244,10 +229,19 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		//noinspection DataFlowIssue
-		addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)).pos(width / 2 - 99, height - 29).size(200, 20).build());
+		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
@@ -255,14 +249,6 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		BetterControlsCommon.getConfig().save();
 	}
 	
-	@Override
-	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();

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

@@ -1,7 +1,8 @@
 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.Renderable;
@@ -17,10 +18,12 @@ import java.util.stream.Collectors;
 
 public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
 	public static final int ROW_WIDTH = 408;
-	public static final int ROW_PADDING = 2;
 	
-	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
-	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
+	private static final int ROW_HORIZONTAL_PADDING = 2;
+	private static final int SCROLL_MULTIPLIER = 18;
+	
+	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_HORIZONTAL_PADDING;
+	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_HORIZONTAL_PADDING;
 	
 	public static int col2(final int column) {
 		return (column * ROW_WIDTH) / 2;
@@ -51,14 +54,14 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	
 	private record Offset(int x, int y) {}
 	
-	public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
-		super(Minecraft.getInstance(), width, height, top, bottom, innerHeight);
+	public OptionListWidget(final int width, final int height, final int top, final int innerHeight, final List<GuiEventListener> widgets) {
+		super(Minecraft.getInstance(), width, height, top, innerHeight);
 		addEntry(new Entry(widgets));
 	}
 	
 	@Override
 	public int getRowLeft() {
-		return super.getRowLeft() - ROW_PADDING;
+		return super.getRowLeft() - ROW_HORIZONTAL_PADDING;
 	}
 	
 	@Override
@@ -71,6 +74,12 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		return (width + ROW_WIDTH) / 2 + 4;
 	}
 	
+	@Override
+	public boolean mouseScrolled(final double x, final double y, final double xAmount, final double yAmount) {
+		setScrollAmount(getScrollAmount() - yAmount * SCROLL_MULTIPLIER);
+		return true;
+	}
+	
 	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
 		private final List<GuiEventListener> elements;
 		private final List<NarratableEntry> narratables;
@@ -95,7 +104,7 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		}
 		
 		@Override
-		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) {
+		public void render(final @NotNull GuiGraphics graphics, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
 			for (final GuiEventListener element : elements) {
 				final Offset offset = offsets.get(element);
 				
@@ -109,7 +118,7 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 				}
 				
 				if (element instanceof final Renderable renderable) {
-					renderable.render(matrices, mouseX, mouseY, tickDelta);
+					renderable.render(graphics, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.gui.elements;
+
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.network.chat.Component;

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;

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;

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;
@@ -66,7 +68,7 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 	}
 	
 	@Override
-	public void render(final @NotNull PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
+	public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
 		final Font textRenderer = Minecraft.getInstance().font;
 		final List<FormattedCharSequence> lines = textRenderer.split(text, width);
 		final int lineHeight = textRenderer.lineHeight + 1;
@@ -75,8 +77,7 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 		final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
 		
 		for (int i = 0; i < lines.size(); i++) {
-			final FormattedCharSequence line = lines.get(i);
-			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
+			graphics.drawString(textRenderer, lines.get(i), finalX, finalY + (i * lineHeight), WHITE);
 		}
 	}
 }

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;

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 {

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import net.minecraft.client.KeyMapping;
 
 public class ToggleTracker {

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import chylex.bettercontrols.mixin.AccessKeyBindingFields;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.KeyMapping;

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/AccessKeyBindingFields.java

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

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/AccessStickyKeyBindingStateGetter.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;

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.player.PlayerTicker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.Input;
@@ -11,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(KeyboardInput.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookClientPlayerInputTick {
 	@Inject(method = "tick(ZF)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info) {

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -11,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(LocalPlayer.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookClientPlayerTick extends AbstractClientPlayer {
 	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
 		super(world, profile);

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

@@ -0,0 +1,34 @@
+package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.player.FlightHelper;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Abilities;
+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;
+
+@Mixin(LocalPlayer.class)
+@SuppressWarnings({ "SameReturnValue", "UnreachableCode" })
+public abstract class HookClientPlayerVerticalFlightSpeed extends LivingEntity {
+	protected HookClientPlayerVerticalFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
+		super(type, world);
+	}
+	
+	@Redirect(
+		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(final Abilities abilities) {
+		@SuppressWarnings("ConstantConditions")
+		final LocalPlayer me = (LocalPlayer)(Object)this;
+		return abilities.getFlyingSpeed() * FlightHelper.getVerticalSpeedMultiplier(me);
+	}
+}

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

@@ -1,11 +1,12 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.BetterControlsCommon;
 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.KeyBindsList;
-import net.minecraft.client.gui.screens.controls.KeyBindsList.Entry;
+import net.minecraft.client.gui.screens.options.controls.KeyBindsList;
+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;
@@ -13,8 +14,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(KeyBindsList.class)
 public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
-	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
-		super(client, width, height, top, bottom, itemHeight);
+	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int itemHeight) {
+		super(client, width, height, top, itemHeight);
 	}
 	
 	@Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))

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

@@ -3,72 +3,40 @@ package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.OptionsSubScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.controls.ControlsScreen;
-import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.client.gui.screens.options.OptionsSubScreen;
+import net.minecraft.client.gui.screens.options.controls.ControlsScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import java.util.List;
 
 @Mixin(ControlsScreen.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookControlsScreen extends OptionsSubScreen {
 	public HookControlsScreen(final Screen parentScreen, final Options options, final Component title) {
 		super(parentScreen, options, title);
 	}
 	
-	@Inject(method = "init", at = @At("RETURN"))
-	public void afterInit(final CallbackInfo ci) {
+	@Inject(method = "addOptions", at = @At("RETURN"))
+	public void afterAddOptions(final CallbackInfo ci) {
 		@SuppressWarnings("ConstantConditions")
 		final ControlsScreen screen = (ControlsScreen)(Object)this;
-		final int center = width / 2;
-		
-		int leftBottomY = 0;
-		int rightBottomY = 0;
-		AbstractWidget doneButton = null;
-		
-		for (final GuiEventListener child : children()) {
-			if (!(child instanceof AbstractWidget widget)) {
-				continue;
-			}
-			
-			if (widget instanceof Button button && button.getMessage() == CommonComponents.GUI_DONE) {
-				doneButton = widget;
-				continue;
-			}
-			
-			final int bottomY = widget.getY() + widget.getHeight();
-			
-			if (widget.getX() + widget.getWidth() < center) {
-				leftBottomY = Math.max(leftBottomY, bottomY);
-			}
-			if (widget.getX() >= center) {
-				rightBottomY = Math.max(rightBottomY, bottomY);
-			}
-		}
-		
-		final int x, y;
-		
-		if (leftBottomY <= rightBottomY) {
-			x = center - 155;
-			y = leftBottomY + 4;
-		}
-		else {
-			x = center + 5;
-			y = rightBottomY + 4;
-		}
 		
+		if (list != null) {
 			final MutableComponent buttonTitle = BetterControlsScreen.TITLE.plainCopy().append("...");
-		addRenderableWidget(Button.builder(buttonTitle, btn -> Minecraft.getInstance().setScreen(new BetterControlsScreen(screen))).pos(x, y).size(150, 20).build());
-		
-		if (doneButton != null) {
-			doneButton.setY(y + 24);
+			list.addSmall(List.of(Button.builder(buttonTitle, btn -> showOptionsScreen(screen)).build()));
 		}
 	}
+	
+	@Unique
+	private static void showOptionsScreen(final ControlsScreen screen) {
+		final Minecraft mc = Minecraft.getInstance();
+		mc.setScreen(new BetterControlsScreen(mc, 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

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

@@ -1,29 +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 = "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(final Player player) {
-		return false;
-	}
-}

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

@@ -0,0 +1,51 @@
+package chylex.bettercontrols.mixin;
+
+import chylex.bettercontrols.player.FlightHelper;
+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.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.Slice;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Player.class)
+@SuppressWarnings({ "SameReturnValue", "UnreachableCode" })
+public abstract class HookPlayerHorizontalFlightSpeed extends LivingEntity {
+	protected HookPlayerHorizontalFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
+		super(type, world);
+	}
+	
+	@SuppressWarnings("SimplifiableIfStatement")
+	@Redirect(
+		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(final Player player) {
+		if (player instanceof LocalPlayer) {
+			return false;
+		}
+		else {
+			return player.isSprinting();
+		}
+	}
+	
+	@Inject(method = "getFlyingSpeed", at = @At("RETURN"), cancellable = true)
+	private void modifyHorizontalFlyingSpeed(final CallbackInfoReturnable<Float> cir) {
+		@SuppressWarnings("ConstantConditions")
+		final Player me = (Player)(Object)this;
+		
+		if (me instanceof final LocalPlayer localPlayer && localPlayer.getAbilities().flying) {
+			final float multiplier = FlightHelper.getHorizontalSpeedMultiplier(localPlayer);
+			cir.setReturnValue(Float.valueOf(cir.getReturnValueF() * multiplier));
+		}
+	}
+}

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.ToggleKeyMapping;

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

@@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import java.util.function.Consumer;
 
 @Mixin(OptionInstance.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookToggleOptionButtons {
 	@Inject(method = "createButton(Lnet/minecraft/client/Options;IIILjava/util/function/Consumer;)Lnet/minecraft/client/gui/components/AbstractWidget;", at = @At("RETURN"))
 	private <T> void disableToggleOptions(final Options options, final int x, final int y, final int width, final Consumer<T> callback, final CallbackInfoReturnable<AbstractWidget> cir) {

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

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

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.player;
+
 import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
@@ -162,32 +163,6 @@ public final class PlayerTicker {
 			input.jumping |= toggleJump.tick();
 		}
 		
-		if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
-			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) {
@@ -211,7 +186,7 @@ public final class PlayerTicker {
 	public void afterSuperCall(final LocalPlayer player) {
 		if (FlightHelper.shouldFlyOnGround(player)) {
 			final boolean isSneaking = player.isShiftKeyDown();
-			final boolean isOnGround = player.isOnGround();
+			final boolean isOnGround = player.onGround();
 			
 			if (!isSneaking) {
 				wasSneakingBeforeTouchingGround = false;
@@ -301,7 +276,7 @@ public final class PlayerTicker {
 		}
 		
 		if (cfg().keyOpenMenu.isDown()) {
-			MINECRAFT.setScreen(new BetterControlsScreen(null));
+			MINECRAFT.setScreen(new BetterControlsScreen(MINECRAFT, null));
 		}
 	}
 	

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,7 +3,7 @@
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
   "refmap": "bettercontrols.refmap.json",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",
@@ -13,10 +13,11 @@
     "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
+    "HookClientPlayerVerticalFlightSpeed",
     "HookControlsListWidget",
     "HookControlsScreen",
     "HookLoadGameOptions",
-    "HookPlayerFlightSpeed",
+    "HookPlayerHorizontalFlightSpeed",
     "HookStickyKeyBindingState",
     "HookToggleOptionButtons"
   ],

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