Update to NeoForge + Minecraft 1.20.2 + Gradle 8.2.1

Fabric/build.gradle.kts

@@ -3,10 +3,13 @@ val minecraftVersion: String by project
 val fabricVersion: String by project
 
 plugins {
-	idea
 	id("fabric-loom")
 }
 
+repositories {
+	maven("https://repo.spongepowered.org/maven")
+}
+
 dependencies {
 	minecraft("com.mojang:minecraft:$minecraftVersion")
 	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
@@ -15,19 +18,17 @@ dependencies {
 
 loom {
 	runs {
-		named("client") {
+		configureEach {
-			configName = "Fabric Client"
-			client()
 			runDir("../run")
 			ideConfigGenerated(true)
 		}
 		
-		named("server") {
+		named("client") {
-			configName = "Fabric Server"
+			configName = "Fabric Client"
-			server()
+			client()
-			runDir("../run")
-			ideConfigGenerated(true)
 		}
+		
+		findByName("server")?.let(::remove)
 	}
 	
 	mixin {

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

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

Forge/build.gradle.kts

@@ -1,95 +0,0 @@
-import net.minecraftforge.gradle.userdev.UserDevExtension
-import org.gradle.api.file.DuplicatesStrategy.INCLUDE
-import org.spongepowered.asm.gradle.plugins.MixinExtension
-
-val modId: String by project
-val minecraftVersion: String by project
-val forgeVersion: String by project
-val mixinVersion: String by project
-
-buildscript {
-	repositories {
-		maven("https://maven.minecraftforge.net")
-		maven("https://repo.spongepowered.org/maven")
-		mavenCentral()
-	}
-	
-	dependencies {
-		classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = "5.1.+") { isChanging = true }
-		classpath(group = "org.spongepowered", name = "mixingradle", version = "0.7-SNAPSHOT")
-	}
-}
-
-plugins {
-	java
-	eclipse
-}
-
-apply {
-	plugin("net.minecraftforge.gradle")
-	plugin("org.spongepowered.mixin")
-}
-
-dependencies {
-	"minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")
-	
-	if (System.getProperty("idea.sync.active") != "true") {
-		annotationProcessor("org.spongepowered:mixin:$mixinVersion:processor")
-	}
-}
-
-configure<UserDevExtension> {
-	mappings("official", minecraftVersion)
-	
-	runs {
-		create("client") {
-			taskName = "Client"
-			workingDirectory(rootProject.file("run"))
-			ideaModule("${rootProject.name}.${project.name}.main")
-			
-			property("mixin.env.remapRefMap", "true")
-			property("mixin.env.refMapRemappingFile", "$projectDir/build/createSrgToMcp/output.srg")
-			arg("-mixin.config=$modId.mixins.json")
-			
-			mods {
-				create(modId) {
-					source(sourceSets.main.get())
-					source(rootProject.sourceSets.main.get())
-				}
-			}
-		}
-		
-		create("server") {
-			taskName = "Server"
-			workingDirectory(rootProject.file("run"))
-			ideaModule("${rootProject.name}.${project.name}.main")
-			
-			property("mixin.env.remapRefMap", "true")
-			property("mixin.env.refMapRemappingFile", "$projectDir/build/createSrgToMcp/output.srg")
-			arg("-mixin.config=$modId.mixins.json")
-			
-			mods {
-				create(modId) {
-					source(sourceSets.main.get())
-					source(rootProject.sourceSets.main.get())
-				}
-			}
-		}
-	}
-}
-
-configure<MixinExtension> {
-	add(sourceSets.main.get(), "$modId.refmap.json")
-}
-
-tasks.processResources {
-	from(sourceSets.main.get().resources.srcDirs) {
-		include("META-INF/mods.toml")
-		expand(inputs.properties)
-		duplicatesStrategy = INCLUDE
-	}
-}
-
-tasks.jar {
-	finalizedBy("reobfJar")
-}

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

@@ -1,33 +0,0 @@
-package chylex.bettercontrols;
-
-import chylex.bettercontrols.config.BetterControlsConfig;
-import chylex.bettercontrols.gui.BetterControlsScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.network.NetworkConstants;
-
-@Mod("bettercontrols")
-public final class BetterControlsMod {
-	public BetterControlsMod() {
-		BetterControlsCommon.setConfig(DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig));
-		ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory(ClientLoader::createScreen));
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
-	}
-	
-	private static final class ClientLoader {
-		public static BetterControlsConfig loadConfig() {
-			return BetterControlsConfig.load(FMLPaths.CONFIGDIR.get().resolve("BetterControls.json"));
-		}
-		
-		public static BetterControlsScreen createScreen(final Minecraft mc, final Screen parentScreen) {
-			return new BetterControlsScreen(parentScreen);
-		}
-	}
-}

NeoForge/build.gradle.kts

@@ -0,0 +1,28 @@
+val 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")
+	id("net.neoforged.gradle.mixin")
+}
+
+dependencies {
+	implementation("net.neoforged:neoforge:$neoForgeVersion")
+}
+
+runs {
+	configureEach {
+		modSource(project.sourceSets.main.get())
+		workingDirectory = file("../run")
+	}
+	
+	create("client")
+}
+
+tasks.processResources {
+	filesMatching("META-INF/mods.toml") {
+		expand(inputs.properties)
+	}
+}

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

@@ -0,0 +1,24 @@
+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;
+
+@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(DisplayTest.class, () -> new DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+	}
+}

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

