Fix AnvilView version checks

Archy-X · Sep 21, 2024 · 88f352e · 88f352e
1 parent 5265805
commit 88f352e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
     implementation("net.kyori:adventure-text-minimessage:4.16.0")
     implementation("net.kyori:adventure-platform-bukkit:4.3.3")
     compileOnly("org.jetbrains:annotations:24.1.0")
-    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.11.6")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.5") {
         exclude("org.spigotmc", "spigot-api")

diff --git a/...t/src/main/java/dev/aurelium/auraskills/bukkit/skills/enchanting/EnchantingAbilities.java b/...t/src/main/java/dev/aurelium/auraskills/bukkit/skills/enchanting/EnchantingAbilities.java
@@ -170,7 +170,7 @@ public void anvilMaster(InventoryOpenEvent event) {
 
         int maxCost = (int) Math.round(getValue(ability, user));
 
-        if (VersionUtils.isAtLeastVersion(21)) {
+        if (VersionUtils.isAtLeastVersion(21, 1)) {
             if (event.getView() instanceof AnvilView view) {
                 view.setMaximumRepairCost(maxCost);
             }

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/fighting/LightningBlade.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/fighting/LightningBlade.java
@@ -36,7 +36,7 @@ public LightningBlade(AuraSkills plugin) {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     public void onActivate(Player player, User user) {
         AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_ATTACK_SPEED);
         if (attribute == null) return;

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/AnvilLeveler.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/AnvilLeveler.java
@@ -71,7 +71,7 @@ public void onAnvilCombine(InventoryClickEvent event) {
     @SuppressWarnings("removal")
     private double getRepairCostMultiplier(AnvilXpSource source, AnvilInventory anvil, Skill skill, InventoryClickEvent event) {
         int repairCost = 1;
-        if (VersionUtils.isAtLeastVersion(21)) {
+        if (VersionUtils.isAtLeastVersion(21, 1)) {
             if (event.getView() instanceof AnvilView view) {
                 repairCost = view.getRepairCost();
             }

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/AnvilDiscountTrait.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/AnvilDiscountTrait.java
@@ -53,7 +53,7 @@ public void onAnvilPrepare(PrepareAnvilEvent event) {
         }
         if (user != null) {
             double wisdom = user.getEffectiveTraitLevel(Traits.ANVIL_DISCOUNT);
-            if (VersionUtils.isAtLeastVersion(21)) {
+            if (VersionUtils.isAtLeastVersion(21, 1)) {
                 AnvilView view = event.getView();
                 int repairCost = view.getRepairCost();
                 int cost = (int) Math.round(repairCost * (1 - getDiscount(wisdom)));

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/HpTrait.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/HpTrait.java
@@ -124,7 +124,7 @@ private void setWorldChange(PlayerChangedWorldEvent event, Player player, User u
         worldChangeHealth.remove(playerID);
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     private void setHealth(Player player, User user) {
         Trait trait = Traits.HP;
 
@@ -187,9 +187,8 @@ private void setHealth(Player player, User user) {
         applyScaling(player);
     }
 
-    @SuppressWarnings("deprecation")
     private boolean isSkillsHealthModifier(AttributeModifier am) {
-        if (am.getName().equals("skillsHealth") || am.getUniqueId().equals(ATTRIBUTE_ID)) {
+        if (am.getName().equals("skillsHealth")) {
             return true;
         }
         if (VersionUtils.isAtLeastVersion(21)) {

diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/LuckTrait.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/trait/LuckTrait.java
@@ -58,7 +58,7 @@ public void worldChange(PlayerChangedWorldEvent event) {
         setLuck(event.getPlayer());
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     private void setLuck(Player player) {
         AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_LUCK);
         if (attribute == null) {