#60 fix version parsing

unldenis · Jul 19, 2024 · 38aee9c · 38aee9c
1 parent a56e221
commit 38aee9c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/README.MD b/README.MD
@@ -1,5 +1,5 @@
 > [!NOTE]
-> New update: 3.4.1: [BlockLines & Animations](https://github.com/unldenis/holoeasy?tab=readme-ov-file#blockline--animations). Scroll down for more information.
+> New update: 3.4.2: [BlockLines & Animations](https://github.com/unldenis/holoeasy?tab=readme-ov-file#blockline--animations). Scroll down for more information.
 
 HoloEasy is a simple, modern and high-performant Java and Kotlin Minecraft Hologram library for 1.8-1.20.4 servers.
 
@@ -20,7 +20,7 @@ Lightweight replacement for Holographic Display. HoloEasy only uses packets inst
 <dependency>
     <groupId>com.github.unldenis.holoeasy</groupId>
     <artifactId>holoeasy-core</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.2</version>
 </dependency>
 
 <!-- For java projects include also the kotlin stdlib -->
@@ -34,7 +34,7 @@ Lightweight replacement for Holographic Display. HoloEasy only uses packets inst
 #### Gradle
 
 ```kotlin
-implementation("com.github.unldenis.holoeasy:holoeasy-core:3.4.1")
+implementation("com.github.unldenis.holoeasy:holoeasy-core:3.4.2")
 
 // For java projects include also the kotlin stdlib
 implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.21")
@@ -139,7 +139,7 @@ plugin.registerHolograms {
 ```
 
 ## BlockLine & Animations
-From 3.4.1 version, library added support for:
+From 3.4.2 version, library added support for:
 - BlockLine: Instead of a dropping item it spawns an hologram with the block as helmet.
 - Animations: You can apply animations to hologram lines.
 <p align="center">

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.1</version>
+        <version>3.4.2</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,15 +27,18 @@ object VersionUtil {
     val CLEAN_VERSION: VersionEnum
 
     init {
+        // Bukkit method that was added in 2011
+        // Example value: 1.20.4-R0.1-SNAPSHOT
         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()))
+
+        // Split with '.' and get first two elements
+        VERSION = bpName.split(".").let { "V${it[0]}_${it[1]}"}
+
+        CLEAN_VERSION = VersionEnum.valueOf(VERSION)
     }
 
     fun isCompatible(ve: VersionEnum): Boolean {
-        return VERSION.lowercase(Locale.getDefault()).contains(ve.toString().lowercase(Locale.getDefault()))
+        return CLEAN_VERSION == ve
     }
 
     fun isAbove(ve: VersionEnum): Boolean {
@@ -69,10 +72,11 @@ enum class VersionEnum(armorstandId: Int, droppedItemId : Int) : Comparable<Vers
     V1_18,
     V1_19(2, 55),
     V1_20,
+    V1_21,
 
     // for non breaking in future
-    V1_21,
-    V1_22
+    V1_22,
+    V1_23
     ;
 
     var armorstandId : Int

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.1</version>
+        <version>3.4.2</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.1</version>
+        <version>3.4.2</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.1</version>
+    <version>3.4.2</version>
     <packaging>pom</packaging>
     <modules>
         <module>holoeasy-core</module>
@@ -99,7 +99,7 @@
 <!--            <plugin>-->
 <!--                <groupId>org.apache.maven.plugins</groupId>-->
 <!--                <artifactId>maven-jar-plugin</artifactId>-->
-<!--                <version>3.4.1</version>-->
+<!--                <version>3.4.2</version>-->
 <!--                <configuration>-->
 <!--                    <outputDirectory>C:\Users\mehil\OneDrive\Desktop\Spigot 1.16.5\plugins</outputDirectory>-->
 <!--                </configuration>-->