Move version to MagicValues

CivPlatform · Dec 7, 2023 · 97dc4d0 · 97dc4d0
1 parent b38e172
commit 97dc4d0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/mod/common/build.gradle b/mod/common/build.gradle
@@ -27,7 +27,7 @@ tasks {
 		replaceToken (
 				"%VERSION%",
 				project.version,
-				"src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java"
+				"src/main/java/gjum/minecraft/mapsync/common/utils/MagicValues.java"
 		)
 	}
 }

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
@@ -24,8 +24,6 @@
 import static gjum.minecraft.mapsync.common.Cartography.chunkTileFromLevel;
 
 public abstract class MapSyncMod {
-	public static final String VERSION = "%VERSION%";
-
 	private static final Minecraft mc = Minecraft.getInstance();
 
 	public static final Logger logger = LogManager.getLogger(MapSyncMod.class);

diff --git a/mod/common/src/main/java/gjum/minecraft/mapsync/common/utils/MagicValues.java b/mod/common/src/main/java/gjum/minecraft/mapsync/common/utils/MagicValues.java
@@ -1,6 +1,8 @@
 package gjum.minecraft.mapsync.common.utils;
 
 public final class MagicValues {
+    public static final String VERSION = "%VERSION%";
+
     // SHA1 produces 160-bit (20-byte) hashes
     // https://en.wikipedia.org/wiki/SHA-1
     public static final int SHA1_HASH_LENGTH = 20;

diff --git a/mod/fabric/src/main/java/gjum/minecraft/mapsync/fabric/FabricMapSyncMod.java b/mod/fabric/src/main/java/gjum/minecraft/mapsync/fabric/FabricMapSyncMod.java
@@ -1,6 +1,7 @@
 package gjum.minecraft.mapsync.fabric;
 
 import gjum.minecraft.mapsync.common.MapSyncMod;
+import gjum.minecraft.mapsync.common.utils.MagicValues;
 import java.io.File;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -24,7 +25,7 @@ public void onInitializeClient() {
 
 	@Override
 	public String getVersion() {
-		return VERSION + "+fabric";
+		return MagicValues.VERSION + "+fabric";
 	}
 
 	@Override

diff --git a/mod/forge/src/main/java/gjum/minecraft/mapsync/forge/ForgeMapSyncMod.java b/mod/forge/src/main/java/gjum/minecraft/mapsync/forge/ForgeMapSyncMod.java
@@ -2,6 +2,7 @@
 
 import gjum.minecraft.mapsync.common.MapSyncMod;
 import gjum.minecraft.mapsync.common.ModGui;
+import gjum.minecraft.mapsync.common.utils.MagicValues;
 import java.io.File;
 import net.minecraft.client.KeyMapping;
 import net.minecraftforge.client.ClientRegistry;
@@ -26,7 +27,7 @@ public ForgeMapSyncMod() {
 
 	@Override
 	public String getVersion() {
-		return VERSION + "+forge";
+		return MagicValues.VERSION + "+forge";
 	}
 
 	@Override