Fix folia adaption.

toxicity188 · Nov 29, 2024 · 5134215 · 5134215
1 parent fd7683c
commit 5134215
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 1 deletion.
diff --git a/api/bukkit-api/src/main/java/kr/toxicity/hud/api/bukkit/nms/NMSVersion.java b/api/bukkit-api/src/main/java/kr/toxicity/hud/api/bukkit/nms/NMSVersion.java
@@ -20,7 +20,8 @@ public enum NMSVersion {
     V1_20_R3(20,3, 22),
     V1_20_R4(20,4, 32),
     V1_21_R1(21,1, 34),
-    V1_21_R2(21,2, 42)
+    V1_21_R2(21,2, 42),
+    V1_21_R3(21,3, 46)
     ;
     /**
      * Main version.

diff --git a/bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/util/MinecraftVersion.kt b/bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/util/MinecraftVersion.kt
@@ -11,6 +11,7 @@ data class MinecraftVersion(
         val current = MinecraftVersion(Bukkit.getBukkitVersion()
             .substringBefore('-'))
 
+        val version1_21_4 = MinecraftVersion(1, 21, 4)
         val version1_21_3 = MinecraftVersion(1, 21, 3)
         val version1_21_2 = MinecraftVersion(1, 21, 2)
         val version1_21_1 = MinecraftVersion(1, 21, 1)

diff --git a/nms/v1_17_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_17_R1/NMSImpl.kt b/nms/v1_17_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_17_R1/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_18_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R1/NMSImpl.kt b/nms/v1_18_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R1/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_18_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R2/NMSImpl.kt b/nms/v1_18_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_18_R2/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_19_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R1/NMSImpl.kt b/nms/v1_19_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R1/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_19_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R2/NMSImpl.kt b/nms/v1_19_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R2/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_19_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R3/NMSImpl.kt b/nms/v1_19_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_19_R3/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_20_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R1/NMSImpl.kt b/nms/v1_20_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R1/NMSImpl.kt
@@ -139,6 +139,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_20_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R2/NMSImpl.kt b/nms/v1_20_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R2/NMSImpl.kt
@@ -141,6 +141,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_20_R4/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R4/NMSImpl.kt b/nms/v1_20_R4/src/main/kotlin/kr/toxicity/hud/nms/v1_20_R4/NMSImpl.kt
@@ -146,6 +146,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_21_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R1/NMSImpl.kt b/nms/v1_21_R1/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R1/NMSImpl.kt
@@ -145,6 +145,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }

diff --git a/nms/v1_21_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R2/NMSImpl.kt b/nms/v1_21_R2/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R2/NMSImpl.kt
@@ -147,6 +147,9 @@ class NMSImpl : NMS {
             override fun getScaledHealth(): Float {
                 return player.scaledHealth
             }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
             override fun getFirstPlayed(): Long {
                 return player.firstPlayed
             }