Update buildscripts

build.gradle

@@ -7,6 +7,7 @@ plugins {
 }
 
 subprojects {
+    mod_version = "${mod_version}+${minecraft_version}"
     version = mod_version
     group = mod_group
 
@@ -130,7 +131,7 @@ subprojects {
 String versionChangelog() {
     List<String> lines = rootProject.file("CHANGELOG.md").readLines()
     StringBuilder builder = new StringBuilder()
-    if ("${mod_version}".startsWith(lines.get(2).substring(3))) {
+    if ("${mod_version}" == lines.get(2).substring(3)) {
         for (int i = 4; i < lines.size(); i++) {
             String line = lines.get(i)
             if (line.startsWith("## ")) {
@@ -142,7 +143,7 @@ String versionChangelog() {
         }
     } else {
         throw new IllegalArgumentException(
-                String.format("Mod version '%s' does not start with changelog version '%s'",
+                String.format("Mod version '%s' does not match changelog version '%s'",
                         mod_version, lines.get(2).substring(3)))
     }
     return builder.toString()

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -92,12 +92,12 @@ processResources {
             "mod_id": mod_id,
             "mod_name": mod_name,
             "mod_description": mod_description,
-            "mod_icon": "assets/" + mod_id + "/icon.png",
+            "mod_icon": "assets/${mod_id}/icon.png",
             "mod_owner": mod_owner,
             "mod_authors_list": asJsonList(mod_authors),
-            "mod_contributors_list": asJsonList(mod_contributors),
-            "mod_authors_string": mod_authors.replace(",", ", "),
-            "mod_contributors_string": mod_contributors.replace(",", ", "),
+            "mod_authors_string": mod_authors.split(",").join(", "),
+            "mod_contributors_list": asJsonList("${mod_contributors},${mod_translators}"),
+            "mod_contributors_string": "${mod_contributors},${mod_translators}".split(",").join(", "),
             "mod_license": mod_license,
             // Links
             "homepage_url": homepage_url,

gradle.properties

@@ -1,16 +1,17 @@
-# SemVer: https://semver.org, generally {major.minor.patch}[-prerelease.{number}]+{mc_version}
+# SemVer: https://semver.org, generally {major.minor.patch}[-prerelease.{number}]
 # Fabric version ranges: https://www.npmjs.com/package/semver#ranges, list by split(',')
 # Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
 
 # Project
-mod_version=2.3.6+1.21
+mod_version=2.3.6
 mod_group=dev.terminalmc
 mod_id=commandkeys
 mod_name=CommandKeys
 mod_description=Send pre-written chat messages and commands using hotkeys.
 mod_owner=TerminalMC
 mod_authors=NotRyken
-mod_contributors=lvxnull2 (#9),ttrafford7 (uk_ua),rfin0 (ru_ru),Lucanoria (de_de),Andypsl8 (zh_cn)
+mod_contributors=lvxnull2 (#9)
+mod_translators=ttrafford7 (uk_ua),rfin0 (ru_ru),Lucanoria (de_de),Andypsl8 (zh_cn)
 mod_license=Apache-2.0
 
 # Links