Skip to content

Commit fcc4d22

Browse files
committed
Further cleanup
Fixes the category translation issue. Removes some unnecessary fields from mixin jsons. And replaces blossom with resource processing.
1 parent 25c9433 commit fcc4d22

8 files changed

Lines changed: 26 additions & 25 deletions

File tree

mod/.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# https://editorconfig.org
2+
3+
[*.const]
4+
insert_final_newline = false

mod/common/build.gradle

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
plugins {
2-
// https://github.com/KyoriPowered/blossom/releases
3-
id("net.kyori.blossom") version "1.3.1"
4-
}
5-
61
architectury {
72
injectInjectables = false
83
common(rootProject.enabled_platforms.split(","))
@@ -21,18 +16,11 @@ dependencies {
2116
modCompileOnly("maven.modrinth:xaeros-world-map:CkZVhVE0")
2217
}
2318

24-
tasks {
25-
blossom {
26-
replaceToken (
27-
"%VERSION%",
28-
project.version,
29-
"src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java"
30-
)
31-
}
32-
}
33-
3419
processResources {
3520
filesMatching("assets/mapsync/lang/en_us.json") {
3621
expand(rootProject.properties)
3722
}
23+
filesMatching("mapsync.version.const") {
24+
expand(rootProject.properties)
25+
}
3826
}

mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import gjum.minecraft.mapsync.common.data.*;
77
import gjum.minecraft.mapsync.common.net.SyncClient;
88
import gjum.minecraft.mapsync.common.net.packet.*;
9+
import java.io.IOException;
10+
import java.io.InputStream;
11+
import java.nio.charset.StandardCharsets;
912
import net.minecraft.client.KeyMapping;
1013
import net.minecraft.client.Minecraft;
1114
import net.minecraft.client.multiplayer.ServerData;
@@ -24,7 +27,18 @@
2427
import static gjum.minecraft.mapsync.common.Cartography.chunkTileFromLevel;
2528

2629
public abstract class MapSyncMod {
27-
public static final String VERSION = "%VERSION%";
30+
public static final String VERSION; static {
31+
final InputStream in = MapSyncMod.class.getResourceAsStream("/mapsync.version.const");
32+
if (in == null) {
33+
throw new ExceptionInInitializerError(new NullPointerException("'mapsync.version.const' const is missing!"));
34+
}
35+
try (in) {
36+
VERSION = new String(in.readAllBytes(), StandardCharsets.UTF_8).trim();
37+
}
38+
catch (final IOException e) {
39+
throw new ExceptionInInitializerError(e);
40+
}
41+
}
2842

2943
private static final Minecraft mc = Minecraft.getInstance();
3044

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"key.map-sync.openGui": "Open GUI",
3-
"category.map-sync": "${mod_display_name}"
3+
"key.category.mapsync.general": "${mod_display_name}"
44
}

mod/common/src/main/resources/mapsync.common.mixins.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
"minVersion": "0.8",
44
"package": "gjum.minecraft.mapsync.common.mixins",
55
"compatibilityLevel": "JAVA_21",
6-
"mixins": [],
76
"client": [
87
"MixinClientPacketListener"
98
],
10-
"server": [],
119
"injectors": {
1210
"defaultRequire": 1
1311
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
${mod_version}

mod/fabric/src/main/resources/mapsync.fabric.mixins.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
"required": true,
33
"minVersion": "0.8",
44
"package": "gjum.minecraft.mapsync.fabric.mixins",
5-
"compatibilityLevel": "JAVA_17",
6-
"mixins": [],
5+
"compatibilityLevel": "JAVA_21",
76
"client": [
87

98
],
10-
"server": [],
119
"injectors": {
1210
"defaultRequire": 1
1311
}

mod/forge/src/main/resources/mapsync.forge.mixins.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
"required": true,
33
"minVersion": "0.8",
44
"package": "gjum.minecraft.mapsync.forge.mixins",
5-
"compatibilityLevel": "JAVA_17",
6-
"mixins": [],
5+
"compatibilityLevel": "JAVA_21",
76
"client": [
87

98
],
10-
"server": [],
119
"injectors": {
1210
"defaultRequire": 1
1311
}

0 commit comments

Comments
 (0)