@@ -13,16 +13,19 @@ authors = "${author}"
 version = "${version}"
 logoFile = "icon.png"
 
+[[mixins]]
+config = "${id}.mixins.json"
+
 [[dependencies.${id}]]
 modId = "minecraft"
 mandatory = true
 versionRange = "[${minimumMinecraftVersion},)"
 ordering = "NONE"
-side = "BOTH"
+side = "CLIENT"
 
 [[dependencies.${id}]]
-modId = "forge"
+modId = "neoforge"
 mandatory = true
-versionRange = "[${minimumForgeVersion},)"
+versionRange = "[${minimumNeoForgeVersion},)"
 ordering = "NONE"
-side = "BOTH"
+side = "CLIENT"

build.gradle.kts

@@ -1,6 +1,6 @@
+@file:Suppress("ConvertLambdaToReference")
+
 import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
-import java.text.SimpleDateFormat
-import java.util.Date
 
 val modId: String by project
 val modName: String by project
@@ -15,22 +15,16 @@ val minecraftVersion: String by project
 val mixinVersion: String by project
 
 val minimumMinecraftVersion: String by project
-val minimumForgeVersion: String by project
+val minimumNeoForgeVersion: String by project
 val minimumFabricVersion: String by project
 
 val modNameStripped = modName.replace(" ", "")
 val jarVersion = "$minecraftVersion+v$modVersion"
 
