Target Java 11; abstract enchantments with Bukkit Registry; minimum API 1.16 due to MorePersistentDataTypes requirements

Author: kccricket

pom.xml

@@ -14,7 +14,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>8</maven.compiler.release>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
 
     <build>
@@ -24,8 +24,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/de/jeff_media/BestTools/BestToolsHandler.java

@@ -2,7 +2,6 @@
 
 import org.bukkit.Material;
 import org.bukkit.Tag;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -199,7 +198,7 @@ ItemStack getNonToolItemFromArray(@NotNull ItemStack[] items,ItemStack currentIt
     boolean hasSilktouch(ItemStack item) {
         if(item==null) return false;
         if(!item.hasItemMeta()) return false;
-        return item.getItemMeta().hasEnchant(Enchantment.SILK_TOUCH);
+        return item.getItemMeta().hasEnchant(EnchantmentUtils.getSilkTouch());
     }
 
     @Nullable

src/main/java/de/jeff_media/BestTools/EnchantmentUtils.java

@@ -1,5 +1,7 @@
 package de.jeff_media.BestTools;
 
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -10,8 +12,9 @@ static int getMultiplier(ItemStack item) {
         int base = getBaseMultiplier(item);
         if(!item.hasItemMeta()) return base;
         ItemMeta meta = item.getItemMeta();
-        if(!meta.hasEnchant(Enchantment.EFFICIENCY)) return base;
-        int efficiencyLevel = meta.getEnchantLevel(Enchantment.EFFICIENCY);
+        Enchantment efficiency = EnchantmentUtils.getEfficiency();
+        if(!meta.hasEnchant(efficiency)) return base;
+        int efficiencyLevel = meta.getEnchantLevel(efficiency);
         return base + (efficiencyLevel * efficiencyLevel) + 1;
     }
 
@@ -26,4 +29,24 @@ static int getBaseMultiplier(ItemStack item) {
         if(n.startsWith("GOLD")) return 12;
         return 1;
     }
+
+    static Enchantment getEfficiency() {
+        return Registry.ENCHANTMENT.get(NamespacedKey.minecraft("efficiency"));
+    }
+
+    static Enchantment getBaneOfArthropods() {
+        return Registry.ENCHANTMENT.get(NamespacedKey.minecraft("bane_of_arthropods"));
+    }
+
+    static Enchantment getSmite() {
+        return Registry.ENCHANTMENT.get(NamespacedKey.minecraft("smite"));
+    }
+
+    static Enchantment getSharpness() {
+        return Registry.ENCHANTMENT.get(NamespacedKey.minecraft("sharpness"));
+    }
+
+    static Enchantment getSilkTouch() {
+        return Registry.ENCHANTMENT.get(NamespacedKey.minecraft("silk_touch"));
+    }
 }

src/main/java/de/jeff_media/BestTools/GUIHandler.java

@@ -3,7 +3,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -137,7 +136,7 @@ private void addBestToolsButton(PlayerSetting ps, Inventory gui) {
         ItemStack is = createGUIItem(mat,String.format("BestTools: %s",getEnabledString(ps.isBestToolsEnabled())),main.messages.GUI_BESTTOOLS_LORE);
         if(ps.isBestToolsEnabled()) {
             ItemMeta meta = is.getItemMeta();
-            meta.addEnchant(Enchantment.EFFICIENCY,5,false);
+            meta.addEnchant(EnchantmentUtils.getEfficiency(),5,false);
             meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
             is.setItemMeta(meta);
         }

src/main/java/de/jeff_media/BestTools/SwordUtils.java

@@ -89,17 +89,17 @@ static double getBonus(ItemStack is, EntityType enemy) {
             Enchantment e = entry.getKey();
             int l = entry.getValue();
             // Sharpness
-            if (e.equals(Enchantment.SHARPNESS)) {
+            if (e.equals(EnchantmentUtils.getSharpness())) {
                 bonus += (0.5 * l + 0.5);
             }
             // Bane of Anthropods
-            else if(e.equals(Enchantment.BANE_OF_ARTHROPODS)) {
+            else if(e.equals(EnchantmentUtils.getBaneOfArthropods())) {
                 if(isAnthropod(enemy)) {
                     bonus += (2.5 * l);
                 }
             }
             // Smite
-            else if(e.equals(Enchantment.SMITE)) {
+            else if(e.equals(EnchantmentUtils.getSmite())) {
                 if(isUndead(enemy)) {
                     bonus += (2.5*l);
                 }

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 main: de.jeff_media.BestTools.Main
 name: BestTools
 version: ${project.version}
-api-version: "1.13"
+api-version: "1.16"
 description: Automatically chooses the best tool when breaking blocks
 author: mfnalex
 #website: https://www.chestsort.de