From ec80eb3cc42a632765b80e61aaecdcccd741c74d Mon Sep 17 00:00:00 2001
From: meownium <31296383+ATPStorages@users.noreply.github.com>
Date: Sun, 14 Apr 2024 09:50:00 -0500
Subject: [PATCH 1/3] Update gradle.yml

---
 .github/workflows/gradle.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 79b58c07..1a9080ec 100644
--- a/.github/workflows/gradle.yml
+++ b/.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,19 @@ 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)
+    - name: Run Data Generation (Server, Client)
+      id: datagen
+      env:
+        MOD_VERSION: ${{steps.readproperties.outputs.mod_version}}.alpha.${{ steps.truncated.outputs.sha }}
+      run: ./gradlew runData
+    - name: Build JAR file
+      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.datagen.env.MOD_VERSION }}
         draft: false

From c3d36351b2fec9142621bc0a662059f0a8744150 Mon Sep 17 00:00:00 2001
From: meownium <31296383+ATPStorages@users.noreply.github.com>
Date: Sun, 14 Apr 2024 09:57:17 -0500
Subject: [PATCH 2/3] Update gradle.yml

---
 .github/workflows/gradle.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 1a9080ec..bc2225ca 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -33,17 +33,20 @@ jobs:
         script: |
           const sha = context.sha.substring(1,6)
           core.setOutput('sha', sha)
+          core.setOutput('versionStr', '${{steps.readproperties.outputs.mod_version}}.alpha.${{ steps.truncated.outputs.sha }}')
     - name: Run Data Generation (Server, Client)
       id: datagen
       env:
-        MOD_VERSION: ${{steps.readproperties.outputs.mod_version}}.alpha.${{ steps.truncated.outputs.sha }}
+        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.datagen.env.MOD_VERSION }}
+        name: ${{steps.readproperties.outputs.mod_name}} ${{  steps.truncated.outputs.versionStr }}
         draft: false

From 4bc853892e8e42b4ad314a3bf1626243a498637d Mon Sep 17 00:00:00 2001
From: meownium <31296383+ATPStorages@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:00:53 -0500
Subject: [PATCH 3/3] Update gradle.yml

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index bc2225ca..501e4134 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -33,7 +33,7 @@ jobs:
         script: |
           const sha = context.sha.substring(1,6)
           core.setOutput('sha', sha)
-          core.setOutput('versionStr', '${{steps.readproperties.outputs.mod_version}}.alpha.${{ steps.truncated.outputs.sha }}')
+          core.setOutput('versionStr', '${{steps.readproperties.outputs.mod_version}}.alpha.' + sha)
     - name: Run Data Generation (Server, Client)
       id: datagen
       env: