Release v1.3.1 for Minecraft 1.20.5+

Fabric/build.gradle.kts

@@ -6,10 +6,6 @@ plugins {
 	id("fabric-loom")
 }
 
-repositories {
-	maven("https://repo.spongepowered.org/maven")
-}
-
 dependencies {
 	minecraft("com.mojang:minecraft:$minecraftVersion")
 	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
@@ -18,8 +14,11 @@ dependencies {
 
 loom {
 	runs {
+		val runJvmArgs: Set<String> by project
+		
 		configureEach {
 			runDir("../run")
+			vmArgs(runJvmArgs)
 			ideConfigGenerated(true)
 		}
 		
@@ -32,7 +31,7 @@ loom {
 	}
 	
 	mixin {
-		add(sourceSets.main.get(), "$modId.refmap.json")
+		defaultRefmapName.set("$modId.refmap.json")
 	}
 }
 

NeoForge/build.gradle.kts

@@ -1,7 +1,4 @@
-val modId: String by project
-val minecraftVersion: String by project
 val neoForgeVersion: String by project
-val mixinVersion: String by project
 
 plugins {
 	id("net.neoforged.gradle.userdev")
@@ -13,16 +10,19 @@ dependencies {
 }
 
 runs {
+	val runJvmArgs: Set<String> by project
+	
 	configureEach {
-		modSource(project.sourceSets.main.get())
 		workingDirectory = file("../run")
+		modSource(project.sourceSets.main.get())
+		jvmArguments(runJvmArgs)
 	}
 	
 	create("client")
 }
 
 tasks.processResources {
-	filesMatching("META-INF/mods.toml") {
+	filesMatching("META-INF/neoforge.mods.toml") {
 		expand(inputs.properties)
 	}
 }

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

@@ -3,22 +3,18 @@ package chylex.bettercontrols;
 import chylex.bettercontrols.config.BetterControlsConfig;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.IExtensionPoint.DisplayTest;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.fml.loading.FMLPaths;
-import net.neoforged.neoforge.client.ConfigScreenHandler.ConfigScreenFactory;
-import net.neoforged.neoforge.network.NetworkConstants;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 
 @Mod("bettercontrols")
 public final class BetterControlsMod {
 	public BetterControlsMod() {
 		if (FMLEnvironment.dist == Dist.CLIENT) {
 			BetterControlsCommon.setConfig(BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json")));
-			ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(BetterControlsScreen::new));
+			ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class, () -> BetterControlsScreen::new);
 		}
-		
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 	}
 }

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

@@ -18,14 +18,14 @@ config = "${id}.mixins.json"
 
 [[dependencies.${id}]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 versionRange = "[${minimumMinecraftVersion},)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.${id}]]
 modId = "neoforge"
-mandatory = true
+type = "required"
 versionRange = "[${minimumNeoForgeVersion},)"
 ordering = "NONE"
 side = "CLIENT"

build.gradle.kts

@@ -43,13 +43,12 @@ idea {
 }
 
 repositories {
-	maven("https://repo.spongepowered.org/maven")
 	mavenCentral()
 }
 
 dependencies {
-	implementation("org.spongepowered:mixin:$mixinVersion")
 	implementation("net.minecraft:client:$minecraftVersion")
+	compileOnly("net.fabricmc:sponge-mixin:$mixinVersion")
 	api("com.google.code.findbugs:jsr305:3.0.2")
 }
 
@@ -68,16 +67,24 @@ allprojects {
 	apply(plugin = "java-library")
 	
 	dependencies {
-		implementation("org.jetbrains:annotations:22.0.0")
+		implementation("org.jetbrains:annotations:24.1.0")
 	}
 	
 	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 	}
 	
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
-		options.release.set(17)
+		options.release.set(21)
+	}
+	
+	val runJvmArgs = mutableSetOf<String>().also {
+		extra["runJvmArgs"] = it
+	}
+	
+	if (project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.orNull == "JetBrains") {
+		runJvmArgs.add("-XX:+AllowEnhancedClassRedefinition")
 	}
 }
 
@@ -145,7 +152,7 @@ val copyJars = tasks.register<Copy>("copyJars") {
 		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
 	}
 	
-	into(file("${project.buildDir}/dist"))
+	into(project.layout.buildDirectory.dir("dist"))
 }
 
 tasks.assemble {

gradle.properties

@@ -3,21 +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.0b
+modVersion=1.3.1
 modLicense=MPL-2.0
 modSourcesURL=https://github.com/chylex/Better-Controls
 modIssuesURL=https://github.com/chylex/Better-Controls/issues
 
 # Dependencies
-minecraftVersion=1.20.3
-neoForgeVersion=20.3.8-beta
-fabricVersion=0.14.21
+minecraftVersion=1.20.5
+neoForgeVersion=20.5.0-beta
+neoGradleVersion=7.0.120
+fabricVersion=0.15.11
 loomVersion=1.3
-mixinVersion=0.8.5
+mixinVersion=0.12.5+mixin.0.8.5
 
 # Constraints
-minimumMinecraftVersion=1.20.3
-minimumNeoForgeVersion=20.3.7
+minimumMinecraftVersion=1.20.5
+minimumNeoForgeVersion=20.5.0-beta
 minimumFabricVersion=0.12.3
 
 # Gradle

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle.kts

@@ -5,18 +5,19 @@ pluginManagement {
 		gradlePluginPortal()
 		maven(url = "https://maven.neoforged.net/releases") { name = "NeoForge" }
 		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
-		maven(url = "https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge Snapshots" }
 	}
 	
 	plugins {
-		if (settings.extra.has("neoForgeVersion")) {
-			id("net.neoforged.gradle.vanilla") version "7.0.61"
-			id("net.neoforged.gradle.userdev") version "7.0.61"
-			id("net.neoforged.gradle.mixin") version "7.0.61"
+		val neoGradleVersion = settings.extra.get("neoGradleVersion") as? String
+		if (neoGradleVersion != null) {
+			id("net.neoforged.gradle.vanilla") version neoGradleVersion
+			id("net.neoforged.gradle.userdev") version neoGradleVersion
+			id("net.neoforged.gradle.mixin") version neoGradleVersion
 		}
 		
-		if (settings.extra.has("loomVersion")) {
-			id("fabric-loom") version "${settings.extra["loomVersion"]}-SNAPSHOT"
+		val loomVersion = settings.extra.get("loomVersion") as? String
+		if (loomVersion != null) {
+			id("fabric-loom") version "$loomVersion-SNAPSHOT"
 		}
 	}
 }

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

@@ -14,15 +14,11 @@ import com.mojang.blaze3d.platform.InputConstants;
 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;
 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 org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 import java.util.ArrayList;
@@ -216,6 +212,8 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	@Override
 	public void init() {
+		super.init();
+		
 		allKeyBindings.clear();
 		
 		final List<GuiEventListener> elements = new ArrayList<>();
@@ -233,10 +231,16 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
 		y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
 		
-		//noinspection DataFlowIssue
-		addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)).pos(width / 2 - 99, height - 25).size(200, 20).build());
+		optionsWidget = addRenderableWidget(new OptionListWidget(width, layout.getContentHeight(), layout.getHeaderHeight(), y - TITLE_MARGIN_TOP + BOTTOM_PADDING, elements));
+	}
+	
+	@Override
+	protected void repositionElements() {
+		super.repositionElements();
 		
-		addRenderableWidget(optionsWidget = new OptionListWidget(width, height - 50, 21, y - TITLE_MARGIN_TOP + BOTTOM_PADDING, elements));
+		if (optionsWidget != null) {
+			optionsWidget.updateSize(width, layout);
+		}
 	}
 	
 	@Override
@@ -244,17 +248,6 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		BetterControlsCommon.getConfig().save();
 	}
 	
