build: update CI to publish for MC 1.21

WiIIiam278 · Jun 24, 2024 · dac1b9f · dac1b9f
1 parent 332739d
commit dac1b9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,6 +83,7 @@ jobs:
             1.20.4
             1.20.5
             1.20.6
+            1.21
           java: 17
       - name: 'Sponge: Publish to Modrinth 🧽'
         uses: WiIIiam278/mc-publish@hangar
@@ -122,22 +123,13 @@ jobs:
             plan | suggests | *
             impactor | suggests | *
             placeholder-api | suggests | *
-          files-primary: target/HuskHomes-Fabric-${{ env.version_name }}.jar
+          files-primary: target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.jar
           name: HuskHomes (Fabric) v${{ env.version_name }}
           version: ${{ env.version_name }}
           version-type: alpha
           changelog: ${{ github.event.head_commit.message }}
           loaders: |
             fabric
           game-versions: |
-            1.20.6
-          java: 17
-      - name: 'Upload GitHub Artifacts 📦'
-        uses: actions/upload-artifact@v4
-        if: success() || failure()
-        with:
-          name: HuskHomes
-          path: |
-            target/HuskHomes-Paper-${{ env.version_name }}.jar
-            target/HuskHomes-Sponge-${{ env.version_name }}.jar
-            target/HuskHomes-Fabric-${{ env.version_name }}.jar
+            1.21
+          java: 17
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -71,6 +71,7 @@ jobs:
             1.20.4
             1.20.5
             1.20.6
+            1.21
           java: 17
       - name: 'Sponge: Publish to Modrinth 🧽'
         uses: WiIIiam278/mc-publish@hangar
@@ -108,21 +109,13 @@ jobs:
             plan | suggests | *
             impactor | suggests | *
             placeholder-api | suggests | *
-          files-primary: target/HuskHomes-Fabric-${{ github.event.release.tag_name }}.jar
+          files-primary: target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.jar
           name: HuskHomes (Fabric) v${{ github.event.release.tag_name }}
           version: ${{ github.event.release.tag_name }}
           version-type: release
           changelog: ${{ github.event.release.body }}
           loaders: |
             fabric
           game-versions: |
-            1.20.6
-          java: 17
-      - name: 'Upload GitHub Artifacts 📦'
-        uses: actions/upload-artifact@v4
-        with:
-          name: HuskHomes
-          path: |
-            target/HuskHomes-Paper-${{ github.event.release.tag_name }}.jar
-            target/HuskHomes-Sponge-${{ github.event.release.tag_name }}.jar
-            target/HuskHomes-Fabric-${{ github.event.release.tag_name }}.jar
+            1.21
+          java: 17
diff --git a/build.gradle b/build.gradle
@@ -119,14 +119,16 @@ allprojects {
 }
 
 subprojects {
+    version rootProject.version
+    archivesBaseName = "${rootProject.name}-${project.name.capitalize()}"
+
+    // Fabric-specific configuration
     if (['fabric'].contains(project.name)) {
         apply plugin: 'fabric-loom'
         compileJava.options.release.set 21
+        version += "+mc.${fabric_minecraft_version}"
     }
 
-    version rootProject.version
-    archivesBaseName = "${rootProject.name}-${project.name.capitalize()}"
-
     jar {
         from '../LICENSE'
     }