From a5d466e0a7cafac792ee8e1a9625ab9ee8cb78d8 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Thu, 4 Nov 2021 14:55:59 +0800 Subject: [PATCH] Added support for automatic upload to CurseForge and Modrinth. (#190) * Added support for automatic upload to CurseForge and Modrinth. Signed-off-by: ZekerZhayard * Fix defining environment variable in circle ci. Signed-off-by: ZekerZhayard * Fix defining environment variable in circle ci. Signed-off-by: ZekerZhayard * Finish fixing defining environment. Signed-off-by: ZekerZhayard --- .circleci/config.yml | 7 +++-- BuildScripts/curseforge.gradle | 54 +++++++++++++++++++++++++++++++++ BuildScripts/modrinth.gradle | 48 +++++++++++++++++++++++++++++ BuildScripts/version.gradle | 1 + Fabric/build.gradle | 21 +++++++++++++ Fabric/build.properties | 3 +- Forge/Active/build.properties | 1 + Forge/Legacy/build.properties | 1 + Vanilla/1.12.2/build.properties | 1 + Vanilla/1.16.5/build.properties | 1 + Vanilla/1.17.1/build.properties | 1 + Vanilla/1.8.9/build.properties | 1 + build.gradle | 13 ++++++-- 13 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 BuildScripts/curseforge.gradle create mode 100644 BuildScripts/modrinth.gradle diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e71b0d..de180c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,8 +25,11 @@ jobs: # Gradle - run: gradle --version - - run: gradle clean build - - run: gradle upload + - run: + name: Build and publish + command: | + export GIT_COMMIT_DESC=$(git log --format=%B -n 1 $CIRCLE_SHA1) + gradle clean build upload # - run: gradle publishGprPublicationToGitHubPackagesRepository - store_artifacts: diff --git a/BuildScripts/curseforge.gradle b/BuildScripts/curseforge.gradle new file mode 100644 index 0000000..f2b7094 --- /dev/null +++ b/BuildScripts/curseforge.gradle @@ -0,0 +1,54 @@ + +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0" + } +} + +import com.matthewprenger.cursegradle.CurseArtifact +import com.matthewprenger.cursegradle.CurseGradlePlugin +import com.matthewprenger.cursegradle.CurseUploadTask + +// https://www.curseforge.com/minecraft/mc-mods/customskinloader +static void provideCurseForge0(Project proj) { + proj.apply plugin: CurseGradlePlugin + + // We don’t use the task provided by the plugin because it adds some dependencies that we don’t need. + proj.tasks.create(name: "publishCurseForge", type: CurseUploadTask) { task -> + onlyIf { + System.getenv("CURSEFORGE_API_KEY") != null + } + + apiKey = System.getenv("CURSEFORGE_API_KEY") + projectId = "286924" + mainArtifact = new CurseArtifact().with { + artifact = proj.tasks.jar + gameVersionStrings = proj.ext.config.minecraft_full_versions.split(",") // Minecraft Versions + proj.ext.config.java_full_versions.split(",").each { + gameVersionStrings += "Java ${it}" // Java Versions + } + gameVersionStrings += proj.name.split("/")[0] // Loader Version + changelogType = "text" + changelog = System.getenv("GIT_COMMIT_DESC") ?: "" + displayName = "${proj.archivesBaseName}-${proj.ext.getShortVersion()}" + releaseType = proj.ext.isSnapshot ? "beta" : "release" + it + } + additionalArtifacts = [] + + proj.rootProject.tasks.whenTaskAdded { + if (it.name == "upload") { + it.finalizedBy task + } + } + } +} + +ext { + provideCurseForge = { Project p -> provideCurseForge0 p } +} diff --git a/BuildScripts/modrinth.gradle b/BuildScripts/modrinth.gradle new file mode 100644 index 0000000..4d6f21f --- /dev/null +++ b/BuildScripts/modrinth.gradle @@ -0,0 +1,48 @@ + +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "gradle.plugin.com.modrinth.minotaur:Minotaur:1.2.1" + } +} + +import com.modrinth.minotaur.TaskModrinthUpload +import com.modrinth.minotaur.request.VersionType + +// https://modrinth.com/mod/csl +static void provideModrinth0(Project proj) { + proj.tasks.create(name: "publishModrinth", type: TaskModrinthUpload) { task -> + onlyIf { + System.getenv("MODRINTH_TOKEN") != null + } + + token = System.getenv("MODRINTH_TOKEN") + projectId = "idMHQ4n2" + versionNumber = proj.ext.getCSLVersion() + versionName = "${proj.archivesBaseName}-${proj.ext.getShortVersion()}" + changelog = System.getenv("GIT_COMMIT_DESC") ?: "" + uploadFile = proj.tasks.jar + versionType = proj.ext.isSnapshot ? VersionType.BETA : VersionType.RELEASE + failSilently = true + detectLoaders = false + + proj.ext.config.minecraft_full_versions.split(",").each { + addGameVersion it // Minecraft Versions + } + addLoader proj.name.split("/")[0] // Loader Version + + proj.rootProject.tasks.whenTaskAdded { + if (it.name == "upload") { + it.finalizedBy task + } + } + } +} + +ext { + provideModrinth = { Project p -> provideModrinth0 p } +} diff --git a/BuildScripts/version.gradle b/BuildScripts/version.gradle index 5db4a0f..1a54a14 100644 --- a/BuildScripts/version.gradle +++ b/BuildScripts/version.gradle @@ -30,6 +30,7 @@ String getShortVersion() { } ext { + isSnapshot = this.&isSnapshot getBuildNum = this.&getBuildNum getCSLVersion = this.&getCSLVersion getShortVersion = this.&getShortVersion diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 1db0868..6c20714 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -27,3 +27,24 @@ dependencies { // This is the minimum version number that the mod should dependent in the development environment. implementation "net.fabricmc:fabric-loader:0.12.0" } + +import groovy.json.JsonSlurper + +// Resolve snapshot versions +tasks.publishModrinth.doFirst { + gameVersions.removeIf { v -> v.endsWith("-Snapshot") } + + // The CustomSkinLoader Fabric edition should support all Minecraft snapshot edition. + def jsonSlurper = new JsonSlurper() + def officialVersionList = [] as Set + jsonSlurper.parse(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json")).versions.each { version -> + officialVersionList << version.id + } + jsonSlurper.parse(new URL("https://meta.fabricmc.net/v2/versions/game")).each { version -> + // Exclude experimental editions which is not support in Modrinth. + if (!version.stable && officialVersionList.contains(version.version)) { + gameVersions << version.version.replace(" ", "-").replace("Pre-Release-", "pre") // Fix the id of the earlier preview versions of 1.14. + } + } + println gameVersions +} diff --git a/Fabric/build.properties b/Fabric/build.properties index 928a0fb..eb8fa6f 100644 --- a/Fabric/build.properties +++ b/Fabric/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.14 -minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17,1.17.1 +minecraft_full_versions=1.14-Snapshot,1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15-Snapshot,1.15,1.15.1,1.15.2,1.16-Snapshot,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17-Snapshot,1.17,1.17.1,1.18-Snapshot +java_full_versions=8,9,10,11,12,13,14,15,16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Forge/Active/build.properties b/Forge/Active/build.properties index d35c31c..e5c5620 100644 --- a/Forge/Active/build.properties +++ b/Forge/Active/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.17.1 minecraft_full_versions=1.17.1 +java_full_versions=16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Forge/Legacy/build.properties b/Forge/Legacy/build.properties index 78dc933..175b7b2 100644 --- a/Forge/Legacy/build.properties +++ b/Forge/Legacy/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.12.2 minecraft_full_versions=1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5 +java_full_versions=8,9,10,11,12,13,14,15,16 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Vanilla/1.12.2/build.properties b/Vanilla/1.12.2/build.properties index f20f61f..e5c348f 100644 --- a/Vanilla/1.12.2/build.properties +++ b/Vanilla/1.12.2/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.12.2 minecraft_full_versions=1.12.2 +java_full_versions=8,9,10,11,12,13,14,15,16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Vanilla/1.16.5/build.properties b/Vanilla/1.16.5/build.properties index cee1dae..eccc13f 100644 --- a/Vanilla/1.16.5/build.properties +++ b/Vanilla/1.16.5/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.16.5 minecraft_full_versions=1.16.5 +java_full_versions=8,9,10,11,12,13,14,15,16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Vanilla/1.17.1/build.properties b/Vanilla/1.17.1/build.properties index 2937d4b..bfb54ef 100644 --- a/Vanilla/1.17.1/build.properties +++ b/Vanilla/1.17.1/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.17.1 minecraft_full_versions=1.17.1 +java_full_versions=16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/Vanilla/1.8.9/build.properties b/Vanilla/1.8.9/build.properties index b3387e9..3254637 100644 --- a/Vanilla/1.8.9/build.properties +++ b/Vanilla/1.8.9/build.properties @@ -1,5 +1,6 @@ minecraft_version=1.8.9 minecraft_full_versions=1.8.9 +java_full_versions=8,9,10,11,12,13,14,15,16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 forge_version=14.23.5.2768 diff --git a/build.gradle b/build.gradle index d2f24e0..23201cc 100644 --- a/build.gradle +++ b/build.gradle @@ -201,10 +201,17 @@ subprojects { tasks.withType(PublishToMavenRepository) { onlyIf { System.getenv("GITHUB_TOKEN") != null } } - } - if (project.name.toLowerCase().contains("vanilla/1.")) { - apply from: rootProject.file('Vanilla/common.gradle') + if (project.name.toLowerCase().contains("vanilla/1.")) { + apply from: rootProject.file('Vanilla/common.gradle') + } else { + // Only Fabric and Forge edition should be uploaded to CurseForge and Modrinth + apply from: rootProject.file("BuildScripts/curseforge.gradle") + provideCurseForge project + + apply from: rootProject.file("BuildScripts/modrinth.gradle") + provideModrinth project + } } }