From c11a7cb83ca063f82c400f2bb758a5eca801ae1e Mon Sep 17 00:00:00 2001
From: Ted Senft <code@robotgryphon.com>
Date: Sun, 17 Nov 2024 19:08:11 -0500
Subject: [PATCH] Add more info to manifest, fix tests running through gradle

---
 spatial-neoforge/build.gradle.kts             |  6 +++--
 .../spatial/test/core/SpatialTestMod.java     |  2 +-
 .../resources/META-INF/neoforge.mods.toml     |  6 ++---
 spatial/build.gradle.kts                      | 26 ++++++++++++++++++-
 .../src/main/resources/META-INF/MANIFEST.MF   |  2 --
 5 files changed, 33 insertions(+), 9 deletions(-)
 delete mode 100644 spatial/src/main/resources/META-INF/MANIFEST.MF

diff --git a/spatial-neoforge/build.gradle.kts b/spatial-neoforge/build.gradle.kts
index e0929e6..5d5475f 100644
--- a/spatial-neoforge/build.gradle.kts
+++ b/spatial-neoforge/build.gradle.kts
@@ -25,11 +25,13 @@ neoForge {
         create("spatial") {
             modSourceSets.add(spatialLib.sourceSets.main)
         }
+
+        create("spatial_test") {}
     }
 
     unitTest {
         enable()
-        testedMod = mods.named("spatial")
+        testedMod = mods.named("spatial_test")
     }
 
     runs {
@@ -37,7 +39,7 @@ neoForge {
             this.type = "gameTestServer"
             gameDirectory.set(file("runs/gametest"))
 
-            systemProperty("neoforge.enabledGameTestNamespaces", "spatial")
+            systemProperty("neoforge.enabledGameTestNamespaces", "spatial_test")
 
             this.sourceSet = sourceSets.test
         }
diff --git a/spatial-neoforge/src/test/java/dev/compactmods/spatial/test/core/SpatialTestMod.java b/spatial-neoforge/src/test/java/dev/compactmods/spatial/test/core/SpatialTestMod.java
index b0ea5b3..4fe8246 100644
--- a/spatial-neoforge/src/test/java/dev/compactmods/spatial/test/core/SpatialTestMod.java
+++ b/spatial-neoforge/src/test/java/dev/compactmods/spatial/test/core/SpatialTestMod.java
@@ -7,7 +7,7 @@
 @Mod(SpatialTestMod.MOD_ID)
 public class SpatialTestMod {
 
-    public static final String MOD_ID = "spatialtest";
+    public static final String MOD_ID = "spatial_test";
     private static final Logger LOGS = LogManager.getLogger("spatial");
 
     public SpatialTestMod() {
diff --git a/spatial-neoforge/src/test/resources/META-INF/neoforge.mods.toml b/spatial-neoforge/src/test/resources/META-INF/neoforge.mods.toml
index 5ac641b..f4245f7 100644
--- a/spatial-neoforge/src/test/resources/META-INF/neoforge.mods.toml
+++ b/spatial-neoforge/src/test/resources/META-INF/neoforge.mods.toml
@@ -3,7 +3,7 @@ loaderVersion = "${loader_version_range}"
 license = "MIT"
 
 [[mods]] #mandatory
-modId = "spatial"
+modId = "spatial_test"
 version = "0.0.1"
 displayName = "Spatial Test Mod"
 authors = "RobotGryphon" #optional
@@ -16,14 +16,14 @@ displayURL = "https://compactmods.dev"
 # logoFile="examplemod.png" #optional
 
 # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.spatial]] #optional
+[[dependencies.spatial_test]] #optional
 modId = "neoforge"
 type = "required"
 versionRange = "${neo_version_range}"
 ordering = "NONE"
 side = "BOTH"
 
-[[dependencies.spatial]]
+[[dependencies.spatial_test]]
 modId = "minecraft"
 type = "required"
 versionRange = "${minecraft_version_range}"
diff --git a/spatial/build.gradle.kts b/spatial/build.gradle.kts
index c8decf6..ebb776b 100644
--- a/spatial/build.gradle.kts
+++ b/spatial/build.gradle.kts
@@ -1,3 +1,6 @@
+import java.text.SimpleDateFormat
+import java.util.*
+
 var envVersion: String = System.getenv("VERSION") ?: "0.0.1"
 if (envVersion.startsWith("v"))
     envVersion = envVersion.trimStart('v')
@@ -13,7 +16,7 @@ plugins {
 base {
     archivesName = "spatial"
     group = "dev.compactmods"
-    version = "0.1.0"
+    version = envVersion
 }
 
 java {
@@ -24,6 +27,27 @@ neoForge {
     neoFormVersion = neoforged.versions.neoform
 }
 
+tasks.withType<Jar> {
+    val gitVersion = providers.exec {
+        commandLine("git", "rev-parse", "HEAD")
+    }.standardOutput.asText.get()
+
+    manifest {
+        val now = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date())
+        attributes(
+            mapOf(
+                "Automatic-Module-Name" to "spatial",
+                "Specification-Title" to "Spatial",
+                "Specification-Version" to "1", // We are version 1 of ourselves
+                "Implementation-Title" to "Spatial",
+                "Implementation-Timestamp" to now,
+                "FMLModType" to "GAMELIBRARY",
+                "Minecraft-Version" to mojang.versions.minecraft.get(),
+                "Commit-Hash" to gitVersion
+            )
+        )
+    }
+}
 
 val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/spatial"
 publishing {
diff --git a/spatial/src/main/resources/META-INF/MANIFEST.MF b/spatial/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 1bc3ded..0000000
--- a/spatial/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-FMLModType: LIBRARY
-Automatic-Module-Name: spatial