🎨 Remove duplicate get version code

17TheWord · Feb 14, 2025 · 2ace101 · 2ace101
1 parent b7ca1ea
commit 2ace101
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 85 deletions.
diff --git a/fabric/origin/build.gradle b/fabric/origin/build.gradle
@@ -3,27 +3,18 @@ plugins {
     id 'maven-publish'
 }
 
-def getVersionFromFile() {
-    def versionFile = file('../../version.txt')
+def getVersionFromFile(String fileName) {
+    def versionFile = file(fileName)
     if (versionFile.exists()) {
         return versionFile.text.trim()
     } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
+        throw new Exception("File not found: ${versionFile.absolutePath}") as Throwable
     }
 }
 
-def mod_version = getVersionFromFile()
+def tool_version = getVersionFromFile('../../tool_version.txt')
 
-def getToolVersionFromFile() {
-    def versionFile = file('../../tool_version.txt')
-    if (versionFile.exists()) {
-        return versionFile.text.trim()
-    } else {
-        throw new Exception("Tool Version file not found: ${versionFile.absolutePath}") as Throwable
-    }
-}
-
-def tool_version = getToolVersionFromFile()
+def mod_version = getVersionFromFile('../../version.txt')
 
 version = mod_version
 group = project.maven_group

diff --git a/forge/origin/build.gradle b/forge/origin/build.gradle
@@ -4,27 +4,18 @@ plugins {
     id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
 }
 
-def getVersionFromFile() {
-    def versionFile = file('../../version.txt')
+def getVersionFromFile(String fileName) {
+    def versionFile = file(fileName)
     if (versionFile.exists()) {
         return versionFile.text.trim()
     } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
+        throw new Exception("File not found: ${versionFile.absolutePath}") as Throwable
     }
 }
 
-def mod_version = getVersionFromFile()
+def tool_version = getVersionFromFile('../../tool_version.txt')
 
-def getToolVersionFromFile() {
-    def versionFile = file('../../tool_version.txt')
-    if (versionFile.exists()) {
-        return versionFile.text.trim()
-    } else {
-        throw new Exception("Tool Version file not found: ${versionFile.absolutePath}") as Throwable
-    }
-}
-
-def tool_version = getToolVersionFromFile()
+def mod_version = getVersionFromFile('../../version.txt')
 
 group = mod_group_id
 version = mod_version

diff --git a/minecraft/origin/build.gradle b/minecraft/origin/build.gradle
@@ -3,27 +3,18 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}"
 }
 
-def getVersionFromFile() {
-    def versionFile = file('../../version.txt')
+def getVersionFromFile(String fileName) {
+    def versionFile = file(fileName)
     if (versionFile.exists()) {
         return versionFile.text.trim()
     } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
+        throw new Exception("File not found: ${versionFile.absolutePath}") as Throwable
     }
 }
 
-def mod_version = getVersionFromFile()
+def tool_version = getVersionFromFile('../../tool_version.txt')
 
-def getToolVersionFromFile() {
-    def versionFile = file('../../tool_version.txt')
-    if (versionFile.exists()) {
-        return versionFile.text.trim()
-    } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
-    }
-}
-
-def tool_version = getToolVersionFromFile()
+def mod_version = getVersionFromFile('../../version.txt')
 
 group = mod_group_id
 version = mod_version

diff --git a/neoforge/origin/build.gradle b/neoforge/origin/build.gradle
@@ -5,27 +5,18 @@ plugins {
     id 'net.neoforged.moddev' version '2.0.78'
 }
 
-def getVersionFromFile() {
-    def versionFile = file('../../version.txt')
+def getVersionFromFile(String fileName) {
+    def versionFile = file(fileName)
     if (versionFile.exists()) {
         return versionFile.text.trim()
     } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
+        throw new Exception("File not found: ${versionFile.absolutePath}") as Throwable
     }
 }
 
-def mod_version = getVersionFromFile()
+def tool_version = getVersionFromFile('../../tool_version.txt')
 
-def getToolVersionFromFile() {
-    def versionFile = file('../../tool_version.txt')
-    if (versionFile.exists()) {
-        return versionFile.text.trim()
-    } else {
-        throw new Exception("Tool Version file not found: ${versionFile.absolutePath}") as Throwable
-    }
-}
-
-def tool_version = getToolVersionFromFile()
+def mod_version = getVersionFromFile('../../version.txt')
 
 version = mod_version
 group = mod_group_id
@@ -136,4 +127,4 @@ idea {
         downloadSources = true
         downloadJavadoc = true
     }
-}
+}
diff --git a/spigot/origin/build.gradle b/spigot/origin/build.gradle
@@ -3,27 +3,18 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-def getVersionFromFile() {
-    def versionFile = file('../../version.txt')
+def getVersionFromFile(String fileName) {
+    def versionFile = file(fileName)
     if (versionFile.exists()) {
         return versionFile.text.trim()
     } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
+        throw new Exception("File not found: ${versionFile.absolutePath}") as Throwable
     }
 }
 
-def mod_version = getVersionFromFile()
+def tool_version = getVersionFromFile('../../tool_version.txt')
 
-def getToolVersionFromFile() {
-    def versionFile = file('../../tool_version.txt')
-    if (versionFile.exists()) {
-        return versionFile.text.trim()
-    } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
-    }
-}
-
-def tool_version = getToolVersionFromFile()
+def mod_version = getVersionFromFile('../../version.txt')
 
 group = project.mod_group_id
 version = mod_version

diff --git a/velocity/origin/build.gradle b/velocity/origin/build.gradle
@@ -5,27 +5,18 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-def getVersionFromFile() {
-    def versionFile = file('../../version.txt')
+def getVersionFromFile(String fileName) {
+    def versionFile = file(fileName)
     if (versionFile.exists()) {
         return versionFile.text.trim()
     } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
+        throw new Exception("File not found: ${versionFile.absolutePath}") as Throwable
     }
 }
 
-def mod_version = getVersionFromFile()
+def tool_version = getVersionFromFile('../../tool_version.txt')
 
-def getToolVersionFromFile() {
-    def versionFile = file('../../tool_version.txt')
-    if (versionFile.exists()) {
-        return versionFile.text.trim()
-    } else {
-        throw new Exception("Version file not found: ${versionFile.absolutePath}") as Throwable
-    }
-}
-
-def tool_version = getToolVersionFromFile()
+def mod_version = getVersionFromFile('../../version.txt')
 
 group = project.mod_group_id
 version = mod_version