Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4

Add Gradle Scan

update ci

[ci skip] update CI

.github/workflows/build_1_20_4_v2.yml

@@ -1,4 +1,4 @@
-name: Luminol CI v2 - ver/1.20.4
+name: Luminol CI v2 - Ver/1.20.4
 
 on:
     push:
@@ -19,6 +19,8 @@ jobs:
         uses: gradle/actions/wrapper-validation@v3
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: 8.4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -27,17 +29,11 @@ jobs:
       - name: Configure Git User Details
         run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
       - name: Apply Patches
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: applyPatches
+        run: gradle applyPatches --scan
       - name: CreateJar
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: createReobfBundlerJar createReobfPaperclipJar
+        run: gradle createReobfBundlerJar createReobfPaperclipJar --scan
       - name: SetENV
         run: |
-          echo "project_id=luminol" >> $GITHUB_ENV
-          echo "project_id_b=Luminol" >> $GITHUB_ENV
           sh scripts/SetENV.sh
           echo "${{ env.tag }}"
       - name: Upload Artifact
@@ -50,9 +46,8 @@ jobs:
         uses: ncipollo/release-action@v1.14.0
         with:
           tag: ${{ env.tag }}
-          name: Luminol ${{ env.mcversion }} - ${{ env.commitid }}
+          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
           body: |
-            ====
             📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=0)](https://github.com/LuminolMC/${{ env.project_id }}/download/${{ env.tag }}/${{ env.jar }})
             This release is automatically compiled by GitHub Actions
             ### Commit Message

gradle.properties

@@ -8,6 +8,6 @@ org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
 
-mcVersion=1.20.4
-GroupMCV=1.20
-preVersion=false
+mcVersion = 1.20.4
+GroupMCV = 1.20
+preVersion = false

scripts/PushToAPI.sh

@@ -22,4 +22,25 @@ jar_name="$pro_id_mcv-paperclip.jar"
 ctime=$(date -u +"%s")"000"
 
 # v2
-curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" -H "Content-Type: application/x-www-form-urlencoded" -H "Authorization: $secret_v2" --data-urlencode "channel=$channel" --data-urlencode "jar_name=$jar_name" --data-urlencode "sha256=$jar_sha256" --data-urlencode "release_tag=$tag" --data-urlencode "time=$ctime" --data-urlencode "changes=$changes"
+json=$(printf "{\\\"channel\\\":\\\"%s\\\", \\\"jar_name\\\":\\\"%s\\\", \\\"sha256\\\":\\\"%s\\\", \\\"tag\\\":\\\"%s\\\", \\\"time\\\":\\\"%s\\\", \\\"changes\\\":\\\"%s\\\"}" \
+    "$channel" "$jar_name" "$jar_sha256" "$tag" "$ctime" "$changes")
+echo "[DEBUG] $json"
+echo "[DEBUG] $changes"
+echo "[DEBUG] curl --location --request POST \"https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit\" \
+    -H \"Content-Type: application/x-www-form-urlencoded\" \
+    -H \"Authorization: $secret_v2\" \
+    --data-urlencode \"channel=$channel\" \
+    --data-urlencode \"jar_name=$jar_name\" \
+    --data-urlencode \"sha256=$jar_sha256\" \
+    --data-urlencode \"release_tag=$tag\" \
+    --data-urlencode \"time=$ctime\" \
+    --data-urlencode \"changes=$changes\""
+curl -L --request POST "https://api.luminolmc.com/v2/projects/$project_id/$mcversion/build/commit" \
+    -H "Content-Type: application/x-www-form-urlencoded" \
+    -H "Authorization: $secret_v2" \
+    --data-urlencode "channel=$channel" \
+    --data-urlencode "jar_name=$jar_name" \
+    --data-urlencode "sha256=$jar_sha256" \
+    --data-urlencode "release_tag=$tag" \
+    --data-urlencode "time=$ctime" \
+    --data-urlencode "changes=$changes"

scripts/SetENV.sh

@@ -1,7 +1,10 @@
 prop() {
-  grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+  grep "^[[:space:]]*${1}" gradle.properties | cut -d'=' -f2 | sed 's/^[[:space:]]*//; s/\r//'
 }
 
+project_id="luminol"
+project_id_b="Luminol"
+
 commitid=$(git log --pretty='%h' -1)
 mcversion=$(prop mcVersion)
 grdversion=$(prop version)
@@ -10,10 +13,12 @@ release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="build/libs/$jarName"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
+number=$(git log --oneline master ^`git describe --tags --abbrev=0` | wc -l)
 
 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
 
+
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV