From f315e99181528c920d28d2855a8697c9a00d4ccf Mon Sep 17 00:00:00 2001
From: kross <135918757+krossgg@users.noreply.github.com>
Date: Fri, 20 Sep 2024 13:12:30 -0400
Subject: [PATCH] Added gradle task for versioning and edited workflows (#1986)

---
 .github/workflows/auto-build.yml   | 8 ++++----
 .github/workflows/auto-publish.yml | 4 +---
 gradle/scripts/publishing.gradle   | 2 +-
 gradle/scripts/resources.gradle    | 6 ++++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml
index afbfb56082..e96540aea7 100644
--- a/.github/workflows/auto-build.yml
+++ b/.github/workflows/auto-build.yml
@@ -35,10 +35,10 @@ jobs:
       - name: Get Version
         id: var
         run: |
-          MESSAGE=$(ls build/libs/* | grep dev.jar -v | grep sources.jar -v | grep slim.jar -v | awk -F 'gtceu-|-SNAPSHOT.jar' '{print $2}')
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT.jar"
-          mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-slim.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-slim.jar"
-          echo "version=$MESSAGE-build_${{ github.run_number }}" >> $GITHUB_OUTPUT
+          VER=$(./gradlew -q printVersion)
+          BUILD_VER=$VER-build_${{ github.run_number }}
+          for jar in ./build/libs/*; do mv "$jar" "${jar/${VER}-SNAPSHOT/${BUILD_VER}-SNAPSHOT}";done 2>/dev/null
+          echo "version=$BUILD_VER" >> $GITHUB_OUTPUT
 
       - name: Release
         id: release
diff --git a/.github/workflows/auto-publish.yml b/.github/workflows/auto-publish.yml
index dee32fe55e..8e24226eba 100644
--- a/.github/workflows/auto-publish.yml
+++ b/.github/workflows/auto-publish.yml
@@ -49,9 +49,7 @@ jobs:
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: Get Version
         id: var
-        run: |
-          MESSAGE=$(ls build/libs/* | grep dev.jar -v | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
-          echo version=$MESSAGE >> $GITHUB_OUTPUT
+        run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
         name: mc-publish-forge
diff --git a/gradle/scripts/publishing.gradle b/gradle/scripts/publishing.gradle
index fe29446cc9..5579fc7767 100644
--- a/gradle/scripts/publishing.gradle
+++ b/gradle/scripts/publishing.gradle
@@ -9,7 +9,7 @@ publishing {
         mavenJava(MavenPublication) {
             groupId = project.maven_group
             artifactId = project.archivesBaseName
-            version = project.mod_version
+            version = project.version
 
             from components.java
 
diff --git a/gradle/scripts/resources.gradle b/gradle/scripts/resources.gradle
index a2e47c2257..77b7d60455 100644
--- a/gradle/scripts/resources.gradle
+++ b/gradle/scripts/resources.gradle
@@ -10,6 +10,12 @@ def mod_description = getConfig("mod_description")
 def mod_url = getConfig("mod_url")
 def mod_issue_tracker = getConfig("mod_issue_tracker")
 
+task printVersion {
+    doLast {
+        println libs.versions.minecraft.get() + "-" + mod_version
+    }
+}
+
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {