From 1ce0d200def9d20434a3bbedfaa736e6b44c7718 Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Fri, 18 Oct 2024 21:16:35 +0200
Subject: [PATCH] tiny refactor to reuse the enchant key

---
 .../enchantio/enchants/EnchantioEnchant.java               | 1 -
 .../enchantio/listeners/SoulboundListener.java             | 7 ++-----
 .../enchantio/listeners/TelepathyListener.java             | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java b/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java
index bf033f0..caec708 100644
--- a/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java
+++ b/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java
@@ -38,7 +38,6 @@ public abstract class EnchantioEnchant {
             EnchantmentRegistryEntry.EnchantmentCost maximumCost,
             TagKey<ItemType> primaryItems,
             TagKey<ItemType> supportedItems,
-
             Set<EquipmentSlotGroup> activeSlots
     ) {
         this.key = key;
diff --git a/src/main/java/me/youhavetrouble/enchantio/listeners/SoulboundListener.java b/src/main/java/me/youhavetrouble/enchantio/listeners/SoulboundListener.java
index bb2c5c6..3a908a8 100644
--- a/src/main/java/me/youhavetrouble/enchantio/listeners/SoulboundListener.java
+++ b/src/main/java/me/youhavetrouble/enchantio/listeners/SoulboundListener.java
@@ -2,7 +2,6 @@ package me.youhavetrouble.enchantio.listeners;
 
 import io.papermc.paper.registry.RegistryAccess;
 import io.papermc.paper.registry.RegistryKey;
-import me.youhavetrouble.enchantio.Enchantio;
 import me.youhavetrouble.enchantio.enchants.SoulboundEnchant;
 import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
@@ -17,15 +16,13 @@ public class SoulboundListener implements Listener {
     public void onSoulboundEnchantDeath(PlayerDeathEvent event) {
         Registry<Enchantment> registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT);
         Enchantment soulbound = registry.get(SoulboundEnchant.KEY);
-        Enchantio.getPlugin(Enchantio.class).getLogger().info("Soulbound enchantment: " + soulbound);
-
+        if (soulbound == null) return;
         event.getPlayer().getInventory().forEach(itemStack -> {
-            if (itemStack != null && itemStack.getEnchantments().containsKey(soulbound)) {
+            if (itemStack != null && itemStack.containsEnchantment(soulbound)) {
                 event.getItemsToKeep().add(itemStack);
                 event.getDrops().remove(itemStack);
             }
         });
-
     }
 
 }
diff --git a/src/main/java/me/youhavetrouble/enchantio/listeners/TelepathyListener.java b/src/main/java/me/youhavetrouble/enchantio/listeners/TelepathyListener.java
index 493b26b..0ac2c46 100644
--- a/src/main/java/me/youhavetrouble/enchantio/listeners/TelepathyListener.java
+++ b/src/main/java/me/youhavetrouble/enchantio/listeners/TelepathyListener.java
@@ -21,9 +21,10 @@ public class TelepathyListener implements Listener {
     public void onTelepathyTool(BlockDropItemEvent event) {
         Registry<Enchantment> registry = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT);
         Enchantment telepathy = registry.get(TelepathyEnchant.KEY);
+        if (telepathy == null) return;
 
         ItemStack tool = event.getPlayer().getInventory().getItemInMainHand();
-        if (!tool.getEnchantments().containsKey(telepathy)) return;
+        if (!tool.containsEnchantment(telepathy)) return;
 
         for (Item item : event.getItems()) {
             item.teleport(event.getPlayer(), PlayerTeleportEvent.TeleportCause.PLUGIN);