Fix Paper 1.21 fix

Author: GavinGoGaming

src/main/java/dev/klash/caramel/Caramel.java

@@ -6,6 +6,7 @@
 import dev.klash.caramel.plugin.ImplCaramelDefault;
 import dev.klash.caramel.recipe.CaramelRecipe;
 import dev.klash.caramel.recipe.CaramelRecipeList;
+import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -19,26 +20,29 @@
 
 public final class Caramel extends JavaPlugin {
 
+    private static Caramel instance;
     public static Caramel getInstance() {
-        return getPlugin(Caramel.class);
+        return instance == null ? (Caramel)Bukkit.getPluginManager().getPlugin("Caramel") : instance;
     }
     public CaramelCommandList commands;
     public CaramelItemList items;
     public CaramelCurrencyList currencies;
     public SpiGUI spigui;
     public CaramelGuiList guis;
 
-    public static NamespacedKey isCaramelKey = new NamespacedKey(Caramel.getInstance(), "is-caramel");
-    public static NamespacedKey caramelIDKey = new NamespacedKey(Caramel.getInstance(), "caramel-id");
+    public NamespacedKey caramelIDKey, isCaramelKey;
 
     public String getPrefix() {
         return getConfig().getString("messages.caramel-prefix");
     }
 
     @Override
     public void onEnable() {
+        instance = this;
         saveDefaultConfig();
         spigui = new SpiGUI(this);
+        caramelIDKey = new NamespacedKey(this, "caramel-id");
+        isCaramelKey = new NamespacedKey(this, "is-caramel");
 
         commands = new CaramelCommandList();
         items = new CaramelItemList();

src/main/java/dev/klash/caramel/CaramelListening.java

@@ -28,13 +28,15 @@ public void onItemClick(PlayerInteractEvent event) {
                 }
             }
         }
-        for (CaramelItem item : Caramel.getInstance().items.getItemList()) {
-            if(event.getItem() == null || event.getItem().getItemMeta() == null) continue;
-            String itemID = item.getDetails().id();
-            String heldItemID = event.getItem().getItemMeta().getPersistentDataContainer().get(Caramel.caramelIDKey, PersistentDataType.STRING);
-            if (event.getItem() != null && heldItemID.equalsIgnoreCase(itemID)) {
-                item.onItemUse(event.getAction().isLeftClick() ? ClickType.LEFT_CLICK : ClickType.RIGHT_CLICK, event.getItem(), event);
-                if(item.cancelEvent()) event.setCancelled(true);
+        if(event.getItem().getItemMeta().getPersistentDataContainer().has(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN)) {
+            for (CaramelItem item : Caramel.getInstance().items.getItemList()) {
+                if (event.getItem() == null || event.getItem().getItemMeta() == null) continue;
+                String itemID = item.getDetails().id();
+                String heldItemID = event.getItem().getItemMeta().getPersistentDataContainer().get(Caramel.getInstance().caramelIDKey, PersistentDataType.STRING);
+                if (event.getItem() != null && heldItemID.equalsIgnoreCase(itemID)) {
+                    item.onItemUse(event.getAction().isLeftClick() ? ClickType.LEFT_CLICK : ClickType.RIGHT_CLICK, event.getItem(), event);
+                    if (item.cancelEvent()) event.setCancelled(true);
+                }
             }
         }
     }

src/main/java/dev/klash/caramel/items/CaramelFactory.java

@@ -17,8 +17,8 @@ public static ItemStack build(CaramelItem item) {
         m.setCustomModelData(item.getDetails().modelData());
 
 
-        m.getPersistentDataContainer().set(Caramel.isCaramelKey, PersistentDataType.BOOLEAN, true);
-        m.getPersistentDataContainer().set(Caramel.caramelIDKey, PersistentDataType.STRING, item.getDetails().id());
+        m.getPersistentDataContainer().set(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN, true);
+        m.getPersistentDataContainer().set(Caramel.getInstance().caramelIDKey, PersistentDataType.STRING, item.getDetails().id());
 
         i.setItemMeta(m);
         i.setAmount(item.getDetails().defaultStack());