From dc078c84d58c5b4e23f3cb68417dfb61c6fae6c2 Mon Sep 17 00:00:00 2001
From: opekope2 <opekope2@gmail.com>
Date: Thu, 8 Feb 2024 20:59:19 +0100
Subject: [PATCH 1/4] Specify Architectury slug in fabric.mod.json

Why can't the mod ID and the slug be the same?
---
 FabricMod/src/main/resources/fabric.mod.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/FabricMod/src/main/resources/fabric.mod.json b/FabricMod/src/main/resources/fabric.mod.json
index 633ee4288..942c85611 100644
--- a/FabricMod/src/main/resources/fabric.mod.json
+++ b/FabricMod/src/main/resources/fabric.mod.json
@@ -46,5 +46,12 @@
     "architectury": ">=$architectury",
     "minecraft": ">=$minecraft",
     "java": ">=$java"
+  },
+  "custom": {
+    "mc-publish": {
+      "dependencies": [
+        "architectury-api@$architectury"
+      ]
+    }
   }
 }

From c6809332d6cf62a567d264f8844d7f778d35c503 Mon Sep 17 00:00:00 2001
From: opekope2 <opekope2@gmail.com>
Date: Thu, 8 Feb 2024 21:01:37 +0100
Subject: [PATCH 2/4] Specify Architectury and Kotlin slugs in mods.toml

Again, why can't the mod ID and the slug be the same?
---
 ForgeMod/src/main/resources/META-INF/mods.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ForgeMod/src/main/resources/META-INF/mods.toml b/ForgeMod/src/main/resources/META-INF/mods.toml
index 165934703..f048350c5 100644
--- a/ForgeMod/src/main/resources/META-INF/mods.toml
+++ b/ForgeMod/src/main/resources/META-INF/mods.toml
@@ -42,3 +42,9 @@ mandatory = true
 versionRange = "[$architectury,)"
 ordering = "AFTER"
 side = "BOTH"
+
+[mc-publish]
+dependencies = [
+    "architectury-api@$architectury",
+    "kotlin-for-forge@$kotlin_for_forge"
+]

From ed113c2d1d8bfdeedcf13a0984d76f0d3b9459cf Mon Sep 17 00:00:00 2001
From: opekope2 <opekope2@gmail.com>
Date: Thu, 8 Feb 2024 21:03:45 +0100
Subject: [PATCH 3/4] Fix CI not selecting the correct file

---
 .github/workflows/publish-release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 6c3639a88..b1330795d 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -52,8 +52,8 @@ jobs:
 
           name: Staff Mod ${{ github.ref_name }} for Fabric
           files: |
-            dist/fabric/!(*-@(dev|sources|javadoc)).jar
-            dist/fabric/*-@(dev|sources|javadoc).jar
+            dist/fabric/!(*-@(dev|dev-shadow|sources|javadoc)).jar
+            dist/fabric/*-@(dev|dev-shadow|sources|javadoc).jar
           changelog-file: CHANGELOG.g.md
           game-version-filter: releases
           java: ${{ steps.load-versions.outputs.JAVA_VERSION }}
@@ -69,8 +69,8 @@ jobs:
 
           name: Staff Mod ${{ github.ref_name }} for Forge
           files: |
-            dist/forge/!(*-@(dev|sources|javadoc)).jar
-            dist/forge/*-@(dev|sources|javadoc).jar
+            dist/forge/!(*-@(dev|dev-shadow|sources|javadoc)).jar
+            dist/forge/*-@(dev|dev-shadow|sources|javadoc).jar
           changelog-file: CHANGELOG.g.md
           game-version-filter: releases
           java: ${{ steps.load-versions.outputs.JAVA_VERSION }}

From 9e034110d70a3a74567dc0837620fb815548e2a8 Mon Sep 17 00:00:00 2001
From: opekope2 <opekope2@gmail.com>
Date: Thu, 8 Feb 2024 21:04:25 +0100
Subject: [PATCH 4/4] Bump version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 4e8f8f7ee..3a46b73c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ fabric_api_version=0.91.3+1.20.4
 java_version=17
 ##########################################################################
 # Mod Properties
-mod_version=0.11.0-beta
+mod_version=0.11.0-beta.2
 maven_group=opekope2.avm_staff
 archives_name=staff-mod
 ##########################################################################