Release v1.1.1 for Minecraft 1.17 or newer

Closes #4

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/FUNDING.yml

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

.gitignore

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

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/gradle.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/Fabric" />
+            <option value="$PROJECT_DIR$/Forge" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitSharedSettings">
+    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
+      <list />
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

BuildMerge.py

@@ -1,61 +0,0 @@
-import subprocess
-import platform
-import sys
-import os
-import time
-import shutil
-import zipfile
-
-root = os.path.abspath(sys.path[0])
-builds = os.path.join(root, "Build")
-combined = os.path.join(builds, "Combined")
-outputjar = "CustomWindowTitle.jar"
-
-gradlew = "gradlew.bat" if platform.system() == "Windows" else "gradlew"
-
-def build(folder):
-    separator = "========={}".format("=" * len(folder))
-    
-    print(separator)
-    print("Building {}".format(folder))
-    print(separator)
-    
-    libs = os.path.join(root, folder, "build", "libs")
-    shutil.rmtree(libs)
-    
-    os.chdir(os.path.join(root, folder))
-    subprocess.run([gradlew, "build"])
-    
-    for fname in os.listdir(libs):
-        if "-dev" not in fname:
-            global outputjar
-            outputjar = fname
-            
-            jar = os.path.join(builds, "{}.{}".format(folder, fname))
-            shutil.copyfile(os.path.join(libs, fname), jar)
-            
-            jar = zipfile.ZipFile(jar)
-            jar.extractall(combined)
-            jar.close()
-            
-            break
-
-if os.path.isdir(builds):
-    shutil.rmtree(builds)
-    time.sleep(0.25)
-
-os.mkdir(builds)
-os.mkdir(combined)
-
-# Forge must run last to overwrite MANIFEST.MF
-build("Fabric")
-build("Forge")
-
-os.chdir(builds)
-
-with zipfile.ZipFile(outputjar, "w", compression = zipfile.ZIP_DEFLATED, compresslevel = 9) as jar:
-    for root, dirs, files in os.walk(combined):
-        for fname in files:
-            fname = os.path.join(root, fname)
-            fname = os.path.normpath(fname)
-            jar.write(fname, os.path.relpath(fname, combined))

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/.gitignore

@@ -1,25 +0,0 @@
-# gradle
-
-.gradle/
-build/
-out/
-classes/
-
-# idea
-
-.idea/
-*.iml
-*.ipr
-*.iws
-
-# vscode
-
-.settings/
-.vscode/
-bin/
-.classpath
-.project
-
-# fabric
-
-run/

Fabric/build.gradle

@@ -1,47 +0,0 @@
-plugins{
-	id 'fabric-loom' version '0.2.6-SNAPSHOT'
-	id 'maven-publish'
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name + '-' + project.minecraft_version
-version = project.mod_version
-group = project.maven_group
-
-minecraft{}
-
-dependencies{
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
-	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-}
-
-processResources{
-	inputs.property "version", project.version
-
-	from(sourceSets.main.resources.srcDirs){
-		include "fabric.mod.json"
-		expand "version": project.version
-	}
-
-	from(sourceSets.main.resources.srcDirs){
-		exclude "fabric.mod.json"
-	}
-}
-
-// fix jar file name
-version = 'v' + version
-
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile){
-	options.encoding = "UTF-8"
-}
-
-jar{
-	from "../LICENSE"
-}

Fabric/build.gradle.kts

@@ -0,0 +1,39 @@
+val modId: String by project
+val minecraftVersion: String by project
+val fabricVersion: String by project
+
+plugins {
+	idea
+	id("fabric-loom") version "0.10-SNAPSHOT"
+}
+
+dependencies {
+	minecraft("com.mojang:minecraft:$minecraftVersion")
+	modImplementation("net.fabricmc:fabric-loader:$fabricVersion")
+	mappings(loom.officialMojangMappings())
+}
+
+loom {
+	runs {
+		named("client") {
+			configName = "Fabric Client"
+			client()
+			runDir("../run")
+			ideConfigGenerated(true)
+		}
+	}
+	
+	mixin {
+		add(sourceSets.main.get(), "$modId.refmap.json")
+	}
+}
+
+tasks.processResources {
+	filesMatching("fabric.mod.json") {
+		expand(inputs.properties)
+	}
+}
+
+tasks.remapJar {
+	archiveVersion.set(tasks.jar.get().archiveVersion)
+}

Fabric/gradle.properties

@@ -1,17 +0,0 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-
-# Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.14.4
-	yarn_mappings=1.14.4+build.15
-	loader_version=0.7.8+build.184
-
-# Mod Properties
-	mod_version = 1.0.0
-	maven_group = chylex.customwindowtitle.fabric
-	archives_base_name = CustomWindowTitle
-
-# Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.4.2+build.246-1.14

