build: properly convert semver to maven version range for forge/neoforge

client/build.gradle.kts

@@ -242,21 +242,52 @@ tasks {
 data class VersionInfo(
     val neoForgeVersion: String,
     val forgeVersion: String,
-    val mcVersions: List<String>
+    val mcVersions: String
 ) {
 
-    // "${mcVersions}" -> "[1.20,1.20.1]"
-    val forgeMcVersions
-        get() =
-            if (mcVersions[0].startsWith(">=")) {
-                "[${mcVersions[0].substringAfter(">=")},)"
+    val forgeMcVersions: String
+        get() {
+            val split = mcVersions.split(" ")
+
+            fun versionBounds(version: String): Triple<String, String, String>? =
+                when {
+                    version.startsWith(">=") -> Triple(
+                        "[", version.substringAfter(">="), ",)"
+                    )
+                    version.startsWith(">") -> Triple(
+                        "(", version.substringAfter(">"), ",)"
+                    )
+                    version.startsWith("<=") -> Triple(
+                        "(,", version.substringAfter("<="), "]"
+                    )
+                    version.startsWith("<") -> Triple(
+                        "(,", version.substringAfter("<"), ")"
+                    )
+                    else -> null
+                }
+
+            if (split.size == 1) {
+                val version = split.first()
+                val bounds = versionBounds(version)
+
+                return if (bounds == null) {
+                    "[$version]"
+                } else {
+                    "${bounds.first}${bounds.second}${bounds.third}"
+                }
+            } else if (split.size == 2) {
+                val bounds = split.map { versionBounds(it)!! }
+                val first = bounds[0]
+                val second = bounds[1]
+
+                return "${first.first}${first.second},${second.second}${second.third}"
             } else {
-                "[${mcVersions.joinToString(",")}]"
+                throw IllegalStateException("Invalid version")
             }
+        }
 
-    // ["${mcVersions}"] -> ["1.20", "1.20.1"]
     val fabricMcVersions
-        get() = mcVersions.joinToString("\", \"")
+        get() = mcVersions
 }
 
 fun readVersionInfo(): VersionInfo = Toml()

client/src/main/resources/fabric.mod.json

@@ -30,6 +30,6 @@
     "depends": {
         "fabric": "*",
         "fabricloader": "*",
-        "minecraft": ["${mcVersions}"]
+        "minecraft": "${mcVersions}"
     }
 }

client/versions.toml

@@ -1,39 +1,39 @@
 [12102]
-mcVersions = [">1.21.1"]
+mcVersions = ">1.21.1"
 
 [12100]
-mcVersions = [">=1.21 <=1.21.1"]
+mcVersions = ">=1.21.0 <=1.21.1"
 forgeVersion = "[51,)"
 neoForgeVersion = "[20,)"
 
 [12004]
 forgeVersion = "[49,)"
-mcVersions = [">=1.20.2 <=1.20.4"]
+mcVersions = ">=1.20.2 <=1.20.4"
 
 [12001]
 forgeVersion = "[46,)"
-mcVersions = [">=1.20 <=1.20.1"]
+mcVersions = ">=1.20.0 <=1.20.1"
 
 [11904]
 forgeVersion = "[45,)"
-mcVersions = ["1.19.4"]
+mcVersions = "1.19.4"
 
 [11903]
 forgeVersion = "[44,)"
-mcVersions = ["1.19.3"]
+mcVersions = "1.19.3"
 
 [11902]
 forgeVersion = "[41,)"
-mcVersions = [">=1.19 <1.19.3"]
+mcVersions = ">=1.19 <1.19.3"
 
 [11802]
 forgeVersion = "[40,)"
-mcVersions = ["1.18.2"]
+mcVersions = "1.18.2"
 
 [11701]
 forgeVersion = "[37,)"
-mcVersions = ["1.17.1"]
+mcVersions = "1.17.1"
 
 [11605]
 forgeVersion = "[32,)"
-mcVersions = ["1.16.5"]
+mcVersions = "1.16.5"