diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 4b89cc67..9180cf03 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -11,5 +11,5 @@ dependencies { implementation(libs.build.indraLicenser) implementation(libs.build.shadow) implementation(libs.build.hangarPublishPlugin) - implementation(libs.build.minotaur) + implementation(libs.build.mod.publish.plugin) } diff --git a/build-logic/src/main/kotlin/tabtps.platform.gradle.kts b/build-logic/src/main/kotlin/tabtps.platform.gradle.kts index 1034d6ed..51d35654 100644 --- a/build-logic/src/main/kotlin/tabtps.platform.gradle.kts +++ b/build-logic/src/main/kotlin/tabtps.platform.gradle.kts @@ -1,7 +1,9 @@ +import me.modmuss50.mpp.ReleaseType + plugins { id("tabtps.base") id("com.github.johnrengelman.shadow") - id("com.modrinth.minotaur") + id("me.modmuss50.mod-publish-plugin") } decorateVersion() @@ -18,10 +20,10 @@ tasks { } } -modrinth { +publishMods.modrinth { projectId.set("cUhi3iB2") - versionType.set("release") + type.set(ReleaseType.STABLE) file.set(platformExt.productionJar) changelog.set(releaseNotes) - token.set(providers.environmentVariable("MODRINTH_TOKEN")) + accessToken.set(providers.environmentVariable("MODRINTH_TOKEN")) } diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 24e0e006..39b86c58 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -64,3 +64,8 @@ tasks { tabTPSPlatform { productionJar.set(tasks.remapJar.flatMap { it.archiveFile }) } + +publishMods.modrinth { + modLoaders.add("fabric") + minecraftVersions.add(minecraftVersion) +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1686ea44..6f0687e6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,7 +30,7 @@ mixin = "0.8.5" # buildSrc indra = "3.1.3" shadow = "8.1.1" -minotaur = "2.7.5" +mod-publish-plugin = "0.4.5" hangarPublishPlugin = "0.1.0" [libraries] @@ -82,7 +82,7 @@ minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft build-indraCommon = { group = "net.kyori", name = "indra-common", version.ref = "indra" } build-indraLicenser = { group = "net.kyori", name = "indra-licenser-spotless", version.ref = "indra" } build-shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" } -build-minotaur = { group = "com.modrinth.minotaur", name = "Minotaur", version.ref = "minotaur" } +build-mod-publish-plugin = { module = "me.modmuss50:mod-publish-plugin", version.ref = "mod-publish-plugin" } build-hangarPublishPlugin = { group = "io.papermc", name = "hangar-publish-plugin", version.ref = "hangarPublishPlugin" } [bundles] diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index 60b3e830..3ae599fe 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -109,6 +109,7 @@ fun TaskContainerScope.createVersionedRun( }) } -modrinth { - gameVersions.addAll(bukkitVersions) +publishMods.modrinth { + modLoaders.add("paper") + minecraftVersions.addAll(bukkitVersions) } diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts index 65e9efeb..f4e7bafc 100644 --- a/sponge/build.gradle.kts +++ b/sponge/build.gradle.kts @@ -94,8 +94,9 @@ tabTPSPlatform { productionJar.set(tasks.shadowJar.flatMap { it.archiveFile }) } -modrinth { - gameVersions.addAll( +publishMods.modrinth { + modLoaders.add("sponge") + minecraftVersions.addAll( "1.16.5", "1.17.1", "1.18.2",