From 8335d6dd40c07ddc8a580050928d60ca28c1bb77 Mon Sep 17 00:00:00 2001
From: omo50 <144749186+omo50@users.noreply.github.com>
Date: Fri, 13 Mar 2026 21:36:04 -0600
Subject: [PATCH] chore(actions): fix packsquash and build

---
 .../workflows/rp-faithful-legacy-publish.yml  | 31 ++++++++++++++-----
 .../rp-lce-panorama-collection-publish.yml    | 27 ++++++++++++----
 .../rp-legacy-mechanics-addon-publish.yml     | 25 ++++++++++++---
 .../rp-legacy-modpack-resources-publish.yml   | 25 ++++++++++++---
 .../rp-legacy-skin-packs-publish.yml          | 25 ++++++++++++---
 .../workflows/rp-legacy-titles-publish.yml    | 25 ++++++++++++---
 .../rp-modern-how-to-play-publish.yml         | 25 ++++++++++++---
 .../rp-modern-skin-packs-publish.yml          | 25 ++++++++++++---
 .forgejo/workflows/rp-old-l4j-ui-publish.yml  | 25 ++++++++++++---
 .../rp-tutorial-world-addon-publish.yml       | 25 ++++++++++++---
 .../workflows/rp-vanilla-live-publish.yml     | 25 ++++++++++++---
 11 files changed, 224 insertions(+), 59 deletions(-)

diff --git a/.forgejo/workflows/rp-faithful-legacy-publish.yml b/.forgejo/workflows/rp-faithful-legacy-publish.yml
index 575824492..ae021840d 100644
--- a/.forgejo/workflows/rp-faithful-legacy-publish.yml
+++ b/.forgejo/workflows/rp-faithful-legacy-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
           dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
-          cd "$dir" && python3 -c "
-          import zipfile, os
-          with zipfile.ZipFile('$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip', 'w', zipfile.ZIP_DEFLATED) as zf:
-              for root, dirs, files in os.walk('.'):
-                  for file in files:
-                      filepath = os.path.join(root, file)
-                      zf.write(filepath, os.path.relpath(filepath, '.'))
-          "
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
+          cat > /tmp/options.toml << EOF
+          pack_directory = '$dir'
+          output_file_path = '$output'
+          EOF
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-lce-panorama-collection-publish.yml b/.forgejo/workflows/rp-lce-panorama-collection-publish.yml
index 1f464a2cd..766b1b4fb 100644
--- a/.forgejo/workflows/rp-lce-panorama-collection-publish.yml
+++ b/.forgejo/workflows/rp-lce-panorama-collection-publish.yml
@@ -97,20 +97,35 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml 
 
-      - name: Publish to Modrinth
+     - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
         uses: https://github.com/Kir-Antipov/mc-publish@v3.3
         with:
diff --git a/.forgejo/workflows/rp-legacy-mechanics-addon-publish.yml b/.forgejo/workflows/rp-legacy-mechanics-addon-publish.yml
index 5d0c004ac..144cf9ff1 100644
--- a/.forgejo/workflows/rp-legacy-mechanics-addon-publish.yml
+++ b/.forgejo/workflows/rp-legacy-mechanics-addon-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-legacy-modpack-resources-publish.yml b/.forgejo/workflows/rp-legacy-modpack-resources-publish.yml
index 41c64c81d..e6cdfd0e7 100644
--- a/.forgejo/workflows/rp-legacy-modpack-resources-publish.yml
+++ b/.forgejo/workflows/rp-legacy-modpack-resources-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-legacy-skin-packs-publish.yml b/.forgejo/workflows/rp-legacy-skin-packs-publish.yml
index 9facf3020..e59f4cce9 100644
--- a/.forgejo/workflows/rp-legacy-skin-packs-publish.yml
+++ b/.forgejo/workflows/rp-legacy-skin-packs-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-legacy-titles-publish.yml b/.forgejo/workflows/rp-legacy-titles-publish.yml
index 6be7114ff..f74d0000f 100644
--- a/.forgejo/workflows/rp-legacy-titles-publish.yml
+++ b/.forgejo/workflows/rp-legacy-titles-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-modern-how-to-play-publish.yml b/.forgejo/workflows/rp-modern-how-to-play-publish.yml
index 970464740..c576f6b39 100644
--- a/.forgejo/workflows/rp-modern-how-to-play-publish.yml
+++ b/.forgejo/workflows/rp-modern-how-to-play-publish.yml
@@ -84,18 +84,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-modern-skin-packs-publish.yml b/.forgejo/workflows/rp-modern-skin-packs-publish.yml
index 6a6a8b9fa..d15d0153d 100644
--- a/.forgejo/workflows/rp-modern-skin-packs-publish.yml
+++ b/.forgejo/workflows/rp-modern-skin-packs-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-old-l4j-ui-publish.yml b/.forgejo/workflows/rp-old-l4j-ui-publish.yml
index 765e5d78c..652c1ab10 100644
--- a/.forgejo/workflows/rp-old-l4j-ui-publish.yml
+++ b/.forgejo/workflows/rp-old-l4j-ui-publish.yml
@@ -90,18 +90,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-tutorial-world-addon-publish.yml b/.forgejo/workflows/rp-tutorial-world-addon-publish.yml
index 471c34270..1ee137eb5 100644
--- a/.forgejo/workflows/rp-tutorial-world-addon-publish.yml
+++ b/.forgejo/workflows/rp-tutorial-world-addon-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'
diff --git a/.forgejo/workflows/rp-vanilla-live-publish.yml b/.forgejo/workflows/rp-vanilla-live-publish.yml
index 34ac4a2e4..70f17a596 100644
--- a/.forgejo/workflows/rp-vanilla-live-publish.yml
+++ b/.forgejo/workflows/rp-vanilla-live-publish.yml
@@ -85,18 +85,33 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+      - name: Cache PackSquash
+        id: cache-packsquash
+        uses: https://github.com/actions/cache@v3
+        with:
+          path: ~/.cargo/bin/packsquash
+          key: packsquash-${{ runner.os }}
+
+      - name: Install PackSquash
+        if: steps.cache-packsquash.outputs.cache-hit != 'true'
+        run: |
+          apt-get update && apt-get install -y cmake
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+          $HOME/.cargo/bin/cargo +nightly install --git https://github.com/ComunidadAylas/PackSquash --bin packsquash
+
+      - name: Add Cargo to Path
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
       - name: Build
         run: |
           mkdir -p ${{ env.OUTPUT }}
-          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}/${{ matrix.subfolder }}"
-          output="$OLDPWD/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ matrix.subfolder }}-${{ steps.version.outputs.version }}.zip"
-          curl -L https://github.com/ComunidadAylas/PackSquash/releases/latest/download/packsquash-linux-x64 -o /tmp/packsquash
-          chmod +x /tmp/packsquash
+          dir="./resourcepacks/external/${{ env.PACK_FOLDER }}"
+          output="$(pwd)/${{ env.OUTPUT }}/${{ env.PACK_FOLDER }}-${{ steps.version.outputs.version }}.zip"
           cat > /tmp/options.toml << EOF
           pack_directory = '$dir'
           output_file_path = '$output'
           EOF
-          /tmp/packsquash /tmp/options.toml
+          packsquash /tmp/options.toml
 
       - name: Publish to Modrinth
         if: needs.check-tag.outputs.is_alpha == 'false'