Merge pull request #58 from AerWyn81/master

Using long-standing Bukkit API to handle server version
unldenis · Jul 12, 2024 · 81a51ae · 81a51ae
2 parents 4c1ba73 + 3bd0c2e
commit 81a51ae
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/holoeasy-core/pom.xml b/holoeasy-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.holoeasy</groupId>
         <artifactId>holoeasy</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
     </parent>
 
     <artifactId>holoeasy-core</artifactId>

diff --git a/holoeasy-core/src/main/kotlin/org/holoeasy/util/VersionUtil.kt b/holoeasy-core/src/main/kotlin/org/holoeasy/util/VersionUtil.kt
@@ -27,9 +27,10 @@ object VersionUtil {
     val CLEAN_VERSION: VersionEnum
 
     init {
-        val bpName = Bukkit.getServer().javaClass.getPackage().name
-        VERSION = bpName.substring(bpName.lastIndexOf(".") + 1)
-        val clean = VERSION.substring(0, VERSION.length - 3)
+        val bpName = Bukkit.getServer().bukkitVersion
+        val version = bpName.substringBefore('-').replace('.', '_')
+        VERSION = "v$version"
+        val clean = VERSION.substring(0, VERSION.length - 2)
         CLEAN_VERSION = VersionEnum.valueOf(clean.uppercase(Locale.getDefault()))
     }
 

diff --git a/holoeasy-example-kotlin/pom.xml b/holoeasy-example-kotlin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.holoeasy</groupId>
         <artifactId>holoeasy</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
     </parent>
 
     <artifactId>holoeasy-example-kotlin</artifactId>

diff --git a/holoeasy-example/pom.xml b/holoeasy-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.holoeasy</groupId>
         <artifactId>holoeasy</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
     </parent>
     <artifactId>holoeasy-example</artifactId>
 

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.holoeasy</groupId>
     <artifactId>holoeasy</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
     <packaging>pom</packaging>
     <modules>
         <module>holoeasy-core</module>