Support both InventoryType and inventory size when instantiating menus

Author: Fupery

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.Fupery</groupId>
     <artifactId>InvMenu</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <description>A Simple Inventory Menu Library</description>
 
     <build>

src/main/java/com/github/Fupery/InvMenu/API/Handler/CacheableMenu.java

@@ -3,7 +3,7 @@
 import com.github.Fupery.InvMenu.API.Button.Button;
 import com.github.Fupery.InvMenu.API.Event.MenuCloseReason;
 import com.github.Fupery.InvMenu.API.Templates.MenuTemplate;
-import org.bukkit.Bukkit;
+import com.github.Fupery.InvMenu.Utils.MenuType;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -15,11 +15,19 @@ public abstract class CacheableMenu implements MenuTemplate {
 
     protected MenuHandler handler;
     protected String heading;
-    protected InventoryType type;
+    protected MenuType type;
     private Button[] buttons;
     private boolean open = false;
 
     protected CacheableMenu(MenuHandler handler, String heading, InventoryType type) {
+        this(handler, heading, new MenuType(type));
+    }
+
+    protected CacheableMenu(MenuHandler handler, String heading, int size) {
+        this(handler, heading, new MenuType(size));
+    }
+
+    protected CacheableMenu(MenuHandler handler, String heading, MenuType type) {
         this.handler = handler;
         this.heading = (heading.length() > 32) ? this.heading = heading.substring(0, 29) + "..." : heading;
         this.type = type;
@@ -34,7 +42,7 @@ private void loadButtons(Inventory inventory) {
     }
 
     void open(Player player) {
-        Inventory inventory = Bukkit.createInventory(player, type, heading);
+        Inventory inventory = type.createInventory(player, heading);
         loadButtons(inventory);
         player.openInventory(inventory);
         onMenuOpenEvent(player);

src/main/java/com/github/Fupery/InvMenu/API/Templates/BasicMenu.java

@@ -18,6 +18,10 @@ protected BasicMenu(MenuHandler handler, String heading, InventoryType type) {
         super(handler, heading, type);
     }
 
+    protected BasicMenu(MenuHandler handler, String heading, int size) {
+        super(handler, heading, size);
+    }
+
     @Override
     public void onMenuOpenEvent(Player viewer) {
     }

src/main/java/com/github/Fupery/InvMenu/API/Templates/ListMenu.java

@@ -5,6 +5,7 @@
 import com.github.Fupery.InvMenu.API.Event.MenuCloseReason;
 import com.github.Fupery.InvMenu.API.Handler.CacheableMenu;
 import com.github.Fupery.InvMenu.API.Handler.MenuHandler;
+import com.github.Fupery.InvMenu.Utils.MenuType;
 import com.github.Fupery.InvMenu.Utils.SoundCompat;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -21,7 +22,11 @@ public ListMenu(MenuHandler handler, String heading, int page) {
     }
 
     public ListMenu(MenuHandler handler, String heading, int listStartIndex, int page) {
-        super(handler, heading, InventoryType.CHEST);
+        this(handler, heading, new MenuType(InventoryType.CHEST), listStartIndex, page);
+    }
+
+    public ListMenu(MenuHandler handler, String heading, MenuType menuType, int listStartIndex, int page) {
+        super(handler, heading, menuType);
         this.heading = heading;
         this.listStart = listStartIndex;
         this.page = page;

src/main/java/com/github/Fupery/InvMenu/Utils/MenuType.java

@@ -0,0 +1,35 @@
+package com.github.Fupery.InvMenu.Utils;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+
+/**
+ * Wrapper for menu types that supports both InventoryType and inventory size
+ */
+public class MenuType {
+
+    private final InventoryType inventoryType;
+    private final int size;
+
+    public MenuType(InventoryType inventoryType) {
+        this.inventoryType = inventoryType;
+        this.size = (inventoryType != null) ? inventoryType.getDefaultSize() : -1;
+    }
+
+    public MenuType(int size) {
+        this.size = size;
+        this.inventoryType = null;
+    }
+
+    public Inventory createInventory(Player player, String heading) {
+        if (inventoryType != null) return Bukkit.createInventory(player, inventoryType, heading);
+        else if (size > 0) return Bukkit.createInventory(player, size, heading);
+        else return null;
+    }
+
+    public int getDefaultSize() {
+        return size;
+    }
+}