From 531b5d58ba7fbca8f8359b59f44c4de5e30ee1bf Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 6 Jun 2023 12:50:36 -0400
Subject: [PATCH] Re-add new versioning logic (was somehow dropped during
 merge)

---
 build.gradle | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d9bc5666..c0585bf2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,18 @@ allprojects {
 	}
 
 	group = 'org.embeddedt'
-	version = gitVersion()
+    // extract base version from tag, generate other metadata ourselves
+    def details = versionDetails()
+    def plusIndex = details.lastTag.indexOf("+")
+    if(plusIndex == -1) {
+        plusIndex = details.lastTag.length()
+    }
+    def baseVersion = details.lastTag.substring(0, plusIndex)
+    def dirtyMarker = details.isCleanTag ? "" : ".dirty"
+    def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash) : ""
+    def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
+    def versionString = "${baseVersion}${preMarker}+mc${minecraft_version}${commitHashMarker}${dirtyMarker}"
+    version = versionString
     archivesBaseName = rootProject.archives_base_name + '-' + project.name
 
     sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17