From fec57f29ad8e20bac49e4eb8d3fbdb0948ff047e Mon Sep 17 00:00:00 2001 From: Siphalor Date: Fri, 18 Mar 2022 22:28:11 +0100 Subject: [PATCH 1/3] Update dependencies --- build.gradle | 10 +++++----- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index dfd8809c..62add184 100644 --- a/build.gradle +++ b/build.gradle @@ -54,12 +54,12 @@ dependencies { exclude group: "net.fabricmc.fabric-api" } - include(modApi("de.siphalor.tweed4:tweed4-base-$minecraft_major_version:1.3.1+")) - include(modApi("de.siphalor.tweed4:tweed4-annotated-$minecraft_major_version:1.2.0+")) - include(modApi("de.siphalor.tweed4:tweed4-data-$minecraft_major_version:1.2.0+")) + include(modApi("de.siphalor.tweed4:tweed4-base-$minecraft_major_version:1.4.2+")) + include(modApi("de.siphalor.tweed4:tweed4-annotated-$minecraft_major_version:1.3.0+")) + include(modApi("de.siphalor.tweed4:tweed4-data-$minecraft_major_version:1.2.1+")) include(modApi("de.siphalor.tweed4:tweed4-data-hjson-$minecraft_major_version:1.1.0+")) - include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$minecraft_major_version:1.0.1+")) - include(modApi("de.siphalor.tweed4:tweed4-tailor-coat-$minecraft_major_version:1.0.1+")) + include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$minecraft_major_version:1.1.0+")) + include(modApi("de.siphalor.tweed4:tweed4-tailor-coat-$minecraft_major_version:1.1.1+")) include(modApi("de.siphalor:coat-$minecraft_major_version:$coat_version")) modImplementation(include("de.siphalor:amecsapi-$minecraft_major_version:${project.amecs_version}")) { diff --git a/gradle.properties b/gradle.properties index 0e180d83..e098b860 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ maven_group=de.siphalor archives_base_name=mousewheelie # Dependencies amecs_version=1.3.5+ -coat_version=1.0.0-beta.14 +coat_version=1.0.0-beta.17+ fabric_api_version=0.42.0+1.16 From 9b4776732d1dccb08dce0fddf6d203d9106266fd Mon Sep 17 00:00:00 2001 From: Siphalor Date: Fri, 18 Mar 2022 22:37:16 +0100 Subject: [PATCH 2/3] Some build script improvements --- build.gradle | 72 ++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index 62add184..cf0c563b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' id 'com.matthewprenger.cursegradle' version '1.4.0' - id 'com.modrinth.minotaur' version '1.2.1' + id 'com.modrinth.minotaur' version '2.1.1' id 'org.cadixdev.licenser' version '0.6.1' id 'com.github.breadmoirai.github-release' version '2.2.12' } @@ -116,6 +116,7 @@ publishing { artifactId = "${project.archives_base_name}-${project.minecraft_major_version}" from components.java + java.withSourcesJar() } } @@ -136,21 +137,9 @@ publishing { // Mod sites -String getProjectChangelog() { - def commits = 'git log -20 --format=oneline'.execute().text.readLines() - def versionCommit = null - for (commit in commits) { - if (commit.contains('Version')) { - versionCommit = commit.split(' ')[0] - break - } - } - if (versionCommit == null) { - return """## Version ${project.mod_version} -No changelog found!""" - } - return "git log -1 --format=format:##%x20%s%n%n%b%nRelease%x20by%x20%an $versionCommit".execute().text.trim() +static def getChangelog() { + return 'git log -1 --format=format:##%x20%s%n%n%b%nRelease%x20by%x20%an --grep Version'.execute().text.trim() } task uploadToModSites { @@ -158,14 +147,14 @@ task uploadToModSites { group = "upload" } -if (project.hasProperty("siphalorCurseForgeApi")) { +if (project.hasProperty("curseforgeToken")) { curseforge { - apiKey project.siphalorCurseForgeApi + apiKey project.curseforgeToken project { id = "317514" releaseType = project.mod_release changelogType = "markdown" - changelog = getProjectChangelog() + changelog = project.getChangelog() addGameVersion("Fabric") for (version in ((String) project.mod_mc_versions).split(";")) { addGameVersion(version) @@ -184,36 +173,31 @@ if (project.hasProperty("siphalorCurseForgeApi")) { uploadToModSites.finalizedBy(tasks.curseforge) } -import com.modrinth.minotaur.TaskModrinthUpload -if (project.hasProperty("siphalorModrinthApi")) { - task modrinth (type: TaskModrinthUpload) { - group = "upload" - dependsOn(build) - - token = project.siphalorModrinthApi - projectId = "u5Ic2U1u" - versionNumber = version - versionName = "[${project.mod_mc_version_specifier}] ${project.mod_version}" - changelog = getProjectChangelog() - uploadFile = remapJar - versionType = project.mod_release - for (version in ((String) project.mod_mc_versions).split(";")) { - addGameVersion(version) - } - addLoader("fabric") +modrinth { + if (project.hasProperty("modrinthToken")) { + token = project.modrinthToken + uploadToModSites.finalizedBy(tasks.modrinth) } - uploadToModSites.finalizedBy(tasks.modrinth) + + projectId = "u5Ic2U1u" + versionName = "[$project.mod_mc_version_specifier] $project.mod_version" + versionType = project.mod_release + changelog = project.getChangelog() + uploadFile = remapJar + gameVersions = project.mod_mc_versions.split(";") as List + loaders = ["fabric"] } +tasks.modrinth.group = "upload" -if (project.hasProperty("siphalorGitHubToken")) { +if (project.hasProperty("githubToken")) { githubRelease { - token siphalorGitHubToken - targetCommitish.set(minecraft_major_version) - releaseName.set("Version $mod_version for $mod_mc_version_specifier") - body.set(getProjectChangelog()) + token project.githubToken + targetCommitish = project.minecraft_major_version + releaseName = "Version $project.mod_version for $project.mod_mc_version_specifier" + body = project.getChangelog() releaseAssets remapJar.getArchiveFile() - prerelease.set(mod_release != "release") - overwrite.set(true) + prerelease = mod_release != "release" + overwrite = true } uploadToModSites.finalizedBy(tasks.githubRelease) } From ddbf95ad8e91f5725bcd81414b06b474819a7215 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Fri, 18 Mar 2022 22:38:06 +0100 Subject: [PATCH 3/3] Version 1.8.4 - Various dependency updates. This should resolve some issues with editing the config file for example. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e098b860..faed2c45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_build=5:v2 loader_version=0.12.5 # Mod Properties mod_id=mousewheelie -mod_version=1.8.3 +mod_version=1.8.4 mod_release=release mod_mc_version_specifier=1.16.3+ mod_mc_versions=1.16.3;1.16.4;1.16.5