-	@Override
-	public void renderBackground(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
-		renderDirtBackground(graphics);
-	}
-	
-	@Override
-	public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
-		super.render(graphics, mouseX, mouseY, delta);
-		graphics.drawCenteredString(font, title, width / 2, 8, TextWidget.WHITE);
-	}
-	
 	private void startEditingKeyBinding(final KeyBindingWidget widget) {
 		if (editingKeyBinding != null) {
 			editingKeyBinding.stopEditing();

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

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

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

@@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
 
 @Mixin(LocalPlayer.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookClientPlayerTick extends AbstractClientPlayer {
 	protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
 		super(world, profile);

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

@@ -11,8 +11,8 @@ 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)
+@SuppressWarnings({ "SameReturnValue", "UnreachableCode" })
 public abstract class HookClientPlayerVerticalFlightSpeed extends LivingEntity {
 	protected HookClientPlayerVerticalFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
 		super(type, world);

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

@@ -3,21 +3,22 @@ package chylex.bettercontrols.mixin;
 import chylex.bettercontrols.gui.BetterControlsScreen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.Options;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.OptionsList;
 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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import java.util.List;
 
 @Mixin(ControlsScreen.class)
+@SuppressWarnings("UnreachableCode")
 public abstract class HookControlsScreen extends OptionsSubScreen {
 	public HookControlsScreen(final Screen parentScreen, final Options options, final Component title) {
 		super(parentScreen, options, title);
@@ -27,48 +28,13 @@ public abstract class HookControlsScreen extends OptionsSubScreen {
 	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 final AbstractWidget widget)) {
-				continue;
+			if (child instanceof final OptionsList optionsList) {
+				final MutableComponent buttonTitle = BetterControlsScreen.TITLE.plainCopy().append("...");
+				optionsList.addSmall(List.of(Button.builder(buttonTitle, btn -> showOptionsScreen(screen)).build()));
+				break;
 			}
-			
-			if (widget instanceof final Button button && button.getMessage() == CommonComponents.GUI_DONE) {
-				doneButton = widget;
-				continue;
-			}
-			
-			final int bottomY = widget.getY() + widget.getHeight();
-			
-			if (widget.getX() + widget.getWidth() < center) {
-				leftBottomY = Math.max(leftBottomY, bottomY);
-			}
-			if (widget.getX() >= center) {
-				rightBottomY = Math.max(rightBottomY, bottomY);
-			}
-		}
-		
-		final int x, y;
-		
-		if (leftBottomY <= rightBottomY) {
-			x = center - 155;
-			y = leftBottomY + 4;
-		}
-		else {
-			x = center + 5;
-			y = rightBottomY + 4;
-		}
-		
-		final MutableComponent buttonTitle = BetterControlsScreen.TITLE.plainCopy().append("...");
-		addRenderableWidget(Button.builder(buttonTitle, btn -> showOptionsScreen(screen)).pos(x, y).size(150, 20).build());
-		
-		if (doneButton != null) {
-			doneButton.setY(y + 24);
 		}
 	}
 	

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

@@ -13,8 +13,8 @@ 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)
+@SuppressWarnings({ "SameReturnValue", "UnreachableCode" })
 public abstract class HookPlayerHorizontalFlightSpeed extends LivingEntity {
 	protected HookPlayerHorizontalFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
 		super(type, world);

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

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

src/main/resources/bettercontrols.mixins.json

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