Add new API

CitizensDev · Jan 5, 2023 · 9e674ee · 9e674ee
1 parent 5dcebea
commit 9e674ee
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 22 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/CitizensAPI.java b/src/main/java/net/citizensnpcs/api/CitizensAPI.java
@@ -89,10 +89,6 @@ private static ClassLoader getImplementationClassLoader() {
         return getImplementation().getOwningClassLoader();
     }
 
-    public static InventoryHelper getInventoryHelper() {
-        return getImplementation().getInventoryHelper();
-    }
-
     public static LocationLookup getLocationLookup() {
         return getImplementation().getLocationLookup();
     }
@@ -111,6 +107,10 @@ public static NPCRegistry getNamedNPCRegistry(String name) {
         return getImplementation().getNamedNPCRegistry(name);
     }
 
+    public static NMSHelper getNMSHelper() {
+        return getImplementation().getNMSHelper();
+    }
+
     public static Iterable<NPCRegistry> getNPCRegistries() {
         return getImplementation().getNPCRegistries();
     }
@@ -148,10 +148,6 @@ public static File getScriptFolder() {
         return getImplementation().getScriptFolder();
     }
 
-    public static SkullMetaProvider getSkullMetaProvider() {
-        return instance.getSkullMetaProvider();
-    }
-
     /**
      * Gets the current implementation's {@link SpeechFactory}.
      *

diff --git a/src/main/java/net/citizensnpcs/api/CitizensPlugin.java b/src/main/java/net/citizensnpcs/api/CitizensPlugin.java
@@ -44,8 +44,6 @@ public interface CitizensPlugin extends Plugin {
      */
     public NPCSelector getDefaultNPCSelector();
 
-    public InventoryHelper getInventoryHelper();
-
     /**
      * Gets the Citizens {@link LocationLookup}
      *
@@ -62,6 +60,8 @@ public interface CitizensPlugin extends Plugin {
      */
     public NPCRegistry getNamedNPCRegistry(String name);
 
+    public NMSHelper getNMSHelper();
+
     /**
      * Get all registered {@link NPCRegistry}s.
      */
@@ -81,11 +81,6 @@ public interface CitizensPlugin extends Plugin {
      */
     public File getScriptFolder();
 
-    /**
-     * @return The Skull ItemMeta provider
-     */
-    public SkullMetaProvider getSkullMetaProvider();
-
     /**
      * Gets the SpeechFactory.
      *

diff --git a/src/main/java/net/citizensnpcs/api/NMSHelper.java b/src/main/java/net/citizensnpcs/api/NMSHelper.java
@@ -0,0 +1,20 @@
+package net.citizensnpcs.api;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.meta.SkullMeta;
+
+public interface NMSHelper {
+    public OfflinePlayer getPlayer(BlockCommandSender sender);
+
+    public String getTexture(SkullMeta meta);
+
+    InventoryView openAnvilInventory(Player player, Inventory inventory, String title);
+
+    public void setTexture(String string, SkullMeta meta);
+
+    void updateInventoryTitle(Player player, InventoryView view, String newTitle);
+}
diff --git a/src/main/java/net/citizensnpcs/api/gui/InventoryMenu.java b/src/main/java/net/citizensnpcs/api/gui/InventoryMenu.java
@@ -274,7 +274,7 @@ private void handleShiftClick(InventoryClickEvent event, Inventory dest, boolean
                 InventoryClickEvent e = new InventoryClickEvent(event.getView(), event.getSlotType(),
                         toNPC ? i : event.getRawSlot(), event.getClick(),
                         toNPC ? InventoryAction.PLACE_ALL : InventoryAction.PICKUP_ALL);
-                handleClick(e);
+                onInventoryClick(e);
                 if (toNPC) {
                     event.getView().setCursor(null);
                 }
@@ -297,7 +297,7 @@ private void handleShiftClick(InventoryClickEvent event, Inventory dest, boolean
                 }
                 InventoryClickEvent e = new InventoryClickEvent(event.getView(), event.getSlotType(),
                         toNPC ? i : event.getRawSlot(), event.getClick(), action);
-                handleClick(e);
+                onInventoryClick(e);
                 if (toNPC) {
                     event.getView().setCursor(null);
                 }
@@ -323,8 +323,13 @@ private boolean isOurInventory(Inventory other) {
 
     @EventHandler(ignoreCancelled = true)
     public void onInventoryClick(InventoryClickEvent event) {
-        if (page == null || transitioning || closingViews)
+        if (page == null || transitioning || closingViews) {
+            if (transitioning && isOurInventory(
+                    event.getClickedInventory() != null ? event.getClickedInventory() : event.getInventory())) {
+                event.setCancelled(true);
+            }
             return;
+        }
         delayViewerChanges = true;
         try {
             handleClick(event);
@@ -354,7 +359,7 @@ public void onInventoryDrag(InventoryDragEvent event) {
 
     private InventoryView openInventory(HumanEntity player, Inventory inventory, String title) {
         if (inventory.getType() == InventoryType.ANVIL) {
-            return CitizensAPI.getInventoryHelper().openAnvilInventory((Player) player, inventory, title);
+            return CitizensAPI.getNMSHelper().openAnvilInventory((Player) player, inventory, title);
         } else {
             return player.openInventory(inventory);
         }
@@ -594,7 +599,7 @@ private void transitionViewersToInventory(Inventory inventory) {
 
     void updateTitle(String newTitle) {
         for (InventoryView view : views) {
-            CitizensAPI.getInventoryHelper().updateInventoryTitle((Player) view.getPlayer(), view, newTitle);
+            CitizensAPI.getNMSHelper().updateInventoryTitle((Player) view.getPlayer(), view, newTitle);
         }
     }
 

diff --git a/src/main/java/net/citizensnpcs/api/util/ItemStorage.java b/src/main/java/net/citizensnpcs/api/util/ItemStorage.java
@@ -216,7 +216,7 @@ private static void deserialiseMeta(DataKey root, ItemStack res) {
             }
 
             if (root.keyExists("skull.texture") && !root.getString("skull.texture").isEmpty()) {
-                CitizensAPI.getSkullMetaProvider().setTexture(root.getString("skull.texture", ""), meta);
+                CitizensAPI.getNMSHelper().setTexture(root.getString("skull.texture", ""), meta);
             }
 
             res.setItemMeta(meta);

diff --git a/src/main/java/net/citizensnpcs/api/util/Placeholders.java b/src/main/java/net/citizensnpcs/api/util/Placeholders.java
@@ -9,6 +9,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -22,8 +23,13 @@
 import net.citizensnpcs.api.trait.trait.Owner;
 
 public class Placeholders {
+    private static OfflinePlayer getPlayer(BlockCommandSender sender) {
+        return CitizensAPI.getNMSHelper().getPlayer(sender);
+    }
+
     public static String replace(String text, CommandSender sender, NPC npc) {
-        text = replace(text, sender instanceof OfflinePlayer ? (OfflinePlayer) sender : null);
+        text = replace(text, sender instanceof OfflinePlayer ? (OfflinePlayer) sender
+                : sender instanceof BlockCommandSender ? getPlayer((BlockCommandSender) sender) : null);
         if (npc == null || text == null) {
             return text;
         }