Release 1.2.4 for Minecraft 1.19.4+

Closes #26

Fabric/build.gradle.kts

@@ -4,7 +4,7 @@ val fabricVersion: String by project
 
 plugins {
 	idea
-	id("fabric-loom") version "0.9-SNAPSHOT"
+	id("fabric-loom")
 }
 
 dependencies {
@@ -42,7 +42,7 @@ tasks.processResources {
 }
 
 tasks.jar {
-	exclude("io/github/prospector/")
+	exclude("com/terraformersmc/modmenu/")
 }
 
 tasks.remapJar {

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

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

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

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

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

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

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

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

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

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

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

@@ -4,20 +4,20 @@ import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.fmlclient.ConfigGuiHandler.ConfigGuiFactory;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
+import net.minecraftforge.network.NetworkConstants;
 
 @Mod("bettercontrols")
 public final class BetterControlsMod {
 	public BetterControlsMod() {
 		BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+		ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(ClientLoader::createScreen));
+		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 	}
 	
 	private static final class ClientLoader {

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

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

build.gradle.kts

@@ -4,11 +4,20 @@ import java.util.Date
 
 val modId: String by project
 val modName: String by project
+val modDescription: String by project
 val modAuthor: String by project
 val modVersion: String by project
+val modLicense: String by project
+val modSourcesURL: String by project
+val modIssuesURL: String by project
+
 val 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"
 
@@ -26,7 +35,17 @@ plugins {
 
 idea {
 	module {
-		excludeDirs.add(project.file("run"))
+		excludeDirs.add(file("gradle"))
+		excludeDirs.add(file("run"))
+		excludeDirs.add(file("Fabric/run"))
+		
+		if (findProject(":Forge") == null) {
+			excludeDirs.add(file("Forge"))
+		}
+		
+		if (findProject(":Fabric") == null) {
+			excludeDirs.add(file("Fabric"))
+		}
 	}
 }
 
@@ -60,12 +79,12 @@ allprojects {
 	}
 	
 	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(16))
+		toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 	}
 	
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
-		options.release.set(16)
+		options.release.set(17)
 	}
 }
 
@@ -87,10 +106,21 @@ subprojects {
 	}
 	
 	tasks.processResources {
-		from(rootProject.sourceSets.main.get().resources)
-		
+		inputs.property("id", modId)
 		inputs.property("name", modName)
+		inputs.property("description", modDescription)
 		inputs.property("version", modVersion)
+		inputs.property("author", modAuthor)
+		inputs.property("license", modLicense)
+		inputs.property("sourcesURL", modSourcesURL)
+		inputs.property("issuesURL", modIssuesURL)
+		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
+		inputs.property("minimumForgeVersion", minimumForgeVersion)
+		inputs.property("minimumFabricVersion", minimumFabricVersion)
+		
+		from(rootProject.sourceSets.main.get().resources) {
+			expand(inputs.properties)
+		}
 	}
 	
 	tasks.jar {
@@ -111,19 +141,40 @@ subprojects {
 			)
 		}
 	}
+	
+	tasks.test {
+		onlyIf { false }
+	}
+}
+
+tasks.register("setupIdea") {
+	group = "mod"
+	
+	dependsOn(tasks.findByName("decompile"))
+	
+	val forge = findProject(":Forge")
+	if (forge != null) {
+		dependsOn(forge.tasks.getByName("genIntellijRuns"))
+	}
+	
+	val fabric = findProject(":Fabric")
+	if (fabric != null) {
+		dependsOn(fabric.tasks.getByName("genSources"))
+	}
 }
 
 val copyJars = tasks.register<Copy>("copyJars") {
+	group = "build"
 	duplicatesStrategy = EXCLUDE
 	
 	for (subproject in subprojects) {
-		dependsOn(subproject.tasks.build)
+		dependsOn(subproject.tasks.assemble)
 		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
 	}
 	
 	into(file("${project.buildDir}/dist"))
 }
 
