Update to NeoForge + Gradle 8.2.1

.gitignore

@@ -1,29 +1,30 @@
-bin/
-[Bb]uild/
-eclipse/
-run/
-out/
+# gradle
+
 .gradle/
-.idea/$CACHE_FILE$
-.idea/codeStyles/
-.idea/compiler.xml
-.idea/dictionaries
-.idea/inspectionProfiles/
-.idea/jarRepositories.xml
-.idea/libraries/
-.idea/misc.xml
-.idea/modules/
-.idea/modules.xml
-.idea/runConfigurations/
-.idea/shelf/
-.idea/uiDesigner.xml
-.idea/workspace.xml
-.settings/
-.updateclasses/
-.classpath
-.project
-.DS_Store
+build/
+out/
+classes/
+
+# eclipse
+
 *.launch
+
+# idea
+
+.idea/
+*.iml
 *.ipr
 *.iws
-Thumbs.db
+
+# vscode
+
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+
+# fabric
+
+run/
+logs/

.idea/gradle.xml

@@ -4,15 +4,12 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/Fabric" />
-            <option value="$PROJECT_DIR$/Forge" />
+            <option value="$PROJECT_DIR$/NeoForge" />
           </set>
         </option>
       </GradleProjectSettings>

Fabric/build.gradle.kts

@@ -3,8 +3,11 @@ val minecraftVersion: String by project
 val fabricVersion: String by project
 
 plugins {
-	idea
-	id("fabric-loom") version "0.10-SNAPSHOT"
+	id("fabric-loom")
+}
+
+repositories {
+	maven("https://repo.spongepowered.org/maven")
 }
 
 dependencies {
@@ -15,12 +18,17 @@ dependencies {
 
 loom {
 	runs {
-		named("client") {
-			configName = "Fabric Client"
-			client()
+		configureEach {
 			runDir("../run")
 			ideConfigGenerated(true)
 		}
+		
+		named("client") {
+			configName = "Fabric Client"
+			client()
+		}
+		
+		findByName("server")?.let(::remove)
 	}
 	
 	mixin {

Fabric/src/main/java/chylex/customwindowtitle/fabric/CustomWindowTitle.java

@@ -1,8 +1,8 @@
 package chylex.customwindowtitle.fabric;
+
 import chylex.customwindowtitle.TitleConfig;
 import chylex.customwindowtitle.TitleParser;
 import chylex.customwindowtitle.data.CommonTokenData;
-import com.mojang.blaze3d.platform.Window;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
@@ -11,7 +11,7 @@ public class CustomWindowTitle implements ClientModInitializer {
 	private final TitleConfig config;
 	
 	public CustomWindowTitle() {
-		config = TitleConfig.read(FabricLoader.getInstance().getConfigDirectory().getAbsolutePath());
+		config = TitleConfig.read(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
 	}
 	
 	@Override
@@ -21,11 +21,6 @@ public class CustomWindowTitle implements ClientModInitializer {
 	}
 	
 	private void updateTitle() {
-		final Window window = Minecraft.getInstance().getWindow();
-		window.setTitle(TitleParser.parse(config.getTitle()));
-		
-		if (config.hasIcon()) {
-			window.setIcon(config.readIcon16(), config.readIcon32());
-		}
+		Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
 	}
 }

Fabric/src/main/java/chylex/customwindowtitle/fabric/TokenProvider.java

@@ -1,4 +1,5 @@
 package chylex.customwindowtitle.fabric;
+
 import chylex.customwindowtitle.TokenException;
 import chylex.customwindowtitle.data.CommonTokenProvider;
 import net.fabricmc.loader.api.FabricLoader;

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

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "customwindowtitle",
+  "id": "${id}",
   "name": "${name}",
   "description": "${description}",
   "version": "${version}",
@@ -22,12 +22,13 @@
       "chylex.customwindowtitle.fabric.CustomWindowTitle"
     ]
   },
-  "mixins": [
-    "customwindowtitle.mixins.json"
-  ],
+  
+  "mixins": [{
+    "config": "${id}.mixins.json"
+  }],
   
   "depends": {
-    "fabricloader": ">=0.7.2",
-    "minecraft": ">=1.17"
+    "fabricloader": ">=${minimumFabricVersion}",
+    "minecraft": ">=${minimumMinecraftVersion}"
   }
 }

Forge/build.gradle.kts

@@ -1,78 +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())
-				}
-			}
-		}
-	}
-}
-
-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/customwindowtitle/forge/CustomWindowTitle.java

