Use templates for mod metadata instead of processResources

Hexaoxide · Jan 23, 2025 · a04a5c3 · a04a5c3
1 parent 5ceca14
commit a04a5c3
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 25 deletions.
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -4,6 +4,7 @@ import kotlin.io.path.invariantSeparatorsPathString
 plugins {
   id("carbon.shadow-platform")
   id("quiet-fabric-loom")
+  alias(libs.plugins.blossom)
 }
 
 val shade: Configuration by configurations.creating
@@ -59,6 +60,22 @@ carbonPlatform {
   productionJar = tasks.remapJar.flatMap { it.archiveFile }
 }
 
+sourceSets.main {
+  blossom {
+    resources {
+      properties.putAll(
+        mapOf(
+          "modId" to rootProject.name.lowercase(),
+          "name" to rootProject.name,
+          "version" to project.version,
+          "description" to project.description,
+          "githubUrl" to GITHUB_REPO_URL,
+        )
+      )
+    }
+  }
+}
+
 tasks {
   shadowJar {
     configurations = listOf(shade)
@@ -72,15 +89,6 @@ tasks {
     relocateGuice()
     relocateDependency("org.checkerframework")
   }
-  processResources {
-    replace("fabric.mod.json", mapOf(
-      "modId" to rootProject.name.lowercase(),
-      "name" to rootProject.name,
-      "version" to project.version,
-      "description" to project.description,
-      "github_url" to GITHUB_REPO_URL
-    ))
-  }
 
   runServer {
     dependsOn(shadowJar)

diff --git a/fabric/src/main/resources/fabric.mod.json → ...in/resource-templates/fabric.mod.json.peb b/fabric/src/main/resources/fabric.mod.json → ...in/resource-templates/fabric.mod.json.peb
@@ -1,17 +1,17 @@
 {
     "schemaVersion": 1,
-    "id": "${modId}",
-    "version": "${version}",
-    "name": "${name}",
-    "description": "${description}",
+    "id": "{{ modId }}",
+    "version": "{{ version }}",
+    "name": "{{ name }}",
+    "description": "{{ description }}",
     "authors": [
         "Draycia",
         "jmp"
     ],
     "contact": {
-        "homepage": "${github_url}",
-        "sources": "${github_url}",
-        "issues": "${github_url}/issues"
+        "homepage": "{{ githubUrl }}",
+        "sources": "{{ githubUrl }}",
+        "issues": "{{ githubUrl }}/issues"
     },
     "license": "GPLv3",
     "environment": "*",

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@ sponge-gradle = { id = "org.spongepowered.gradle.plugin", version = "2.2.0" }
 hangar-publish = { id = "io.papermc.hangar-publish-plugin", version = "0.1.2" }
 indra-publishing-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
 javadoc-links = { id = "org.incendo.cloud-build-logic.javadoc-links", version = "0.0.15" }
+blossom = { id = "net.kyori.blossom", version = "2.1.0" }
 
 [versions]
 indra = "3.1.3"

diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
   id("carbon.shadow-platform")
   id("net.neoforged.moddev")
+  alias(libs.plugins.blossom)
 }
 
 neoForge {
@@ -66,6 +67,22 @@ carbonPlatform {
   productionJar = prodJar.flatMap { it.archiveFile }
 }
 
+sourceSets.main {
+  blossom {
+    resources {
+      properties.putAll(
+        mapOf(
+          "modId" to rootProject.name.lowercase(),
+          "name" to rootProject.name,
+          "version" to project.version,
+          "description" to project.description,
+          "githubUrl" to GITHUB_REPO_URL,
+        )
+      )
+    }
+  }
+}
+
 tasks {
   shadowJar {
     archiveClassifier = "dev-all"
@@ -80,15 +97,6 @@ tasks {
     relocateGuice()
     relocateDependency("org.checkerframework")
   }
-  processResources {
-    replace("META-INF/neoforge.mods.toml", mapOf(
-      "modId" to rootProject.name.lowercase(),
-      "name" to rootProject.name,
-      "version" to project.version,
-      "description" to project.description,
-      "github_url" to GITHUB_REPO_URL
-    ))
-  }
   jar {
     archiveClassifier = "dev"
   }

diff --git a/...ain/resources/META-INF/neoforge.mods.toml → ...templates/META-INF/neoforge.mods.toml.peb b/...ain/resources/META-INF/neoforge.mods.toml → ...templates/META-INF/neoforge.mods.toml.peb