From 92b9d91fdfe571d262ebf8c2a19c02dee05cd0d9 Mon Sep 17 00:00:00 2001
From: ShintoKosei <2081384668@qq.com>
Date: Fri, 24 May 2024 15:04:28 +0800
Subject: [PATCH] Update CI (the mojmap)

---
 .github/workflows/build_1.20.6.yml | 2 +-
 scripts/SetENV.sh                  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_1.20.6.yml b/.github/workflows/build_1.20.6.yml
index 30b9a7d..1287545 100644
--- a/.github/workflows/build_1.20.6.yml
+++ b/.github/workflows/build_1.20.6.yml
@@ -57,7 +57,7 @@ jobs:
             ${{ env.commit_msg }}
           artifacts: |
             ${{ env.jar_dir }}
-            build/libs/${{ env.project_id }}-${{ env.mcversion }}-bundler.jar
+            ${{ env.jar_dir_bundler }}
           generateReleaseNotes: true
           prerelease: ${{ env.pre }}
           makeLatest: ${{ env.make_latest }}
diff --git a/scripts/SetENV.sh b/scripts/SetENV.sh
index dd55a7d..64c1414 100644
--- a/scripts/SetENV.sh
+++ b/scripts/SetENV.sh
@@ -11,11 +11,13 @@ grdversion=$(prop version)
 preVersion=$(prop preVersion)
 release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
+jarName_bundler="$project_id-$mcversion-bundler.jar"
 jarName_dir="build/libs/$jarName"
+jarName_bundler_dir="build/libs/$jarName_bundler"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
-mv build/libs/$project_id-paperclip-$grdversion-reobf.jar build/libs/$jarName
-mv build/libs/$project_id-bundler-$grdversion-reobf.jar build/libs/$project_id-$mcversion-bundler.jar
+mv build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir
+mv build/libs/$project_id-bundler-$grdversion-mojmap.jar $jarName_bundler_dir
 
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
@@ -26,4 +28,5 @@ echo "pre=$preVersion" >> $GITHUB_ENV
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
 echo "jar_dir=$jarName_dir" >> $GITHUB_ENV
+echo "jar_dir_bundler=$jarName_bundler_dir" >> $GITHUB_ENV
 echo "make_latest=$make_latest" >> $GITHUB_ENV
\ No newline at end of file