@@ -1,40 +0,0 @@
-package chylex.customwindowtitle.forge;
-import chylex.customwindowtitle.TitleConfig;
-import chylex.customwindowtitle.TitleParser;
-import chylex.customwindowtitle.data.CommonTokenData;
-import com.mojang.blaze3d.platform.Window;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
-
-@Mod("customwindowtitle")
-public class CustomWindowTitle {
-	private final TitleConfig config;
-	
-	public CustomWindowTitle() {
-		config = TitleConfig.read(FMLPaths.CONFIGDIR.get().toString());
-		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup);
-		CommonTokenData.register(new TokenProvider());
-	}
-	
-	@SubscribeEvent
-	public void onClientSetup(final FMLClientSetupEvent e) {
-		e.enqueueWork(this::updateTitle);
-	}
-	
-	private void updateTitle() {
-		final Window window = Minecraft.getInstance().getWindow();
-		window.setTitle(TitleParser.parse(config.getTitle()));
-		
-		if (config.hasIcon()) {
-			window.setIcon(config.readIcon16(), config.readIcon32());
-		}
-	}
-}

Forge/src/main/resources/pack.mcmeta

@@ -1,7 +0,0 @@
-{
-    "pack": {
-        "description": "Custom Window Title",
-        "pack_format": 5,
-        "_comment": ""
-    }
-}

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/customwindowtitle/neoforge/CustomWindowTitle.java

@@ -0,0 +1,34 @@
+package chylex.customwindowtitle.neoforge;
+
+import chylex.customwindowtitle.TitleConfig;
+import chylex.customwindowtitle.TitleParser;
+import chylex.customwindowtitle.data.CommonTokenData;
+import net.minecraft.client.Minecraft;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.IExtensionPoint.DisplayTest;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.fml.loading.FMLPaths;
+
+@Mod("customwindowtitle")
+public class CustomWindowTitle {
+	private final TitleConfig config;
+	
+	public CustomWindowTitle() {
+		config = TitleConfig.read(FMLPaths.CONFIGDIR.get().toString());
+		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> DisplayTest.IGNORESERVERONLY, (a, b) -> true));
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup);
+		CommonTokenData.register(new TokenProvider());
+	}
+	
+	@SubscribeEvent
+	public void onClientSetup(final FMLClientSetupEvent e) {
+		e.enqueueWork(this::updateTitle);
+	}
+	
+	private void updateTitle() {
+		Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
+	}
+}

NeoForge/src/main/java/chylex/customwindowtitle/neoforge/TokenProvider.java

@@ -1,9 +1,10 @@
-package chylex.customwindowtitle.forge;
+package chylex.customwindowtitle.neoforge;
+
 import chylex.customwindowtitle.TokenException;
 import chylex.customwindowtitle.data.CommonTokenProvider;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
