Release v1.3.0 for Minecraft 1.20+

Closes #14

Fabric/build.gradle.kts

@@ -4,7 +4,7 @@ val fabricVersion: String by project
 
 plugins {
 	idea
-	id("fabric-loom") version "0.10-SNAPSHOT"
+	id("fabric-loom")
 }
 
 dependencies {
@@ -18,14 +18,14 @@ loom {
 		named("client") {
 			configName = "Fabric Client"
 			client()
-			runDir("run")
+			runDir("../run")
 			ideConfigGenerated(true)
 		}
 		
 		named("server") {
 			configName = "Fabric Server"
 			server()
-			runDir("run")
+			runDir("../run")
 			ideConfigGenerated(true)
 		}
 	}

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,4 +1,5 @@
 package chylex.bettercontrols.compatibility;
+
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;

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

@@ -13,6 +13,7 @@
   ],
   
   "contact": {
+    "homepage": "https://chylex.com",
     "issues": "${issuesURL}",
     "sources": "${sourcesURL}"
   },
@@ -29,7 +30,7 @@
   }],
   
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=${minimumFabricVersion}",
-    "minecraft": ">=1.17"
+    "minecraft": ">=${minimumMinecraftVersion}"
   }
 }

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

@@ -1,10 +1,11 @@
 package chylex.bettercontrols;
+
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ConfigGuiHandler.ConfigGuiFactory;
+import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -16,7 +17,7 @@ import net.minecraftforge.network.NetworkConstants;
 public final class BetterControlsMod {
 	public BetterControlsMod() {
 		BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
+		ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(ClientLoader::createScreen));
 		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 	}
 	

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

@@ -1,27 +1,28 @@
 modLoader = "javafml"
-loaderVersion = "[37,)"
+loaderVersion = "[0,)"
 
-authors = "${author}"
 license = "${license}"
 issueTrackerURL = "${issuesURL}"
 
 [[mods]]
 modId = "${id}"
-version = "${version}"
 displayName = "${name}"
+displayURL = "${sourcesURL}"
 description = "${description}"
+authors = "${author}"
+version = "${version}"
 logoFile = "icon.png"
 
 [[dependencies.${id}]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.17.1,)"
+versionRange = "[${minimumMinecraftVersion},)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${id}]]
 modId = "forge"
 mandatory = true
-versionRange = "[37,)"
+versionRange = "[${minimumForgeVersion},)"
 ordering = "NONE"
 side = "BOTH"

build.gradle.kts

@@ -14,6 +14,10 @@ val modIssuesURL: String by project
 val minecraftVersion: String by project
 val mixinVersion: String by project
 
+val minimumMinecraftVersion: String by project
+val minimumForgeVersion: String by project
+val minimumFabricVersion: String by project
+
 val modNameStripped = modName.replace(" ", "")
 val jarVersion = "$minecraftVersion+v$modVersion"
 