-tasks.build {
+tasks.assemble {
 	finalizedBy(copyJars)
 }

gradle.properties

@@ -1,14 +1,24 @@
 # Mod
 modId=bettercontrols
 modName=Better Controls
+modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
 modAuthor=chylex
-modVersion=1.2.1
+modVersion=1.2.4
+modLicense=MPL-2.0
+modSourcesURL=https://github.com/chylex/Better-Controls
+modIssuesURL=https://github.com/chylex/Better-Controls/issues
 
 # Dependencies
-minecraftVersion=1.17.1
-forgeVersion=37.0.75
-fabricVersion=0.11.7
-mixinVersion=0.8.4
+minecraftVersion=1.19.4
+forgeVersion=45.0.6
+fabricVersion=0.14.17
+loomVersion=0.12
+mixinVersion=0.8.5
+
+# Constraints
+minimumMinecraftVersion=1.19.4
+minimumForgeVersion=45.0.0
+minimumFabricVersion=0.7.4
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

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

@@ -24,10 +24,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

@@ -8,6 +8,7 @@ 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;
@@ -20,7 +21,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 +34,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) {
-		return new TextComponent(text);
+	private static Component text(final String text) {
+		return literal(text);
 	}
 	
 	public static final Component TITLE = text("Better Controls");
@@ -85,11 +86,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,7 +104,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 			new Option<>(Float.valueOf(8.00F), text("8x"))
 		);
 		
-		final List<Option<Float>> flightVerticalBoostOptions = Arrays.asList(
+		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%")),
@@ -220,6 +220,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 +244,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));
 	}
 	

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

@@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 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;
@@ -35,14 +35,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);
@@ -82,13 +82,15 @@ 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);
 		}
 		
@@ -98,16 +100,16 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 				final Offset offset = offsets.get(element);
 				
 				if (element instanceof final AbstractWidget widget) {
-					widget.x = x + offset.x;
-					widget.y = y + offset.y;
+					widget.setX(x + offset.x);
+					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) {
-					widget.render(matrices, mouseX, mouseY, tickDelta);
+				if (element instanceof final Renderable renderable) {
+					renderable.render(matrices, mouseX, mouseY, tickDelta);
 				}
 			}
 		}

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

@@ -1,20 +1,19 @@
 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 +21,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 +44,9 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
 		}
 	}
 	
+	@NotNull
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
-		return new TranslatableComponent("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
+	protected MutableComponent createNarrationMessage() {
+		return Component.translatable("gui.narrate.slider", narration.plainCopy().append(" ").append(getMessage()));
 	}
 }

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

@@ -7,8 +7,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 +22,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 +38,10 @@ public final class KeyBindingWidget extends Button {
 		button.active = !binding.isUnbound();
 	}
 	
+	@NotNull
 	@Override
