From 489a30d185b049a28cda544ac74eadddcc50a3db Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Mon, 5 Jun 2023 21:31:43 -0400
Subject: [PATCH] New versioning scheme

---
 build.gradle | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 45284276..a36814b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ architectury {
     minecraft = rootProject.minecraft_version
 }
 
-ext.archives_base_name = 'modernfix-mc' + minecraft_version
+ext.archives_base_name = 'modernfix'
 
 allprojects {
     apply plugin: "java"
@@ -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_1_8