@@ -33,7 +37,6 @@ idea {
 	module {
 		excludeDirs.add(file("gradle"))
 		excludeDirs.add(file("run"))
-		excludeDirs.add(file("Fabric/run"))
 		
 		if (findProject(":Forge") == null) {
 			excludeDirs.add(file("Forge"))
@@ -110,6 +113,9 @@ subprojects {
 		inputs.property("license", modLicense)
 		inputs.property("sourcesURL", modSourcesURL)
 		inputs.property("issuesURL", modIssuesURL)
+		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
+		inputs.property("minimumForgeVersion", minimumForgeVersion)
+		inputs.property("minimumFabricVersion", minimumFabricVersion)
 		
 		from(rootProject.sourceSets.main.get().resources) {
 			expand(inputs.properties)

gradle.properties

@@ -3,16 +3,22 @@ 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.3
+modVersion=1.3.0
 modLicense=MPL-2.0
 modSourcesURL=https://github.com/chylex/Better-Controls
 modIssuesURL=https://github.com/chylex/Better-Controls/issues
 
 # Dependencies
-minecraftVersion=1.18
+minecraftVersion=1.20
-forgeVersion=38.0.8
+forgeVersion=46.0.1
-fabricVersion=0.12.8
+fabricVersion=0.14.21
-mixinVersion=0.8.4
+loomVersion=1.1
+mixinVersion=0.8.5
+
+# Constraints
+minimumMinecraftVersion=1.20
+minimumForgeVersion=46.0.0
+minimumFabricVersion=0.12.3
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -6,6 +6,12 @@ pluginManagement {
 		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"
+		}
+	}
 }
 
 if (settings.extra.has("forgeVersion")) {

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 flightHorizontalSpeedMpCreativeDefault = 1F;
-	public float flightSpeedMpCreativeSprinting = 2F;
+	public float flightHorizontalSpeedMpCreativeSprinting = 2F;
-	public float flightSpeedMpSpectatorDefault = 1F;
+	public float flightHorizontalSpeedMpSpectatorDefault = 1F;
-	public float flightSpeedMpSpectatorSprinting = 2F;
+	public float flightHorizontalSpeedMpSpectatorSprinting = 2F;
-	public float flightVerticalBoostCreativeDefault = 0F;
+	public float flightVerticalSpeedMpCreativeDefault = 1F;
-	public float flightVerticalBoostCreativeSprinting = 0F;
+	public float flightVerticalSpeedMpCreativeSprinting = 2F;
-	public float flightVerticalBoostSpectatorDefault = 0F;
+	public float flightVerticalSpeedMpSpectatorDefault = 1F;
-	public float flightVerticalBoostSpectatorSprinting = 0F;
+	public float flightVerticalSpeedMpSpectatorSprinting = 2F;
 	
 	public final KeyBindingWithModifier keyToggleWalkForward = new KeyBindingWithModifier("key.bettercontrols.toggle_forward");
 	public final KeyBindingWithModifier keyToggleJump = new KeyBindingWithModifier("key.bettercontrols.toggle_jump");
@@ -39,11 +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.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting);
+		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.writeKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.writeKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -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.flightHorizontalSpeedMpCreativeDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
-		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpCreativeSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
-		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpSpectatorDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
-		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
+		cfg.flightHorizontalSpeedMpSpectatorSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
-		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
+		cfg.flightVerticalSpeedMpCreativeDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Default", "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
-		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
+		cfg.flightVerticalSpeedMpCreativeSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Sprinting", "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
-		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
+		cfg.flightVerticalSpeedMpSpectatorDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Default", "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
-		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
+		cfg.flightVerticalSpeedMpSpectatorSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Sprinting", "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -100,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;
@@ -24,10 +25,12 @@ final class Json {
 		return obj.has(key) ? obj.get(key).getAsBoolean() : defaultValue;
 	}
 	
+	@SuppressWarnings("SameParameterValue")
 	static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value) {
 		obj.addProperty(key, value.name());
 	}
 	
+	@SuppressWarnings("SameParameterValue")
 	static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass) {
 		if (!obj.has(key)) {
 			return defaultValue;

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.gui;
+
 import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.elements.DiscreteValueSliderWidget;
@@ -8,11 +9,12 @@ import chylex.bettercontrols.gui.elements.TextWidget;
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.ModifierKey;
 import chylex.bettercontrols.input.SprintMode;
+import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.PoseStack;
 import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -20,7 +22,6 @@ import net.minecraft.client.gui.screens.OptionsSubScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
@@ -34,10 +35,11 @@ import static chylex.bettercontrols.gui.OptionListWidget.ROW_WIDTH;
 import static chylex.bettercontrols.gui.OptionListWidget.col2;
 import static chylex.bettercontrols.gui.OptionListWidget.col4;
 import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
+import static net.minecraft.network.chat.Component.literal;
 
 public class BetterControlsScreen extends OptionsSubScreen {
-	private static TextComponent text(final String text) {
+	private static Component text(final String text) {
-		return new TextComponent(text);
+		return literal(text);
 	}
 	
 	public static final Component TITLE = text("Better Controls");
@@ -85,11 +87,10 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		return y;
 	}
 	
-	@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
 	private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
 		final BetterControlsConfig cfg = BetterControlsCommon.getConfig();
 		
-		final List<Option<Float>> flightSpeedOptions = Arrays.asList(
+		final ImmutableList<Option<Float>> flightSpeedOptions = ImmutableList.of(
 			new Option<>(Float.valueOf(0.25F), text("0.25x")),
 			new Option<>(Float.valueOf(0.50F), text("0.5x")),
 			new Option<>(Float.valueOf(0.75F), text("0.75x")),
@@ -104,18 +105,6 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
-		final List<Option<Float>> flightVerticalBoostOptions = Arrays.asList(
-			new Option<>(Float.valueOf(0.00F), text("None")),
-			new Option<>(Float.valueOf(0.25F), text("+25%")),
-			new Option<>(Float.valueOf(0.50F), text("+50%")),
-			new Option<>(Float.valueOf(0.75F), text("+75%")),
-			new Option<>(Float.valueOf(1.00F), text("+100%")),
-			new Option<>(Float.valueOf(1.50F), text("+150%")),
-			new Option<>(Float.valueOf(2.00F), text("+200%")),
-			new Option<>(Float.valueOf(2.50F), text("+250%")),
-			new Option<>(Float.valueOf(3.00F), text("+300%"))
-		);
-		
 		generateKeyBindingWithModifierRow(y, elements, text("Toggle Flight (Creative)"), cfg.keyToggleFlight);
 		y += ROW_HEIGHT;
 		
@@ -136,24 +125,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)"));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightSpeedMpCreativeDefault, value -> cfg.flightSpeedMpCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeDefault, value -> cfg.flightHorizontalSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorDefault, value -> cfg.flightHorizontalSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Speed Multiplier (Sprinting)"));
+		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightSpeedMpCreativeSprinting, value -> cfg.flightSpeedMpCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpCreativeSprinting, value -> cfg.flightHorizontalSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorSprinting, value -> cfg.flightSpeedMpSpectatorSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Horizontal Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorSprinting, value -> cfg.flightHorizontalSpeedMpSpectatorSprinting = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (Default)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Default)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Boost in Creative Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeDefault, value -> cfg.flightVerticalBoostCreativeDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeDefault, value -> cfg.flightVerticalSpeedMpCreativeDefault = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Boost in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorDefault, value -> cfg.flightVerticalSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Boost (Sprinting)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Sprinting)"));
-		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Boost when Sprinting in Creative Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostCreativeSprinting, value -> cfg.flightVerticalBoostCreativeSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(2), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Creative Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpCreativeSprinting, value -> cfg.flightVerticalSpeedMpCreativeSprinting = value));
-		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Boost when Sprinting in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorSprinting, value -> cfg.flightVerticalBoostSpectatorSprinting = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorSprinting, value -> cfg.flightVerticalSpeedMpSpectatorSprinting = value));
 		y += ROW_HEIGHT;
 		
 		return y;
