Update deps, move from minotaur to mod-publish-plugin

Minotaur is barely maintained, and mod-publish-plugin lets us remove the annoying version handling

Author: kennytv

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
         cache-disabled: false
         cache-provider: basic
     - name: Set up JDK 17
-      uses: actions/setup-java@v6.0.1
+      uses: actions/setup-java@v6.1.0
       with:
         distribution: 'temurin'
         java-version: 17

.github/workflows/publish.yml

@@ -25,7 +25,7 @@ jobs:
           cache-disabled: false
           cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@v6.0.1
+        uses: actions/setup-java@v6.1.0
         with:
           distribution: 'temurin'
           java-version: 17
@@ -40,5 +40,5 @@ jobs:
       - name: Publish to Modrinth
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew modrinth --stacktrace
+        run: ./gradlew publishMods --stacktrace
         continue-on-error: true

gradle.properties

@@ -1,7 +1,6 @@
 projectVersion=5.12.2-SNAPSHOT
 
-# Smile emoji (note that modrinth may not have added the version on release yet)
-mcVersions=26.3, 26.2, 26.1.2, 26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
+# note that modrinth may not have added the version on release yet
 mcVersionRange=1.10-26.3
 velocityVersion=3.4-4.2.1
 

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ netty = "4.0.20.Final"
 guava = "17.0"
 log4j = "2.8.1"
 
-checkerQual = "4.3.0"
+checkerQual = "4.3.1"
 
 # Platforms
 paper = "1.16.5-R0.1-SNAPSHOT"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=dce76f55f8e251a3a1f130eb120f30b3d271de2b76c9b0729d316b5a1b6dc01f
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
+distributionSha256Sum=21bd5da2de49b642904077f38c0efdc7778e92b3ed0889392dca61b97e389607
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

universal/build.gradle.kts

@@ -1,8 +1,6 @@
-import com.modrinth.minotaur.TaskModrinthUpload
-
 plugins {
+    id("me.modmuss50.mod-publish-plugin") version "2.2.1"
     id("io.papermc.hangar-publish-plugin") version "0.1.4"
-    id("com.modrinth.minotaur") version "2.+"
 
     // A nice no-conflict comment for patching in downgrading
 }
@@ -45,45 +43,37 @@ if (runNumber != null && (!isRelease || isMainBranch)) { // Only publish release
         val commitHash = rootProject.latestCommitHash()
         "[$commitHash](https://github.com/ViaVersion/ViaBackwards/commit/$commitHash) ${rootProject.latestCommitMessage()}"
     }
-    val mcVersions: List<String> = (property("mcVersions") as String)
-        .split(",")
-        .map { it.trim() }
-    modrinth {
-        token.set(System.getenv("MODRINTH_TOKEN"))
-        projectId.set("viabackwards")
-        versionType.set(if (isRelease) "release" else if (isMainBranch) "beta" else "alpha")
-        versionNumber.set(suffixedVersion)
-        versionName.set(suffixedVersion)
-        changelog.set(changelogContent)
-        uploadFile.set(tasks.shadowJar.flatMap { it.archiveFile })
-        gameVersions.set(mcVersions)
-        loaders.add("paper")
-        loaders.add("folia")
-        loaders.add("velocity")
-        autoAddDependsOn.set(false)
-        detectLoaders.set(false)
-        dependencies {
-            required.project("viaversion")
-            optional.project("viafabric")
-            optional.project("viarewind")
+    val mcVersionRange = property("mcVersionRange") as String
+    val (mcVersionStart, mcVersionEnd) = mcVersionRange.split("-", limit = 2)
+    publishMods {
+        file = tasks.shadowJar.flatMap { it.archiveFile }
+        type = if (isRelease) STABLE else if (isMainBranch) BETA else ALPHA
+        version = suffixedVersion
+        displayName = suffixedVersion
+        changelog = changelogContent
+
+        val modrinthOptions = modrinthOptions {
+            accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+            projectId = "viabackwards"
+            requires("viaversion")
+            optional("viafabric", "viarewind")
         }
-    }
-    tasks.modrinth {
-        notCompatibleWithConfigurationCache("")
-        finalizedBy("modrinthFabric")
-    }
-    // Fabric requires 1.14+ (18w43b), so it is uploaded separately with only the supported versions...
-    val modrinthExtension = modrinth
-    tasks.register<TaskModrinthUpload>("modrinthFabric") {
-        group = "publishing"
-        dependsOn(tasks.assemble)
-        notCompatibleWithConfigurationCache("")
-        doFirst {
-            modrinthExtension.loaders.set(listOf("fabric"))
-            modrinthExtension.gameVersions.set(mcVersions.filter { version ->
-                val (major, minor) = version.split(".").map(String::toInt)
-                major > 1 || minor >= 14
-            })
+        modrinth {
+            from(modrinthOptions)
+            modLoaders.addAll("paper", "folia", "velocity")
+            minecraftVersionRange {
+                start = mcVersionStart
+                end = mcVersionEnd
+            }
+        }
+        // Fabric requires 1.14+ (18w43b), so it is uploaded separately with only the supported versions...
+        modrinth("modrinthFabric") {
+            from(modrinthOptions)
+            modLoaders.add("fabric")
+            minecraftVersionRange {
+                start = "1.14"
+                end = mcVersionEnd
+            }
         }
     }
 
@@ -97,7 +87,7 @@ if (runNumber != null && (!isRelease || isMainBranch)) { // Only publish release
             platforms {
                 paper {
                     jar = tasks.shadowJar.flatMap { it.archiveFile }
-                    platformVersions = listOf(property("mcVersionRange") as String)
+                    platformVersions = listOf(mcVersionRange)
                     dependencies {
                         hangar("ViaVersion") {
                             required = true
@@ -122,7 +112,4 @@ if (runNumber != null && (!isRelease || isMainBranch)) { // Only publish release
             }
         }
     }
-    tasks.named("publishPluginPublicationToHangar") {
-        notCompatibleWithConfigurationCache("")
-    }
 }