gradle updates

build.gradle

@@ -2,23 +2,21 @@ plugins {
   id 'fabric-loom' version '0.11-SNAPSHOT'
   id 'maven-publish'
 
-  id 'com.modrinth.minotaur' version '1.1.0'
+  id 'com.modrinth.minotaur' version '2.+'
   id 'com.matthewprenger.cursegradle' version '1.4.0'
 }
 
 /* Setup */
 
-def ENV = System.getenv()
-
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
 tasks.withType(JavaCompile).configureEach { it.options.release = 17 }
 
-archivesBaseName = "${project.mod_id}-fabric"
-group = project.maven_group
-
-String ver = "${project.version}+${project.ver_minecraft}"
+def ENV = System.getenv()
+String ver = "${project.version}+${project.github_branch.replaceAll("/", ".")}"
 version = ENV.GITHUB_ACTIONS ? "${ver}.build.${ENV.GITHUB_RUN_NUMBER}" : ver
 
+group = project.maven_group
+
 /* Dependencies */
 
 repositories {

gradle/publishing/curseforge.gradle

@@ -1,8 +1,6 @@
 apply plugin: "com.matthewprenger.cursegradle"
-curseforge {
-    def ENV = System.getenv()
-
-    if (!ENV.CURSEFORGE_API_KEY) return
+def ENV = System.getenv()
+if (ENV.CURSEFORGE_API_KEY) curseforge {
     apiKey = ENV.CURSEFORGE_API_KEY
 
     project {
@@ -13,7 +11,11 @@ curseforge {
         changelog = new File("./gradle/publishing", "CHANGELOG.md").text
         releaseType = project.release_type
 
-        mainArtifact(remapJar) { displayName = "[$project.ver_minecraft] $project.mod_name $version" }
+        mainArtifact(remapJar) {
+            displayName = "[$project.ver_minecraft] $project.mod_name $project.version"
+            relations { requiredLibrary 'fabric-api' }
+        }
+
         afterEvaluate { uploadTask.dependsOn(remapJar) }
     }
 

gradle/publishing/github.gradle

@@ -15,7 +15,7 @@ task github(dependsOn: build) {
         def repository = github.getRepository(project.github_repository)
 
         def builder = new GHReleaseBuilder(repository, version)
-        builder.name("[$project.ver_minecraft] $project.mod_name $version")
+        builder.name("[$project.ver_minecraft] $project.mod_name $project.version")
         builder.body(new File("./gradle/publishing", "CHANGELOG.md").text)
         builder.commitish(project.github_branch)
         builder.prerelease(project.release_type == 'beta')

gradle/publishing/modrinth.gradle

@@ -1,23 +1,20 @@
 buildscript {
-    repositories { maven { url "https://plugins.gradle.org/m2/" } }
-    dependencies { classpath group: 'gradle.plugin.com.modrinth.minotaur', name: 'Minotaur', version: '1.1.0' }
+    repositories { gradlePluginPortal() }
+    dependencies { classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2.+' }
 }
-
 apply plugin: "com.modrinth.minotaur"
-task modrinth(type: com.modrinth.minotaur.TaskModrinthUpload, dependsOn: remapJar) {
-    def ENV = System.getenv()
 
-    onlyIf { ENV.MODRINTH_TOKEN }
+def ENV = System.getenv()
+if (ENV.MODRINTH_TOKEN) modrinth {
     token = ENV.MODRINTH_TOKEN
-
     projectId = project.modrinth_id
     versionNumber = version
     versionName = "[$project.ver_minecraft] $project.mod_name $version"
-    releaseType = project.release_type
+    versionType = project.release_type
     changelog = new File("./gradle/publishing", "CHANGELOG.md").text
-
     uploadFile = remapJar
-
-    addGameVersion(project.ver_minecraft)
-    addLoader('fabric')
+    gameVersions = [ project.ver_minecraft ]
+    /*dependencies = [ // TODO doesn't work?
+            new ModDependency("P7dR8mSH", "required") // FAPI
+    ]*/
 }