Fabric/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

Fabric/settings.gradle

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        jcenter()
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        gradlePluginPortal()
-    }
-}

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

@@ -1,46 +0,0 @@
-package chylex.customwindowtitle;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class TitleParser{
-	private static final Pattern tokenRegex = Pattern.compile("\\{([a-z]+)(?::([^}]+))?}");
-	private static final Logger logger = LogManager.getLogger("CustomWindowTitle");
-	
-	public static String parse(String input){
-		StringBuffer buffer = new StringBuffer();
-		Matcher matcher = tokenRegex.matcher(input);
-		
-		while(matcher.find()){
-			String token = matcher.group(1);
-			String[] args = StringUtils.split(matcher.group(2), ',');
-			
-			String result = null;
-			
-			try{
-				result = TitleTokens.getTokenFunction(token).apply(args == null ? ArrayUtils.EMPTY_STRING_ARRAY : args);
-			}catch(TokenException e){
-				logger.warn("Error processing token '" + token + "': " + e.getMessage());
-			}catch(Throwable t){
-				logger.warn("Error processing token '" + token + "': " + t.getMessage(), t);
-			}
-			
-			if (result == null){
-				matcher.appendReplacement(buffer, input.substring(matcher.start(), matcher.end()));
-			}
-			else{
-				matcher.appendReplacement(buffer, result);
-			}
-		}
-		
-		matcher.appendTail(buffer);
-		return buffer.toString();
-	}
-	
-	// Static class
-	
-	private TitleParser(){}
-}

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

@@ -1,43 +0,0 @@
-package chylex.customwindowtitle;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-
-public final class TitleTokens{
-	
-	// Registry
-	
-	private static final Map<String, Function<String[], String>> tokenMap = new HashMap<>();
-	
-	public static void registerToken(String token, Function<String[], String> processor){
-		tokenMap.putIfAbsent(token, processor);
-	}
-	
-	public static Function<String[], String> getTokenFunction(String token){
-		return tokenMap.getOrDefault(token, args -> null);
-	}
-	
-	// Arguments
-	
-	public static Function<String[], String> noArgs(Supplier<String> func){
-		return args -> args.length > 0 ? fail("expected no arguments, got " + args.length) : func.get();
-	}
-	
-	public static Function<String[], String> oneArg(UnaryOperator<String> func){
-		return args -> args.length != 1 ? fail("expected 1 argument, got " + args.length) : func.apply(args[0]);
-	}
-	
-	public static Function<String[], String> rangeArgs(int min, int max, Function<String[], String> func){
-		return args -> args.length < min || args.length > max ? fail("expected between " + min + " and " + max + " arguments, got " + args.length) : func.apply(args);
-	}
-	
-	private static String fail(String message){
-		throw new TokenException(message);
-	}
-	
-	// Static class
-	
-	private TitleTokens(){}
-}

Fabric/src/main/java/chylex/customwindowtitle/TokenException.java

@@ -1,7 +0,0 @@
-package chylex.customwindowtitle;
-
-public class TokenException extends RuntimeException{
-	public TokenException(String message){
-		super(message);
-	}
-}

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

@@ -1,50 +1,31 @@
 package chylex.customwindowtitle.fabric;
+import chylex.customwindowtitle.TitleConfig;
 import chylex.customwindowtitle.TitleParser;
+import chylex.customwindowtitle.data.CommonTokenData;
+import com.mojang.blaze3d.platform.Window;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import org.apache.commons.lang3.StringUtils;
-import org.lwjgl.glfw.GLFW;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
+import net.minecraft.client.Minecraft;
 
