From 11c81d22248b1a937cb071c73dc840b82c109012 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Tue, 18 Nov 2025 16:32:31 +0100 Subject: [PATCH 1/7] Remove automatic github releases --- build.gradle | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/build.gradle b/build.gradle index be322539..a5dd9c54 100644 --- a/build.gradle +++ b/build.gradle @@ -178,15 +178,6 @@ publishing { } } -subprojects { - publishMods { - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent project(":").tasks.named("publishGithub") - } - } -} - publishMods { file = remapJar.archiveFile type = STABLE @@ -195,14 +186,6 @@ publishMods { changelog = "" displayName = "${project.mod_version}" - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - repository = "RedstoneTools/redstonetools-mod" - commitish = "main" - tagName = "${project.mod_version}" - allowEmptyFiles = true - } - modrinth { accessToken = providers.environmentVariable("MODRINTH_TOKEN") projectId = "9ySQVrz2" From 5ccbeb193d36a118aea94aa198e136af66a0d140 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Tue, 18 Nov 2025 16:36:51 +0100 Subject: [PATCH 2/7] Fix #410 --- .../redstonetools/malilib/widget/action/CommandListWidget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/java/tools/redstone/redstonetools/malilib/widget/action/CommandListWidget.java b/src/client/java/tools/redstone/redstonetools/malilib/widget/action/CommandListWidget.java index 0338b8cc..543415f4 100644 --- a/src/client/java/tools/redstone/redstonetools/malilib/widget/action/CommandListWidget.java +++ b/src/client/java/tools/redstone/redstonetools/malilib/widget/action/CommandListWidget.java @@ -25,7 +25,7 @@ public CommandListWidget(GuiMacroEditor parent, MinecraftClient mc, int width, i super(mc, width, height, y, itemHeight); this.parent = parent; this.macro = macro; - this.macro.actions.forEach((t) -> this.children().add(new CommandEntry(t, this))); + this.macro.actions.forEach((t) -> this.addEntry(new CommandEntry(t, this))); } @Override From a8084bef9f8320a17f12fa4f656064f36b2c6517 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Wed, 19 Nov 2025 11:32:27 +0100 Subject: [PATCH 3/7] Remove shadow, readd github publishing, other publishing things --- .github/workflows/publish.yml | 23 ++++++++++++++++++++--- build.gradle | 28 +++++++++++++++++++--------- stonecutter.gradle | 26 +++++++++++++++++++++++++- 3 files changed, 64 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dcaac5a0..3d92de98 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,6 +1,20 @@ name: Publish Mod -on: [workflow_dispatch] # Manual trigger - +#on: [workflow_dispatch] # Manual trigger +on: + workflow_dispatch: + inputs: + release_github: + type: boolean + description: 'Github Release' + default: false + github_repo: + type: string + description: 'Github repo' + default: "RedstoneTools/redstonetools-mod" + release_modrinth: + type: boolean + description: 'Modrinth Release' + default: false permissions: contents: write @@ -16,4 +30,7 @@ jobs: env: # modrinth-id: 9ySQVrz2 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} \ No newline at end of file + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + RELEASE_GITHUB: ${{ inputs.release_github }} + RELEASE_MODRINTH: ${{ inputs.release_modrinth }} + GITHUB_REPO: ${{ inputs.github_repo }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index a5dd9c54..34c78a66 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id 'fabric-loom' version '1.11-SNAPSHOT' id 'maven-publish' - id 'com.github.johnrengelman.shadow' version '8.+' id "me.modmuss50.mod-publish-plugin" version "1.1.0" } @@ -183,16 +182,27 @@ publishMods { type = STABLE modLoaders.add("fabric") - changelog = "" + changelog = "" displayName = "${project.mod_version}" - modrinth { - accessToken = providers.environmentVariable("MODRINTH_TOKEN") - projectId = "9ySQVrz2" - minecraftVersions.add(project.minecraft_version) + if (providers.environmentVariable("RELEASE_MODRINTH").getOrElse("false").toBoolean()) { + modrinth { + accessToken = providers.environmentVariable("MODRINTH_TOKEN") + projectId = "9ySQVrz2" + minecraftVersions.add(project.minecraft_version) - requires("fabric-api") - requires("malilib") - optional("worldedit") + requires("fabric-api") + requires("malilib") + optional("worldedit") + } + } + + + if (providers.environmentVariable("RELEASE_GITHUB").getOrElse("false").toBoolean()) { + github { + accessToken = providers.environmentVariable("GITHUB_TOKEN") + + parent rootProject.tasks.named("publishGithub") + } } } \ No newline at end of file diff --git a/stonecutter.gradle b/stonecutter.gradle index 37d02b07..3593be58 100644 --- a/stonecutter.gradle +++ b/stonecutter.gradle @@ -1,4 +1,28 @@ plugins { id "dev.kikugie.stonecutter" + id "me.modmuss50.mod-publish-plugin" version "1.1.0" } -stonecutter.active "1.21.10" \ No newline at end of file +stonecutter.active "1.21.10" + +publishMods { + if (providers.environmentVariable("RELEASE_MODRINTH").getOrElse("false").toBoolean()) { + if (!providers.environmentVariable("MODRINTH_TOKEN").isPresent() || providers.environmentVariable("MODRINTH_TOKEN").get() == "") { + throw new GradleException('Missing MODRINTH_TOKEN') + } + } + + if (providers.environmentVariable("RELEASE_GITHUB").getOrElse("false").toBoolean()) { + if (!providers.environmentVariable("GITHUB_TOKEN").isPresent() || providers.environmentVariable("GITHUB_TOKEN").get() == "") { + throw new GradleException('Missing GITHUB_TOKEN') + } + + github { + accessToken = providers.environmentVariable("GITHUB_TOKEN") + repository = providers.environmentVariable("GITHUB_REPO") + commitish = "main" + tagName = "${project.mod_version}" + displayName = "Redstone Tools ${rootProject.mod_version}" + allowEmptyFiles = true + } + } +} \ No newline at end of file From 7c88948f4f1f1fccf0e25569e840db69d3051b0b Mon Sep 17 00:00:00 2001 From: kr1viah Date: Wed, 19 Nov 2025 11:33:53 +0100 Subject: [PATCH 4/7] bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 32cc191e..ffd81e64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ maven_group = tools.redstone archives_base_name = redstonetools loader_version=0.17.3 -mod_version = v3.1.4 +mod_version = v3.1.5 From bb9c16e3d629e807b92ae43bdf37f893a2fc7912 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Wed, 19 Nov 2025 11:41:56 +0100 Subject: [PATCH 5/7] move version = ... --- stonecutter.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stonecutter.gradle b/stonecutter.gradle index 3593be58..aa9b9836 100644 --- a/stonecutter.gradle +++ b/stonecutter.gradle @@ -4,6 +4,8 @@ plugins { } stonecutter.active "1.21.10" +version = project.mod_version + "+" + stonecutter.current.version + publishMods { if (providers.environmentVariable("RELEASE_MODRINTH").getOrElse("false").toBoolean()) { if (!providers.environmentVariable("MODRINTH_TOKEN").isPresent() || providers.environmentVariable("MODRINTH_TOKEN").get() == "") { From dfc77f9d89d44d79702f5a6d0170432a71df9ed0 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Wed, 19 Nov 2025 11:49:02 +0100 Subject: [PATCH 6/7] Add changelog = "" --- stonecutter.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/stonecutter.gradle b/stonecutter.gradle index aa9b9836..6371e079 100644 --- a/stonecutter.gradle +++ b/stonecutter.gradle @@ -22,6 +22,7 @@ publishMods { accessToken = providers.environmentVariable("GITHUB_TOKEN") repository = providers.environmentVariable("GITHUB_REPO") commitish = "main" + changelog = "" tagName = "${project.mod_version}" displayName = "Redstone Tools ${rootProject.mod_version}" allowEmptyFiles = true From 7655bd692eabb13b06a5aeb7986ee3369b3d3d2a Mon Sep 17 00:00:00 2001 From: kr1viah Date: Wed, 19 Nov 2025 11:56:10 +0100 Subject: [PATCH 7/7] Add type = STABLE --- stonecutter.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/stonecutter.gradle b/stonecutter.gradle index 6371e079..2035f022 100644 --- a/stonecutter.gradle +++ b/stonecutter.gradle @@ -23,6 +23,7 @@ publishMods { repository = providers.environmentVariable("GITHUB_REPO") commitish = "main" changelog = "" + type = STABLE tagName = "${project.mod_version}" displayName = "Redstone Tools ${rootProject.mod_version}" allowEmptyFiles = true