@@ -220,6 +209,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private KeyBindingWidget editingKeyBinding;
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
+	@SuppressWarnings("DataFlowIssue")
 	public BetterControlsScreen(@Nullable final Screen parentScreen) {
 		super(parentScreen, Minecraft.getInstance().options, TITLE);
 	}
@@ -243,7 +233,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
+		//noinspection DataFlowIssue
+		addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)).pos(width / 2 - 99, height - 29).size(200, 20).build());
+		
 		addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
@@ -253,11 +245,11 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@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) {
-		renderBackground(matrices);
+		renderBackground(graphics);
-		optionsWidget.render(matrices, mouseX, mouseY, delta);
+		optionsWidget.render(graphics, mouseX, mouseY, delta);
-		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
+		graphics.drawCenteredString(font, title, width / 2, 8, TextWidget.WHITE);
-		super.render(matrices, mouseX, mouseY, delta);
+		super.render(graphics, mouseX, mouseY, delta);
 	}
 	
 	private void startEditingKeyBinding(final KeyBindingWidget widget) {

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

@@ -1,10 +1,11 @@
 package chylex.bettercontrols.gui;
+
 import chylex.bettercontrols.gui.OptionListWidget.Entry;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import org.jetbrains.annotations.NotNull;
@@ -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;
+	private static final int ROW_HORIZONTAL_PADDING = 2;
-	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
+	private static final int SCROLL_MULTIPLIER = 18;
+	
+	public static 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;
@@ -35,14 +38,14 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 			return new Offset(widget.getX(), widget.getY());
 		}
 		else if (element instanceof final AbstractWidget widget) {
-			return new Offset(widget.x, widget.y);
+			return new Offset(widget.getX(), widget.getY());
 		}
 		else {
 			return new Offset(0, 0);
 		}
 	}
 	
