Fixed depreciation warnings for /ench and removed unnecessary code fr…

…om Enchantments.java
CoPokBl · Apr 21, 2024 · b2e6000 · b2e6000
1 parent ad70da8
commit b2e6000
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/net/serble/estools/Commands/Ench.java b/src/main/java/net/serble/estools/Commands/Ench.java
@@ -7,6 +7,7 @@
 import net.serble.estools.Enchantments;
 import net.serble.estools.Main;
 import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
@@ -56,8 +57,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		Enchantment ench;
 		try {
 			if (Main.majorVersion > 12) {
-                // TODO: Fix for versions that use Registry
-                ench = Enchantment.getByKey(NamespacedKey.minecraft(args[0].toLowerCase()));
+                ench = Registry.ENCHANTMENT.get(NamespacedKey.minecraft(args[0].toLowerCase()));
             } else {
                 ench = Enchantments.getByName(args[0].toLowerCase());
             }
@@ -84,8 +84,7 @@ public List<String> tabComplete(CommandSender sender, String[] args, String lArg
 		switch (args.length) {
 			case 1:
 				if (Main.majorVersion > 12) {
-					// TODO: Fix for versions that use Registry
-                    for (Enchantment e : Enchantment.values()) {
+                    for (Enchantment e : Registry.ENCHANTMENT) {
 						tab.add(e.getKey().getKey());
 					}
 				} else {

diff --git a/src/main/java/net/serble/estools/Enchantments.java b/src/main/java/net/serble/estools/Enchantments.java
@@ -7,6 +7,8 @@
 import java.util.Map;
 import java.util.Set;
 
+// This class exists because the registry doesn't exist pre 1.13, so all the enchantments names have to be hardcoded.
+// only enchantments before 1.13 need to be here because this class isn't used past 1.13
 public class Enchantments {
     private static final Map<String, Enchantment> ENCHANTMENTS = new HashMap<>();
 
@@ -60,11 +62,5 @@ private static void AddEnchants() {
         ENCHANTMENTS.put("bindingcurse", Enchantment.BINDING_CURSE);
         ENCHANTMENTS.put("vanishingcurse", Enchantment.VANISHING_CURSE);
         ENCHANTMENTS.put("sweepingedge", Enchantment.SWEEPING_EDGE);
-
-        if (Main.majorVersion <= 15) return;
-        ENCHANTMENTS.put("soulspeed", Enchantment.SOUL_SPEED);
-
-        if (Main.majorVersion <= 18) return;
-        ENCHANTMENTS.put("loyalty", Enchantment.LOYALTY);
     }
 }