trying to improve paginated menu implementation

Author: KodySimpson

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.kodysimpson</groupId>
     <artifactId>SimpAPI</artifactId>
-    <version>4.5.5</version>
+    <version>4.5.6</version>
     <packaging>jar</packaging>
 
     <name>SimpAPI</name>

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

@@ -23,16 +23,16 @@ public abstract class Menu implements InventoryHolder {
 
     //Protected values that can be accessed in the menus
     protected PlayerMenuUtility playerMenuUtility;
-    protected Player p;
+    protected Player player;
     protected Inventory inventory;
     protected ItemStack FILLER_GLASS = makeItem(Material.GRAY_STAINED_GLASS_PANE, " ");
 
     //Constructor for Menu. Pass in a PlayerMenuUtility so that
-    // we have information on who's menu this is and
+    // we have information on whose menu this is and
     // what info is to be transferred
     public Menu(PlayerMenuUtility playerMenuUtility) {
         this.playerMenuUtility = playerMenuUtility;
-        this.p = playerMenuUtility.getOwner();
+        this.player = playerMenuUtility.getOwner();
     }
 
     //let each menu decide their name
@@ -76,8 +76,8 @@ protected void reloadItems() {
     }
 
     protected void reload() throws MenuManagerException, MenuManagerNotSetupException {
-        p.closeInventory();
-        MenuManager.openMenu(this.getClass(), p);
+        player.closeInventory();
+        MenuManager.openMenu(this.getClass(), player);
     }
 
     //Overridden method from the InventoryHolder interface

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

@@ -3,7 +3,6 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
@@ -19,23 +18,16 @@ public abstract class PaginatedMenu extends Menu {
     //28 is max items because with the border set below,
     //28 empty slots are remaining.
     protected int maxItemsPerPage = 28;
-    //the index represents the index of the slot
-    //that the loop is on
-    protected int index = 0;
 
     public PaginatedMenu(PlayerMenuUtility playerMenuUtility) {
         super(playerMenuUtility);
     }
 
     /**
-     * @return A list of the data being paginated. usually this is a list of items but it can be anything
+     * @return A list of ItemStacks that you want to be placed in the menu. This is the data that will be paginated
+     * You can also use this as a way to convert your data to items if you need to
      */
-    public abstract List<?> getData();
-
-    /**
-     * @param object A single element of the data list that you do something with. It is recommended that you turn this into an item if it is not already and then put it into the inventory as you would with a normal Menu. You can execute any other logic in here as well.
-     */
-    public abstract void loopCode(Object object);
+    public abstract List<ItemStack> dataToItems();
 
     /**
      * @return A hashmap of items you want to be placed in the paginated menu border. This will override any items already placed by default. Key = slot, Value = Item
@@ -86,20 +78,14 @@ public void setMenuItems() {
 
         addMenuBorder();
 
-        List<Object> data = (List<Object>) getData();
-
-        if (data != null && !data.isEmpty()) {
-            for (int i = 0; i < getMaxItemsPerPage(); i++) {
-                index = getMaxItemsPerPage() * page + i;
-                System.out.println(index);
-                if (index >= data.size()) break;
-                if (data.get(index) != null) {
-                    loopCode(data.get(index)); //run the code defined by the user
-                }
-            }
+        //add the items to the inventory based on the current page and max items per page
+        List<ItemStack> items = dataToItems();
+        for (int i = 0; i < maxItemsPerPage; i++) {
+            int index = maxItemsPerPage * page + i;
+            if (index >= items.size()) break;
+            inventory.addItem(items.get(index));
         }
 
-
     }
 
     /**
@@ -119,7 +105,7 @@ public boolean prevPage() {
      * @return true if successful, false if already on the last page
      */
     public boolean nextPage() {
-        if (!((index + 1) >= getData().size())) {
+        if (!((page + 1) * maxItemsPerPage >= dataToItems().size())) {
             page = page + 1;
             reloadItems();
             return true;