-public class CustomWindowTitle implements ClientModInitializer{
-	private static final String defaultTitle = "Minecraft {mcversion}";
-	private String configTitle;
+public class CustomWindowTitle implements ClientModInitializer {
+	private final TitleConfig config;
+	
+	public CustomWindowTitle() {
+		config = TitleConfig.read(FabricLoader.getInstance().getConfigDirectory().getAbsolutePath());
+	}
 	
 	@Override
-	public void onInitializeClient(){
-		Path configFile = Paths.get(FabricLoader.getInstance().getConfigDirectory().getAbsolutePath(), "customwindowtitle-client.toml");
-		
-		try{
-			String prefix = "title = ";
-			
-			if (!Files.exists(configFile)){
-				Files.write(configFile, Collections.singletonList(prefix + '"' + defaultTitle + '"'), StandardCharsets.UTF_8);
-				configTitle = defaultTitle;
-			}
-			else{
-				configTitle = Files
-					.readAllLines(configFile, StandardCharsets.UTF_8)
-					.stream()
-					.filter(line -> line.startsWith(prefix))
-					.map(line -> StringUtils.strip(StringUtils.removeStart(line, prefix).trim(), "\""))
-					.findFirst()
-					.orElse(defaultTitle);
-			}
-		}catch(IOException e){
-			throw new RuntimeException("CustomWindowTitle configuration error", e);
-		}
-		
-		TokenData.register();
-		MinecraftClient.getInstance().method_18858(this::updateTitle);
+	public void onInitializeClient() {
+		CommonTokenData.register(new TokenProvider());
+		Minecraft.getInstance().execute(this::updateTitle);
 	}
 	
-	private void updateTitle(){
-		GLFW.glfwSetWindowTitle(MinecraftClient.getInstance().window.getHandle(), TitleParser.parse(configTitle));
+	private void updateTitle() {
+		final Window window = Minecraft.getInstance().getWindow();
+		window.setTitle(TitleParser.parse(config.getTitle()));
+		
+		if (config.hasIcon()) {
+			window.setIcon(config.readIcon16(), config.readIcon32());
+		}
 	}
 }

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

@@ -1,22 +0,0 @@
-package chylex.customwindowtitle.fabric;
-import chylex.customwindowtitle.TokenException;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.SharedConstants;
-import static chylex.customwindowtitle.TitleTokens.noArgs;
-import static chylex.customwindowtitle.TitleTokens.oneArg;
-import static chylex.customwindowtitle.TitleTokens.registerToken;
-
-final class TokenData{
-	static void register(){
-		registerToken("mcversion", noArgs(TokenData::getMinecraftVersion));
-		registerToken("modversion", oneArg(TokenData::getModVersion));
-	}
-	
-	static String getMinecraftVersion(){
-		return SharedConstants.getGameVersion().getName();
-	}
-	
-	static String getModVersion(String modId){
-		return FabricLoader.getInstance().getModContainer(modId).orElseThrow(() -> new TokenException("mod info for '" + modId + "' not found")).getMetadata().getVersion().getFriendlyString();
-	}
-}

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

@@ -0,0 +1,16 @@
+package chylex.customwindowtitle.fabric;
+import chylex.customwindowtitle.TokenException;
+import chylex.customwindowtitle.data.CommonTokenProvider;
+import net.fabricmc.loader.api.FabricLoader;
+
+final class TokenProvider implements CommonTokenProvider {
+	@Override
+	public String getModVersion(final String modId) {
+		return FabricLoader.getInstance()
+			.getModContainer(modId)
+			.orElseThrow(() -> new TokenException("mod info for '" + modId + "' not found"))
+			.getMetadata()
+			.getVersion()
+			.getFriendlyString();
+	}
+}

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

@@ -1,29 +1,33 @@
 {
   "schemaVersion": 1,
   "id": "customwindowtitle",
+  "name": "${name}",
+  "description": "${description}",
   "version": "${version}",
-
-  "name": "Custom Window Title",
+  "license": "${license}",
+  
   "authors": [
-    "chylex"
+    "${author}"
   ],
+  
   "contact": {
     "homepage": "https://chylex.com",
-    "sources": "https://github.com/chylex/Minecraft-Window-Title",
-    "issues": "https://github.com/chylex/Minecraft-Window-Title/issues"
+    "issues": "${issuesURL}",
+    "sources": "${sourcesURL}"
   },
-
-  "license": "Unlicense",
-
+  
   "environment": "client",
   "entrypoints": {
     "client": [
       "chylex.customwindowtitle.fabric.CustomWindowTitle"
     ]
   },
-
+  "mixins": [
+    "customwindowtitle.mixins.json"
+  ],
+  
   "depends": {
     "fabricloader": ">=0.7.2",
-    "minecraft": "1.14.x"
+    "minecraft": ">=1.17"
   }
 }

Forge/.gitignore

@@ -1,25 +0,0 @@
-# eclipse
-bin
-*.launch
-.settings
-.metadata
-.classpath
-.project
-
-# idea
-out
-*.ipr
-*.iws
-*.iml
-.idea
-
-# gradle
-build
-.gradle
-
-# other
-eclipse
-run
-
-# Files from Forge MDK
-forge*changelog.txt

Forge/build.gradle

@@ -1,82 +0,0 @@
-buildscript{
-    repositories{
-        maven{ url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
-        mavenCentral()
-    }
-
-    dependencies{
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
-    }
-}
-
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
-
-def mcversion = "1.14.4"
-def forgeversion = "28.2.0"
-
-def prefixName = 'displayName = '
-def prefixVersion = 'version = '
-
-def metaLines = file('src/main/resources/META-INF/mods.toml').readLines()
-def metaName = metaLines.find { line -> line.startsWith(prefixName) }.substring(prefixName.length())[1..-2]
-def metaVersion = metaLines.find { line -> line.startsWith(prefixVersion) }.substring(prefixVersion.length())[1..-2]
-
-group = 'chylex.customwindowtitle.forge'
-version = metaVersion
-archivesBaseName = metaName.replaceAll('\\s', '')
-
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
-
-minecraft{
-    mappings channel: 'snapshot', version: '20200119-1.14.4'
-
-    runs{
-        client{
-            workingDirectory file('run')
-
-            mods{
-                customwindowtitle{
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server{
-            workingDirectory file('run')
-
-            mods{
-                customwindowtitle{
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
-
-dependencies{
-    minecraft 'net.minecraftforge:forge:' + mcversion + '-' + forgeversion
-}
-
-jar{
-    archiveName = archivesBaseName + '-' + mcversion + '-v' + version + '.jar'
-
-    from('../'){
-        include 'LICENSE'
-    }
-
-    manifest{
-        attributes([
-                'Specification-Title'  : 'customwindowtitle',
-                'Specification-Version': '1',
-                'Specification-Vendor' : 'chylex',
-
-                'Implementation-Title'  : metaName,
-                'Implementation-Version': metaVersion,
-                'Implementation-Vendor' : 'chylex',
-
-                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
-}

Forge/build.gradle.kts

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

Forge/gradle.properties

@@ -1,4 +0,0 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false

Forge/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-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"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((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
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

Forge/gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

Forge/src/main/java/chylex/customwindowtitle/TokenException.java

@@ -1,7 +0,0 @@
-package chylex.customwindowtitle;
-
-public class TokenException extends RuntimeException{
-	public TokenException(String message){
-		super(message);
-	}
-}

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

@@ -1,37 +1,40 @@
 package chylex.customwindowtitle.forge;
+import chylex.customwindowtitle.TitleConfig;
 import chylex.customwindowtitle.TitleParser;
+import chylex.customwindowtitle.data.CommonTokenData;
+import com.mojang.blaze3d.platform.Window;
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
 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.config.ModConfig.Type;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import org.lwjgl.glfw.GLFW;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
 
 @Mod("customwindowtitle")
-public class CustomWindowTitle{
-	private final ConfigValue<String> configTitle;
+public class CustomWindowTitle {
+	private final TitleConfig config;
 	
-	public CustomWindowTitle(){
-		ForgeConfigSpec.Builder configBuilder = new ForgeConfigSpec.Builder();
-		
-		configTitle = configBuilder.define("title", "Minecraft {mcversion}");
-		
-		ModLoadingContext.get().registerConfig(Type.CLIENT, configBuilder.build());
-		FMLJavaModLoadingContext.get().getModEventBus().register(this);
-		
-		TokenData.register();
+	public CustomWindowTitle() {
+		config = TitleConfig.read(FMLPaths.CONFIGDIR.get().toString());
+		ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup);
+		CommonTokenData.register(new TokenProvider());
 	}
 	
 	@SubscribeEvent
-	public void onClientSetup(FMLClientSetupEvent e){
-		e.getMinecraftSupplier().get().enqueue(this::updateTitle);
+	public void onClientSetup(final FMLClientSetupEvent e) {
+		e.enqueueWork(this::updateTitle);
 	}
 	
-	private void updateTitle(){
-		GLFW.glfwSetWindowTitle(Minecraft.getInstance().mainWindow.getHandle(), TitleParser.parse(configTitle.get()));
+	private void updateTitle() {
+		final Window window = Minecraft.getInstance().getWindow();
+		window.setTitle(TitleParser.parse(config.getTitle()));
+		
+		if (config.hasIcon()) {
+			window.setIcon(config.readIcon16(), config.readIcon32());
+		}
 	}
 }

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

@@ -1,36 +0,0 @@
-package chylex.customwindowtitle.forge;
-import chylex.customwindowtitle.TokenException;
-import net.minecraft.util.SharedConstants;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-import static chylex.customwindowtitle.TitleTokens.noArgs;
-import static chylex.customwindowtitle.TitleTokens.oneArg;
-import static chylex.customwindowtitle.TitleTokens.registerToken;
-
-final class TokenData{
-	static void register(){
-		registerToken("mcversion", noArgs(TokenData::getMinecraftVersion));
-		registerToken("modversion", oneArg(TokenData::getModVersion));
-	}
-	
-	static String getMinecraftVersion(){
-		return SharedConstants.getVersion().getName();
-	}
-	
-	static String getModVersion(String modId){
-		ModFileInfo file = ModList.get().getModFileById(modId);
-		
-		if (file == null){
-			throw new TokenException("mod file for '" + modId + "' not found");
-		}
-		
-		for(IModInfo info : file.getMods()){
-			if (info.getModId().equals(modId)){
-				return info.getVersion().toString();
-			}
-		}
-		
-		throw new TokenException("mod info for '" + modId + "' not found");
-	}
-}

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

@@ -0,0 +1,25 @@
+package chylex.customwindowtitle.forge;
+import chylex.customwindowtitle.TokenException;
+import chylex.customwindowtitle.data.CommonTokenProvider;
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.forgespi.language.IModFileInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
+
+final class TokenProvider implements CommonTokenProvider {
+	@Override
+	public String getModVersion(final String modId) {
+		final IModFileInfo file = ModList.get().getModFileById(modId);
+		
+		if (file == null) {
+			throw new TokenException("mod file for '" + modId + "' not found");
+		}
+		
+		for (final IModInfo info : file.getMods()) {
+			if (info.getModId().equals(modId)) {
+				return info.getVersion().toString();
+			}
+		}
+		
+		throw new TokenException("mod info for '" + modId + "' not found");
+	}
+}

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

@@ -1,25 +1,27 @@
 modLoader = "javafml"
-loaderVersion = "[26,)"
+loaderVersion = "[31,)"
 
-authors = "chylex"
-issueTrackerURL = "https://github.com/chylex/Minecraft-Window-Title/issues"
+authors = "${author}"
+license = "${license}"
+issueTrackerURL = "${issuesURL}"
 
 [[mods]]
 modId = "customwindowtitle"
-version = "1.0.0"
-displayName = "Custom Window Title"
-displayURL = "https://github.com/chylex/Minecraft-Window-Title"
+version = "${version}"
+displayName = "${name}"
+description = "${description}"
+displayURL = "${sourcesURL}"
 
 [[dependencies.customwindowtitle]]
-    modId = "minecraft"
-    mandatory = true
-    versionRange = "[1.14,1.15)"
-    ordering = "NONE"
-    side = "CLIENT"
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.17,)"
+ordering = "NONE"
+side = "CLIENT"
 
 [[dependencies.customwindowtitle]]
-    modId = "forge"
-    mandatory = true
-    versionRange = "[26,)"
-    ordering = "NONE"
-    side = "CLIENT"
+modId = "forge"
+mandatory = true
+versionRange = "[31.2.45,)"
+ordering = "NONE"
+side = "CLIENT"

README.md

@@ -4,25 +4,48 @@
 
 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.
+(*) 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, navigate to the **.minecraft/config** folder, and open **customwindowtitle-client.toml** in a text editor. You will see the following line:
+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}"
+title = 'Minecraft {mcversion}'  
+icon16 = ''  
+icon32 = ''
 ```
 
-Change only text inside the quotes. You can use the following special tokens:
+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:<span style="text-decoration: underline;">modid</span>}** - version of installed mod with the identifier _modid_
 
 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
+
+You must create two PNG images with sizes 16x16 and 32x32 pixels. The images **must be saved with transparency** even if they don't use it, **otherwise the icons will appear corrupted**. In Krita for example, you must check _Store alpha channel (transparency)_ when saving the image.
+
+The _icon16_ and _icon32_ configuration entries point to the PNG files relative to the **.minecraft/config** folder. For example, if you place the two icons in a folder named _customwindowtitle_ as follows:
+
+* `.minecraft/config/customwindowtitle-client.toml`
+* `.minecraft/config/customwindowtitle/icon16.png`
+* `.minecraft/config/customwindowtitle/icon32.png`
+
+Then, the two icon entries should look like this:
+
+```toml
+icon16 = 'customwindowtitle/icon16.png'  
+icon32 = 'customwindowtitle/icon32.png'
+```
+
 ## Screenshots
 
 These screenshots were taken using the following example configuration:
@@ -31,10 +54,17 @@ These screenshots were taken using the following example configuration:
 title = "Minecraft {mcversion} - Custom Window Title {modversion:customwindowtitle}"
 ```
 
-![](https://media.forgecdn.net/attachments/277/212/customwindowtitlefabric.png)![](https://media.forgecdn.net/attachments/277/213/customwindowtitleforge.png)
+![](https://github.com/chylex/Minecraft-Window-Title/blob/master/.github/README/screenshot.png)
 
 # For Developers
 
-Currently the common source files (package `chylex.customwindowtitle`) are just duplicated in the Forge and Fabric folders, and the jar files are combined with a horrible python script. If anyone has the time and patience to clean it up, I'd appreciate a Pull Request :P
+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
 
-For now, you can build either separate Forge and Fabric projects using `gradlew build` in either folder, or run `python BuildMerge.py` to automatically build both and combine them into a single `.jar` file.
+The Gradle project provides the following tasks:
+- `setupIdea` generates Minecraft sources and run configurations for IntelliJ IDEA
+- `assemble` creates 2 `.jar` files in the `build/dist` folder - one for Forge, one for Fabric
+
+When building against a Minecraft version that is only supported by one mod loader, open `gradle.properties` and comment or remove either `forgeVersion` or `fabricVersion` to disable them.

build.gradle.kts

@@ -0,0 +1,165 @@
+import org.gradle.api.file.DuplicatesStrategy.EXCLUDE
+import java.text.SimpleDateFormat
+import java.util.Date
+
+val modId: String by project
+val modName: String by project
+val modDescription: String by project
+val modAuthor: String by project
+val modVersion: String by project
+val modLicense: String by project
+val modSourcesURL: String by project
+val modIssuesURL: String by project
+
+val minecraftVersion: String by project
+val mixinVersion: String by project
+
+val modNameStripped = modName.replace(" ", "")
+val jarVersion = "$minecraftVersion+v$modVersion"
+
+buildscript {
+	repositories {
+		maven("https://repo.spongepowered.org/maven")
+	}
+}
+
+plugins {
+	`java-library`
+	idea
+	id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
+}
+
+idea {
+	module {
+		excludeDirs.add(file("gradle"))
+		excludeDirs.add(file("run"))
+		
+		if (findProject(":Forge") == null) {
+			excludeDirs.add(file("Forge"))
+		}
+		
+		if (findProject(":Fabric") == null) {
+			excludeDirs.add(file("Fabric"))
+		}
+	}
+}
+
+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")
+}
+
+minecraft {
+	version(minecraftVersion)
+	runs.clear()
+}
+
+allprojects {
+	group = "com.$modAuthor.$modId"
+	version = modVersion
+	
+	apply(plugin = "java")
+	
+	dependencies {
+		implementation("org.jetbrains:annotations:22.0.0")
+	}
+	
+	extensions.getByType<JavaPluginExtension>().apply {
+		toolchain.languageVersion.set(JavaLanguageVersion.of(16))
+	}
+	
+	tasks.withType<JavaCompile> {
+		options.encoding = "UTF-8"
+		options.release.set(16)
+	}
+}
+
+subprojects {
+	repositories {
+		maven("https://repo.spongepowered.org/maven")
+	}
+	
+	dependencies {
+		implementation(rootProject)
+	}
+	
+	base {
+		archivesName.set("$modNameStripped-${project.name}")
+	}
+	
+	tasks.withType<JavaCompile> {
+		source({ rootProject.sourceSets.main.get().allSource })
+	}
+	
+	tasks.processResources {
+		from(rootProject.sourceSets.main.get().resources)
+		
+		inputs.property("name", modName)
+		inputs.property("description", modDescription)
+		inputs.property("version", modVersion)
+		inputs.property("author", modAuthor)
+		inputs.property("license", modLicense)
+		inputs.property("sourcesURL", modSourcesURL)
+		inputs.property("issuesURL", modIssuesURL)
+	}
+	
+	tasks.jar {
+		archiveVersion.set(jarVersion)
+		
+		from(rootProject.file("LICENSE"))
+		
+		manifest {
+			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"
+			)
+		}
+	}
+}
+
+tasks.register("setupIdea") {
+	group = "mod"
+	
+	dependsOn(tasks.findByName("decompile"))
+	
+	val forge = findProject(":Forge")
+	if (forge != null) {
+		dependsOn(forge.tasks.getByName("genIntellijRuns"))
+	}
+	
+	val fabric = findProject(":Fabric")
+	if (fabric != null) {
+		dependsOn(fabric.tasks.getByName("genSources"))
+	}
+}
+
+val copyJars = tasks.register<Copy>("copyJars") {
+	group = "build"
+	duplicatesStrategy = EXCLUDE
+	
+	for (subproject in subprojects) {
+		dependsOn(subproject.tasks.assemble)
+		from(subproject.base.libsDirectory.file("${subproject.base.archivesName.get()}-$jarVersion.jar"))
+	}
+	
+	into(file("${project.buildDir}/dist"))
+}
+
+tasks.assemble {
+	finalizedBy(copyJars)
+}

gradle.properties

@@ -0,0 +1,19 @@
+# Mod
+modId=customwindowtitle
+modName=Custom Window Title
+modDescription=Customize window title and icon.
+modAuthor=chylex
+modVersion=1.1.1
+modLicense=Unlicense
+modSourcesURL=https://github.com/chylex/Minecraft-Window-Title
+modIssuesURL=https://github.com/chylex/Minecraft-Window-Title/issues
+
+# Dependencies
+minecraftVersion=1.17.1
+forgeVersion=37.0.75
+fabricVersion=0.11.7
+mixinVersion=0.8.4
+
+# Gradle
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 #
 # Copyright 2015 the original author or authors.
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,35 +156,28 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        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" ;;
+        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
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+ARGV=("$@")
+eval set -- $DEFAULT_JVM_OPTS
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+IFS=$'
+' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
+IFS=$'
+' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -0,0 +1,17 @@
+rootProject.name = "Minecraft-Window-Title"
+
+pluginManagement {
+	repositories {
+		gradlePluginPortal()
+		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
+		maven(url = "https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge Snapshots" }
+	}
+}
+
+if (settings.extra.has("forgeVersion")) {
+	include("Forge")
+}
+
+if (settings.extra.has("fabricVersion")) {
+	include("Fabric")
+}

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

@@ -0,0 +1,131 @@
+package chylex.customwindowtitle;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public final class TitleConfig {
+	private static final Map<String, String> DEFAULTS;
+	
+	static {
+		final Map<String, String> defaults = new LinkedHashMap<>();
+		
+		defaults.put("title", "Minecraft {mcversion}");
+		defaults.put("icon16", "");
+		defaults.put("icon32", "");
+		
+		DEFAULTS = Collections.unmodifiableMap(defaults);
+	}
+	
+	public static TitleConfig read(final String folder) {
+		final Path configFile = Paths.get(folder, "customwindowtitle-client.toml");
+		final 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);
+			}
+			else {
+				Files.readAllLines(configFile, StandardCharsets.UTF_8).stream().map(String::trim).filter(line -> !line.isEmpty()).forEach(line -> {
+					final String[] split = line.split("=", 2);
+					
+					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());
+					
+					if (config.containsKey(key)) {
+						config.put(key, value);
+					}
+					else {
+						throw new RuntimeException("CustomWindowTitle configuration has an invalid key: " + key);
+					}
+				});
+			}
+		} catch (final IOException e) {
+			throw new RuntimeException("CustomWindowTitle configuration error", e);
+		}
+		
+		final String icon16 = config.get("icon16");
+		final String icon32 = config.get("icon32");
+		
+		final Path pathIcon16 = icon16.isEmpty() ? null : Paths.get(folder, icon16);
+		final Path pathIcon32 = icon32.isEmpty() ? null : Paths.get(folder, icon32);
+		
+		if ((pathIcon16 == null) != (pathIcon32 == null)) {
+			throw new RuntimeException("CustomWindowTitle configuration specifies only one icon, both 'icon16' and 'icon32' must be set.");
+		}
+		
+		if (pathIcon16 != null && Files.notExists(pathIcon16)) {
+			throw new RuntimeException("CustomWindowTitle 16x16 icon not found: " + pathIcon16);
+		}
+		
+		if (pathIcon32 != null && Files.notExists(pathIcon32)) {
+			throw new RuntimeException("CustomWindowTitle 32x32 icon not found: " + pathIcon32);
+		}
+		
+		return new TitleConfig(config.get("title"), pathIcon16, pathIcon32);
+	}
+	
+	private static String parseTrimmedValue(String value) {
+		if (value.isEmpty()) {
+			return value;
+		}
+		
+		final char surrounding = value.charAt(0);
+		final int length = value.length();
+		
+		if (value.charAt(length - 1) == surrounding) {
+			value = value.substring(1, length - 1);
+			
+			if (surrounding == '"') {
+				value = value.replace("\\\"", "\"").replace("\\\\", "\\");
+			}
+		}
+		
+		return value;
+	}
+	
+	private final String title;
+	private final Path icon16;
+	private final Path icon32;
+	
+	private TitleConfig(final String title, final Path icon16, final Path icon32) {
+		this.title = title;
+		this.icon16 = icon16;
+		this.icon32 = icon32;
+	}
+	
+	public String getTitle() {
+		return title;
+	}
+	
+	public boolean hasIcon() {
+		return icon16 != null && icon32 != null;
+	}
+	
+	public InputStream readIcon16() {
+		try {
+			return Files.newInputStream(icon16, StandardOpenOption.READ);
+		} catch (final IOException e) {
+			throw new RuntimeException("CustomWindowTitle could not open the specified 16x16 icon: " + icon16, e);
+		}
+	}
+	
+	public InputStream readIcon32() {
+		try {
+			return Files.newInputStream(icon32, StandardOpenOption.READ);
+		} catch (final IOException e) {
+			throw new RuntimeException("CustomWindowTitle could not open the specified 32x32 icon: " + icon16, e);
+		}
+	}
+}

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

@@ -6,32 +6,32 @@ import org.apache.logging.log4j.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public final class TitleParser{
+public final class TitleParser {
 	private static final Pattern tokenRegex = Pattern.compile("\\{([a-z]+)(?::([^}]+))?}");
 	private static final Logger logger = LogManager.getLogger("CustomWindowTitle");
 	
-	public static String parse(String input){
-		StringBuffer buffer = new StringBuffer();
-		Matcher matcher = tokenRegex.matcher(input);
+	public static String parse(final String input) {
+		final StringBuffer buffer = new StringBuffer();
+		final Matcher matcher = tokenRegex.matcher(input);
 		
-		while(matcher.find()){
-			String token = matcher.group(1);
-			String[] args = StringUtils.split(matcher.group(2), ',');
+		while (matcher.find()) {
+			final String token = matcher.group(1);
+			final String[] args = StringUtils.split(matcher.group(2), ',');
 			
 			String result = null;
 			
-			try{
+			try {
 				result = TitleTokens.getTokenFunction(token).apply(args == null ? ArrayUtils.EMPTY_STRING_ARRAY : args);
-			}catch(TokenException e){
+			} catch (final TokenException e) {
 				logger.warn("Error processing token '" + token + "': " + e.getMessage());
-			}catch(Throwable t){
+			} catch (final Throwable t) {
 				logger.warn("Error processing token '" + token + "': " + t.getMessage(), t);
 			}
 			
-			if (result == null){
+			if (result == null) {
 				matcher.appendReplacement(buffer, input.substring(matcher.start(), matcher.end()));
 			}
-			else{
+			else {
 				matcher.appendReplacement(buffer, result);
 			}
 		}
@@ -42,5 +42,5 @@ public final class TitleParser{
 	
 	// Static class
 	
-	private TitleParser(){}
+	private TitleParser() {}
 }

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

@@ -5,39 +5,39 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
-public final class TitleTokens{
+public final class TitleTokens {
 	
 	// Registry
 	
 	private static final Map<String, Function<String[], String>> tokenMap = new HashMap<>();
 	
-	public static void registerToken(String token, Function<String[], String> processor){
+	public static void registerToken(final String token, final Function<String[], String> processor) {
 		tokenMap.putIfAbsent(token, processor);
 	}
 	
-	public static Function<String[], String> getTokenFunction(String token){
+	public static Function<String[], String> getTokenFunction(final String token) {
 		return tokenMap.getOrDefault(token, args -> null);
 	}
 	
 	// Arguments
 	
-	public static Function<String[], String> noArgs(Supplier<String> func){
+	public static Function<String[], String> noArgs(final Supplier<String> func) {
 		return args -> args.length > 0 ? fail("expected no arguments, got " + args.length) : func.get();
 	}
 	
-	public static Function<String[], String> oneArg(UnaryOperator<String> func){
+	public static Function<String[], String> oneArg(final UnaryOperator<String> func) {
 		return args -> args.length != 1 ? fail("expected 1 argument, got " + args.length) : func.apply(args[0]);
 	}
 	
-	public static Function<String[], String> rangeArgs(int min, int max, Function<String[], String> func){
+	public static Function<String[], String> rangeArgs(final int min, final int max, final Function<String[], String> func) {
 		return args -> args.length < min || args.length > max ? fail("expected between " + min + " and " + max + " arguments, got " + args.length) : func.apply(args);
 	}
 	
-	private static String fail(String message){
+	private static String fail(final String message) {
 		throw new TokenException(message);
 	}
 	
 	// Static class
 	
-	private TitleTokens(){}
+	private TitleTokens() {}
 }

src/main/java/chylex/customwindowtitle/TokenException.java

@@ -0,0 +1,7 @@
+package chylex.customwindowtitle;
+
+public class TokenException extends RuntimeException {
+	public TokenException(final String message) {
+		super(message);
+	}
+}

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

@@ -0,0 +1,14 @@
+package chylex.customwindowtitle.data;
+
+import static chylex.customwindowtitle.TitleTokens.noArgs;
+import static chylex.customwindowtitle.TitleTokens.oneArg;
+import static chylex.customwindowtitle.TitleTokens.registerToken;
+
+public final class CommonTokenData {
+	public static void register(final CommonTokenProvider provider) {
+		registerToken("mcversion", noArgs(provider::getMinecraftVersion));
+		registerToken("modversion", oneArg(provider::getModVersion));
+	}
+	
+	private CommonTokenData() {}
+}

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

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

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

@@ -0,0 +1,14 @@
+package chylex.customwindowtitle.mixin;
+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 DisableVanillaTitle {
+	@Inject(method = "updateTitle()V", at = @At("HEAD"), cancellable = true)
+	private void updateTitle(final CallbackInfo info) {
+		info.cancel();
+	}
+}

src/main/resources/customwindowtitle.mixins.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "chylex.customwindowtitle.mixin",
+  "refmap": "customwindowtitle.refmap.json",
+  "compatibilityLevel": "JAVA_16",
+  "client": [
+    "DisableVanillaTitle"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}