Hello modrinth 😎

ViaVersion · Aug 11, 2023 · 796f81f · 796f81f
1 parent 70725d4
commit 796f81f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,4 +23,4 @@ jobs:
         env:
           HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew publishAllPublicationsToHangar # add 'modrinth' after it is approved
+        run: ./gradlew modrinth publishAllPublicationsToHangar
diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt
@@ -56,6 +56,15 @@ fun Project.branchName(): String {
     return byteOut.toString(Charsets.UTF_8.name()).trim()
 }
 
+fun Project.parseMinecraftSnapshotVersion(version: String): String? {
+    val separatorIndex = version.indexOf('-')
+    val lastSeparatorIndex = version.lastIndexOf('-')
+    if (separatorIndex == -1 || separatorIndex == lastSeparatorIndex) {
+        return null
+    }
+    return version.substring(separatorIndex + 1, lastSeparatorIndex)
+}
+
 fun JavaPluginExtension.javaTarget(version: Int) {
     sourceCompatibility = JavaVersion.toVersion(version)
     targetCompatibility = JavaVersion.toVersion(version)

diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts
@@ -48,18 +48,26 @@ val isMainBranch = branch == "master"
 val ver = (project.version as String) + "+" + System.getenv("GITHUB_RUN_NUMBER")
 val changelogContent = rootProject.lastCommitMessage()
 modrinth {
+    val snapshotVersion = rootProject.parseMinecraftSnapshotVersion(project.version as String)
     val mcVersions: List<String> = (property("mcVersions") as String)
             .split(",")
             .map { it.trim() }
+            .let { if (snapshotVersion != null) it + snapshotVersion else it }
+
     token.set(System.getenv("MODRINTH_TOKEN"))
     projectId.set("viabackwards")
     versionType.set(if (isMainBranch) "beta" else "alpha")
     versionNumber.set(ver)
-    versionName.set("[$branch] $ver")
+    versionName.set(ver)
     changelog.set(changelogContent)
     uploadFile.set(tasks.shadowJar.flatMap { it.archiveFile })
     gameVersions.set(mcVersions)
     loaders.add("fabric")
+    loaders.add("paper")
+    loaders.add("folia")
+    loaders.add("velocity")
+    loaders.add("bungeecord")
+    loaders.add("sponge")
     autoAddDependsOn.set(false)
     detectLoaders.set(false)
     dependencies {