From 34371641a92d3dee0ef02c8a803c13461eace3a2 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Thu, 14 Dec 2023 18:46:51 +0500
Subject: [PATCH] workflows

---
 .github/buildtools/filelist.txt | 11 -----------
 .github/workflows/release.yml   | 19 +++++++++----------
 2 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 .github/buildtools/filelist.txt

diff --git a/.github/buildtools/filelist.txt b/.github/buildtools/filelist.txt
deleted file mode 100644
index 14bd8ec4b..000000000
--- a/.github/buildtools/filelist.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-.git/
-.github/
-shaderpacks/
-.curseclient
-.gitignore
-CHANGELOG.md
-README.md
-instance.cfg
-manifest.json
-mmc-pack.json
-modlist.html
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 418ba29dd..7adb91edd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,8 +19,8 @@ jobs:
       - name: Set the version
         run: |
           DEV=${{ steps.get_version.outputs.version }}
-          sed -i -e "s/DEV/${DEV}/g" manifest.json
-          sed -i -e "s/DEV/${DEV}/g" instance.cfg
+          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
 
@@ -30,11 +30,6 @@ jobs:
         with:
           path: CHANGELOG.md
 
-      - 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
@@ -42,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: |