Further cleanup

Protonull · Gjum · commit bd41f8f0994e · 2026-03-18T22:25:46.000+01:00
Fixes the category translation issue. Removes some unnecessary fields from mixin jsons. Restores parchment name property. And replaces blossom with resource processing.
diff --git a/mod/.editorconfig b/mod/.editorconfig
@@ -0,0 +1,4 @@
+# https://editorconfig.org
+
+[*.const]
+insert_final_newline = false
diff --git a/mod/build.gradle b/mod/build.gradle
@@ -21,7 +21,7 @@ subprojects {
 		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
 		mappings loom.layered() {
 			officialMojangMappings()
-			parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}@zip")
+			parchment("org.parchmentmc.data:${project.parchment_name}:${project.parchment_version}@zip")
 		}
 	}
 }
diff --git a/mod/common/build.gradle b/mod/common/build.gradle
@@ -1,8 +1,3 @@
-plugins {
-	// https://github.com/KyoriPowered/blossom/releases
-	id("net.kyori.blossom") version "1.3.1"
-}
-
 architectury {
 	injectInjectables = false
 	common(rootProject.enabled_platforms.split(","))
@@ -21,18 +16,11 @@ dependencies {
 	modCompileOnly("maven.modrinth:xaeros-world-map:CkZVhVE0")
 }
 
-tasks {
-	blossom {
-		replaceToken (
-			"%VERSION%",
-			project.version,
-			"src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java"
-		)
-	}
-}
-
 processResources {
 	filesMatching("assets/mapsync/lang/en_us.json") {
 		expand(rootProject.properties)
 	}
+	filesMatching("mapsync.version.const") {
+		expand(rootProject.properties)
+	}
 }
diff --git a/mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java b/mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java
@@ -6,6 +6,9 @@
 import gjum.minecraft.mapsync.common.data.*;
 import gjum.minecraft.mapsync.common.net.SyncClient;
 import gjum.minecraft.mapsync.common.net.packet.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ServerData;
@@ -24,7 +27,18 @@
 import static gjum.minecraft.mapsync.common.Cartography.chunkTileFromLevel;
 
 public abstract class MapSyncMod {
-	public static final String VERSION = "%VERSION%";
+	public static final String VERSION; static {
+		final InputStream in = MapSyncMod.class.getResourceAsStream("/mapsync.version.const");
+		if (in == null) {
+			throw new ExceptionInInitializerError(new NullPointerException("'mapsync.version.const' const is missing!"));
+		}
+		try (in) {
+			VERSION = new String(in.readAllBytes(), StandardCharsets.UTF_8).trim();
+		}
+		catch (final IOException e) {
+			throw new ExceptionInInitializerError(e);
+		}
+	}
 
 	private static final Minecraft mc = Minecraft.getInstance();
 
diff --git a/mod/common/src/main/resources/assets/mapsync/lang/en_us.json b/mod/common/src/main/resources/assets/mapsync/lang/en_us.json
@@ -1,4 +1,4 @@
 {
 	"key.map-sync.openGui": "Open GUI",
-	"category.map-sync": "${mod_display_name}"
+	"key.category.mapsync.general": "${mod_display_name}"
 }
diff --git a/mod/common/src/main/resources/mapsync.common.mixins.json b/mod/common/src/main/resources/mapsync.common.mixins.json
@@ -3,11 +3,9 @@
 	"minVersion": "0.8",
 	"package": "gjum.minecraft.mapsync.common.mixins",
 	"compatibilityLevel": "JAVA_21",
-	"mixins": [],
 	"client": [
 		"MixinClientPacketListener"
 	],
-	"server": [],
 	"injectors": {
 		"defaultRequire": 1
 	}
diff --git a/mod/common/src/main/resources/mapsync.version.const b/mod/common/src/main/resources/mapsync.version.const
@@ -0,0 +1 @@
+${mod_version}
diff --git a/mod/fabric/src/main/resources/mapsync.fabric.mixins.json b/mod/fabric/src/main/resources/mapsync.fabric.mixins.json
@@ -2,12 +2,10 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "gjum.minecraft.mapsync.fabric.mixins",
-	"compatibilityLevel": "JAVA_17",
-	"mixins": [],
+	"compatibilityLevel": "JAVA_21",
 	"client": [
 
 	],
-	"server": [],
 	"injectors": {
 		"defaultRequire": 1
 	}
diff --git a/mod/forge/src/main/resources/mapsync.forge.mixins.json b/mod/forge/src/main/resources/mapsync.forge.mixins.json
@@ -2,12 +2,10 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "gjum.minecraft.mapsync.forge.mixins",
-	"compatibilityLevel": "JAVA_17",
-	"mixins": [],
+	"compatibilityLevel": "JAVA_21",
 	"client": [
 
 	],
-	"server": [],
 	"injectors": {
 		"defaultRequire": 1
 	}
diff --git a/mod/gradle.properties b/mod/gradle.properties
@@ -13,7 +13,7 @@ mod_issues_url=https://github.com/CivPlatform/map-sync/issues
 
 minecraft_version=1.21.11
 # https://parchmentmc.org/docs/getting-started
-# parchment_name=parchment-1.21
+parchment_name=parchment-1.21.11
 parchment_version=2025.12.20
 enabled_platforms=fabric
 
@@ -25,4 +25,4 @@ forge_version=1.21.1-61.1.1
 forge_major_version=61
 
 # Architectuy Loom 1.14 is not available for JM 6.0.0
-loom.ignoreDependencyLoomVersionValidation=true
+loom.ignoreDependencyLoomVersionValidation=true

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ subprojects {`
`21`	`21`	`minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"`
`22`	`22`	`mappings loom.layered() {`
`23`	`23`	`officialMojangMappings()`
`24`		`- parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}@zip")`
	`24`	`+ parchment("org.parchmentmc.data:${project.parchment_name}:${project.parchment_version}@zip")`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"key.map-sync.openGui": "Open GUI",`
`3`		`- "category.map-sync": "${mod_display_name}"`
	`3`	`+ "key.category.mapsync.general": "${mod_display_name}"`
`4`	`4`	`}`