Fix attribute errors on 1.21.3

Archy-X · Nov 5, 2024 · 4fcb242 · 4fcb242
1 parent 7226d7e
commit 4fcb242
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     implementation(project(":common"))
     implementation(project(":api-bukkit"))
     implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
-    implementation("de.tr7zw:item-nbt-api:2.13.3-SNAPSHOT")
+    implementation("de.tr7zw:item-nbt-api:2.14.0")
     implementation("org.bstats:bstats-bukkit:3.0.2")
     implementation("net.kyori:adventure-text-minimessage:4.16.0")
     implementation("net.kyori:adventure-platform-bukkit:4.3.3")

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/AttributeCompat.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/util/AttributeCompat.java
@@ -13,21 +13,20 @@ public class AttributeCompat {
     public static Attribute LUCK;
 
     static {
-        /*
-        Saved for updating to spigot-api 1.21.3+
+
         if (VersionUtils.isAtLeastVersion(21, 2)) {
-            MAX_HEALTH = Attribute.MAX_HEALTH;
-            MOVEMENT_SPEED = Attribute.MOVEMENT_SPEED;
-            ATTACK_DAMAGE = Attribute.ATTACK_DAMAGE;
-            ATTACK_SPEED = Attribute.ATTACK_SPEED;
-            LUCK = Attribute.LUCK;
+            MAX_HEALTH = fromRegistry("max_health");
+            MOVEMENT_SPEED = fromRegistry("movement_speed");
+            ATTACK_DAMAGE = fromRegistry("attack_damage");
+            ATTACK_SPEED = fromRegistry("attack_speed");
+            LUCK = fromRegistry("luck");
         } else {
-         */
-        MAX_HEALTH = fromRegistry("generic.max_health");
-        MOVEMENT_SPEED = fromRegistry("generic.movement_speed");
-        ATTACK_DAMAGE = fromRegistry("generic.attack_damage");
-        ATTACK_SPEED = fromRegistry("generic.attack_speed");
-        LUCK = fromRegistry("generic.luck");
+            MAX_HEALTH = fromRegistry("generic.max_health");
+            MOVEMENT_SPEED = fromRegistry("generic.movement_speed");
+            ATTACK_DAMAGE = fromRegistry("generic.attack_damage");
+            ATTACK_SPEED = fromRegistry("generic.attack_speed");
+            LUCK = fromRegistry("generic.luck");
+        }
     }
 
     private static Attribute fromRegistry(String key) {