Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

.github/workflows/gradle.yml

@@ -20,10 +20,6 @@ jobs:
         distribution: 'temurin'
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
-    - name: Run Data Generation (Server, Client)
-      run: ./gradlew runData
-    - name: Build JAR file
-      run: ./gradlew build
     - name: Read Properties
       id: readproperties
       uses: BrycensRanch/read-properties-action@v1
@@ -35,12 +31,22 @@ jobs:
       uses: actions/github-script@v7.0.1
       with:
         script: |
-          const sha = context.payload.client_payload.value.substring(1,6)
+          const sha = context.sha.substring(1,6)
           core.setOutput('sha', sha)
+          core.setOutput('versionStr', '${{steps.readproperties.outputs.mod_version}}.alpha.' + sha)
+    - name: Run Data Generation (Server, Client)
+      id: datagen
+      env:
+        MOD_VERSION: ${{ steps.truncated.outputs.versionStr }}
+      run: ./gradlew runData
+    - name: Build JAR file
+      env:
+        MOD_VERSION: ${{ steps.truncated.outputs.versionStr }}
+      run: ./gradlew build
     - name: Create Release
       uses: softprops/action-gh-release@v2
       with:
         files: build/libs/*
         tag_name: snapshot-${{ steps.truncated.outputs.sha }}
-        name: ${{steps.readproperties.outputs.mod_name}} ${{steps.readproperties.outputs.mod_version}}.alpha.${{ steps.truncated.outputs.sha }}
+        name: ${{steps.readproperties.outputs.mod_name}} ${{  steps.truncated.outputs.versionStr }}
         draft: false