More nightly build number shenanigans

Author: robotgryphon

build.gradle

@@ -21,7 +21,22 @@ apply plugin: "net.minecraftforge.gradle"
 def semver = 'git describe --tags --match v*'.execute().text.trim().split('-')[0]
 def gitCommitHash = 'git rev-parse --verify --short HEAD'.execute().text.trim()
 
-def nightlyVersion = "${semver}-nightly.${"git describe --tags --match ${semver}*".execute().text.trim().split('-')[1]}+${gitCommitHash}"
+def buildNumber = { ->
+    try {
+        def code = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'describe', '--tags', '--match', 'v*'
+            standardOutput = code
+        }
+
+        return Integer.parseInt(code.toString().trim().split('-')[1])
+    }
+    catch (ignored) {
+        return 0;
+    }
+}
+
+def nightlyVersion = "${semver}-nightly.${buildNumber}-${gitCommitHash}"
 def isRelease = (System.getenv("CM_RELEASE") ?: "false").equalsIgnoreCase("true")
 
 task getBuildInfo() {