Ajout d'un système complet de commandes & d'un créateur d'items

Author: DotDebian

src/main/java/space/debian/WrapAPI/objects/commands/WCommand.java

@@ -3,15 +3,22 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static space.debian.WrapAPI.tools.Messages.errorPrefix;
+import static space.debian.WrapAPI.tools.Messages.noPermissionError;
 
 public abstract class WCommand implements CommandExecutor {
 
-	private String name;
-	private WSubCommand command;
+	private final String name;
+	private boolean consoleOnly = false;
 	private List<WSubCommand> subCommands = new ArrayList<>();
+	private String permission = null;
 
 	/**
 	 * Create a new instance of a WCommand
@@ -37,18 +44,52 @@ public String getName() {
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String string, String[] args) {
 
+		if (args.length > 0) {
+
+			Optional<WSubCommand> subCommand = subCommands.stream().filter((singleSubCommand) -> singleSubCommand.getName().equalsIgnoreCase(args[0])).findFirst();
+
+			if (subCommand.isPresent())
+				return subCommand.get().subCommandProcess(sender, command, string, args);
+		}
+
+		if ((consoleOnly && sender instanceof Player) || (permission != null && !sender.hasPermission(permission))) {
+
+			sender.sendMessage(errorPrefix + noPermissionError);
+			return true;
+		}
+
 		return process(sender, command, string, args);
 	}
 
 	/**
-	 * WrapAPI's command process method, override this method and build your command !
+	 * WrapAPI's command process method, override this method and build your command.
 	 * @param sender Command sender
 	 * @param command Command executed, a.k.a this
 	 * @param string Command name as executed, can be an aliase
 	 * @param args Command arguments
 	 * @return False if command is off, true otherwise
 	 */
 	public boolean process(CommandSender sender, Command command, String string, String[] args) {
+
 		return true;
 	}
+
+	public List<WSubCommand> getSubCommands() {
+		return subCommands;
+	}
+
+	public WCommand addSubCommand(WSubCommand subCommand) {
+		subCommands.add(subCommand);
+		return this;
+	}
+
+	public WCommand setConsoleOnly(boolean consoleOnly) {
+		this.consoleOnly = consoleOnly;
+		return this;
+	}
+
+	public WCommand setPermission(String permission) {
+		this.permission = permission;
+		return this;
+	}
 }

src/main/java/space/debian/WrapAPI/objects/commands/WSubCommand.java

@@ -2,14 +2,75 @@
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import static space.debian.WrapAPI.tools.Messages.errorPrefix;
+import static space.debian.WrapAPI.tools.Messages.noPermissionError;
 
 public class WSubCommand {
 
-	private String name;
-	private boolean consoleOnly;
+	private final WCommand parent;
+	private final String name;
+	private boolean consoleOnly = false;
+	private String permission = null;
+
+	/**
+	 * Create a new instance of a WSubCommand
+	 * @param parent WCommand parent of this subcommand
+	 * @param name Name of the subcommand, used when checking parent's args
+	 */
+	public WSubCommand(WCommand parent, String name) {
+		this.parent = parent;
+		this.name = name;
+	}
+
+	/**
+	 * WrapAPI's subcommand processor method, only override this if you know what you're doing !
+	 * @param sender Command sender
+	 * @param command Command executed, a.k.a parent
+	 * @param string Command name as executed, can be an aliase
+	 * @param args Command arguments
+	 * @return False if command is off, true otherwise
+	 */
+	public boolean subCommandProcess(CommandSender sender, Command command, String string, String[] args) {
+
+		if ((consoleOnly && sender instanceof Player) || (permission != null && !sender.hasPermission(permission))) {
+
+			sender.sendMessage(errorPrefix + noPermissionError);
+			return true;
+		}
+
+		return execute(sender, command, string, args);
+	}
 
+	/**
+	 * WrapAPI's subcommand process method, override this method and build your command.
+	 * @param sender Command sender
+	 * @param command Command executed, a.k.a parent
+	 * @param string Command name as executed, can be an aliase
+	 * @param args Command arguments
+	 * @return False if command is off, true otherwise
+	 */
 	public boolean execute(CommandSender sender, Command command, String string, String[] args) {
 
 		return true;
 	}
+
+	public WCommand getParent() {
+		return parent;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public WSubCommand setConsoleOnly(boolean consoleOnly) {
+		this.consoleOnly = consoleOnly;
+		return this;
+	}
+
+	public WSubCommand setPermission(String permission) {
+		this.permission = permission;
+		return this;
+	}
 }

src/main/java/space/debian/WrapAPI/tools/Messages.java

@@ -0,0 +1,9 @@
+package space.debian.WrapAPI.tools;
+
+public class Messages {
+
+    public static String errorPrefix = "§4 » §c";
+
+    public static String noPermissionError = "Vous n'avez pas la permission de faire ceci.";
+
+}

src/main/java/space/debian/WrapAPI/tools/SimpleItem.java

@@ -0,0 +1,87 @@
+package space.debian.WrapAPI.tools;
+
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public abstract class SimpleItem {
+
+    private Material itemType;
+    private String name;
+    private List<String> lore;
+    private short dataId = -1;
+    private HashMap<Enchantment, Integer> enchantments = null;
+
+    public ItemStack asItemstack(int amount) {
+        ItemStack result = (dataId == -1) ? new ItemStack(itemType, amount) : new ItemStack(itemType, amount, dataId);
+        ItemMeta resultMeta = result.getItemMeta();
+        resultMeta.setLore(lore);
+        resultMeta.setDisplayName(name);
+        if (enchantments != null)
+            enchantments.forEach((k, v) -> resultMeta.addEnchant(k, v, true));
+        result.setItemMeta(resultMeta);
+        return (result);
+    }
+
+    public ItemStack asItemstack() {
+        return asItemstack(1);
+    }
+
+    public Material getItemType() {
+        return itemType;
+    }
+
+    public SimpleItem setItemType(Material itemType) {
+        this.itemType = itemType;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public SimpleItem setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public List<String> getLore() {
+        return lore;
+    }
+
+    public SimpleItem addLoreLine(String loreLine) {
+        lore.add(loreLine);
+        return this;
+    }
+
+    public SimpleItem setLore(List<String> lore) {
+        this.lore = lore;
+        return this;
+    }
+
+    public short getDataId() {
+        return dataId;
+    }
+
+    public SimpleItem setDataId(short dataId) {
+        this.dataId = dataId;
+        return this;
+    }
+
+    public void addEnchantment(Enchantment enchantment, Integer level) {
+        if (enchantments == null)
+            enchantments = new HashMap<>();
+        enchantments.put(enchantment, level);
+    }
+
+    public SimpleItem addEnchantment(Enchantment enchantment) {
+        addEnchantment(enchantment, 1);
+        return this;
+    }
+}