26.1

.github/workflows/release.yml

@@ -2,168 +2,76 @@ name: Publish on Modrinth & CurseForge
 
 on:
   workflow_dispatch:
-    secrets:
-      CURSEFORGE_TOKEN:
-        required: true
-      MODRINTH_TOKEN:
-        required: true
+
+secrets:
+  CURSEFORGE_TOKEN:
+    required: true
+  MODRINTH_TOKEN:
+    required: true
+
+permissions:
+  contents: write
 
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@v3
-
-      - name: Get Artifact Id
-        uses: actions/github-script@v5
-        env:
-          branch: ${{ github.head_ref || github.ref_name }}   
-        id: artifact_id
-        with:
-          result-encoding: string
-          script: |
-            // use env branch replace / with _
-            return process.env.branch.replace(/\//g, '_')
+        uses: actions/checkout@v6
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
-          java-version: 21
+          java-version: 25
 
       - name: Grant Execute Permission
         run: chmod +x gradlew
 
       - name: Build
-        run: |
-          ./gradlew build
-
-      - name: Upload To Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.artifact_id.outputs.result }}
-          path: |
-            ./dist/**/*
-            ./fabric/build/libs
-            ./forge/build/libs
-            ./gradle.properties
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - name: Checkout Branch
-        uses: actions/checkout@v3
-
-      - name: Get Artifact Id
-        uses: actions/github-script@v5
-        env:
-          branch: ${{ github.head_ref || github.ref_name }}   
-        id: artifact_id
-        with:
-          result-encoding: string
-          script: |
-            // use env branch replace / with _
-            return process.env.branch.replace(/\//g, '_')
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'adopt'
-          java-version: 21
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ steps.artifact_id.outputs.result }}
+        run: ./gradlew build
 
       - name: Load Gradle Properties
         uses: christian-draeger/read-properties@1.1.1
         id: gradle_properties
         with:
           path: './gradle.properties'
-          properties: 'java_version minecraft_version mod_version'
-
-      - name: Check For Fabric Jar
-        uses: actions/github-script@v5
-        id: fabric_release
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("./fabric/build/libs")[0] || false;
-
-      - name: Check For Forge Jar
-        uses: actions/github-script@v5
-        id: forge_release
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("./forge/build/libs")[0] || false;
+          properties: 'minecraft_version mod_version'
 
-      - name: Run Publish Fabric
-        if: ${{ steps.fabric_release.outputs.result != 'false' }}
+      - name: Run Publish
+        id: publish_merged
         uses: Kir-Antipov/mc-publish@v3.3
-        id: publish_fabric
         with:
           modrinth-id: OI3FlFon
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: false
+          modrinth-featured: true
           modrinth-unfeature-mode: any
 
-          curseforge-id: 1302303
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          name: ${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}-Fabric
-          version: ${{ steps.gradle_properties.outputs.mod_version }}
-
-          files: |
-            ./fabric/build/libs/!(*-@(dev|sources|javadoc|all|dev-shadow)).jar
-            ./fabric/build/libs/*-@(dev|sources|javadoc|all|dev-shadow).jar
-          version-type: release
-
-          loaders: fabric
-          game-versions: |
-            ${{ steps.gradle_properties.outputs.minecraft_version }}
-
-          changelog-file: CHANGELOG.md
-
-          java: ${{ steps.gradle_properties.outputs.java_version }}
-          retry-attempts: 5
-          retry-delay: 60000
-          fail-mode: skip
-
-      - name: Run Publish Forge
-        if: ${{ steps.forge_release.outputs.result != 'false' }}
-        uses: Kir-Antipov/mc-publish@v3.3
-        id: publish_forge
-        with:
-          modrinth-id: OI3FlFon
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: false
-          modrinth-unfeature-mode: any
+          github-tag: v${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
           curseforge-id: 1302303
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          name: ${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}-NeoForge
+          name: ${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}
           version: ${{ steps.gradle_properties.outputs.mod_version }}
 
           files: |
-            ./forge/build/libs/!(*-@(dev|sources|javadoc|all|dev-shadow)).jar
-            ./forge/build/libs/*-@(dev|sources|javadoc|all|dev-shadow).jar
-          version-type: release
+            ./build/libs/BendableCuboidsMerged-*.jar
+          version-type: beta
+
+          loaders: |
+            fabric
+            neoforge
 
-          loaders: neoforge
           game-versions: |
             ${{ steps.gradle_properties.outputs.minecraft_version }}
+            26.1.1
+            26.1
 
           changelog-file: CHANGELOG.md
 
-          java: ${{ steps.gradle_properties.outputs.java_version }}
+          java: 25
           retry-attempts: 5
           retry-delay: 60000
           fail-mode: skip
@@ -174,22 +82,11 @@ jobs:
           {
             echo 'P2D_LINKS<<EOF'
 
-            # --- Fabric ---
-            if [ -n "${{ steps.publish_fabric.outputs.modrinth-url }}" ]; then
-              echo "Modrinth (Fabric)|${{ steps.publish_fabric.outputs.modrinth-url }}|MODRINTH"
-            fi
-            if [ -n "${{ steps.publish_fabric.outputs.curseforge-url }}" ]; then
-              echo "CurseForge (Fabric)|${{ steps.publish_fabric.outputs.curseforge-url }}|CURSEFORGE"
-            fi
-
-            echo ""
-
-            # --- NeoForge ---
-            if [ -n "${{ steps.publish_forge.outputs.modrinth-url }}" ]; then
-              echo "Modrinth (NeoForge)|${{ steps.publish_forge.outputs.modrinth-url }}|MODRINTH"
+            if [ -n "${{ steps.publish_merged.outputs.modrinth-url }}" ]; then
+              echo "Modrinth|${{ steps.publish_merged.outputs.modrinth-url }}|MODRINTH"
             fi
-            if [ -n "${{ steps.publish_forge.outputs.curseforge-url }}" ]; then
-              echo "CurseForge (NeoForge)|${{ steps.publish_forge.outputs.curseforge-url }}|CURSEFORGE"
+            if [ -n "${{ steps.publish_merged.outputs.curseforge-url }}" ]; then
+              echo "CurseForge|${{ steps.publish_merged.outputs.curseforge-url }}|CURSEFORGE"
             fi
 
             echo 'EOF'

CHANGELOG.md

@@ -1 +1 @@
-- Update to new PAL
+- Port to 26.1.X