-	public interface OptionWidget extends GuiEventListener, Widget {
+	public interface OptionWidget extends GuiEventListener, Renderable {
 		int getX();
 		int getY();
 		void setX(int x);
@@ -58,7 +61,7 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	
 	@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 amount) {
+		setScrollAmount(getScrollAmount() - amount * SCROLL_MULTIPLIER);
+		return true;
+	}
+	
 	protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
 		private final List<GuiEventListener> elements;
 		private final List<NarratableEntry> narratables;
@@ -82,32 +91,34 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 			this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
 		}
 		
+		@NotNull
 		@Override
-		public @NotNull List<? extends GuiEventListener> children() {
+		public List<? extends GuiEventListener> children() {
 			return Collections.unmodifiableList(elements);
 		}
 		
+		@NotNull
 		@Override
-		public @NotNull List<? extends NarratableEntry> narratables() {
+		public List<? extends NarratableEntry> narratables() {
 			return Collections.unmodifiableList(narratables);
 		}
 		
 		@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);
 				
 				if (element instanceof final AbstractWidget widget) {
-					widget.x = x + offset.x;
+					widget.setX(x + offset.x);
-					widget.y = y + offset.y;
+					widget.setY(y + offset.y);
 				}
 				else if (element instanceof final OptionWidget widget) {
 					widget.setX(x + offset.x);
 					widget.setY(y + offset.y);
 				}
 				
-				if (element instanceof final Widget widget) {
+				if (element instanceof final Renderable renderable) {
-					widget.render(matrices, mouseX, mouseY, tickDelta);
+					renderable.render(graphics, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,20 +1,20 @@
 package chylex.bettercontrols.gui.elements;
+
+import com.google.common.collect.ImmutableList;
 import net.minecraft.client.gui.components.AbstractSliderButton;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
-import java.util.List;
 import java.util.function.Consumer;
 
 public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 	private final Component narration;
-	private final List<Option<T>> options;
+	private final ImmutableList<Option<T>> options;
 	private final Consumer<T> onChanged;
 	private T selectedValue;
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final Component narration, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final Component narration, final ImmutableList<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
 		super(x, y, width, height, Option.find(options, selectedValue).text(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
 		this.narration = narration;
 		this.options = options;
@@ -22,7 +22,7 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 		this.onChanged = onChanged;
 	}
 	
-	public DiscreteValueSliderWidget(final int x, final int y, final int width, final Component narration, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
+	public DiscreteValueSliderWidget(final int x, final int y, final int width, final Component narration, final ImmutableList<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
 		this(x, y, width, 20, narration, options, selectedValue, onChanged);
 	}
 	
@@ -45,8 +45,9 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 		}
 	}
 	
+	@NotNull
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
+	protected MutableComponent createNarrationMessage() {
-		return new TranslatableComponent("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
+		return Component.translatable("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
 	}
 }

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.gui.elements;
+
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
@@ -7,8 +8,6 @@ import net.minecraft.client.gui.components.AbstractButton;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +23,7 @@ public final class KeyBindingWidget extends Button {
 	private boolean isEditing;
 	
 	public KeyBindingWidget(final int x, final int y, final int width, final int height, final Component bindingName, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
-		super(x, y, width, height, TextComponent.EMPTY, btn -> {});
+		super(x, y, width, height, Component.empty(), btn -> {}, DEFAULT_NARRATION);
 		this.binding = binding;
 		this.bindingName = bindingName;
 		this.onEditingStarted = onEditingStarted;
@@ -40,9 +39,10 @@ public final class KeyBindingWidget extends Button {
 		button.active = !binding.isUnbound();
 	}
 	
+	@NotNull
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
+	protected MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
+		return binding.isUnbound() ? Component.translatable("narrator.controls.unbound", bindingName) : Component.translatable("narrator.controls.bound", bindingName, super.createNarrationMessage());
 	}
 	
 	@Override
@@ -79,13 +79,13 @@ public final class KeyBindingWidget extends Button {
 		}
 		
 		if (isEditing) {
-			setMessage((new TextComponent("> ")).append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
+			setMessage(Component.literal("> ").append(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
 		}
 		else if (hasConflict) {
 			setMessage(binding.getTranslatedKeyMessage().copy().withStyle(ChatFormatting.RED));
 		}
 		else {
-			setMessage(binding.isUnbound() ? new TextComponent("(No Binding)") : binding.getTranslatedKeyMessage());
+			setMessage(binding.isUnbound() ? Component.literal("(No Binding)") : binding.getTranslatedKeyMessage());
 		}
 	}
 }

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.gui.elements;
+
 import net.minecraft.client.gui.components.CycleButton;
 import net.minecraft.network.chat.Component;
 import java.util.List;

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;
@@ -58,7 +60,15 @@ 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 setFocused(final boolean focused) {}
+	
+	@Override
+	public boolean isFocused() {
+		return false;
+	}
+	
+	@Override
+	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;
@@ -67,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);
+			graphics.drawString(textRenderer, lines.get(i), finalX, finalY + (i * lineHeight), WHITE);
-			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

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

@@ -1,4 +1,5 @@
 package chylex.bettercontrols.input;
+
 import com.mojang.blaze3d.platform.InputConstants.Type;
 import net.minecraft.client.KeyMapping;
 import org.jetbrains.annotations.Nullable;

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;
@@ -12,7 +13,7 @@ import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(KeyboardInput.class)
 public abstract class HookClientPlayerInputTick {
-	@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
+	@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) {
 		@SuppressWarnings("ConstantConditions")
 		final Input input = (Input)(Object)this;

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;
@@ -23,7 +24,7 @@ public abstract class HookClientPlayerTick extends AbstractClientPlayer {
 		PlayerTicker.get(player).atHead(player);
 	}
 	
-	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
+	@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(ZF)V", ordinal = 0, shift = AFTER))
 	private void afterInputTick(final CallbackInfo info) {
 		@SuppressWarnings("ConstantConditions")
 		final LocalPlayer player = (LocalPlayer)(Object)this;

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;
+
+@SuppressWarnings("SameReturnValue")
+@Mixin(LocalPlayer.class)
+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,4 +1,5 @@
 package chylex.bettercontrols.mixin;
+
 import chylex.bettercontrols.BetterControlsCommon;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;

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

@@ -9,7 +9,9 @@ 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.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -29,25 +31,31 @@ public abstract class HookControlsScreen extends OptionsSubScreen {
 		
 		int leftBottomY = 0;
 		int rightBottomY = 0;
+		AbstractWidget doneButton = null;
 		
 		for (final GuiEventListener child : children()) {
 			if (!(child instanceof AbstractWidget widget)) {
 				continue;
 			}
 			
-			final int bottomY = widget.y + widget.getHeight();
+			if (widget instanceof Button button && button.getMessage() == CommonComponents.GUI_DONE) {
+				doneButton = widget;
+				continue;
+			}
 			
-			if (widget.x + widget.getWidth() < center) {
+			final int bottomY = widget.getY() + widget.getHeight();
+			
+			if (widget.getX() + widget.getWidth() < center) {
 				leftBottomY = Math.max(leftBottomY, bottomY);
 			}
-			if (widget.x >= center) {
+			if (widget.getX() >= center) {
 				rightBottomY = Math.max(rightBottomY, bottomY);
 			}
 		}
 		
 		final int x, y;
 		
-		if (leftBottomY < rightBottomY) {
+		if (leftBottomY <= rightBottomY) {
 			x = center - 155;
 			y = leftBottomY + 4;
 		}
@@ -56,6 +64,11 @@ public abstract class HookControlsScreen extends OptionsSubScreen {
 			y = rightBottomY + 4;
 		}
 		
-		addRenderableWidget(new Button(x, y, 150, 20, BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> Minecraft.getInstance().setScreen(new BetterControlsScreen(screen))));
+		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);
+		}
 	}
 }

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;

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

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

src/main/java/chylex/bettercontrols/mixin/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;
+
+@SuppressWarnings("SameReturnValue")
+@Mixin(Player.class)
+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

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

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

@@ -1,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 KeyMapping KEY_SPRINT = Minecraft.getInstance().options.keySprint;
-	private static final float BASE_VERTICAL_VELOCITY = 3F;
+	
+	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 isSprinting() ? cfg().flightHorizontalSpeedMpCreativeSprinting : cfg().flightHorizontalSpeedMpCreativeDefault;
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
-			}
-			else {
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
-			}
 		}
 		else if (player.isSpectator()) {
-			if (boost) {
+			return isSprinting() ? cfg().flightHorizontalSpeedMpSpectatorSprinting : cfg().flightHorizontalSpeedMpSpectatorDefault;
-				return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
-			}
-			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 isSprinting() ? cfg().flightVerticalSpeedMpCreativeSprinting : cfg().flightVerticalSpeedMpCreativeDefault;
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
-			}
-			else {
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
-			}
 		}
 		else if (player.isSpectator()) {
-			if (isSprinting) {
+			return isSprinting() ? cfg().flightVerticalSpeedMpSpectatorSprinting : cfg().flightVerticalSpeedMpSpectatorDefault;
-				return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
-			}
-			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;
@@ -50,8 +51,8 @@ public final class PlayerTicker {
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
+	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, OPTIONS.toggleSprint()::set);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
+	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, OPTIONS.toggleCrouch()::set);
 	private final ToggleTracker toggleWalkForward = new ToggleTracker(cfg().keyToggleWalkForward, KEY_FORWARD);
 	private final ToggleTracker toggleJump = new ToggleTracker(cfg().keyToggleJump, KEY_JUMP);
 	
@@ -91,7 +92,7 @@ public final class PlayerTicker {
 		}
 		
 		final SprintMode sprintMode = cfg().sprintMode;
-		final boolean wasSprintToggled = OPTIONS.toggleSprint;
+		final boolean wasSprintToggled = Boolean.TRUE.equals(OPTIONS.toggleSprint().get());
 		final boolean isSprintToggled = toggleSprint.tick();
 		
 		if (temporarySprintTimer > 0) {
@@ -149,6 +150,7 @@ public final class PlayerTicker {
 	
 	public void afterInputAssignsPressingForward(final Input input) {
 		if (MINECRAFT.screen == null) {
+			//noinspection NonShortCircuitBooleanExpression
 			input.up |= toggleWalkForward.tick();
 		}
 	}
@@ -157,35 +159,10 @@ public final class PlayerTicker {
 		final Input input = player.input;
 		
 		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+			//noinspection NonShortCircuitBooleanExpression
 			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) {
@@ -209,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;

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

@@ -13,10 +13,11 @@
     "HookClientPlayerFOV",
     "HookClientPlayerInputTick",
     "HookClientPlayerTick",
+    "HookClientPlayerVerticalFlightSpeed",
     "HookControlsListWidget",
     "HookControlsScreen",
     "HookLoadGameOptions",
-    "HookPlayerFlightSpeed",
+    "HookPlayerHorizontalFlightSpeed",
     "HookStickyKeyBindingState",
     "HookToggleOptionButtons"
   ],