From 04709bd5127acf1a14ca4f033f7aa345ed42f002 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Thu, 14 Dec 2023 19:00:43 +0500
Subject: [PATCH] workflows

---
 .github/workflows/preview.yml | 31 ++++++++++++-------------------
 .github/workflows/release.yml |  2 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 9eb307486..2d080c173 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -19,7 +19,8 @@ jobs:
       - name: Set the version
         run: |
           DEV=${{ steps.get_version.outputs.version }}
-          sed -i -e "s/DEV/${DEV}/g" pack.toml
+          sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/manifest.json
+          sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/instance.cfg
           sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt
           sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml
 
@@ -29,18 +30,6 @@ jobs:
         with:
           path: CHANGELOG.md
 
-      - name: Set up Go 1.19
-        id: go
-        uses: actions/setup-go@v5.0.0
-        with:
-          go-version: 1.19
-      - run: go install github.com/packwiz/packwiz@latest
-
-      - name: Archive CF
-        run: |
-          cd ./
-          packwiz curseforge export -o TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip
-
       - name: Submodule init
         run: |
           git submodule init
@@ -48,11 +37,15 @@ jobs:
           git config --global credential.helper '!f() { echo "username=Xikaro"; echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f'
           git submodule update --recursive
 
+      - name: Archive CF
+        run: |
+          cp -r {config,defaultconfigs,kubejs,mods}  overrides/
+          zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip .github/buildtools/modpack/manifest.json .github/buildtools/modpack/modlist.html overrides
+
       - name: Archive MMC
         run: |
-          mkdir -p .minecraft
-          cp -r {config,defaultconfigs,kubejs,mods} .github/buildtools/modpack/mmc-pack.json .github/buildtools/modpack/instance.cfg .minecraft/
-          zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip .minecraft/
+          mv -vf overrides/ .minecraft/ 
+          zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip .github/buildtools/modpack/mmc-pack.json .github/buildtools/modpack/instance.cfg .minecraft/
 
       - name: Archive Server
         run: |
@@ -70,6 +63,6 @@ jobs:
           name: ${{ steps.changelog.outputs.version }}
           body: ${{ steps.changelog.outputs.description }}
           files: |
-            ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip
-            ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip
-            ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip
+            ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip
+            ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip
+            ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ba71ea720..b426953d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
 
       - name: Get the version
         id: get_version
-        run: echo ::set-output name=version::${GITHUB_REF#refs/tags/Pre}
+        run: echo ::set-output name=version::${GITHUB_REF#refs/tags/}
 
       - name: Set the version
         run: |