-	protected @NotNull MutableComponent createNarrationMessage() {
-		return binding.isUnbound() ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
+	protected MutableComponent createNarrationMessage() {
+		return binding.isUnbound() ? Component.translatable("narrator.controls.unbound", bindingName) : Component.translatable("narrator.controls.bound", bindingName, super.createNarrationMessage());
 	}
 	
 	@Override
@@ -79,13 +78,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/TextWidget.java

@@ -57,6 +57,14 @@ public final class TextWidget extends GuiComponent implements OptionWidget {
 		this.y = y;
 	}
 	
+	@Override
+	public void setFocused(final boolean focused) {}
+	
+	@Override
+	public boolean isFocused() {
+		return false;
+	}
+	
 	@Override
 	public void render(final @NotNull PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
 		final Font textRenderer = Minecraft.getInstance().font;

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

@@ -12,7 +12,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

@@ -23,7 +23,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/HookControlsListWidget.java

@@ -4,14 +4,14 @@ import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.controls.ControlList;
-import net.minecraft.client.gui.screens.controls.ControlList.Entry;
+import net.minecraft.client.gui.screens.controls.KeyBindsList;
+import net.minecraft.client.gui.screens.controls.KeyBindsList.Entry;
 import org.apache.commons.lang3.ArrayUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(ControlList.class)
+@Mixin(KeyBindsList.class)
 public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
 	public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
 		super(client, width, height, top, bottom, itemHeight);

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

@@ -1,28 +1,74 @@
 package chylex.bettercontrols.mixin;
 
 import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.CycleOption;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.Option;
 import net.minecraft.client.Options;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.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.Redirect;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ControlsScreen.class)
-public abstract class HookControlsScreen {
-	@Redirect(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/CycleOption;createButton(Lnet/minecraft/client/Options;III)Lnet/minecraft/client/gui/components/AbstractWidget;"))
-	private AbstractWidget replaceAutoJumpButton(final CycleOption<?> option, final Options options, final int x, final int y, final int width) {
-		if (option == Option.AUTO_JUMP && !Screen.hasAltDown()) {
-			@SuppressWarnings("ConstantConditions")
-			final ControlsScreen screen = (ControlsScreen)(Object)this;
-			return new Button(x, y, width, 20, BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> Minecraft.getInstance().setScreen(new BetterControlsScreen(screen)));
+public abstract class HookControlsScreen extends OptionsSubScreen {
+	public HookControlsScreen(final Screen parentScreen, final Options options, final Component title) {
+		super(parentScreen, options, title);
+	}
+	
+	@Inject(method = "init", at = @At("RETURN"))
+	public void afterInit(final CallbackInfo ci) {
+		@SuppressWarnings("ConstantConditions")
+		final ControlsScreen screen = (ControlsScreen)(Object)this;
+		final int center = width / 2;
+		
+		int leftBottomY = 0;
+		int rightBottomY = 0;
+		AbstractWidget doneButton = null;
+		
+		for (final GuiEventListener child : children()) {
+			if (!(child instanceof AbstractWidget widget)) {
+				continue;
+			}
+			
+			if (widget instanceof Button button && button.getMessage() == CommonComponents.GUI_DONE) {
+				doneButton = widget;
+				continue;
+			}
+			
+			final int bottomY = widget.getY() + widget.getHeight();
+			
+			if (widget.getX() + widget.getWidth() < center) {
+				leftBottomY = Math.max(leftBottomY, bottomY);
+			}
+			if (widget.getX() >= center) {
+				rightBottomY = Math.max(rightBottomY, bottomY);
+			}
 		}
 		
-		return option.createButton(options, x, y, width);
+		final int x, y;
+		
+		if (leftBottomY <= rightBottomY) {
+			x = center - 155;
+			y = leftBottomY + 4;
+		}
+		else {
+			x = center + 5;
+			y = rightBottomY + 4;
+		}
+		
+		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/HookPlayerFlightSpeed.java

@@ -16,9 +16,12 @@ public abstract class HookPlayerFlightSpeed extends LivingEntity {
 	}
 	
 	@Redirect(
-		method = "travel",
+		method = "getFlyingSpeed",
 		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"))
+		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/HookToggleOptionButtons.java

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

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

@@ -50,8 +50,8 @@ public final class PlayerTicker {
 	
 	// Logic
 	
-	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, toggled -> OPTIONS.toggleSprint = toggled);
-	private final ToggleTracker toggleSneak = new ToggleTrackerForStickyKey(cfg().keyToggleSneak, KEY_SNEAK, toggled -> OPTIONS.toggleCrouch = toggled);
+	private final ToggleTracker toggleSprint = new ToggleTrackerForStickyKey(cfg().keyToggleSprint, KEY_SPRINT, OPTIONS.toggleSprint()::set);
+	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 +91,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 +149,7 @@ public final class PlayerTicker {
 	
 	public void afterInputAssignsPressingForward(final Input input) {
 		if (MINECRAFT.screen == null) {
+			//noinspection NonShortCircuitBooleanExpression
 			input.up |= toggleWalkForward.tick();
 		}
 	}
@@ -157,6 +158,7 @@ public final class PlayerTicker {
 		final Input input = player.input;
 		
 		if (MINECRAFT.screen == null && !player.getAbilities().flying) {
+			//noinspection NonShortCircuitBooleanExpression
 			input.jumping |= toggleJump.tick();
 		}
 		

src/main/resources/bettercontrols.mixins.json

@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "chylex.bettercontrols.mixin",
   "refmap": "bettercontrols.refmap.json",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "AccessCameraFields",
     "AccessClientPlayerFields",

src/main/resources/pack.mcmeta

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