From e63e0703e2640b5894d4bee76e7f5fb530583c9b Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Fri, 14 Nov 2025 20:42:19 +0100 Subject: [PATCH 01/14] Add changelog --- versions/1.21.10/build.gradle | 1 + versions/1.21.4/build.gradle | 1 + versions/1.21.5/build.gradle | 1 + versions/1.21.8/build.gradle | 1 + 4 files changed, 4 insertions(+) diff --git a/versions/1.21.10/build.gradle b/versions/1.21.10/build.gradle index ca20ce31..d5e30a9f 100644 --- a/versions/1.21.10/build.gradle +++ b/versions/1.21.10/build.gradle @@ -6,6 +6,7 @@ publishMods { file = remapJar.archiveFile type = STABLE modLoaders.add("fabric") + changelog = "" modrinth { projectId = "9ySQVrz2" diff --git a/versions/1.21.4/build.gradle b/versions/1.21.4/build.gradle index ca20ce31..d5e30a9f 100644 --- a/versions/1.21.4/build.gradle +++ b/versions/1.21.4/build.gradle @@ -6,6 +6,7 @@ publishMods { file = remapJar.archiveFile type = STABLE modLoaders.add("fabric") + changelog = "" modrinth { projectId = "9ySQVrz2" diff --git a/versions/1.21.5/build.gradle b/versions/1.21.5/build.gradle index ca20ce31..d5e30a9f 100644 --- a/versions/1.21.5/build.gradle +++ b/versions/1.21.5/build.gradle @@ -6,6 +6,7 @@ publishMods { file = remapJar.archiveFile type = STABLE modLoaders.add("fabric") + changelog = "" modrinth { projectId = "9ySQVrz2" diff --git a/versions/1.21.8/build.gradle b/versions/1.21.8/build.gradle index ca20ce31..d5e30a9f 100644 --- a/versions/1.21.8/build.gradle +++ b/versions/1.21.8/build.gradle @@ -6,6 +6,7 @@ publishMods { file = remapJar.archiveFile type = STABLE modLoaders.add("fabric") + changelog = "" modrinth { projectId = "9ySQVrz2" From 60a8a8ed4fab06119d1fed00fa4a58e42cb6edda Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Fri, 14 Nov 2025 20:48:21 +0100 Subject: [PATCH 02/14] Add changelog --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 0a0f6f13..694ed6f7 100644 --- a/build.gradle +++ b/build.gradle @@ -184,6 +184,7 @@ publishMods { repository = "RedstoneTools/redstonetools-mod" commitish = "main" tagName = "v${project.mod_version}" + changelog = "" allowEmptyFiles = true } } \ No newline at end of file From 745da6732cc1562bd1e65d2ededb33144e1ba5ce Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Fri, 14 Nov 2025 20:56:05 +0100 Subject: [PATCH 03/14] Add type --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 694ed6f7..eb5c5920 100644 --- a/build.gradle +++ b/build.gradle @@ -183,6 +183,7 @@ publishMods { accessToken = providers.environmentVariable("GITHUB_TOKEN") repository = "RedstoneTools/redstonetools-mod" commitish = "main" + type = STABLE tagName = "v${project.mod_version}" changelog = "" allowEmptyFiles = true From a004feb37ec2e74793e10a6c79e31aba5cf6e4ad Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Sat, 15 Nov 2025 11:27:29 +0100 Subject: [PATCH 04/14] Fix releases and tag name --- build.gradle | 2 +- versions/1.21.10/build.gradle | 2 +- versions/1.21.4/build.gradle | 2 +- versions/1.21.5/build.gradle | 2 +- versions/1.21.8/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index eb5c5920..2fca59a6 100644 --- a/build.gradle +++ b/build.gradle @@ -184,7 +184,7 @@ publishMods { repository = "RedstoneTools/redstonetools-mod" commitish = "main" type = STABLE - tagName = "v${project.mod_version}" + tagName = "${project.mod_version}" changelog = "" allowEmptyFiles = true } diff --git a/versions/1.21.10/build.gradle b/versions/1.21.10/build.gradle index d5e30a9f..8ee0d5a3 100644 --- a/versions/1.21.10/build.gradle +++ b/versions/1.21.10/build.gradle @@ -19,6 +19,6 @@ publishMods { github { accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent = project(":").tasks.named("publishGithub") + parent project(":").tasks.named("publishGithub") } } diff --git a/versions/1.21.4/build.gradle b/versions/1.21.4/build.gradle index d5e30a9f..8ee0d5a3 100644 --- a/versions/1.21.4/build.gradle +++ b/versions/1.21.4/build.gradle @@ -19,6 +19,6 @@ publishMods { github { accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent = project(":").tasks.named("publishGithub") + parent project(":").tasks.named("publishGithub") } } diff --git a/versions/1.21.5/build.gradle b/versions/1.21.5/build.gradle index d5e30a9f..8ee0d5a3 100644 --- a/versions/1.21.5/build.gradle +++ b/versions/1.21.5/build.gradle @@ -19,6 +19,6 @@ publishMods { github { accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent = project(":").tasks.named("publishGithub") + parent project(":").tasks.named("publishGithub") } } diff --git a/versions/1.21.8/build.gradle b/versions/1.21.8/build.gradle index d5e30a9f..8ee0d5a3 100644 --- a/versions/1.21.8/build.gradle +++ b/versions/1.21.8/build.gradle @@ -19,6 +19,6 @@ publishMods { github { accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent = project(":").tasks.named("publishGithub") + parent project(":").tasks.named("publishGithub") } } From a46957ada78835414617f1f6e0a5473be14e0c7f Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Sat, 15 Nov 2025 12:17:17 +0100 Subject: [PATCH 05/14] idk anymore --- build.gradle | 36 ++++++++++++++++++++++++++++------- versions/1.21.10/build.gradle | 24 ----------------------- versions/1.21.4/build.gradle | 24 ----------------------- versions/1.21.5/build.gradle | 24 ----------------------- versions/1.21.8/build.gradle | 24 ----------------------- 5 files changed, 29 insertions(+), 103 deletions(-) delete mode 100644 versions/1.21.10/build.gradle delete mode 100644 versions/1.21.4/build.gradle delete mode 100644 versions/1.21.5/build.gradle delete mode 100644 versions/1.21.8/build.gradle diff --git a/build.gradle b/build.gradle index 2fca59a6..a40ac2a2 100644 --- a/build.gradle +++ b/build.gradle @@ -178,14 +178,36 @@ publishing { } } -publishMods { +subproject { github { accessToken = providers.environmentVariable("GITHUB_TOKEN") - repository = "RedstoneTools/redstonetools-mod" - commitish = "main" - type = STABLE - tagName = "${project.mod_version}" - changelog = "" - allowEmptyFiles = true + parent project(":").tasks.named("publishGithub") + } +} + +publishMods { + file = remapJar.archiveFile + type = STABLE + modLoaders.add("fabric") + + 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" + minecraftVersions.add(project.minecraft_version) + + requires("fabric-api") + requires("malilib") + optional("worldedit") } } \ No newline at end of file diff --git a/versions/1.21.10/build.gradle b/versions/1.21.10/build.gradle deleted file mode 100644 index 8ee0d5a3..00000000 --- a/versions/1.21.10/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id "me.modmuss50.mod-publish-plugin" version "1.1.0" -} - -publishMods { - file = remapJar.archiveFile - type = STABLE - modLoaders.add("fabric") - changelog = "" - - modrinth { - projectId = "9ySQVrz2" - accessToken = providers.environmentVariable("MODRINTH_TOKEN") - minecraftVersions.add(project.minecraft_version) - requires("fabric-api") - requires("malilib") - optional("worldedit") - } - - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent project(":").tasks.named("publishGithub") - } -} diff --git a/versions/1.21.4/build.gradle b/versions/1.21.4/build.gradle deleted file mode 100644 index 8ee0d5a3..00000000 --- a/versions/1.21.4/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id "me.modmuss50.mod-publish-plugin" version "1.1.0" -} - -publishMods { - file = remapJar.archiveFile - type = STABLE - modLoaders.add("fabric") - changelog = "" - - modrinth { - projectId = "9ySQVrz2" - accessToken = providers.environmentVariable("MODRINTH_TOKEN") - minecraftVersions.add(project.minecraft_version) - requires("fabric-api") - requires("malilib") - optional("worldedit") - } - - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent project(":").tasks.named("publishGithub") - } -} diff --git a/versions/1.21.5/build.gradle b/versions/1.21.5/build.gradle deleted file mode 100644 index 8ee0d5a3..00000000 --- a/versions/1.21.5/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id "me.modmuss50.mod-publish-plugin" version "1.1.0" -} - -publishMods { - file = remapJar.archiveFile - type = STABLE - modLoaders.add("fabric") - changelog = "" - - modrinth { - projectId = "9ySQVrz2" - accessToken = providers.environmentVariable("MODRINTH_TOKEN") - minecraftVersions.add(project.minecraft_version) - requires("fabric-api") - requires("malilib") - optional("worldedit") - } - - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent project(":").tasks.named("publishGithub") - } -} diff --git a/versions/1.21.8/build.gradle b/versions/1.21.8/build.gradle deleted file mode 100644 index 8ee0d5a3..00000000 --- a/versions/1.21.8/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -plugins { - id "me.modmuss50.mod-publish-plugin" version "1.1.0" -} - -publishMods { - file = remapJar.archiveFile - type = STABLE - modLoaders.add("fabric") - changelog = "" - - modrinth { - projectId = "9ySQVrz2" - accessToken = providers.environmentVariable("MODRINTH_TOKEN") - minecraftVersions.add(project.minecraft_version) - requires("fabric-api") - requires("malilib") - optional("worldedit") - } - - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent project(":").tasks.named("publishGithub") - } -} From b6414e5cd25c937295dc2b091b13088d3248b98c Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Sat, 15 Nov 2025 12:21:06 +0100 Subject: [PATCH 06/14] typo --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a40ac2a2..67e3511d 100644 --- a/build.gradle +++ b/build.gradle @@ -178,7 +178,7 @@ publishing { } } -subproject { +subprojects { github { accessToken = providers.environmentVariable("GITHUB_TOKEN") parent project(":").tasks.named("publishGithub") From 11eaf610f6c0cf1aae03026922fe4744c0b821bd Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Sat, 15 Nov 2025 14:45:06 +0100 Subject: [PATCH 07/14] add publishMods to subprojects --- build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 67e3511d..be322539 100644 --- a/build.gradle +++ b/build.gradle @@ -179,9 +179,11 @@ publishing { } subprojects { - github { - accessToken = providers.environmentVariable("GITHUB_TOKEN") - parent project(":").tasks.named("publishGithub") + publishMods { + github { + accessToken = providers.environmentVariable("GITHUB_TOKEN") + parent project(":").tasks.named("publishGithub") + } } } From 11c81d22248b1a937cb071c73dc840b82c109012 Mon Sep 17 00:00:00 2001 From: kr1viah Date: Tue, 18 Nov 2025 16:32:31 +0100 Subject: [PATCH 08/14] 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 09/14] 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 10/14] 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 11/14] 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 12/14] 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 13/14] 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 14/14] 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