4.1.81

Author: KodySimpson

pom.xml

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

src/main/java/me/kodysimpson/simpapi/command/CommandList.java

@@ -1,6 +1,6 @@
 package me.kodysimpson.simpapi.command;
 
-import org.bukkit.entity.Player;
+import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
@@ -11,9 +11,9 @@
 public interface CommandList {
 
     /**
-     * @param player The player to list the commands to
+     * @param sender The thing that ran the command
      * @param subCommandList A list of all the subcommands you can display
      */
-    void displayCommandList(Player player, List<SubCommand> subCommandList);
+    void displayCommandList(CommandSender sender, List<SubCommand> subCommandList);
 
 }

src/main/java/me/kodysimpson/simpapi/command/CoreCommand.java

@@ -31,29 +31,22 @@ public ArrayList<SubCommand> getSubCommands(){
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, String[] args) {
 
-        if (sender instanceof Player){
-            Player p = (Player) sender;
-
-            if (args.length > 0){
-                for (int i = 0; i < getSubCommands().size(); i++){
-                    if (args[0].equalsIgnoreCase(getSubCommands().get(i).getName()) || (getSubCommands().get(i).getAliases() != null && getSubCommands().get(i).getAliases().contains(args[0]))){
-                        getSubCommands().get(i).perform(p, args);
-                    }
+        if (args.length > 0){
+            for (int i = 0; i < getSubCommands().size(); i++){
+                if (args[0].equalsIgnoreCase(getSubCommands().get(i).getName()) || (getSubCommands().get(i).getAliases() != null && getSubCommands().get(i).getAliases().contains(args[0]))){
+                    getSubCommands().get(i).perform(sender, args);
                 }
-            }else {
-                if (commandList == null){
-                    p.sendMessage("--------------------------------");
-                    for (SubCommand subcommand : subcommands) {
-                        p.sendMessage(subcommand.getSyntax() + " - " + subcommand.getDescription());
-                    }
-                    p.sendMessage("--------------------------------");
-                }else{
-                    commandList.displayCommandList(p, subcommands);
+            }
+        }else {
+            if (commandList == null){
+                sender.sendMessage("--------------------------------");
+                for (SubCommand subcommand : subcommands) {
+                    sender.sendMessage(subcommand.getSyntax() + " - " + subcommand.getDescription());
                 }
+                sender.sendMessage("--------------------------------");
+            }else{
+                commandList.displayCommandList(sender, subcommands);
             }
-
-        }else{
-            System.out.println("You must be a player to execute this command");
         }
 
         return true;

src/main/java/me/kodysimpson/simpapi/command/SubCommand.java

@@ -1,5 +1,6 @@
 package me.kodysimpson.simpapi.command;
 
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -31,10 +32,10 @@ public abstract class SubCommand {
     public abstract String getSyntax();
 
     /**
-     * @param player The player who ran the command
+     * @param sender The thing that ran the command
      * @param args The args passed into the command when run
      */
-    public abstract void perform(Player player, String[] args);
+    public abstract void perform(CommandSender sender, String[] args);
 
     /**
      * @param player The player who ran the command

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

@@ -0,0 +1,57 @@
+package me.kodysimpson.simpapi.menu;
+
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+
+import java.util.List;
+
+public abstract class PaginatedMenu extends Menu {
+
+    protected List<Object> data;
+
+    //Keep track of what page the menu is on
+    protected int page = 0;
+    //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);
+    }
+
+    //Set the border and menu buttons for the menu
+    public void addMenuBorder(){
+        inventory.setItem(48, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Left"));
+
+        inventory.setItem(49, makeItem(Material.BARRIER, ChatColor.DARK_RED + "Close"));
+
+        inventory.setItem(50, makeItem(Material.DARK_OAK_BUTTON, ChatColor.GREEN + "Right"));
+
+        for (int i = 0; i < 10; i++) {
+            if (inventory.getItem(i) == null) {
+                inventory.setItem(i, super.FILLER_GLASS);
+            }
+        }
+
+        inventory.setItem(17, super.FILLER_GLASS);
+        inventory.setItem(18, super.FILLER_GLASS);
+        inventory.setItem(26, super.FILLER_GLASS);
+        inventory.setItem(27, super.FILLER_GLASS);
+        inventory.setItem(35, super.FILLER_GLASS);
+        inventory.setItem(36, super.FILLER_GLASS);
+
+        for (int i = 44; i < 54; i++) {
+            if (inventory.getItem(i) == null) {
+                inventory.setItem(i, super.FILLER_GLASS);
+            }
+        }
+    }
+
+    public int getMaxItemsPerPage() {
+        return maxItemsPerPage;
+    }
+}
+