improving menu manager

Author: KodySimpson

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.kodysimpson</groupId>
     <artifactId>SimpAPI</artifactId>
-    <version>4.5.6</version>
+    <version>4.6.0</version>
     <packaging>jar</packaging>
 
     <name>SimpAPI</name>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.4</version>
+            <version>2.13.4.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

src/main/java/me/kodysimpson/simpapi/menu/Menu.java

@@ -129,5 +129,14 @@ public ItemStack makeItem(Material material, String displayName, String... lore)
         return item;
     }
 
+    /**
+     * Called when a player closes this menu
+     * Override this method to handle menu closing events
+     */
+    public void handleMenuClose() {
+        // Default empty implementation
+        // Subclasses can override this if they want to handle menu closing
+    }
+
 }
 

src/main/java/me/kodysimpson/simpapi/menu/MenuListener.java

@@ -6,9 +6,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.inventory.InventoryHolder;
 
-
 public class MenuListener implements Listener {
 
     @EventHandler
@@ -19,13 +19,10 @@ public void onMenuClick(InventoryClickEvent e) {
         // is an instance of Menu, then gg. The reason that
         // an InventoryHolder can be a Menu is because our Menu
         // class implements InventoryHolder!!
-        if (holder instanceof Menu) {
+        if (holder instanceof Menu menu) {
             if (e.getCurrentItem() == null) { //deal with null exceptions
                 return;
             }
-            //Since we know our inventoryholder is a menu, get the Menu Object representing
-            // the menu we clicked on
-            Menu menu = (Menu) holder;
 
             if (menu.cancelAllClicks()) {
                 e.setCancelled(true); //prevent them from fucking with the inventory
@@ -43,5 +40,14 @@ public void onMenuClick(InventoryClickEvent e) {
 
     }
 
+    @EventHandler
+    public void onMenuClose(InventoryCloseEvent e) {
+        InventoryHolder holder = e.getInventory().getHolder();
+        
+        if (holder instanceof Menu menu) {
+            menu.handleMenuClose();
+        }
+    }
+
 }
 

src/main/java/me/kodysimpson/simpapi/menu/MenuManager.java

@@ -23,7 +23,6 @@ public class MenuManager {
     private static void registerMenuListener(Server server, Plugin plugin) {
         boolean isAlreadyRegistered = false;
         for (RegisteredListener rl : InventoryClickEvent.getHandlerList().getRegisteredListeners()) {
-            System.out.println(rl.getListener().getClass().getSimpleName());
             if (rl.getListener() instanceof MenuListener) {
                 isAlreadyRegistered = true;
                 break;
@@ -40,7 +39,7 @@ private static void registerMenuListener(Server server, Plugin plugin) {
      * @param plugin The instance of the plugin using this API. Can provide in plugin class by passing this keyword
      */
     public static void setup(Server server, Plugin plugin) {
-        System.out.println("MENU MANAGER HAS BEEN SETUP");
+        plugin.getLogger().info("Menu Manager has been setup");
 
         registerMenuListener(server, plugin);
         isSetup = true;

src/main/java/me/kodysimpson/simpapi/menu/PaginatedMenu.java

@@ -19,6 +19,9 @@ public abstract class PaginatedMenu extends Menu {
     //28 empty slots are remaining.
     protected int maxItemsPerPage = 28;
 
+    // Add cache field
+    private List<ItemStack> cachedItems;
+
     public PaginatedMenu(PlayerMenuUtility playerMenuUtility) {
         super(playerMenuUtility);
     }
@@ -39,10 +42,16 @@ public PaginatedMenu(PlayerMenuUtility playerMenuUtility) {
      * Set the border and menu buttons for the menu. Override this method to provide a custom menu border or specify custom items in customMenuBorderItems()
      */
     protected void addMenuBorder() {
-
-        inventory.setItem(48, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Left"));
+        // First page button
+        inventory.setItem(47, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "First Page"));
+        // Previous page button
+        inventory.setItem(48, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Previous"));
+        // Close button
         inventory.setItem(49, makeItem(Material.BARRIER, ChatColor.DARK_RED + "Close"));
-        inventory.setItem(50, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Right"));
+        // Next page button
+        inventory.setItem(50, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Next"));
+        // Last page button
+        inventory.setItem(51, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Last Page"));
 
         for (int i = 0; i < 10; i++) {
             if (inventory.getItem(i) == null) {
@@ -70,22 +79,43 @@ protected void addMenuBorder() {
 
     }
 
+    /**
+     * Gets the paginated items, using cache if available
+     * @return List of ItemStacks to display
+     */
+    protected List<ItemStack> getItems() {
+        if (cachedItems == null) {
+            cachedItems = dataToItems();
+        }
+        return cachedItems;
+    }
+
+    /**
+     * Clears the item cache, forcing items to be reloaded next time
+     */
+    protected void invalidateCache() {
+        cachedItems = null;
+    }
+
     /**
      * Place each item in the paginated menu, automatically coded by default but override if you want custom functionality. Calls the loopCode() method you define for each item returned in the getData() method
      */
     @Override
     public void setMenuItems() {
-
         addMenuBorder();
-
-        //add the items to the inventory based on the current page and max items per page
-        List<ItemStack> items = dataToItems();
+        
+        List<ItemStack> items = getItems(); // Use cached items
+        
+        int slot = 10;
         for (int i = 0; i < maxItemsPerPage; i++) {
             int index = maxItemsPerPage * page + i;
             if (index >= items.size()) break;
-            inventory.addItem(items.get(index));
+            
+            if (slot % 9 == 8) slot += 2;
+            
+            inventory.setItem(slot, items.get(index));
+            slot++;
         }
-
     }
 
     /**
@@ -105,17 +135,68 @@ public boolean prevPage() {
      * @return true if successful, false if already on the last page
      */
     public boolean nextPage() {
-        if (!((page + 1) * maxItemsPerPage >= dataToItems().size())) {
-            page = page + 1;
+        int totalItems = getItems().size(); // Use cached items
+        int lastPageNumber = (totalItems - 1) / maxItemsPerPage;
+        
+        if (page < lastPageNumber) {
+            page++;
             reloadItems();
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     public int getMaxItemsPerPage() {
         return maxItemsPerPage;
     }
+
+    public int getCurrentPage() {
+        return page + 1; // Convert to 1-based page numbers for display
+    }
+
+    public int getTotalPages() {
+        return ((getItems().size() - 1) / maxItemsPerPage) + 1; // Use cached items
+    }
+
+    @Override
+    public void open() {
+        invalidateCache(); // Force items to be reloaded when menu opens
+        super.open();
+    }
+
+    /**
+     * Refreshes the menu data and reloads items while keeping the menu open
+     */
+    public void refreshData() {
+        invalidateCache();
+        reloadItems();
+    }
+
+    /**
+     * Sets the current page to the first page (0)
+     * @return true if the page was changed, false if already on first page
+     */
+    public boolean firstPage() {
+        if (page == 0) {
+            return false;
+        }
+        page = 0;
+        reloadItems();
+        return true;
+    }
+
+    /**
+     * Sets the current page to the last page
+     * @return true if the page was changed, false if already on last page
+     */
+    public boolean lastPage() {
+        int lastPageNum = (getItems().size() - 1) / maxItemsPerPage;
+        if (page == lastPageNum) {
+            return false;
+        }
+        page = lastPageNum;
+        reloadItems();
+        return true;
+    }
 }