Pin VanillaGradle version

Closes #15

.github/FUNDING.yml

@@ -1 +1,3 @@
+github: chylex
+patreon: chylex
 ko_fi: chylex

.idea/gradle.xml

@@ -4,12 +4,15 @@
   <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$/NeoForge" />
+            <option value="$PROJECT_DIR$/Forge" />
           </set>
         </option>
       </GradleProjectSettings>

CURSEFORGE.html

@@ -0,0 +1,30 @@
+<h2>Installation</h2>
+<p>The mod supports <a href="https://files.minecraftforge.net/">Forge</a> and <a href="https://fabricmc.net/">Fabric</a> (*) mod loaders. Follow either mod loader's installation guide, then <a href="https://www.curseforge.com/minecraft/mc-mods/custom-window-title/files">download the mod file</a> for your Minecraft version and mod loader, and install it into the <strong>.minecraft/mods</strong> folder.</p>
+<p>(*) Fabric API is <strong>not</strong> required.</p>
+<h2>Configuration</h2>
+<p>Run the game once to create the configuration file. By default, the window title will be set to <strong>Minecraft <em>&lt;version&gt;</em></strong>. Unlike in vanilla 1.15.2 onwards, the title will not change when you enter a world/server.</p>
+<p>To change the title or icon, navigate to the <strong>.minecraft/config</strong> folder, and open <strong>customwindowtitle-client.toml</strong> in a text editor. You will see the following entries:</p>
+<p><span style="font-family: courier new,courier,monospace;">title = '<span style="color: #808000;">Minecraft {mcversion}</span>'</span><br /> <span style="font-family: courier new,courier,monospace;">icon16 = ''</span><br /> <span style="font-family: courier new,courier,monospace;">icon32 = ''</span></p>
+<p>Only edit text inside quotes or apostrophes.</p>
+<h3>Changing the Title</h3>
+<p>You can use the following special tokens in the <em>title</em> configuration entry:</p>
+<ul>
+  <li><strong>{mcversion}</strong> - current Minecraft version</li>
+  <li><strong>{modversion:<span style="text-decoration: underline;">modid</span>}</strong> - version of installed mod with the identifier <em>modid</em></li>
+</ul>
+<p>If any of the tokens aren't working, search the game log for <strong>CustomWindowTitle</strong> and you should see the reason, otherwise please file an issue on the <a href="https://github.com/chylex/Minecraft-Window-Title/issues">issue tracker</a> with as many details as possible.</p>
+<h3>Changing the Icon</h3>
+<p>You must create two PNG images with sizes 16x16 and 32x32 pixels. The images <strong>must be saved with transparency</strong> even if they don't use it, <strong>otherwise the icons will appear corrupted</strong>. In Krita for example, you must check <em>Store alpha channel (transparency)</em> when saving the image.</p>
+<p>The <em>icon16</em> and <em>icon32</em> configuration entries point to the PNG files relative to the <strong>.minecraft/config</strong> folder. For example, if you place the two icons in a folder named <em>customwindowtitle</em> as follows:</p>
+<ul>
+  <li><span style="font-family: courier new, courier, monospace;">.minecraft/config/<span style="color: #008080;">customwindowtitle-client.toml</span></span></li>
+  <li><span style="font-family: courier new, courier, monospace;">.minecraft/config/<span style="color: #808000;">customwindowtitle/icon16.png</span></span></li>
+  <li><span style="font-family: courier new, courier, monospace;">.minecraft/config/<span style="color: #808000;">customwindowtitle/icon32.png</span></span></li>
+</ul>
+<p>Then, the two icon entries should look like this:</p>
+<p><span style="font-family: courier new,courier,monospace;">icon16 = '<span style="color: #808000;">customwindowtitle/icon16.png</span>'</span><br /> <span style="font-family: courier new,courier,monospace;">icon32 = '<span style="color: #808000;">customwindowtitle/icon32.png</span>'</span></p>
+<p><strong>Custom icons require Custom Window Title 1.1.0 or newer.</strong></p>
+<h2>Screenshots</h2>
+<p>These screenshots were taken using the following example configuration:</p>
+<p><span style="font-family: courier new,courier,monospace;">title = "<span style="color: #808000;">Minecraft {mcversion} - Custom Window Title {modversion:customwindowtitle}</span>"</span></p>
+<p><img src="https://media.forgecdn.net/attachments/277/212/customwindowtitlefabric.png" width="417" height="284" /><img src="https://media.forgecdn.net/attachments/277/213/customwindowtitleforge.png" alt="" width="417" height="284" /></p>

Fabric/build.gradle.kts

@@ -1,12 +1,9 @@
-import net.fabricmc.loom.configuration.ide.RunConfigSettings
-import org.gradle.jvm.tasks.Jar
-
 val modId: String by project
-val modSides: String by project
 val minecraftVersion: String by project
 val fabricVersion: String by project
 
 plugins {
+	idea
 	id("fabric-loom")
 }
 
