Merge pull request #412 from RedstoneTools/dev

Dev

Author: kr1viah

.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 }}
+                  MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+                  RELEASE_GITHUB: ${{ inputs.release_github }}
+                  RELEASE_MODRINTH: ${{ inputs.release_modrinth }}
+                  GITHUB_REPO: ${{ inputs.github_repo }}

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"
 }
 
@@ -178,38 +177,32 @@ publishing {
 	}
 }
 
-subprojects {
-	publishMods {
-		github {
-			accessToken = providers.environmentVariable("GITHUB_TOKEN")
-			parent project(":").tasks.named("publishGithub")
-		}
-	}
-}
-
 publishMods {
 	file = remapJar.archiveFile
 	type = STABLE
 	modLoaders.add("fabric")
 
-    changelog = ""
+	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")
+	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")
+		}
+	}
+
+
+	if (providers.environmentVariable("RELEASE_GITHUB").getOrElse("false").toBoolean()) {
+		github {
+			accessToken = providers.environmentVariable("GITHUB_TOKEN")
+
+			parent rootProject.tasks.named("publishGithub")
+		}
 	}
 }

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

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

stonecutter.gradle

@@ -1,4 +1,32 @@
 plugins {
     id "dev.kikugie.stonecutter"
+	id "me.modmuss50.mod-publish-plugin" version "1.1.0"
 }
-stonecutter.active "1.21.10"
+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() == "") {
+			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"
+			changelog = ""
+			type = STABLE
+			tagName = "${project.mod_version}"
+			displayName = "Redstone Tools ${rootProject.mod_version}"
+			allowEmptyFiles = true
+		}
+	}
+}