Release 1.4.2 for Minecraft 1.21.6 or newer

Closes #21

.github/FUNDING.yml

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

.idea/gradle.xml

@@ -12,6 +12,7 @@
             <option value="$PROJECT_DIR$/NeoForge" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

CURSEFORGE.html

@@ -1,31 +0,0 @@
-<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>
-  <li><strong>{username}</strong> - current username</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,6 +1,8 @@
+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
 
@@ -24,12 +26,24 @@ loom {
 			ideConfigGenerated(true)
 		}
 		
-		named("client") {
+		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()
 		}
 		
-		findByName("server")?.let(::remove)
+		side("server") {
+			configName = "Fabric Server"
+			server()
+		}
 	}
 	
 	mixin {

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,16 +11,12 @@ public class CustomWindowTitle implements ClientModInitializer {
 	private final TitleConfig config;
 	
 	public CustomWindowTitle() {
-		config = TitleConfig.read(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
+		config = TitleConfig.load(FabricLoader.getInstance().getConfigDir().toAbsolutePath().toString());
 	}
 	
 	@Override
 	public void onInitializeClient() {
 		CommonTokenData.register(new TokenProvider());
-		Minecraft.getInstance().execute(this::updateTitle);
-	}
-	
-	private void updateTitle() {
-		Minecraft.getInstance().getWindow().setTitle(TitleParser.parse(config.getTitle()));
+		Minecraft.getInstance().execute(() -> TitleChanger.setTitle(config));
 	}
 }

NeoForge/build.gradle.kts

@@ -1,24 +1,47 @@
+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.gradle.userdev")
-	id("net.neoforged.gradle.mixin")
+	id("net.neoforged.moddev")
 }
 
-dependencies {
-	implementation("net.neoforged:neoforge:$neoForgeVersion")
-}
+neoForge {
+	version = neoForgeVersion
 	
-runs {
-	val runJvmArgs: Set<String> by project
-	
-	configureEach {
-		workingDirectory = file("../run")
-		modSource(project.sourceSets.main.get())
-		jvmArguments(runJvmArgs)
+	mods {
+		register(modId) {
+			sourceSet(sourceSets.main.get())
+			sourceSet(rootProject.sourceSets.main.get())
+		}
 	}
 	
-	removeIf { it.name != "client" }
+	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 {

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

@@ -1,9 +1,8 @@
 package chylex.customwindowtitle.neoforge;
 
+import chylex.customwindowtitle.TitleChanger;
 import chylex.customwindowtitle.TitleConfig;
-import chylex.customwindowtitle.TitleParser;
 import chylex.customwindowtitle.data.CommonTokenData;
-import net.minecraft.client.Minecraft;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
@@ -16,17 +15,13 @@ public class CustomWindowTitle {
 	private final TitleConfig config;
 	
 	public CustomWindowTitle(IEventBus eventBus) {
-		config = TitleConfig.read(FMLPaths.CONFIGDIR.get().toString());
+		config = TitleConfig.load(FMLPaths.CONFIGDIR.get().toString());
 		eventBus.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()));
+		CommonTokenData.register(new TokenProvider());
+		e.enqueueWork(() -> TitleChanger.setTitle(config));
 	}
 }

README.md

@@ -2,7 +2,7 @@
 
 ## Installation
 
-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.
+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.
 
 (*) Fabric API is **not** required.
 
@@ -10,12 +10,11 @@ The mod supports [Forge](https://files.minecraftforge.net/) and [Fabric](https:/
 
 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}'  
-icon16 = ''  
-icon32 = ''
+icon = ''  
 ```
 
 Only edit text inside quotes or apostrophes.
@@ -24,31 +23,38 @@ Only edit text inside quotes or apostrophes.
 
 You can use the following special tokens in the _title_ configuration entry:
 
-* **{mcversion}** - current Minecraft version
-* **{modversion:<span style="text-decoration: underline;">modid</span>}** - version of installed mod with the identifier _modid_
-* **{username}** - current username
+* `{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
 
-**This feature is currently not supported in Minecraft 1.20.**
+#### 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
-icon16 = 'customwindowtitle/icon16.png'  
-icon32 = 'customwindowtitle/icon32.png'
+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:
@@ -64,10 +70,8 @@ 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
-- `Forge/src/` contains source files specific for Forge
+- `NeoForge/src/` contains source files specific for NeoForge
 
-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
+The `assemble` Gradle task creates a single `.jar` file for both mod loaders in the `build/dist` folder.
 
 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

@@ -116,6 +116,10 @@ allprojects {
 		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
 		inputs.property("minimumNeoForgeVersion", minimumNeoForgeVersion)
 		inputs.property("minimumFabricVersion", minimumFabricVersion)
+		
+		from(rootProject.file("logo.png")) {
+			into("assets/$modId")
+		}
 	}
 	
 	tasks.withType<AbstractArchiveTask>().configureEach {
@@ -133,10 +137,8 @@ subprojects {
 		archivesName.set("$modNameStripped-${project.name}")
 	}
 	
-	listOf("compileJava", "compileTestJava").forEach {
-		tasks.named<JavaCompile>(it) {
-			source({ rootProject.sourceSets.main.get().allSource })
-		}
+	tasks.compileJava {
+		source({ rootProject.sourceSets.main.get().allSource })
 	}
 	
 	tasks.processResources {

docs/CURSEFORGE.md

@@ -0,0 +1,65 @@
+## 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

@@ -0,0 +1,66 @@
+## 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,27 +3,28 @@ modId=customwindowtitle
 modName=Custom Window Title
 modDescription=Customize window title and icon.
 modAuthor=chylex
-modVersion=1.2.0
+modVersion=1.4.2
 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
-neoForgeVersion=21.0.0-beta
-neoGradleVersion=7.0.152
-fabricVersion=0.15.11
-loomVersion=1.7
+minecraftVersion=1.21.6
+neoForgeVersion=21.6.20-beta
+neoModDevVersion=2.0.103
+fabricVersion=0.16.14
+loomVersion=1.10
 mixinVersion=0.12.5+mixin.0.8.5
 
-# https://projects.neoforged.net/neoforged/neogradle/
+# 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
-minimumNeoForgeVersion=21.0.0-beta
+minimumMinecraftVersion=1.21.6
+minimumNeoForgeVersion=21.6.0-beta
 minimumFabricVersion=0.12.3
 
 # Gradle

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +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
 @rem ##########################################################################

settings.gradle.kts

@@ -8,10 +8,9 @@ pluginManagement {
 	}
 	
 	plugins {
-		val neoGradleVersion = settings.extra.get("neoGradleVersion") as? String
-		if (neoGradleVersion != null) {
-			id("net.neoforged.gradle.userdev") version neoGradleVersion
-			id("net.neoforged.gradle.mixin") version neoGradleVersion
+		val neoModDevVersion = settings.extra.get("neoModDevVersion") as? String
+		if (neoModDevVersion != null) {
+			id("net.neoforged.moddev") version neoModDevVersion
 		}
 		
 		val loomVersion = settings.extra.get("loomVersion") as? String

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

@@ -0,0 +1,65 @@
+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

@@ -0,0 +1,11 @@
+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,7 +1,6 @@
 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;
@@ -12,47 +11,79 @@ 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("title", "Minecraft {mcversion}")
-		.build();
+		.put(KEY_TITLE, "Minecraft {mcversion}")
+		.put(KEY_ICON, "")
+		.buildOrThrow();
 	
-	private static final ImmutableSet<String> IGNORED_KEYS = ImmutableSet.of(
-		"icon16",
-		"icon32"
-	);
+	private static volatile TitleConfig instance;
 	
-	public static TitleConfig read(final String folder) {
-		final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
-		final Map<String, String> config = new LinkedHashMap<>(DEFAULTS);
+	public static TitleConfig getInstance() {
+		return instance;
+	}
+	
+	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().map(entry -> String.format("%s = '%s'", entry.getKey(), entry.getValue())).collect(Collectors.toList()), StandardCharsets.UTF_8);
+				Files.write(configFile, config.entrySet().stream()
+					.map(entry -> String.format("%s = '%s'", entry.getKey(), entry.getValue()))
+					.collect(Collectors.toList()), StandardCharsets.UTF_8);
 			}
 			else {
-				Files.readAllLines(configFile, StandardCharsets.UTF_8).stream().map(String::trim).filter(line -> !line.isEmpty()).forEach(line -> {
-					final String[] split = line.split("=", 2);
+				Files.readAllLines(configFile, StandardCharsets.UTF_8).stream()
+					.map(String::trim)
+					.filter(line -> !line.isEmpty())
+					.forEach(line -> {
+						String[] split = line.split("=", 2);
 						
-					if (split.length != 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();
+						String value = parseTrimmedValue(split[1].trim());
 						
-					if (config.containsKey(key)) {
-						config.put(key, value);
-					}
-					else if (!IGNORED_KEYS.contains(key)) {
-						throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
-					}
-				});
+						if (config.containsKey(key)) {
+							config.put(key, value);
+						}
+						else {
+							throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
+						}
+					});
 			}
-		} catch (final IOException e) {
+		} catch (IOException e) {
 			throw new RuntimeException("CustomWindowTitle configuration error", e);
 		}
 		
-		return new TitleConfig(config.get("title"));
+		String iconPathStr = config.get(KEY_ICON);
+		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) {
@@ -75,12 +106,22 @@ public final class TitleConfig {
 	}
 	
 	private final String title;
+	private final Path icon;
 	
-	private TitleConfig(final String title) {
+	private TitleConfig(final String title, final Path icon) {
 		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;
 
-public final class TitleParser {
+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/CommonTokenProvider.java

@@ -5,10 +5,10 @@ import net.minecraft.client.Minecraft;
 
 public interface CommonTokenProvider {
 	default String getMinecraftVersion() {
-		return SharedConstants.getCurrentVersion().getName();
+		return SharedConstants.getCurrentVersion().name();
 	}
 	
-	String getModVersion(final String modId);
+	String getModVersion(String modId);
 	
 	default String getUsername() {
 		return Minecraft.getInstance().getUser().getName();

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

@@ -0,0 +1,20 @@
+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,7 +5,8 @@
   "refmap": "customwindowtitle.refmap.json",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "DisableVanillaTitle"
+    "DisableVanillaTitle",
+    "InitializeCustomIcon"
   ],
   "injectors": {
     "defaultRequire": 1