Merge branch 'dev' into release/1.21

opekope2 · Oct 27, 2024 · d2b16bc · d2b16bc
2 parents 2a01933 + 9ea053f
commit d2b16bc
Show file tree

Hide file tree

Showing 27 changed files with 293 additions and 648 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -90,14 +90,6 @@ jobs:
           path: |
             NeoForgeMod/build/libs/*.jar
           if-no-files-found: error
-      - name: Upload Forge jars
-        if: inputs.build-project && inputs.upload-output && false
-        uses: actions/[email protected]
-        with:
-          name: forge-jars
-          path: |
-            ForgeMod/build/libs/*.jar
-          if-no-files-found: error
       - name: Upload documentation output
         if: inputs.build-docs && inputs.upload-output
         uses: actions/[email protected]

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -32,12 +32,6 @@ jobs:
         with:
           name: neoforge-jars
           path: dist/neoforge
-      - name: Download Forge jars
-        if: false
-        uses: actions/[email protected]
-        with:
-          name: forge-jars
-          path: dist/forge
       - name: Fetch release tag
         run: git fetch origin $GITHUB_REF:$GITHUB_REF -f
       - name: Generate changelog
@@ -95,25 +89,6 @@ jobs:
           changelog-file: CHANGELOG.g.md
           game-version-filter: releases
           java: ${{ steps.load-java-version.outputs.value }}
-      - name: Publish Forge mod to Modrinth and CurseForge
-        if: false
-        uses: Kir-Antipov/[email protected]
-        with:
-          modrinth-id: ${{ vars.MODRINTH_ID }}
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: false
-
-          curseforge-id: ${{ vars.CURSEFORGE_ID }}
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          name: Staff Mod ${{ github.ref_name }} for Forge
-          version: ${{ github.ref_name }}+forge
-          files: |
-            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-java-version.outputs.value }}
       - name: Publish mods to GitHub
         uses: Kir-Antipov/[email protected]
         with:

diff --git a/ForgeMod/build.gradle.kts b/ForgeMod/build.gradle.kts
diff --git a/ForgeMod/gradle.properties b/ForgeMod/gradle.properties
diff --git a/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/StaffMod.kt b/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/StaffMod.kt
diff --git a/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/StaffModClient.kt b/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/StaffModClient.kt
diff --git a/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/StaffModPlatformImpl.kt b/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/StaffModPlatformImpl.kt
diff --git a/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/item/ForgeCrownItem.kt b/ForgeMod/src/main/kotlin/opekope2/avm_staff/internal/forge/item/ForgeCrownItem.kt