@@ -18,36 +15,16 @@ dependencies {
 
 loom {
 	runs {
-		val runJvmArgs: Set<String> by project
+		named("client") {
-		
-		configureEach {
-			runDir("../run")
-			vmArgs(runJvmArgs)
-			ideConfigGenerated(true)
-		}
-		
-		fun side(name: String, configure: RunConfigSettings.() -> Unit) {
-			if (modSides == "both" || modSides == name) {
-				named(name, configure)
-			}
-			else {
-				findByName(name)?.let(::remove)
-			}
-		}
-		
-		side("client") {
 			configName = "Fabric Client"
 			client()
-		}
+			runDir("../run")
-		
+			ideConfigGenerated(true)
-		side("server") {
-			configName = "Fabric Server"
-			server()
 		}
 	}
 	
 	mixin {
-		defaultRefmapName.set("$modId.refmap.json")
+		add(sourceSets.main.get(), "$modId.refmap.json")
 	}
 }
 
@@ -57,11 +34,6 @@ tasks.processResources {
 	}
 }
 
-tasks.register<Jar>("uncompressedRemapJar") {
+tasks.remapJar {
-	group = "fabric"
+	archiveVersion.set(tasks.jar.get().archiveVersion)
-	
-	from(tasks.remapJar.map { it.outputs.files.map(::zipTree) })
-	
-	archiveClassifier.set("uncompressed")
-	entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
 }

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

@@ -1,7 +1,7 @@
 package chylex.customwindowtitle.fabric;
 
-import chylex.customwindowtitle.TitleChanger;
 import chylex.customwindowtitle.TitleConfig;
+import chylex.customwindowtitle.TitleParser;
 import chylex.customwindowtitle.data.CommonTokenData;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
@@ -11,12 +11,16 @@ public class CustomWindowTitle implements ClientModInitializer {
 	private final TitleConfig config;
 	
 	public CustomWindowTitle() {
-		config = TitleConfig.load(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
+		config = TitleConfig.read(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
 	}
 	
 	@Override
 	public void onInitializeClient() {
 		CommonTokenData.register(new TokenProvider());
-		Minecraft.getInstance().execute(() -> TitleChanger.setTitle(config));
+		Minecraft.getInstance().execute(this::updateTitle);
+	}
+	
+	private void updateTitle() {
+		Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
 	}
 }

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

@@ -16,7 +16,7 @@
     "sources": "${sourcesURL}"
   },
   
-  "environment": "${sidesForFabric}",
+  "environment": "client",
   "entrypoints": {
     "client": [
       "chylex.customwindowtitle.fabric.CustomWindowTitle"
@@ -24,8 +24,7 @@
   },
   
   "mixins": [{
-    "config": "${id}.mixins.json",
+    "config": "${id}.mixins.json"
-    "environment": "${sidesForFabric}"
   }],
   
   "depends": {

Forge/build.gradle.kts

@@ -0,0 +1,80 @@
+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 = "[6.0,6.2)")
+		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)
+	
+	copyIdeResources.set(true)
+	
+	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

@@ -0,0 +1,34 @@
+package chylex.customwindowtitle.forge;
+
+import chylex.customwindowtitle.TitleConfig;
+import chylex.customwindowtitle.TitleParser;
+import chylex.customwindowtitle.data.CommonTokenData;
+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;
+
+@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()));
+	}
+}

Forge/src/main/java/chylex/customwindowtitle/forge/TokenProvider.java

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

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

@@ -12,19 +12,16 @@ description = "${description}"
 authors = "${author}"
 version = "${version}"
 
-[[mixins]]
-config = "${id}.mixins.json"
-
 [[dependencies.${id}]]
 modId = "minecraft"
-type = "required"
+mandatory = true
 versionRange = "[${minimumMinecraftVersion},)"
 ordering = "NONE"
-side = "${sidesForNeoForge}"
+side = "CLIENT"
 
 [[dependencies.${id}]]
-modId = "neoforge"
+modId = "forge"
-type = "required"
+mandatory = true
-versionRange = "[${minimumNeoForgeVersion},)"
+versionRange = "[${minimumForgeVersion},)"
 ordering = "NONE"
-side = "${sidesForNeoForge}"
+side = "CLIENT"

NeoForge/build.gradle.kts

@@ -1,51 +0,0 @@
-import net.neoforged.moddevgradle.dsl.RunModel
-
-val modId: String by project
-val modSides: String by project
-val neoForgeVersion: String by project
-
-plugins {
-	id("net.neoforged.moddev")
-}
-
-neoForge {
-	version = neoForgeVersion
-	
-	mods {
-		register(modId) {
-			sourceSet(sourceSets.main.get())
-			sourceSet(rootProject.sourceSets.main.get())
-		}
-	}
-	
-	runs {
-		val runJvmArgs: Set<String> by project
-		
-		configureEach {
-			gameDirectory = file("../run")
-			jvmArguments.addAll(runJvmArgs)
-		}
-		
-		fun side(name: String, configure: RunModel.() -> Unit) {
-			if (modSides == "both" || modSides == name) {
-				register(name, configure)
-			}
-		}
-		
-		side("client") {
-			ideName.set("NeoForge Client")
-			client()
-		}
-		
-		side("server") {
-			ideName.set("NeoForge Server")
-			server()
-		}
-	}
-}
-
-tasks.processResources {
-	filesMatching("META-INF/neoforge.mods.toml") {
-		expand(inputs.properties)
-	}
-}

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

@@ -1,27 +0,0 @@
-package chylex.customwindowtitle.neoforge;
-
-import chylex.customwindowtitle.TitleChanger;
-import chylex.customwindowtitle.TitleConfig;
-import chylex.customwindowtitle.data.CommonTokenData;
-import net.neoforged.bus.api.IEventBus;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
-import net.neoforged.fml.loading.FMLPaths;
-
-@Mod("customwindowtitle")
-public class CustomWindowTitle {
-	
-	private final TitleConfig config;
-	
-	public CustomWindowTitle(IEventBus eventBus) {
-		config = TitleConfig.load(FMLPaths.CONFIGDIR.get().toString());
-		eventBus.addListener(this::onClientSetup);
-	}
-	
-	@SubscribeEvent
-	public void onClientSetup(final FMLClientSetupEvent e) {
-		CommonTokenData.register(new TokenProvider());
-		e.enqueueWork(() -> TitleChanger.setTitle(config));
-	}
-}

