From 833d0c75f68e1e956df995c22da2d77599d3ee57 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Tue, 2 Jul 2024 01:58:54 +0800 Subject: [PATCH 1/8] yamlang v1.4.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9c3b440..03d3c5a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { id 'com.replaymod.preprocess' version 'ce1aeb2b' // https://github.com/Fallen-Breath/yamlang - id 'me.fallenbreath.yamlang' version '1.3.1' apply false + id 'me.fallenbreath.yamlang' version '1.4.0' apply false } preprocess { From 08c4cc2463ae388681fdaed1e6d30b924d990939 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Tue, 2 Jul 2024 01:59:53 +0800 Subject: [PATCH 2/8] updated yarn mapping and fapi version for mc 1.20.6 and 1.21 --- versions/1.20.6/gradle.properties | 4 ++-- versions/1.21/gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties index f04f1b5..6b3c91a 100644 --- a/versions/1.20.6/gradle.properties +++ b/versions/1.20.6/gradle.properties @@ -1,7 +1,7 @@ # Fabric Properties # check these on https://fallen-breath.github.io/fabric-versions/?&version=1.20.6 minecraft_version=1.20.6 - yarn_mappings=1.20.6+build.1 + yarn_mappings=1.20.6+build.3 # Fabric Mod Metadata minecraft_dependency=1.20.x @@ -11,4 +11,4 @@ game_versions=1.20.6 # Dependencies - # fabric_api_version=0.97.8+1.20.6 \ No newline at end of file + # fabric_api_version=0.100.4+1.20.6 \ No newline at end of file diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties index d6283b4..f64a242 100644 --- a/versions/1.21/gradle.properties +++ b/versions/1.21/gradle.properties @@ -1,7 +1,7 @@ # Fabric Properties # check these on https://fallen-breath.github.io/fabric-versions/?&version=1.21 minecraft_version=1.21 - yarn_mappings=1.21+build.2 + yarn_mappings=1.21+build.7 # Fabric Mod Metadata minecraft_dependency=1.21.x @@ -11,4 +11,4 @@ game_versions=1.21 # Dependencies - # fabric_api_version=0.100.1+1.21 \ No newline at end of file + # fabric_api_version=0.100.4+1.21 \ No newline at end of file From 0c39ffbe442127327d0946da0769754c2bcdf77f Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Tue, 9 Jul 2024 02:59:49 +0800 Subject: [PATCH 3/8] changes: tweak artifact version order, make sure the artifact version follow maven's version syntax --- common.gradle | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/common.gradle b/common.gradle index 03b7875..8d5f113 100644 --- a/common.gradle +++ b/common.gradle @@ -80,32 +80,33 @@ remapJar { String modVersionSuffix = '' String artifactVersion = project.mod_version +String artifactVersionSuffix = '' // detect github action environment variables // https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables if (System.getenv("BUILD_RELEASE") != "true") { String buildNumber = System.getenv("BUILD_ID") modVersionSuffix += buildNumber != null ? ('+build.' + buildNumber) : '-SNAPSHOT' - artifactVersion += '-SNAPSHOT' // A non-release artifact is always a SNAPSHOT artifact + artifactVersionSuffix = '-SNAPSHOT' // A non-release artifact is always a SNAPSHOT artifact } String finalModVersion = project.mod_version + modVersionSuffix String fullProjectVersion, fullArtifactVersion // Example version values: // project.mod_version 1.0.3 (the base mod version) -// finalModVersion 1.0.3+build.88 (the actual mod version to use) -// fullProjectVersion mc1.15.2-v1.0.3+build.88 (in build output jar name) -// fullArtifactVersion mc1.15.2-v1.0.3-SNAPSHOT (maven artifact version) +// finalModVersion 1.0.3+build.88 (the actual mod version to use in the mod) +// fullProjectVersion v1.0.3-mc1.15.2+build.88 (in build output jar name) +// fullArtifactVersion 1.0.3-mc1.15.2-SNAPSHOT (maven artifact version) group = project.maven_group if (System.getenv("JITPACK") == "true") { // move mc version into archivesBaseName, so jitpack will be able to organize archives from multiple subprojects correctly base.archivesName = project.archives_base_name + '-mc' + project.minecraft_version fullProjectVersion = 'v' + finalModVersion - fullArtifactVersion = 'v' + artifactVersion + fullArtifactVersion = artifactVersion + artifactVersionSuffix } else { base.archivesName = project.archives_base_name - fullProjectVersion = 'mc' + project.minecraft_version + '-v' + finalModVersion - fullArtifactVersion = 'mc' + project.minecraft_version + '-v' + artifactVersion + fullProjectVersion = 'v' + finalModVersion + '-mc' + project.minecraft_version + fullArtifactVersion = artifactVersion + '-mc' + project.minecraft_version + artifactVersionSuffix } version = fullProjectVersion From fb7e444f5149d206d89de657560040cbb06960a8 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Thu, 18 Jul 2024 00:11:30 +0800 Subject: [PATCH 4/8] better version import path switch --- src/main/java/me/fallenbreath/template_mod/TemplateMod.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/fallenbreath/template_mod/TemplateMod.java b/src/main/java/me/fallenbreath/template_mod/TemplateMod.java index 35e328b..31ed875 100644 --- a/src/main/java/me/fallenbreath/template_mod/TemplateMod.java +++ b/src/main/java/me/fallenbreath/template_mod/TemplateMod.java @@ -24,7 +24,7 @@ import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.metadata.ModMetadata; -//#if MC >= 11800 +//#if MC >= 11802 //$$ import com.mojang.logging.LogUtils; //$$ import org.slf4j.Logger; //#else @@ -35,7 +35,7 @@ public class TemplateMod implements ModInitializer { public static final Logger LOGGER = - //#if MC >= 11800 + //#if MC >= 11802 //$$ LogUtils.getLogger(); //#else LogManager.getLogger(); From 1bec646db5401e83212500cee8ed265fb2382440 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Sun, 21 Jul 2024 02:17:06 +0800 Subject: [PATCH 5/8] updated version format in release action synced with 0c39ffbe442127327d0946da0769754c2bcdf77f --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec63ddb..a117088 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -192,7 +192,7 @@ jobs: files: ${{ steps.file_info.outputs.path }} name: ${{ format('{0} v{1} for mc{2}', steps.properties_g.outputs.mod_name, steps.properties_g.outputs.mod_version, steps.properties_v.outputs.minecraft_version) }} - version: ${{ format('mc{0}-v{1}', steps.properties_v.outputs.minecraft_version, steps.properties_g.outputs.mod_version) }} + version: ${{ format('v{1}-mc{0}', steps.properties_v.outputs.minecraft_version, steps.properties_g.outputs.mod_version) }} version-type: release loaders: fabric From 64ca73cea6d7dc0a44b7e4de8edcfdd9c693933a Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Sun, 21 Jul 2024 14:42:06 +0800 Subject: [PATCH 6/8] version fixes --- common.gradle | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/common.gradle b/common.gradle index 8d5f113..423762f 100644 --- a/common.gradle +++ b/common.gradle @@ -88,24 +88,26 @@ if (System.getenv("BUILD_RELEASE") != "true") { modVersionSuffix += buildNumber != null ? ('+build.' + buildNumber) : '-SNAPSHOT' artifactVersionSuffix = '-SNAPSHOT' // A non-release artifact is always a SNAPSHOT artifact } -String finalModVersion = project.mod_version + modVersionSuffix +String fullModVersion = project.mod_version + modVersionSuffix String fullProjectVersion, fullArtifactVersion // Example version values: -// project.mod_version 1.0.3 (the base mod version) -// finalModVersion 1.0.3+build.88 (the actual mod version to use in the mod) -// fullProjectVersion v1.0.3-mc1.15.2+build.88 (in build output jar name) -// fullArtifactVersion 1.0.3-mc1.15.2-SNAPSHOT (maven artifact version) +// project.mod_version 1.0.3 (the base mod version) +// modVersionSuffix +build.88 (use github action build number if possible) +// artifactVersionSuffix -SNAPSHOT +// fullModVersion 1.0.3+build.88 (the actual mod version to use in the mod) +// fullProjectVersion v1.0.3-mc1.15.2+build.88 (in build output jar name) +// fullArtifactVersion 1.0.3-mc1.15.2-SNAPSHOT (maven artifact version) group = project.maven_group if (System.getenv("JITPACK") == "true") { // move mc version into archivesBaseName, so jitpack will be able to organize archives from multiple subprojects correctly base.archivesName = project.archives_base_name + '-mc' + project.minecraft_version - fullProjectVersion = 'v' + finalModVersion + fullProjectVersion = 'v' + project.mod_version + modVersionSuffix fullArtifactVersion = artifactVersion + artifactVersionSuffix } else { base.archivesName = project.archives_base_name - fullProjectVersion = 'v' + finalModVersion + '-mc' + project.minecraft_version + fullProjectVersion = 'v' + project.mod_version + '-mc' + project.minecraft_version + modVersionSuffix fullArtifactVersion = artifactVersion + '-mc' + project.minecraft_version + artifactVersionSuffix } version = fullProjectVersion @@ -115,14 +117,14 @@ version = fullProjectVersion processResources { inputs.property "id", project.mod_id inputs.property "name", project.mod_name - inputs.property "version", finalModVersion + inputs.property "version", fullModVersion inputs.property "minecraft_dependency", project.minecraft_dependency filesMatching("fabric.mod.json") { def valueMap = [ "id": project.mod_id, "name": project.mod_name, - "version": finalModVersion, + "version": fullModVersion, "minecraft_dependency": project.minecraft_dependency, ] expand valueMap From 7f7357a6cf95fdb1d324719be1d3524aadb896a0 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Sun, 28 Jul 2024 23:41:15 +0800 Subject: [PATCH 7/8] github action node 16 thing: git-get-release-action 1.2.4 -> 1.2.5 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a117088..c955077 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: steps: - name: Get github release information if: ${{ github.event_name == 'workflow_dispatch' }} - uses: cardinalby/git-get-release-action@1.2.4 + uses: cardinalby/git-get-release-action@1.2.5 env: GITHUB_TOKEN: ${{ github.token }} with: @@ -95,7 +95,7 @@ jobs: - name: Get github release information if: ${{ github.event_name == 'workflow_dispatch' }} id: get_release - uses: cardinalby/git-get-release-action@1.2.4 + uses: cardinalby/git-get-release-action@1.2.5 env: GITHUB_TOKEN: ${{ github.token }} with: From bfefe81011a61904ef807bc14ed97e9041cdf717 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Sun, 4 Aug 2024 21:10:48 +0800 Subject: [PATCH 8/8] update vm args in run configs for stricter more mixin checks --- common.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common.gradle b/common.gradle index 423762f..51b5a56 100644 --- a/common.gradle +++ b/common.gradle @@ -58,17 +58,19 @@ if (mcVersion >= 12005) { JavaVersion MIXIN_COMPATIBILITY_LEVEL = JAVA_COMPATIBILITY loom { + def commonVmArgs = ['-Dmixin.debug.export=true', '-Dmixin.debug.countInjections=true'] runConfigs.configureEach { // to make sure it generates all "Minecraft Client (:subproject_name)" applications ideConfigGenerated = true runDir '../../run' - vmArgs '-Dmixin.debug.export=true' + vmArgs commonVmArgs } // // [FEATURE] MIXIN_AUDITOR // runs { +// def auditVmArgs = ['-DmixinAuditor.audit=true'] // serverMixinAudit { // server() -// vmArgs '-DmixinAuditor.audit=true' +// vmArgs auditVmArgs // ideConfigGenerated false // } // }