+import net.neoforged.fml.ModList;
+import net.neoforged.neoforgespi.language.IModFileInfo;
+import net.neoforged.neoforgespi.language.IModInfo;
 
 final class TokenProvider implements CommonTokenProvider {
 	@Override

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

@@ -1,27 +1,30 @@
 modLoader = "javafml"
-loaderVersion = "[31,)"
+loaderVersion = "[0,)"
 
-authors = "${author}"
 license = "${license}"
 issueTrackerURL = "${issuesURL}"
 
 [[mods]]
-modId = "customwindowtitle"
-version = "${version}"
+modId = "${id}"
 displayName = "${name}"
-description = "${description}"
 displayURL = "${sourcesURL}"
+description = "${description}"
+authors = "${author}"
+version = "${version}"
 
-[[dependencies.customwindowtitle]]
+[[mixins]]
+config = "${id}.mixins.json"
+
+[[dependencies.${id}]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.17,)"
+versionRange = "[${minimumMinecraftVersion},)"
 ordering = "NONE"
 side = "CLIENT"
 
-[[dependencies.customwindowtitle]]
-modId = "forge"
+[[dependencies.${id}]]
+modId = "neoforge"
 mandatory = true
-versionRange = "[31.2.45,)"
+versionRange = "[${minimumNeoForgeVersion},)"
 ordering = "NONE"
 side = "CLIENT"

README.md

@@ -31,6 +31,8 @@ If any of the tokens aren't working, search the game log for **CustomWindowTitle
 
 ### Changing the Icon
 
+**This feature is currently not supported in Minecraft 1.20.**
+
 You must create two PNG images with sizes 16x16 and 32x32 pixels. The images **must be saved with transparency** even if they don't use it, **otherwise the icons will appear corrupted**. In Krita for example, you must check _Store alpha channel (transparency)_ when saving the image.
 
 The _icon16_ and _icon32_ configuration entries point to the PNG files relative to the **.minecraft/config** folder. For example, if you place the two icons in a folder named _customwindowtitle_ as follows:
@@ -67,4 +69,4 @@ The Gradle project provides the following tasks:
 - `setupIdea` generates Minecraft sources and run configurations for IntelliJ IDEA
 - `assemble` creates 2 `.jar` files in the `build/dist` folder - one for Forge, one for Fabric
 
-When building against a Minecraft version that is only supported by one mod loader, open `gradle.properties` and comment or remove either `forgeVersion` or `fabricVersion` to disable them.
+When building against a Minecraft version that is only supported by one mod loader, open `gradle.properties` and comment or remove either `neoForgeVersion` or `fabricVersion` to disable them.

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
@@ -14,19 +14,17 @@ val modIssuesURL: String by project
 val minecraftVersion: String by project
 val mixinVersion: String by project
 
+val minimumMinecraftVersion: 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 {
@@ -34,8 +32,8 @@ idea {
 		excludeDirs.add(file("gradle"))
 		excludeDirs.add(file("run"))
 		
-		if (findProject(":Forge") == null) {
-			excludeDirs.add(file("Forge"))
+		if (findProject(":NeoForge") == null) {
+			excludeDirs.add(file("NeoForge"))
 		}
 		
 		if (findProject(":Fabric") == null) {
@@ -51,6 +49,7 @@ repositories {
 
 dependencies {
 	implementation("org.spongepowered:mixin:$mixinVersion")
+	implementation("net.minecraft:client:$minecraftVersion")
 	api("com.google.code.findbugs:jsr305:3.0.2")
 }
 
@@ -58,36 +57,31 @@ base {
 	archivesName.set("$modNameStripped-Common")
 }
 
-minecraft {
-	version(minecraftVersion)
-	runs.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")
 	}
 	
 	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)
 	}
 }
 
 subprojects {
-	repositories {
-		maven("https://repo.spongepowered.org/maven")
-	}
-	
 	dependencies {
 		implementation(rootProject)
 	}
@@ -96,13 +90,14 @@ subprojects {
 		archivesName.set("$modNameStripped-${project.name}")
 	}
 	
-	tasks.withType<JavaCompile> {
+	listOf("compileJava", "compileTestJava").forEach {
+		tasks.named<JavaCompile>(it) {
 			source({ rootProject.sourceSets.main.get().allSource })
 		}
+	}
 	
 	tasks.processResources {
-		from(rootProject.sourceSets.main.get().resources)
-		
+		inputs.property("id", modId)
 		inputs.property("name", modName)
 		inputs.property("description", modDescription)
 		inputs.property("version", modVersion)
@@ -110,6 +105,13 @@ subprojects {
 		inputs.property("license", modLicense)
 		inputs.property("sourcesURL", modSourcesURL)
 		inputs.property("issuesURL", modIssuesURL)
+		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
+		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
+		inputs.property("minimumFabricVersion", minimumFabricVersion)
+		
+		from(rootProject.sourceSets.main.get().resources) {
+			expand(inputs.properties)
+		}
 	}
 	
 	tasks.jar {
@@ -125,26 +127,12 @@ 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"
 			)
 		}
 	}
-}
 	
-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"))
+	tasks.test {
+		onlyIf { false }
 	}
 }
 

gradle.properties

@@ -3,16 +3,22 @@ modId=customwindowtitle
 modName=Custom Window Title
 modDescription=Customize window title and icon.
 modAuthor=chylex
-modVersion=1.1.1
+modVersion=1.2.0
 modLicense=Unlicense
 modSourcesURL=https://github.com/chylex/Minecraft-Window-Title
 modIssuesURL=https://github.com/chylex/Minecraft-Window-Title/issues
 
 # Dependencies
-minecraftVersion=1.17.1
-forgeVersion=37.0.75
-fabricVersion=0.11.7
-mixinVersion=0.8.4
+minecraftVersion=1.20
+neoForgeVersion=20.2.44-beta
+fabricVersion=0.14.21
+loomVersion=1.3
+mixinVersion=0.8.5
+
+# Constraints
+minimumMinecraftVersion=1.20
+minimumNeoForgeVersion=20.2.43
+minimumFabricVersion=0.12.3
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,98 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,86 +129,120 @@ Please set the JAVA_HOME variable in your environment to match the
 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.
+    JAVACMD=java
+    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.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+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
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-ARGV=("$@")
-eval set -- $DEFAULT_JVM_OPTS
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-IFS=$'
-' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
-IFS=$'
-' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    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
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -3,13 +3,26 @@ rootProject.name = "Minecraft-Window-Title"
 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("forgeVersion")) {
-	include("Forge")
+		if (settings.extra.has("loomVersion")) {
+			id("fabric-loom") version "${settings.extra["loomVersion"]}-SNAPSHOT"
+		}
+	}
+}
+
+if (settings.extra.has("neoForgeVersion")) {
+	include("NeoForge")
 }
 
 if (settings.extra.has("fabricVersion")) {

src/main/java/chylex/customwindowtitle/TitleConfig.java

@@ -1,28 +1,25 @@
 package chylex.customwindowtitle;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 public final class TitleConfig {
-	private static final Map<String, String> DEFAULTS;
+	private static final ImmutableMap<String, String> DEFAULTS = ImmutableMap.<String, String>builder()
+		.put("title", "Minecraft {mcversion}")
+		.build();
 	
-	static {
-		final Map<String, String> defaults = new LinkedHashMap<>();
-		
-		defaults.put("title", "Minecraft {mcversion}");
-		defaults.put("icon16", "");
-		defaults.put("icon32", "");
-		
-		DEFAULTS = Collections.unmodifiableMap(defaults);
-	}
+	private static final ImmutableSet<String> IGNORED_KEYS = ImmutableSet.of(
+		"icon16",
+		"icon32"
+	);
 	
 	public static TitleConfig read(final String folder) {
 		final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
@@ -46,7 +43,7 @@ public final class TitleConfig {
 					if (config.containsKey(key)) {
 						config.put(key, value);
 					}
-					else {
+					else if (!IGNORED_KEYS.contains(key)) {
 						throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
 					}
 				});
@@ -55,25 +52,7 @@ public final class TitleConfig {
 			throw new RuntimeException("CustomWindowTitle configuration error", e);
 		}
 		
-		final String icon16 = config.get("icon16");
-		final String icon32 = config.get("icon32");
-		
-		final Path pathIcon16 = icon16.isEmpty() ? null : Paths.get(folder, icon16);
-		final Path pathIcon32 = icon32.isEmpty() ? null : Paths.get(folder, icon32);
-		
-		if ((pathIcon16 == null) != (pathIcon32 == null)) {
-			throw new RuntimeException("CustomWindowTitle configuration specifies only one icon, both 'icon16' and 'icon32' must be set.");
-		}
-		
-		if (pathIcon16 != null && Files.notExists(pathIcon16)) {
-			throw new RuntimeException("CustomWindowTitle 16x16 icon not found: " + pathIcon16);
-		}
-		
-		if (pathIcon32 != null && Files.notExists(pathIcon32)) {
-			throw new RuntimeException("CustomWindowTitle 32x32 icon not found: " + pathIcon32);
-		}
-		
-		return new TitleConfig(config.get("title"), pathIcon16, pathIcon32);
+		return new TitleConfig(config.get("title"));
 	}
 	
 	private static String parseTrimmedValue(String value) {
@@ -96,36 +75,12 @@ public final class TitleConfig {
 	}
 	
 	private final String title;
-	private final Path icon16;
-	private final Path icon32;
 	
-	private TitleConfig(final String title, final Path icon16, final Path icon32) {
+	private TitleConfig(final String title) {
 		this.title = title;
-		this.icon16 = icon16;
-		this.icon32 = icon32;
 	}
 	
 	public String getTitle() {
 		return title;
 	}
-	
-	public boolean hasIcon() {
-		return icon16 != null && icon32 != null;
-	}
-	
-	public InputStream readIcon16() {
-		try {
-			return Files.newInputStream(icon16, StandardOpenOption.READ);
-		} catch (final IOException e) {
-			throw new RuntimeException("CustomWindowTitle could not open the specified 16x16 icon: " + icon16, e);
-		}
-	}
-	
-	public InputStream readIcon32() {
-		try {
-			return Files.newInputStream(icon32, StandardOpenOption.READ);
-		} catch (final IOException e) {
-			throw new RuntimeException("CustomWindowTitle could not open the specified 32x32 icon: " + icon16, e);
-		}
-	}
 }

src/main/java/chylex/customwindowtitle/TitleParser.java

@@ -1,4 +1,5 @@
 package chylex.customwindowtitle;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -11,7 +12,7 @@ public final class TitleParser {
 	private static final Logger logger = LogManager.getLogger("CustomWindowTitle");
 	
 	public static String parse(final String input) {
-		final StringBuffer buffer = new StringBuffer();
+		final StringBuilder buffer = new StringBuilder();
 		final Matcher matcher = tokenRegex.matcher(input);
 		
 		while (matcher.find()) {

src/main/java/chylex/customwindowtitle/TitleTokens.java

@@ -1,4 +1,5 @@
 package chylex.customwindowtitle;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;

src/main/java/chylex/customwindowtitle/data/CommonTokenProvider.java

@@ -1,9 +1,10 @@
 package chylex.customwindowtitle.data;
-import net.minecraft.client.Minecraft;
+
+import net.minecraft.SharedConstants;
 
 public interface CommonTokenProvider {
 	default String getMinecraftVersion() {
-		return Minecraft.getInstance().getGame().getVersion().getName();
+		return SharedConstants.getCurrentVersion().getName();
 	}
 	
 	String getModVersion(final String modId);

src/main/java/chylex/customwindowtitle/mixin/DisableVanillaTitle.java

@@ -1,4 +1,5 @@
 package chylex.customwindowtitle.mixin;
+
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/resources/customwindowtitle.mixins.json

@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "chylex.customwindowtitle.mixin",
   "refmap": "customwindowtitle.refmap.json",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "DisableVanillaTitle"
   ],

src/main/resources/pack.mcmeta

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