Updated CI/Buildscript

Author: Sunekaer

.github/workflows/build-release.yml

@@ -9,7 +9,13 @@ jobs:
   build:
     if: |
       !contains(github.event.head_commit.message, '[ciskip]')
-    uses: nanite/workflows/.github/workflows/standard-release.yml@v1
+    uses: nanite/workflows/.github/workflows/standard-modmuss.yml@v1.1
+    with:
+      java-version: 17
+      changelog-file: "./CHANGELOG.md"
+      release-to-github: false
+      release-files: "./build/libs/*.jar"
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}
       curse-token: ${{ secrets.CURSE_DEPLOY }}
+      modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,3 @@
 # Changelog
 
-Build on 1.20.1
+Updated build script

build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id "dev.architectury.loom" version "0.12.0-SNAPSHOT"
 	id 'maven-publish'
-	id "com.matthewprenger.cursegradle" version "1.4.0"
+	id "me.modmuss50.mod-publish-plugin" version "0.3.0"
 }
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
@@ -79,35 +79,55 @@ jar {
 publishing {
 	publications {
 		mavenForge(MavenPublication) {
-			artifactId = rootProject.archivesBaseName
+			artifactId = rootProject.archives_base_name + "-" + project.name
 			from components.java
 		}
 	}
 
 	repositories {
-		if (ENV.NANITE_TOKEN) {
+		if (providers.environmentVariable("NANITE_TOKEN").orNull) {
 			maven {
-				url "https://maven.nanite.dev/releases"
+				url "${maven_url}/releases"
 				credentials {
 					username = "nanite"
-					password = "${ENV.NANITE_TOKEN}"
+					password = providers.environmentVariable("NANITE_TOKEN").get()
 				}
 			}
 		}
 	}
 }
 
-if (ENV.CURSE_TOKEN) {
-	curseforge {
-		apiKey = ENV.CURSE_TOKEN
-		project {
-			id = project.curseforge_id
-			releaseType = project.curseforge_type
-			addGameVersion "Forge"
-			addGameVersion project.minecraft_version
-			mainArtifact(remapJar.archivePath)
-			changelog = file("./CHANGELOG.md")
-			changelogType = 'markdown'
+publishMods {
+	dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
+	changelog = file("./CHANGELOG.md").text
+	version = "${mod_version}"
+	type = STABLE
+
+	def forgeOptions = publishOptions {
+		file = project.provider { project.tasks.remapJar }.flatMap { it.archiveFile }
+		displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
+		modLoaders.add("forge")
+	}
+
+	def curseForgeOptions = curseforgeOptions {
+		accessToken = providers.environmentVariable("CURSE_TOKEN")
+		projectId = "${curseforge_id}"
+		minecraftVersions.add("${minecraft_version}")
+	}
+
+	def modrinthOptions = modrinthOptions {
+		accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+		projectId = "${modrinth_id}"
+		minecraftVersions.add("${minecraft_version}")
+	}
+
+	curseforge("curseforgeForge") {
+		from(curseForgeOptions, forgeOptions)
+	}
+
+	if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
+		modrinth("modrinthForge") {
+			from(modrinthOptions, forgeOptions)
 		}
 	}
-}
+}

gradle.properties

@@ -4,8 +4,11 @@ mod_id=structure-expansion
 archives_base_name=structure-expansion
 maven_group=com.sunekaer.mods
 minecraft_version=1.20.1
-mod_version=2.0.0
+mod_version=2.0.1
 mod_author=Sunekaer
 forge_version=47.0.4
+
+# Publishing
 curseforge_id=398430
-curseforge_type=beta
+modrinth_id=IKJL3zrR
+maven_url=https://maven.nanite.dev/

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip