Merge pull request #29 from Protonull/mod-name-authors

okx-code · Aug 29, 2024 · f819f38 · f819f38
2 parents 43eda8d + 318706d
commit f819f38
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 15 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -14,6 +14,14 @@ java {
     withSourcesJar()
 }
 
+processResources {
+    filesMatching("assets/civmodern/lang/en_us.json") {
+        expand([
+            "mod_name": rootProject.mod_name,
+        ])
+    }
+}
+
 publishing {
     publications {
         mavenCommon(MavenPublication) {

diff --git a/common/src/main/resources/assets/civmodern/lang/en_us.json b/common/src/main/resources/assets/civmodern/lang/en_us.json
@@ -4,7 +4,7 @@
     "key.civmodern.ice": "Toggle ice road macro",
     "key.civmodern.attack": "Toggle attack macro",
     "key.civmodern.config": "Open Civ Modern configuration",
-    "category.civmodern": "Civ Modern",
+    "category.civmodern": "${mod_name}",
     "civmodern.screen.main.title": "Civ Modern Config",
     "civmodern.screen.main.radar": "Radar Settings",
     "civmodern.screen.main.ice": "Ice Road Macro",

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,3 +1,5 @@
+import groovy.json.JsonBuilder
+
 plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
@@ -29,15 +31,22 @@ dependencies {
 processResources {
     filesMatching("fabric.mod.json") {
         expand([
+            "mod_name": rootProject.mod_name,
             "mod_version": rootProject.mod_version,
             "mod_description": rootProject.mod_description,
             "mod_home_url": rootProject.mod_home_url,
             "mod_source_url": rootProject.mod_source_url,
             "copyright_licence": rootProject.copyright_licence,
 
             "minecraft_version": rootProject.minecraft_version,
-            "fabric_loader_version": rootProject.fabric_loader_version
+            "fabric_loader_version": rootProject.fabric_loader_version,
         ])
+        filter {
+            (it as String).replace(
+                "\"%FABRIC_AUTHORS_ARRAY%\"",
+                new JsonBuilder((rootProject.mod_authors as String).tokenize(",")).toString()
+            )
+        }
     }
 }
 

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -2,11 +2,9 @@
     "schemaVersion": 1,
     "id": "civmodern",
     "version": "${mod_version}",
-    "name": "CivModern",
+    "name": "${mod_name}",
     "description": "${mod_description}",
-    "authors": [
-        "Okx"
-    ],
+    "authors": "%FABRIC_AUTHORS_ARRAY%",
     "contact": {
         "homepage": "${mod_home_url}",
         "sources": "${mod_source_url}"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -29,7 +29,7 @@ configurations {
 }
 
 dependencies {
-    forge("net.minecraftforge:forge:${rootProject.forge_version}")
+    forge("net.minecraftforge:forge:${rootProject.forge_loader_version}")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive = false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
@@ -41,11 +41,19 @@ processResources {
             "mod_issues_url": rootProject.mod_issues_url,
             "copyright_licence": rootProject.copyright_licence,
 
+            "mod_name": rootProject.mod_name,
             "mod_version": rootProject.mod_version,
             "mod_description": rootProject.mod_description,
             "mod_home_url": rootProject.mod_home_url,
+            "mod_authors": rootProject.mod_authors,
 
-            "minecraft_version": rootProject.minecraft_version
+            "forge_loader_major_version": rootProject.forge_loader_major_version,
+            "minecraft_version": rootProject.minecraft_version,
+        ])
+    }
+    filesMatching("pack.mcmeta") {
+        expand([
+            "mod_name": rootProject.mod_name,
         ])
     }
 }

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,21 +1,21 @@
 modLoader = "javafml"
-loaderVersion = "[50,)"
+loaderVersion = "[${forge_loader_major_version},)"
 issueTrackerURL = "${mod_issues_url}"
 license = "${copyright_licence}"
 
 [[mods]]
 modId = "civmodern"
 version = "${mod_version}"
-displayName = "CivModern"
+displayName = "${mod_name}"
 description = "${mod_description}"
 displayURL = "${mod_home_url}"
-authors = "Okx"
+authors = "${mod_authors}"
 #logoFile = ""
 
 [[dependencies.civmodern]]
 modId = "forge"
 mandatory = true
-versionRange = "[50,)"
+versionRange = "[${forge_loader_major_version},)"
 ordering = "NONE"
 side = "CLIENT"
 

diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
-        "description": "CivModern",
+        "description": "${mod_name}",
         "pack_format": 6
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,9 @@ org.gradle.jvmargs=-Xmx3072M
 archives_base_name=civmodern
 maven_group=sh.okx.civmodern
 mod_version=1.6.5
-mod_description=Civ Modern
+mod_name=CivModern
+mod_description=Radar and civ utilities
+mod_authors=Okx,Protonull
 copyright_licence=GPLv3
 mod_home_url=https://github.com/okx-code/civmodern
 mod_source_url=https://github.com/okx-code/civmodern
@@ -17,4 +19,5 @@ enabled_platforms=fabric,forge
 fabric_loader_version=0.15.11
 fabric_api_version=0.102.1+1.21.1
 
-forge_version=1.21.1-52.0.4
+forge_loader_version=1.21.1-52.0.4
+forge_loader_major_version=52