Fabric/build.gradle.kts

@@ -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,5 +1,4 @@
 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,5 +1,4 @@
 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,7 +13,6 @@
   ],
   
   "contact": {
-    "homepage": "https://chylex.com",
     "issues": "${issuesURL}",
     "sources": "${sourcesURL}"
   },

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

@@ -1,5 +1,4 @@
 package chylex.bettercontrols;
-
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.minecraft.client.Minecraft;

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

@@ -7,7 +7,6 @@ issueTrackerURL = "${issuesURL}"
 [[mods]]
 modId = "${id}"
 displayName = "${name}"
-displayURL = "${sourcesURL}"
 description = "${description}"
 authors = "${author}"
 version = "${version}"

build.gradle.kts

@@ -37,6 +37,7 @@ idea {
 	module {
 		excludeDirs.add(file("gradle"))
 		excludeDirs.add(file("run"))
+		excludeDirs.add(file("Fabric/run"))
 		
 		if (findProject(":Forge") == null) {
 			excludeDirs.add(file("Forge"))

gradle.properties

@@ -3,22 +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.3.0
+modVersion=1.2.4
 modLicense=MPL-2.0
 modSourcesURL=https://github.com/chylex/Better-Controls
 modIssuesURL=https://github.com/chylex/Better-Controls/issues
 
 # Dependencies
-minecraftVersion=1.20
+minecraftVersion=1.19.4
-forgeVersion=46.0.1
+forgeVersion=45.0.6
-fabricVersion=0.14.21
+fabricVersion=0.14.17
-loomVersion=1.1
+loomVersion=0.12
 mixinVersion=0.8.5
 
 # Constraints
-minimumMinecraftVersion=1.20
+minimumMinecraftVersion=1.19.4
-minimumForgeVersion=46.0.0
+minimumForgeVersion=45.0.0
-minimumFabricVersion=0.12.3
+minimumFabricVersion=0.7.4
 
 # 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.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,23 +1,14 @@
 package chylex.bettercontrols.config;
-
 import chylex.bettercontrols.input.KeyBindingWithModifier;
 import chylex.bettercontrols.input.SprintMode;
 import java.nio.file.Path;
 
 public final class BetterControlsConfig {
 	public static BetterControlsConfig load(final Path path) {
-		final BetterControlsConfig cfg = ConfigSerializer.read(path);
+		return ConfigSerializer.deserialize(path).setPath(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;
@@ -32,14 +23,14 @@ public final class BetterControlsConfig {
 	public boolean disableFlightInertia = false;
 	public boolean disableChangingFovWhileFlying = false;
 	public boolean flyOnGroundInCreative = false;
-	public float flightHorizontalSpeedMpCreativeDefault = 1F;
+	public float flightSpeedMpCreativeDefault = 1F;
-	public float flightHorizontalSpeedMpCreativeSprinting = 2F;
+	public float flightSpeedMpCreativeSprinting = 2F;
-	public float flightHorizontalSpeedMpSpectatorDefault = 1F;
+	public float flightSpeedMpSpectatorDefault = 1F;
-	public float flightHorizontalSpeedMpSpectatorSprinting = 2F;
+	public float flightSpeedMpSpectatorSprinting = 2F;
-	public float flightVerticalSpeedMpCreativeDefault = 1F;
+	public float flightVerticalBoostCreativeDefault = 0F;
-	public float flightVerticalSpeedMpCreativeSprinting = 2F;
+	public float flightVerticalBoostCreativeSprinting = 0F;
-	public float flightVerticalSpeedMpSpectatorDefault = 1F;
+	public float flightVerticalBoostSpectatorDefault = 0F;
-	public float flightVerticalSpeedMpSpectatorSprinting = 2F;
+	public float flightVerticalBoostSpectatorSprinting = 0F;
 	
 	public final KeyBindingWithModifier keyToggleWalkForward = new KeyBindingWithModifier("key.bettercontrols.toggle_forward");
 	public final KeyBindingWithModifier keyToggleJump = new KeyBindingWithModifier("key.bettercontrols.toggle_jump");
@@ -48,6 +39,11 @@ public final class BetterControlsConfig {
 	
 	BetterControlsConfig() {}
 	
+	private BetterControlsConfig setPath(final Path path) {
+		this.path = path;
+		return this;
+	}
+	
 	public KeyBindingWithModifier[] getAllKeyBindings() {
 		return new KeyBindingWithModifier[] {
 			keyToggleSprint,
@@ -61,6 +57,6 @@ public final class BetterControlsConfig {
 	}
 	
 	public void save() {
-		ConfigSerializer.write(path, this);
+		ConfigSerializer.serialize(path, this);
 	}
 }

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

@@ -1,5 +1,4 @@
 package chylex.bettercontrols.config;
-
 import chylex.bettercontrols.input.SprintMode;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -12,7 +11,6 @@ import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import net.minecraft.util.Mth;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import java.io.FileNotFoundException;
@@ -46,14 +44,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.flightHorizontalSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault);
-		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
+		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
+		Json.setFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
+		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault);
-		Json.setFloat(obj, "Flight.VerticalSpeedMp.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
+		Json.setFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting);
 		
 		Json.writeKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.writeKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -85,14 +83,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.flightHorizontalSpeedMpCreativeDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Default", cfg.flightHorizontalSpeedMpCreativeDefault);
+		cfg.flightSpeedMpCreativeDefault = Json.getFloat(obj, "Flight.SpeedMp.Creative.Default", cfg.flightSpeedMpCreativeDefault, 0.25F, 8F);
-		cfg.flightHorizontalSpeedMpCreativeSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightHorizontalSpeedMpCreativeSprinting);
+		cfg.flightSpeedMpCreativeSprinting = Json.getFloat(obj, "Flight.SpeedMp.Creative.Sprinting", cfg.flightSpeedMpCreativeSprinting, 0.25F, 8F);
-		cfg.flightHorizontalSpeedMpSpectatorDefault = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightHorizontalSpeedMpSpectatorDefault);
+		cfg.flightSpeedMpSpectatorDefault = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Default", cfg.flightSpeedMpSpectatorDefault, 0.25F, 8F);
-		cfg.flightHorizontalSpeedMpSpectatorSprinting = readHorizontalSpeedMultiplier(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightHorizontalSpeedMpSpectatorSprinting);
+		cfg.flightSpeedMpSpectatorSprinting = Json.getFloat(obj, "Flight.SpeedMp.Spectator.Sprinting", cfg.flightSpeedMpSpectatorSprinting, 0.25F, 8F);
-		cfg.flightVerticalSpeedMpCreativeDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Default", "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalSpeedMpCreativeDefault);
+		cfg.flightVerticalBoostCreativeDefault = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Default", cfg.flightVerticalBoostCreativeDefault, 0F, 3F);
-		cfg.flightVerticalSpeedMpCreativeSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Creative.Sprinting", "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalSpeedMpCreativeSprinting);
+		cfg.flightVerticalBoostCreativeSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Creative.Sprinting", cfg.flightVerticalBoostCreativeSprinting, 0F, 3F);
-		cfg.flightVerticalSpeedMpSpectatorDefault = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Default", "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalSpeedMpSpectatorDefault);
+		cfg.flightVerticalBoostSpectatorDefault = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Default", cfg.flightVerticalBoostSpectatorDefault, 0F, 3F);
-		cfg.flightVerticalSpeedMpSpectatorSprinting = readVerticalSpeedMultiplier(obj, cfg, "Flight.VerticalSpeedMp.Spectator.Sprinting", "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalSpeedMpSpectatorSprinting);
+		cfg.flightVerticalBoostSpectatorSprinting = Json.getFloat(obj, "Flight.VerticalBoost.Spectator.Sprinting", cfg.flightVerticalBoostSpectatorSprinting, 0F, 3F);
 		
 		Json.readKeyBinding(obj, "Misc.KeyToggleWalkForward", cfg.keyToggleWalkForward);
 		Json.readKeyBinding(obj, "Misc.KeyToggleJump", cfg.keyToggleJump);
@@ -102,38 +100,7 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		return cfg;
 	}
 	
-	private static float readHorizontalSpeedMultiplier(final JsonObject obj, final String key, final float defaultValue) {
+	static void serialize(final Path path, final BetterControlsConfig config) {
-		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) {
@@ -141,7 +108,7 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
 		}
 	}
 	
-	static BetterControlsConfig read(final Path path) {
+	static BetterControlsConfig deserialize(final Path path) {
 		try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
 			return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
 		} catch (final FileNotFoundException | NoSuchFileException ignored) {

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

@@ -1,5 +1,4 @@
 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,5 +1,4 @@
 package chylex.bettercontrols.gui;
-
 import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.elements.DiscreteValueSliderWidget;
@@ -11,10 +10,10 @@ 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;
@@ -105,6 +104,18 @@ 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;
 		
@@ -125,24 +136,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("Horizontal Speed Multiplier (Default)"));
+		generateLeftSideText(y, elements, text("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(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("Horizontal Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorDefault, value -> cfg.flightHorizontalSpeedMpSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Speed Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightSpeedMpSpectatorDefault, value -> cfg.flightSpeedMpSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Horizontal Speed Multiplier (Sprinting)"));
+		generateLeftSideText(y, elements, text("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(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("Horizontal Speed Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightHorizontalSpeedMpSpectatorSprinting, value -> cfg.flightHorizontalSpeedMpSpectatorSprinting = 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));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Default)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Boost (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(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 Multiplier in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorDefault, value -> cfg.flightVerticalSpeedMpSpectatorDefault = value));
+		elements.add(new DiscreteValueSliderWidget<>(col4(3), y, COL4_W, text("Vertical Speed Boost in Spectator Mode"), flightVerticalBoostOptions, cfg.flightVerticalBoostSpectatorDefault, value -> cfg.flightVerticalBoostSpectatorDefault = value));
 		y += ROW_HEIGHT;
 		
-		generateLeftSideText(y, elements, text("Vertical Speed Multiplier (Sprinting)"));
+		generateLeftSideText(y, elements, text("Vertical Speed Boost (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(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 Multiplier when Sprinting in Spectator Mode"), flightSpeedOptions, cfg.flightVerticalSpeedMpSpectatorSprinting, value -> cfg.flightVerticalSpeedMpSpectatorSprinting = 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));
 		y += ROW_HEIGHT;
 		
 		return y;
@@ -245,11 +256,11 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	}
 	
 	@Override
-	public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
+	public void render(final @NotNull PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
-		renderBackground(graphics);
+		renderBackground(matrices);
-		optionsWidget.render(graphics, mouseX, mouseY, delta);
+		optionsWidget.render(matrices, mouseX, mouseY, delta);
-		graphics.drawCenteredString(font, title, width / 2, 8, TextWidget.WHITE);
+		drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
-		super.render(graphics, mouseX, mouseY, delta);
+		super.render(matrices, mouseX, mouseY, delta);
 	}
 	
 	private void startEditingKeyBinding(final KeyBindingWidget widget) {

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

@@ -1,8 +1,7 @@
 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;
@@ -18,12 +17,10 @@ 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;
 	
-	private static final int ROW_HORIZONTAL_PADDING = 2;
+	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
-	private static final int SCROLL_MULTIPLIER = 18;
+	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
-	
-	public static final int COL2_W = (ROW_WIDTH / 2) - ROW_HORIZONTAL_PADDING;
-	public static final int COL4_W = (ROW_WIDTH / 4) - ROW_HORIZONTAL_PADDING;
 	
 	public static int col2(final int column) {
 		return (column * ROW_WIDTH) / 2;
@@ -61,7 +58,7 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	
 	@Override
 	public int getRowLeft() {
-		return super.getRowLeft() - ROW_HORIZONTAL_PADDING;
+		return super.getRowLeft() - ROW_PADDING;
 	}
 	
 	@Override
@@ -74,12 +71,6 @@ 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;
@@ -104,7 +95,7 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 		}
 		
 		@Override
-		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) {
+		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) {
 			for (final GuiEventListener element : elements) {
 				final Offset offset = offsets.get(element);
 				
@@ -118,7 +109,7 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 				}
 				
 				if (element instanceof final Renderable renderable) {
-					renderable.render(graphics, mouseX, mouseY, tickDelta);
+					renderable.render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,5 +1,4 @@
 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,5 +1,4 @@
 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,5 +1,4 @@
 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,20 +1,18 @@
 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.GuiGraphics;
+import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
 import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
-public final class TextWidget implements OptionWidget {
+public final class TextWidget extends GuiComponent 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;
@@ -68,7 +66,7 @@ public final class TextWidget implements OptionWidget {
 	}
 	
 	@Override
-	public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
+	public void render(final @NotNull PoseStack matrices, 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;
@@ -77,7 +75,8 @@ public final class TextWidget implements OptionWidget {
 		final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
 		
 		for (int i = 0; i < lines.size(); i++) {
-			graphics.drawString(textRenderer, lines.get(i), finalX, finalY + (i * lineHeight), WHITE);
+			final FormattedCharSequence line = lines.get(i);
+			textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
 		}
 	}
 }

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

@@ -1,5 +1,4 @@
 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,5 +1,4 @@
 package chylex.bettercontrols.input;
-
 import net.minecraft.client.gui.screens.Screen;
 
 public enum ModifierKey {

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

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

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

@@ -1,5 +1,4 @@
 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,5 +1,4 @@
 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,5 +1,4 @@
 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,5 +1,4 @@
 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,5 +1,4 @@
 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,5 +1,4 @@
 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,5 +1,4 @@
 package chylex.bettercontrols.mixin;
-
 import chylex.bettercontrols.player.PlayerTicker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.Input;

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

@@ -1,5 +1,4 @@
 package chylex.bettercontrols.mixin;
-
 import chylex.bettercontrols.player.PlayerTicker;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.multiplayer.ClientLevel;

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

@@ -1,34 +0,0 @@
-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,5 +1,4 @@
 package chylex.bettercontrols.mixin;
-
 import chylex.bettercontrols.BetterControlsCommon;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;

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

@@ -1,5 +1,4 @@
 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

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

@@ -1,51 +0,0 @@
-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,5 +1,4 @@
 package chylex.bettercontrols.mixin;
-
 import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.ToggleKeyMapping;

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

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

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

@@ -1,5 +1,4 @@
 package chylex.bettercontrols.player;
-
 import chylex.bettercontrols.BetterControlsCommon;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
@@ -163,6 +162,32 @@ 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) {
@@ -186,7 +211,7 @@ public final class PlayerTicker {
 	public void afterSuperCall(final LocalPlayer player) {
 		if (FlightHelper.shouldFlyOnGround(player)) {
 			final boolean isSneaking = player.isShiftKeyDown();
-			final boolean isOnGround = player.onGround();
+			final boolean isOnGround = player.isOnGround();
 			
 			if (!isSneaking) {
 				wasSneakingBeforeTouchingGround = false;

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

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

src/main/resources/bettercontrols.mixins.json

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