Update README

.gitignore

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

Fabric/build.gradle.kts

@@ -4,7 +4,7 @@ val fabricVersion: String by project
 
 plugins {
 	idea
-	id("fabric-loom") version "0.10-SNAPSHOT"
+	id("fabric-loom")
 }
 
 dependencies {

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

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

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

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

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

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

Forge/build.gradle.kts

@@ -15,7 +15,7 @@ buildscript {
 	}
 	
 	dependencies {
-		classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = "5.1.+") { isChanging = true }
+		classpath(group = "net.minecraftforge.gradle", name = "ForgeGradle", version = "[6.0,6.2)")
 		classpath(group = "org.spongepowered", name = "mixingradle", version = "0.7-SNAPSHOT")
 	}
 }
@@ -41,6 +41,8 @@ dependencies {
 configure<UserDevExtension> {
 	mappings("official", minecraftVersion)
 	
+	copyIdeResources.set(true)
+	
 	runs {
 		create("client") {
 			taskName = "Client"

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

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

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

@@ -1,4 +1,5 @@
 package chylex.customwindowtitle.forge;
+
 import chylex.customwindowtitle.TokenException;
 import chylex.customwindowtitle.data.CommonTokenProvider;
 import net.minecraftforge.fml.ModList;

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

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

Forge/src/main/resources/pack.mcmeta

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

README.md

@@ -31,6 +31,8 @@ If any of the tokens aren't working, search the game log for **CustomWindowTitle
 
 ### Changing the Icon
 
+**This feature is currently not supported in Minecraft 1.20.**
+
 You must create two PNG images with sizes 16x16 and 32x32 pixels. The images **must be saved with transparency** even if they don't use it, **otherwise the icons will appear corrupted**. In Krita for example, you must check _Store alpha channel (transparency)_ when saving the image.
 
 The _icon16_ and _icon32_ configuration entries point to the PNG files relative to the **.minecraft/config** folder. For example, if you place the two icons in a folder named _customwindowtitle_ as follows:

build.gradle.kts

@@ -14,6 +14,10 @@ val modIssuesURL: String by project
 val minecraftVersion: String by project
 val mixinVersion: String by project
 
+val minimumMinecraftVersion: String by project
+val minimumForgeVersion: String by project
+val minimumFabricVersion: String by project
+
 val modNameStripped = modName.replace(" ", "")
 val jarVersion = "$minecraftVersion+v$modVersion"
 
@@ -74,12 +78,12 @@ allprojects {
 	}
 	
 	extensions.getByType<JavaPluginExtension>().apply {
-		toolchain.languageVersion.set(JavaLanguageVersion.of(16))
+		toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 	}
 	
 	tasks.withType<JavaCompile> {
 		options.encoding = "UTF-8"
-		options.release.set(16)
+		options.release.set(17)
 	}
 }
 
@@ -101,8 +105,7 @@ subprojects {
 	}
 	
 	tasks.processResources {
-		from(rootProject.sourceSets.main.get().resources)
-		
+		inputs.property("id", modId)
 		inputs.property("name", modName)
 		inputs.property("description", modDescription)
 		inputs.property("version", modVersion)
@@ -110,6 +113,13 @@ subprojects {
 		inputs.property("license", modLicense)
 		inputs.property("sourcesURL", modSourcesURL)
 		inputs.property("issuesURL", modIssuesURL)
+		inputs.property("minimumMinecraftVersion", minimumMinecraftVersion)
+		inputs.property("minimumForgeVersion", minimumForgeVersion)
+		inputs.property("minimumFabricVersion", minimumFabricVersion)
+		
+		from(rootProject.sourceSets.main.get().resources) {
+			expand(inputs.properties)
+		}
 	}
 	
 	tasks.jar {
@@ -130,6 +140,10 @@ subprojects {
 			)
 		}
 	}
+	
+	tasks.test {
+		onlyIf { false }
+	}
 }
 
 tasks.register("setupIdea") {

gradle.properties

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

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
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -6,6 +6,12 @@ pluginManagement {
 		maven(url = "https://maven.fabricmc.net/") { name = "Fabric" }
 		maven(url = "https://repo.spongepowered.org/repository/maven-public/") { name = "Sponge Snapshots" }
 	}
+	
+	plugins {
+		if (settings.extra.has("loomVersion")) {
+			id("fabric-loom") version "${settings.extra["loomVersion"]}-SNAPSHOT"
+		}
+	}
 }
 
 if (settings.extra.has("forgeVersion")) {

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

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

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

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

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

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

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

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

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

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

src/main/resources/customwindowtitle.mixins.json

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

src/main/resources/pack.mcmeta

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