-buildscript {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-}
-
 plugins {
-	`java-library`
 	idea
-	id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
+	`java-library`
+	id("net.neoforged.gradle.vanilla")
 }
 
 idea {
@@ -38,8 +32,8 @@ idea {
 		excludeDirs.add(file("gradle"))
 		excludeDirs.add(file("run"))
 		
-		if (findProject(":Forge") == null) {
+		if (findProject(":NeoForge") == null) {
-			excludeDirs.add(file("Forge"))
+			excludeDirs.add(file("NeoForge"))
 		}
 		
 		if (findProject(":Fabric") == null) {
@@ -55,6 +49,7 @@ repositories {
 
 dependencies {
 	implementation("org.spongepowered:mixin:$mixinVersion")
+	implementation("net.minecraft:client:$minecraftVersion")
 	api("com.google.code.findbugs:jsr305:3.0.2")
 }
 
@@ -62,16 +57,15 @@ base {
 	archivesName.set("$modNameStripped-Common")
 }
 
-minecraft {
+runs {
-	version(minecraftVersion)
+	clear()
-	runs.clear()
 }
 
 allprojects {
 	group = "com.$modAuthor.$modId"
 	version = modVersion
 	
-	apply(plugin = "java")
+	apply(plugin = "java-library")
 	
 	dependencies {
 		implementation("org.jetbrains:annotations:22.0.0")
@@ -88,10 +82,6 @@ allprojects {
 }
 
 subprojects {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-	
 	dependencies {
 		implementation(rootProject)
 	}
@@ -100,8 +90,10 @@ subprojects {
 		archivesName.set("$modNameStripped-${project.name}")
 	}
 	
-	tasks.withType<JavaCompile> {
+	listOf("compileJava", "compileTestJava").forEach {
-		source({ rootProject.sourceSets.main.get().allSource })
+		tasks.named<JavaCompile>(it) {
+			source({ rootProject.sourceSets.main.get().allSource })
+		}
 	}
 	
 	tasks.processResources {
@@ -114,7 +106,7 @@ subprojects {
 		inputs.property("sourcesURL", modSourcesURL)
 		inputs.property("issuesURL", modIssuesURL)
 		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
-		inputs.property("minimumForgeVersion", minimumForgeVersion)
+		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
 		inputs.property("minimumFabricVersion", minimumFabricVersion)
 		
 		from(rootProject.sourceSets.main.get().resources) {
@@ -135,8 +127,6 @@ subprojects {
 				"Implementation-Title" to "$modNameStripped-${project.name}",
 				"Implementation-Vendor" to modAuthor,
 				"Implementation-Version" to modVersion,
-				"Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()),
-				"MixinConfigs" to "$modId.mixins.json"
 			)
 		}
 	}
@@ -146,22 +136,6 @@ subprojects {
 	}
 }
 
-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

gradle.properties

@@ -9,15 +9,15 @@ modSourcesURL=https://github.com/chylex/Better-Controls
 modIssuesURL=https://github.com/chylex/Better-Controls/issues
 
 # Dependencies
-minecraftVersion=1.20
+minecraftVersion=1.20.2
-forgeVersion=46.0.1
+neoForgeVersion=20.2.86
 fabricVersion=0.14.21
-loomVersion=1.1
+loomVersion=1.3
 mixinVersion=0.8.5
 
 # Constraints
-minimumMinecraftVersion=1.20
+minimumMinecraftVersion=1.20.2
-minimumForgeVersion=46.0.0
+minimumNeoForgeVersion=20.2.86
 minimumFabricVersion=0.12.3
 
 # Gradle

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 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-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +144,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=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

settings.gradle.kts

@@ -3,19 +3,26 @@ rootProject.name = "Better-Controls"
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
+		maven(url = "https://maven.neoforged.net/releases") { name = "NeoForge" }
 		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
 		maven(url = "https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge Snapshots" }
 	}
 	
 	plugins {
+		if (settings.extra.has("neoForgeVersion")) {
+			id("net.neoforged.gradle.vanilla") version "7.0.41"
+			id("net.neoforged.gradle.userdev") version "7.0.41"
+			id("net.neoforged.gradle.mixin") version "7.0.41"
+		}
+		
 		if (settings.extra.has("loomVersion")) {
 			id("fabric-loom") version "${settings.extra["loomVersion"]}-SNAPSHOT"
 		}
 	}
 }
 
-if (settings.extra.has("forgeVersion")) {
+if (settings.extra.has("neoForgeVersion")) {
-	include("Forge")
+	include("NeoForge")
 }
 
 if (settings.extra.has("fabricVersion")) {

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

@@ -210,8 +210,8 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
 	
 	@SuppressWarnings("DataFlowIssue")
-	public BetterControlsScreen(@Nullable final Screen parentScreen) {
+	public BetterControlsScreen(final Minecraft mc, @Nullable final Screen parentScreen) {
-		super(parentScreen, Minecraft.getInstance().options, TITLE);
+		super(parentScreen, mc.options, TITLE);
 	}
 	
 	@Override
@@ -236,7 +236,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 		//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));
+		addRenderableWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
 	}
 	
 	@Override
@@ -246,7 +246,7 @@ public class BetterControlsScreen extends OptionsSubScreen {
 	
 	@Override
 	public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
-		renderBackground(graphics);
+		renderBackground(graphics, mouseX, mouseY, delta);
 		optionsWidget.render(graphics, mouseX, mouseY, delta);
 		graphics.drawCenteredString(font, title, width / 2, 8, TextWidget.WHITE);
 		super.render(graphics, mouseX, mouseY, delta);

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

@@ -75,8 +75,8 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
 	}
 	
 	@Override
-	public boolean mouseScrolled(final double x, final double y, final double amount) {
+	public boolean mouseScrolled(final double x, final double y, final double xAmount, final double yAmount) {
-		setScrollAmount(getScrollAmount() - amount * SCROLL_MULTIPLIER);
+		setScrollAmount(getScrollAmount() - yAmount * SCROLL_MULTIPLIER);
 		return true;
 	}
 	

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

@@ -34,11 +34,11 @@ public abstract class HookControlsScreen extends OptionsSubScreen {
 		AbstractWidget doneButton = null;
 		
 		for (final GuiEventListener child : children()) {
-			if (!(child instanceof AbstractWidget widget)) {
+			if (!(child instanceof final AbstractWidget widget)) {
 				continue;
 			}
 			
-			if (widget instanceof Button button && button.getMessage() == CommonComponents.GUI_DONE) {
+			if (widget instanceof final Button button && button.getMessage() == CommonComponents.GUI_DONE) {
 				doneButton = widget;
 				continue;
 			}
@@ -65,10 +65,15 @@ public abstract class HookControlsScreen extends OptionsSubScreen {
 		}
 		
 		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());
+		addRenderableWidget(Button.builder(buttonTitle, btn -> showOptionsScreen(screen)).pos(x, y).size(150, 20).build());
 		
 		if (doneButton != null) {
 			doneButton.setY(y + 24);
 		}
 	}
+	
+	private static void showOptionsScreen(final ControlsScreen screen) {
+		final Minecraft mc = Minecraft.getInstance();
+		mc.setScreen(new BetterControlsScreen(mc, screen));
+	}
 }

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

@@ -276,7 +276,7 @@ public final class PlayerTicker {
 		}
 		
 		if (cfg().keyOpenMenu.isDown()) {
-			MINECRAFT.setScreen(new BetterControlsScreen(null));
+			MINECRAFT.setScreen(new BetterControlsScreen(MINECRAFT, null));
 		}
 	}