Migrate to mc-publish from Minotaur and CurseGradle

Signed-off-by: Emanuel Pilz <emonadeo@gmail.com>

.github/workflows/build.yml

@@ -1,40 +1,37 @@
-# Automatically build the project and run any configured tests for every push
-# and submitted pull request. This can help catch issues that only occur on
-# certain platforms or Java versions, and provides a first line of defence
-# against bad commits.
-
 name: build
-on: [pull_request, push]
+
+on:
+    pull_request:
+    push:
+        branches:
+            - '*'
 
 jobs:
-  build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          21,    # Current Java LTS & minimum supported by Minecraft
-        ]
-        # and run on both Linux and Windows
-        os: [ubuntu-22.04, windows-2022]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v3
-      - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: 'microsoft'
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-      - name: build
-        run: ./gradlew build
-      - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v3
-        with:
-          name: Artifacts
-          path: build/libs/
+    build:
+        runs-on: ubuntu-22.04
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Validate Gradle Wrapper
+              uses: gradle/wrapper-validation-action@v1
+
+            - name: Setup Java 21
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 21
+                  distribution: 'microsoft'
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v4
+              with:
+                  cache-read-only: false
+
+            - name: Execute Gradle Build
+              run: ./gradlew build
+
+            - name: Upload Artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Artifacts
+                  path: build/libs/

.github/workflows/publish.yml

@@ -0,0 +1,45 @@
+name: publish
+
+on:
+    push:
+        tags:
+            - '*'
+
+jobs:
+    publish:
+        runs-on: ubuntu-22.04
+        permissions:
+            # needed to create new releases
+            contents: write
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Validate Gradle Wrapper
+              uses: gradle/wrapper-validation-action@v1
+
+            - name: Setup Java 21
+              uses: actions/setup-java@v4
+              with:
+                  java-version: 21
+                  distribution: 'microsoft'
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v4
+              with:
+                  cache-read-only: false
+
+            - name: Execute Gradle Build
+              run: ./gradlew build
+
+            - name: Upload Artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Artifacts
+                  path: build/libs/
+
+            - uses: Kir-Antipov/mc-publish@v3.3
+              with:
+                  modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+                  curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+                  github-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,8 +1,6 @@
 plugins {
 	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
-	id "com.matthewprenger.cursegradle" version "1.4.0"
-	id "com.modrinth.minotaur" version "2.+"
 }
 
 version = "${project.supported_versions}-${project.mod_version}"
@@ -61,44 +59,3 @@ jar {
 		rename { "${it}_${project.archivesBaseName}"}
 	}
 }
-
-curseforge {
-	if (project.hasProperty("curseForgeApiKey") || System.getenv("curseForgeApiKey") != null) {
-		apiKey = project.hasProperty("curseForgeApiKey") ? project.property("curseForgeApiKey") : System.getenv("curseForgeApiKey")
-		project {
-			id = project.project_id
-			releaseType = project.release_type
-			changelogType = "text"
-			changelog = file("changelog.txt")
-
-			addGameVersion "1.21.3"
-			addGameVersion "1.21.2"
-			addGameVersion "Java 21"
-			addGameVersion "Fabric"
-
-			relations {
-				requiredLibrary "fabric-api"
-			}
-
-			mainArtifact(remapJar)
-			afterEvaluate {
-				uploadTask.dependsOn(remapJar)
-			}
-		}
-		options {
-			forgeGradleIntegration = false
-		}
-	}
-}
-
-import com.modrinth.minotaur.dependencies.ModDependency
-
-modrinth {
-	token = project.hasProperty("modrinthApiKey") ? project.property("modrinthApiKey") : System.getenv("modrinthApiKey")
-	projectId = "2i7tg1Wv"
-	versionName = "v${project.mod_version} (Minecraft 1.21.2)"
-	versionNumber = version
-	uploadFile = remapJar
-	gameVersions = ["1.21.2", "1.21.3"]
-	loaders = ["fabric"]
-}

gradle.properties

@@ -17,8 +17,4 @@ archives_base_name=autorun
 # Dependencies
 fabric_version=0.106.1+1.21.2
 modmenu_version=12.0.0-beta.1
-cloth_version=16.0.141
-
-# CurseGradle
-project_id=279429
-release_type=release
+cloth_version=16.0.141

src/main/resources/fabric.mod.json

@@ -19,9 +19,18 @@
 	},
 	"mixins": ["autorun.mixins.json"],
 	"depends": {
+		"fabric-api": "*",
 		"fabricloader": ">=0.15.10",
-		"minecraft": ">=1.21.2-",
-		"java": ">=21",
-		"fabric-api": "*"
+		"minecraft": ">=1.21.2-"
+	},
+	"suggests": {
+		"modmenu": ">=12",
+		"cloth-config": ">=16"
+	},
+	"custom": {
+		"mc-publish": {
+			"modrinth": "2i7tg1Wv",
+			"curseforge": "279429"
+		}
 	}
 }