README.md

@@ -2,7 +2,7 @@
 
 ## Installation
 
-The mod supports [NeoForge](https://neoforged.net/) and [Fabric](https://fabricmc.net/) (*) mod loaders. Follow either mod loader's installation guide, then download the mod file for your Minecraft version from [CurseForge](https://www.curseforge.com/minecraft/mc-mods/custom-window-title/files) or [Modrinth](https://modrinth.com/mod/custom-window-title/versions), and install it into the `.minecraft/mods` folder.
+The mod supports [Forge](https://files.minecraftforge.net/) and [Fabric](https://fabricmc.net/) (*) mod loaders, **the same mod file will work in both**. Follow either mod loader's installation guide, then [download the mod file](https://www.curseforge.com/minecraft/mc-mods/custom-window-title/files) for your Minecraft version, and install it into the **.minecraft/mods** folder.
 
 (*) Fabric API is **not** required.
 
@@ -10,11 +10,12 @@ The mod supports [NeoForge](https://neoforged.net/) and [Fabric](https://fabricm
 
 Run the game once to create the configuration file. By default, the window title will be set to **Minecraft _<version>_**. Unlike in vanilla 1.15.2 onwards, the title will not change when you enter a world/server.
 
-To change the title or icon, navigate to the `.minecraft/config` folder, and open `customwindowtitle-client.toml` in a text editor. You will see the following entries:
+To change the title or icon, navigate to the **.minecraft/config** folder, and open **customwindowtitle-client.toml** in a text editor. You will see the following entries:
 
 ```toml
 title = 'Minecraft {mcversion}'  
-icon = ''  
+icon16 = ''  
+icon32 = ''
 ```
 
 Only edit text inside quotes or apostrophes.
@@ -23,38 +24,28 @@ Only edit text inside quotes or apostrophes.
 
 You can use the following special tokens in the _title_ configuration entry:
 
-* `{mcversion}` - current Minecraft version
+* **{mcversion}** - current Minecraft version
-* `{modversion:<mod_id>}` - version of installed mod with the identifier `<mod_id>`
+* **{modversion:<span style="text-decoration: underline;">modid</span>}** - version of installed mod with the identifier _modid_
-* `{username}` - current username
 
 If any of the tokens aren't working, search the game log for **CustomWindowTitle** and you should see the reason, otherwise please file an issue on the [issue tracker](https://github.com/chylex/Minecraft-Window-Title/issues) with as many details as possible.
 
 ### Changing the Icon
 
-#### Minecraft 1.21+
+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.
 
-**This feature is only available in Custom Window Title 1.4.0 and newer.**
+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:
 
-Create a square PNG image whose dimensions are a power of two, such as 32x32 or 48x48. Put the PNG file into the `.minecraft/config` folder, either directly or into a subfolder.
+* `.minecraft/config/customwindowtitle-client.toml`
+* `.minecraft/config/customwindowtitle/icon16.png`
+* `.minecraft/config/customwindowtitle/icon32.png`
 
-The icon **must be saved with transparency** even if it doesn't use it, otherwise the icon may be corrupted or not appear at all. In Krita, for example, you must check _Store alpha channel (transparency)_ when saving.
+Then, the two icon entries should look like this:
-
-The _icon_ configuration entry points to the PNG file relative to `.minecraft/config`.
-
-For example, if you placed the icon into `.minecraft/config/customwindowtitle/icon.png`, then the configuration entry should look like this:
 
 ```toml
-icon = 'customwindowtitle/icon.png'
+icon16 = 'customwindowtitle/icon16.png'  
+icon32 = 'customwindowtitle/icon32.png'
 ```
 
-#### Minecraft 1.20
-
-This feature is not available in Minecraft 1.20.
-
-#### Minecraft 1.19 and older
-
-Instead of one `icon` configuration entry, there are two configuration entries `icon16` and `icon32` for icons with dimensions 16x16 and 32x32.
-
 ## Screenshots
 
 These screenshots were taken using the following example configuration:
@@ -70,8 +61,10 @@ title = "Minecraft {mcversion} - Custom Window Title {modversion:customwindowtit
 The mod sources are organized into 3 projects:
 - `src/` contains common source files and mixins
 - `Fabric/src/` contains source files specific for Fabric
-- `NeoForge/src/` contains source files specific for NeoForge
+- `Forge/src/` contains source files specific for Forge
 
-The `assemble` Gradle task creates a single `.jar` file for both mod loaders in the `build/dist` folder.
+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 `neoForgeVersion` 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 `forgeVersion` 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 org.gradle.jvm.tasks.Jar
+import java.util.Date
 
 val modId: String by project
 val modName: String by project
@@ -10,21 +10,31 @@ val modVersion: String by project
 val modLicense: String by project
 val modSourcesURL: String by project
 val modIssuesURL: String by project
-val modSides: String by project
 
 val minecraftVersion: String by project
 val mixinVersion: String by project
 
 val minimumMinecraftVersion: String by project
-val minimumNeoForgeVersion: String by project
+val minimumForgeVersion: 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")
+	}
+	
+	dependencies {
+		classpath("org.spongepowered:vanillagradle:0.2.1-20231203.020957-71")
+	}
+}
 
 plugins {
-	idea
 	`java-library`
-	id("fabric-loom")
+	idea
+	id("org.spongepowered.gradle.vanilla") version "0.2.1-20231203.020957-71"
 }
 
 idea {
@@ -32,8 +42,8 @@ idea {
 		excludeDirs.add(file("gradle"))
 		excludeDirs.add(file("run"))
 		
-		if (findProject(":NeoForge") == null) {
+		if (findProject(":Forge") == null) {
-			excludeDirs.add(file("NeoForge"))
+			excludeDirs.add(file("Forge"))
 		}
 		
 		if (findProject(":Fabric") == null) {
@@ -43,66 +53,62 @@ idea {
 }
 
 repositories {
+	maven("https://repo.spongepowered.org/maven")
 	mavenCentral()
 }
 
+dependencies {
+	implementation("org.spongepowered:mixin:$mixinVersion")
+	api("com.google.code.findbugs:jsr305:3.0.2")
+}
+
 base {
 	archivesName.set("$modNameStripped-Common")
 }
 
-loom {
+minecraft {
-	runs {
+	version(minecraftVersion)
-		named("client") {
+	runs.clear()
-			ideConfigGenerated(false)
-		}
-		
-		findByName("server")?.let(::remove)
-	}
-}
-
-dependencies {
-	minecraft("com.mojang:minecraft:$minecraftVersion")
-	mappings(loom.officialMojangMappings())
-	
-	compileOnly("net.fabricmc:sponge-mixin:$mixinVersion")
-	api("com.google.code.findbugs:jsr305:3.0.2")
 }
 
 allprojects {
 	group = "com.$modAuthor.$modId"
 	version = modVersion
 	
-	apply(plugin = "java-library")
+	apply(plugin = "java")
+	
+	dependencies {
+		implementation("org.jetbrains:annotations:22.0.0")
+	}
 	
 	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+		toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 	}
 	
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
-		options.release.set(21)
+		options.release.set(17)
 	}
-	
+}
-	val runJvmArgs = mutableSetOf<String>().also {
+
-		extra["runJvmArgs"] = it
+subprojects {
-	}
+	repositories {
-	
+		maven("https://repo.spongepowered.org/maven")
-	if (project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.orNull == "JetBrains") {
-		runJvmArgs.add("-XX:+AllowEnhancedClassRedefinition")
 	}
 	
 	dependencies {
-		implementation("org.jetbrains:annotations:24.1.0")
+		implementation(rootProject)
 	}
 	
-	tasks.withType<ProcessResources> {
+	base {
-		val (sidesForNeoForge, sidesForFabric) = when (modSides) {
+		archivesName.set("$modNameStripped-${project.name}")
-			"both"   -> Pair("BOTH", "*")
+	}
-			"client" -> Pair("CLIENT", "client")
+	
-			"server" -> Pair("SERVER", "server")
+	tasks.withType<JavaCompile> {
-			else     -> error("Invalid modSides value: $modSides")
+		source({ rootProject.sourceSets.main.get().allSource })
-		}
+	}
-		
+	
+	tasks.processResources {
 		inputs.property("id", modId)
 		inputs.property("name", modName)
 		inputs.property("description", modDescription)
@@ -111,47 +117,31 @@ allprojects {
 		inputs.property("license", modLicense)
 		inputs.property("sourcesURL", modSourcesURL)
 		inputs.property("issuesURL", modIssuesURL)
-		inputs.property("sidesForNeoForge", sidesForNeoForge)
-		inputs.property("sidesForFabric", sidesForFabric)
 		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
-		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
+		inputs.property("minimumForgeVersion", minimumForgeVersion)
 		inputs.property("minimumFabricVersion", minimumFabricVersion)
 		
-		from(rootProject.file("logo.png")) {
-			into("assets/$modId")
-		}
-	}
-	
-	tasks.withType<AbstractArchiveTask>().configureEach {
-		isPreserveFileTimestamps = false
-		isReproducibleFileOrder = true
-	}
-}
-
-subprojects {
-	dependencies {
-		implementation(project(rootProject.path, configuration = "namedElements"))
-	}
-	
-	base {
-		archivesName.set("$modNameStripped-${project.name}")
-	}
-	
-	tasks.compileJava {
-		source({ rootProject.sourceSets.main.get().allSource })
-	}
-	
-	tasks.processResources {
 		from(rootProject.sourceSets.main.get().resources) {
 			expand(inputs.properties)
 		}
 	}
 	
 	tasks.jar {
-		entryCompression = ZipEntryCompression.STORED // Reduces size of multiloader jar.
+		archiveVersion.set(jarVersion)
+		
+		from(rootProject.file("LICENSE"))
 		
 		manifest {
-			packageInformation(modId, "$modNameStripped-${project.name}")
+			attributes(
+				"Specification-Title" to modId,
+				"Specification-Vendor" to modAuthor,
+				"Specification-Version" to "1",
+				"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"
+			)
 		}
 	}
 	
@@ -160,55 +150,34 @@ subprojects {
 	}
 }
 
-fun Manifest.packageInformation(specificationTitle: String, implementationTitle: String) {
+tasks.register("setupIdea") {
-	attributes(
+	group = "mod"
-		"Specification-Title" to specificationTitle,
+	
-		"Specification-Vendor" to modAuthor,
+	dependsOn(tasks.findByName("decompile"))
-		"Specification-Version" to "1",
+	
-		"Implementation-Title" to implementationTitle,
+	val forge = findProject(":Forge")
-		"Implementation-Vendor" to modAuthor,
+	if (forge != null) {
-		"Implementation-Version" to modVersion,
+		dependsOn(forge.tasks.getByName("genIntellijRuns"))
-	)
+	}
+	
+	val fabric = findProject(":Fabric")
+	if (fabric != null) {
+		dependsOn(fabric.tasks.getByName("genSources"))
+	}
 }
 
-val multiloaderSources = sourceSets.register("multiloader")
+val copyJars = tasks.register<Copy>("copyJars") {
-
-val multiloaderJar = tasks.register<Jar>("multiloaderJar") {
 	group = "build"
+	duplicatesStrategy = EXCLUDE
 	
-	archiveBaseName.set(modNameStripped)
+	for (subproject in subprojects) {
-	archiveVersion.set("$minecraftVersion+v$modVersion")
+		dependsOn(subproject.tasks.assemble)
-	
+		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
-	destinationDirectory = layout.buildDirectory.dir("dist")
-	
-	fun includeJar(project: Project, jarTaskName: String) {
-		from(project.tasks.named(jarTaskName).map { it.outputs }) {
-			into("jars")
-			rename { "$modNameStripped-${project.name}.jar" }
-		}
 	}
 	
-	findProject(":NeoForge")?.let { includeJar(it, "jar") }
+	into(file("${project.buildDir}/dist"))
-	findProject(":Fabric")?.let { includeJar(it, "uncompressedRemapJar") }
-	
-	from(rootProject.file("LICENSE"))
-	from(multiloaderSources.map { it.output })
-	
-	manifest {
-		packageInformation("$modId-multiloader", modNameStripped)
-		attributes("FMLModType" to "GAMELIBRARY")
-	}
-}
-
-tasks.named<ProcessResources>("processMultiloaderResources").configure {
-	inputs.property("group", project.group)
-	inputs.property("jarPrefix", modNameStripped)
-	
-	filesMatching(listOf("fabric.mod.json", "META-INF/jarjar/metadata.json")) {
-		expand(inputs.properties)
-	}
 }
 
 tasks.assemble {
-	finalizedBy(multiloaderJar)
+	finalizedBy(copyJars)
 }

docs/CURSEFORGE.md

@@ -1,65 +0,0 @@
-## Installation
-
-The mod supports [NeoForge](https://neoforged.net/) and [Fabric](https://fabricmc.net/) (*) mod loaders. Follow either mod loader's installation guide, then [download the mod file](https://www.curseforge.com/minecraft/mc-mods/custom-window-title/files) for your Minecraft version, and install it into the `.minecraft/mods` folder.
-
-(*) Fabric API is **not** required.
-
-## Configuration
-
-Run the game once to create the configuration file. By default, the window title will be set to **Minecraft _<version>_**. Unlike in vanilla 1.15.2 onwards, the title will not change when you enter a world/server.
-
-To change the title or icon, navigate to the `.minecraft/config` folder, and open `customwindowtitle-client.toml` in a text editor. You will see the following entries:
-
-```toml
-title = 'Minecraft {mcversion}'  
-icon16 = ''  
-icon32 = ''
-```
-
-Only edit text inside quotes or apostrophes.
-
-### Changing the Title
-
-You can use the following special tokens in the _title_ configuration entry:
-
-* `{mcversion}` - current Minecraft version
-* `{modversion:mod_id}` - version of installed mod with the identifier `mod_id`
-* `{username}` - current username
-
-If any of the tokens aren't working, search the game log for **CustomWindowTitle** and you should see the reason, otherwise please file an issue on the [issue tracker](https://github.com/chylex/Minecraft-Window-Title/issues) with as many details as possible.
-
-### Changing the Icon
-
-#### Minecraft 1.21+
-
-**This feature is only available in Custom Window Title 1.4.0 and newer.**
-
-Create a square PNG image whose dimensions are a power of two, such as 32x32 or 48x48. Put the PNG file into the `.minecraft/config` folder, either directly or into a subfolder.
-
-The icon **must be saved with transparency** even if it doesn't use it, otherwise the icon may be corrupted or not appear at all. In Krita, for example, you must check _Store alpha channel (transparency)_ when saving.
-
-The _icon_ configuration entry points to the PNG file relative to `.minecraft/config`.
-
-For example, if you placed the icon into `.minecraft/config/customwindowtitle/icon.png`, then the configuration entry should look like this:
-
-```toml
-icon = 'customwindowtitle/icon.png'
-```
-
-#### Minecraft 1.20
-
-This feature is not available in Minecraft 1.20.
-
-#### Minecraft 1.19 and older
-
-Instead of one `icon` configuration entry, there are two configuration entries `icon16` and `icon32` for icons with dimensions 16x16 and 32x32.
-
-## Screenshots
-
-These screenshots were taken using the following example configuration:
-
-```toml
-title = "Minecraft {mcversion} - Custom Window Title {modversion:customwindowtitle}"
-```
-
-<img src="https://media.forgecdn.net/attachments/277/212/customwindowtitlefabric.png" width="417" height="284"><img src="https://media.forgecdn.net/attachments/277/213/customwindowtitleforge.png" alt="" width="417" height="284">

docs/MODRINTH.md

@@ -1,66 +0,0 @@
-## Installation
-
-The mod supports [NeoForge](https://neoforged.net/) and [Fabric](https://fabricmc.net/) (*) mod loaders. Follow either mod loader's installation guide, then [download the mod file](https://modrinth.com/mod/custom-window-title/versions) for your Minecraft version, and install it into the `.minecraft/mods` folder.
-
-(*) Fabric API is **not** required.
-
-## Configuration
-
-Run the game once to create the configuration file. By default, the window title will be set to **Minecraft _<version>_**. Unlike in vanilla 1.15.2 onwards, the title will not change when you enter a world/server.
-
-To change the title or icon, navigate to the `.minecraft/config` folder, and open `customwindowtitle-client.toml` in a text editor. You will see the following entries:
-
-```toml
-title = 'Minecraft {mcversion}'  
-icon16 = ''  
-icon32 = ''
-```
-
-Only edit text inside quotes or apostrophes.
-
-### Changing the Title
-
-You can use the following special tokens in the _title_ configuration entry:
-
-* `{mcversion}` - current Minecraft version
-* `{modversion:<mod_id>}` - version of installed mod with the identifier `<mod_id>`
-* `{username}` - current username
-
-If any of the tokens aren't working, search the game log for **CustomWindowTitle** and you should see the reason, otherwise please file an issue on the [issue tracker](https://github.com/chylex/Minecraft-Window-Title/issues) with as many details as possible.
-
-### Changing the Icon
-
-#### Minecraft 1.21+
-
-**This feature is only available in Custom Window Title 1.4.0 and newer.**
-
-Create a square PNG image whose dimensions are a power of two, such as 32x32 or 48x48. Put the PNG file into the `.minecraft/config` folder, either directly or into a subfolder.
-
-The icon **must be saved with transparency** even if it doesn't use it, otherwise the icon may be corrupted or not appear at all. In Krita, for example, you must check _Store alpha channel (transparency)_ when saving.
-
-The _icon_ configuration entry points to the PNG file relative to `.minecraft/config`.
-
-For example, if you placed the icon into `.minecraft/config/customwindowtitle/icon.png`, then the configuration entry should look like this:
-
-```toml
-icon = 'customwindowtitle/icon.png'
-```
-
-#### Minecraft 1.20
-
-This feature is not available in Minecraft 1.20.
-
-#### Minecraft 1.19 and older
-
-Instead of one `icon` configuration entry, there are two configuration entries `icon16` and `icon32` for icons with dimensions 16x16 and 32x32.
-
-## Screenshots
-
-These screenshots were taken using the following example configuration:
-
-```toml
-title = "Minecraft {mcversion} - Custom Window Title {modversion:customwindowtitle}"
-```
-
-![Screenshot 1](https://cdn.modrinth.com/data/RGH5gtzF/images/583e2cde5254f758f890abe5d018f46201dd856e.png)
-![Screenshot 2](https://cdn.modrinth.com/data/RGH5gtzF/images/68b89c57f5505625c2cff00fd5fe7489571dcae3.png)

gradle.properties

@@ -3,28 +3,21 @@ modId=customwindowtitle
 modName=Custom Window Title
 modDescription=Customize window title and icon.
 modAuthor=chylex
-modVersion=1.4.1
+modVersion=1.2.0
 modLicense=Unlicense
 modSourcesURL=https://github.com/chylex/Minecraft-Window-Title
 modIssuesURL=https://github.com/chylex/Minecraft-Window-Title/issues
-modSides=client
 
 # Dependencies
-minecraftVersion=1.21.4
+minecraftVersion=1.20
-neoForgeVersion=21.4.77-beta
+forgeVersion=46.0.1
-neoModDevVersion=2.0.76
+fabricVersion=0.14.21
-fabricVersion=0.16.10
+loomVersion=1.2
-loomVersion=1.9
+mixinVersion=0.8.5
-mixinVersion=0.12.5+mixin.0.8.5
-
-# https://projects.neoforged.net/neoforged/neoforge
-# https://projects.neoforged.net/neoforged/moddevgradle
-# https://fabricmc.net/develop/
-# https://github.com/FabricMC/fabric-loom/releases
 
 # Constraints
-minimumMinecraftVersion=1.21
+minimumMinecraftVersion=1.20
-minimumNeoForgeVersion=21.0.0-beta
+minimumForgeVersion=46.0.0
 minimumFabricVersion=0.12.3
 
 # Gradle

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,103 +15,69 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   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/platforms/jvm/plugins-application/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
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   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
 
-# This is normally unused
+APP_NAME="Gradle"
-# shellcheck disable=SC2034
+APP_BASE_NAME=`basename "$0"`
-APP_BASE_NAME=${0##*/}
+
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # 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                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,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
@@ -132,120 +98,86 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    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" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-        # shellcheck disable=SC2039,SC3045
+            MAX_FD="$MAX_FD_LIMIT"
-        MAX_FD=$( ulimit -H -n ) ||
+        fi
-            warn "Could not query maximum file descriptor limit"
+        ulimit -n $MAX_FD
-    esac
+        if [ $? -ne 0 ] ; then
-    case $MAX_FD in  #(
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-      '' | soft) :;; #(
+        fi
-      *)
+    else
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-        # shellcheck disable=SC2039,SC3045
+    fi
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
+# For Darwin, add options to specify how the application appears in the dock
-#   * args from the command line
+if $darwin; then
-#   * the main class name
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#   * -classpath
+fi
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # We build the pattern for arguments to be converted via cygpath
-    for arg do
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-        if
+    SEP=""
-            case $arg in                                #(
+    for dir in $ROOTDIRSRAW ; do
-              -*)   false ;;                            # don't mess with options #(
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+        SEP="|"
-                    [ -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
+    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" ;;
+    esac
 fi
 
+ARGV=("$@")
+eval set -- $DEFAULT_JVM_OPTS
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+IFS=$'
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
+IFS=$'
+' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
 
-# Collect all arguments for the java command:
+exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"
-#   * 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" \
-        -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

@@ -13,10 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -78,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="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!
-set EXIT_CODE=%ERRORLEVEL%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
+exit /b 1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

@@ -3,25 +3,19 @@ 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 {
-		val neoModDevVersion = settings.extra.get("neoModDevVersion") as? String
+		if (settings.extra.has("loomVersion")) {
-		if (neoModDevVersion != null) {
+			id("fabric-loom") version "${settings.extra["loomVersion"]}-SNAPSHOT"
-			id("net.neoforged.moddev") version neoModDevVersion
-		}
-		
-		val loomVersion = settings.extra.get("loomVersion") as? String
-		if (loomVersion != null) {
-			id("fabric-loom") version "$loomVersion-SNAPSHOT"
 		}
 	}
 }
 
-if (settings.extra.has("neoForgeVersion")) {
+if (settings.extra.has("forgeVersion")) {
-	include("NeoForge")
+	include("Forge")
 }
 
 if (settings.extra.has("fabricVersion")) {

src/main/java/chylex/customwindowtitle/IconChanger.java

@@ -1,65 +0,0 @@
-package chylex.customwindowtitle;
-
-import net.minecraft.client.Minecraft;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.glfw.GLFWImage;
-import org.lwjgl.stb.STBImage;
-import org.lwjgl.system.MemoryStack;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public final class IconChanger {
-	private static final Logger LOGGER = LogManager.getLogger("CustomWindowTitle");
-	
-	private IconChanger() {}
-	
-	public static void setIcon(Path iconPath) {
-		long windowHandle = Minecraft.getInstance().getWindow().getWindow();
-		setWindowIcon(windowHandle, iconPath);
-	}
-	
-	private static void setWindowIcon(long windowHandle, Path iconPath) {
-		ByteBuffer icon = null;
-		try (MemoryStack stack = MemoryStack.stackPush()) {
-			IntBuffer w = stack.mallocInt(1);
-			IntBuffer h = stack.mallocInt(1);
-			IntBuffer channels = stack.mallocInt(1);
-			
-			icon = loadIcon(iconPath, w, h, channels);
-			if (icon == null) {
-				return;
-			}
-			
-			try (GLFWImage.Buffer icons = GLFWImage.malloc(1)) {
-				GLFWImage iconImage = icons.get(0);
-				iconImage.set(w.get(0), h.get(0), icon);
-				
-				GLFW.glfwSetWindowIcon(windowHandle, icons);
-			}
-		} catch (Exception e) {
-			LOGGER.error("Failed to set window icon from path: {}", iconPath, e);
-		} finally {
-			if (icon != null) {
-				STBImage.stbi_image_free(icon);
-			}
-		}
-	}
-	
-	private static ByteBuffer loadIcon(Path path, IntBuffer w, IntBuffer h, IntBuffer channels) throws IOException {
-		byte[] iconBytes = Files.readAllBytes(path);
-		
-		ByteBuffer buffer = ByteBuffer.allocateDirect(iconBytes.length).put(iconBytes).flip();
-		ByteBuffer icon = STBImage.stbi_load_from_memory(buffer, w, h, channels, 4);
-		
-		if (icon == null) {
-			LOGGER.error("Failed to load image from path: {} - {}", path, STBImage.stbi_failure_reason());
-		}
-		
-		return icon;
-	}
-}

src/main/java/chylex/customwindowtitle/TitleChanger.java

@@ -1,11 +0,0 @@
-package chylex.customwindowtitle;
-
-import net.minecraft.client.Minecraft;
-
-public final class TitleChanger {
-	private TitleChanger() {}
-	
-	public static void setTitle(TitleConfig config) {
-		Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
-	}
-}

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

@@ -1,6 +1,7 @@
 package chylex.customwindowtitle;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -11,79 +12,47 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 public final class TitleConfig {
-	private static final String KEY_TITLE = "title";
-	private static final String KEY_ICON = "icon";
-	
 	private static final ImmutableMap<String, String> DEFAULTS = ImmutableMap.<String, String>builder()
-		.put(KEY_TITLE, "Minecraft {mcversion}")
+		.put("title", "Minecraft {mcversion}")
-		.put(KEY_ICON, "")
+		.build();
-		.buildOrThrow();
 	
-	private static volatile TitleConfig instance;
+	private static final ImmutableSet<String> IGNORED_KEYS = ImmutableSet.of(
+		"icon16",
+		"icon32"
+	);
 	
-	public static TitleConfig getInstance() {
+	public static TitleConfig read(final String folder) {
-		return instance;
+		final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
-	}
+		final Map<String, String> config = new LinkedHashMap<>(DEFAULTS);
-	
-	public static TitleConfig load(String folder) {
-		if (instance != null) {
-			throw new IllegalStateException("TitleConfig has already been loaded and cannot be loaded again.");
-		}
-		
-		if (instance == null) {
-			synchronized(TitleConfig.class) {
-				if (instance == null) {
-					instance = loadImpl(folder);
-				}
-			}
-		}
-		
-		return instance;
-	}
-	
-	private static TitleConfig loadImpl(String folder) {
-		Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
-		Map<String, String> config = new LinkedHashMap<>(DEFAULTS);
 		
 		try {
 			if (!Files.exists(configFile)) {
-				Files.write(configFile, config.entrySet().stream()
+				Files.write(configFile, config.entrySet().stream().map(entry -> String.format("%s = '%s'", entry.getKey(), entry.getValue())).collect(Collectors.toList()), StandardCharsets.UTF_8);
-					.map(entry -> String.format("%s = '%s'", entry.getKey(), entry.getValue()))
-					.collect(Collectors.toList()), StandardCharsets.UTF_8);
 			}
 			else {
-				Files.readAllLines(configFile, StandardCharsets.UTF_8).stream()
+				Files.readAllLines(configFile, StandardCharsets.UTF_8).stream().map(String::trim).filter(line -> !line.isEmpty()).forEach(line -> {
-					.map(String::trim)
+					final String[] split = line.split("=", 2);
-					.filter(line -> !line.isEmpty())
+					
-					.forEach(line -> {
+					if (split.length != 2) {
-						String[] split = line.split("=", 2);
+						throw new RuntimeException("CustomWindowTitle configuration has an invalid line: " + line);
-						
+					}
-						if (split.length != 2) {
+					
-							throw new RuntimeException("CustomWindowTitle configuration has an invalid line: " + line);
+					final String key = split[0].trim();
-						}
+					final String value = parseTrimmedValue(split[1].trim());
-						
+					
-						String key = split[0].trim();
+					if (config.containsKey(key)) {
-						String value = parseTrimmedValue(split[1].trim());
+						config.put(key, value);
-						
+					}
-						if (config.containsKey(key)) {
+					else if (!IGNORED_KEYS.contains(key)) {
-							config.put(key, value);
+						throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
-						}
+					}
-						else {
+				});
-							throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
-						}
-					});
 			}
-		} catch (IOException e) {
+		} catch (final IOException e) {
 			throw new RuntimeException("CustomWindowTitle configuration error", e);
 		}
 		
-		String iconPathStr = config.get(KEY_ICON);
+		return new TitleConfig(config.get("title"));
-		Path iconPath = iconPathStr.isEmpty() ? null : Paths.get(folder, iconPathStr);
-		if (iconPath != null && Files.notExists(iconPath)) {
-			throw new RuntimeException("CustomWindowTitle configuration points to a missing icon: " + iconPath);
-		}
-		
-		return new TitleConfig(config.get(KEY_TITLE), iconPath);
 	}
 	
 	private static String parseTrimmedValue(String value) {
@@ -106,22 +75,12 @@ public final class TitleConfig {
 	}
 	
 	private final String title;
-	private final Path icon;
 	
-	private TitleConfig(final String title, final Path icon) {
+	private TitleConfig(final String title) {
 		this.title = title;
-		this.icon = icon;
 	}
 	
 	public String getTitle() {
 		return title;
 	}
-	
-	public boolean hasIcon() {
-		return icon != null;
-	}
-	
-	public Path getIconPath() {
-		return icon;
-	}
 }

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

@@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-final class TitleParser {
+public final class TitleParser {
 	private static final Pattern tokenRegex = Pattern.compile("\\{([a-z]+)(?::([^}]+))?}");
 	private static final Logger logger = LogManager.getLogger("CustomWindowTitle");
 	

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

@@ -8,7 +8,6 @@ public final class CommonTokenData {
 	public static void register(final CommonTokenProvider provider) {
 		registerToken("mcversion", noArgs(provider::getMinecraftVersion));
 		registerToken("modversion", oneArg(provider::getModVersion));
-		registerToken("username", noArgs(provider::getUsername));
 	}
 	
 	private CommonTokenData() {}

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

@@ -1,7 +1,6 @@
 package chylex.customwindowtitle.data;
 
 import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
 
 public interface CommonTokenProvider {
 	default String getMinecraftVersion() {
@@ -9,8 +8,4 @@ public interface CommonTokenProvider {
 	}
 	
 	String getModVersion(final String modId);
-	
-	default String getUsername() {
-		return Minecraft.getInstance().getUser().getName();
-	}
 }

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

@@ -1,20 +0,0 @@
-package chylex.customwindowtitle.mixin;
-
-import chylex.customwindowtitle.IconChanger;
-import chylex.customwindowtitle.TitleConfig;
-import net.minecraft.client.Minecraft;
-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;
-
-@Mixin(Minecraft.class)
-public final class InitializeCustomIcon {
-	@Inject(method = "onResourceLoadFinished", at = @At("HEAD"))
-	private void onFinishedLoading(CallbackInfo callbackInfo) {
-		TitleConfig config = TitleConfig.getInstance();
-		if (config != null && config.hasIcon()) {
-			IconChanger.setIcon(config.getIconPath());
-		}
-	}
-}

src/main/resources/customwindowtitle.mixins.json

@@ -5,8 +5,7 @@
   "refmap": "customwindowtitle.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "DisableVanillaTitle",
+    "DisableVanillaTitle"
-    "InitializeCustomIcon"
   ],
   "injectors": {
     "defaultRequire": 1

src/multiloader/resources/META-INF/jarjar/metadata.json

@@ -1,13 +0,0 @@
-{
-  "jars": [{
-    "identifier": {
-      "group": "${group}",
-      "artifact": "${id}"
-    },
-    "version": {
-      "artifactVersion": "${version}",
-      "range": "[${version}]"
-    },
-    "path": "jars/${jarPrefix}-NeoForge.jar"
-  }]
-}

src/multiloader/resources/fabric.mod.json

@@ -1,32 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "${id}_multiloader",
-  "name": "${name} (Multiloader)",
-  "description": "${description}",
-  "version": "${version}",
-  "license": "${license}",
-  
-  "authors": [
-    "${author}"
-  ],
-  
-  "contact": {
-    "homepage": "https://chylex.com",
-    "issues": "${issuesURL}",
-    "sources": "${sourcesURL}"
-  },
-  
-  "environment": "${sidesForFabric}",
-  
-  "jars": [{
-      "file": "jars/${jarPrefix}-Fabric.jar"
-  }],
-  
-  "custom": {
-    "modmenu": {
-      "parent": "${id}",
-      "badges": [ "library" ],
-      "update_checker": false
-    }
-  }
-}