Merge Staff Mod 0.11.0-beta.2

opekope2 · Feb 8, 2024 · 766dfbd · 766dfbd
2 parents 8a2bab2 + 9e03411
commit 766dfbd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git 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 }}

diff --git 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"
+      ]
+    }
   }
 }
diff --git 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"
+]
diff --git 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
 ##########################################################################