Merge branch 'release/1.0.3.0'

Author: Maxlego08

changelog.md

@@ -32,16 +32,26 @@
 - [ ] Adding more logs on the errors that can occur with custom items like ItemAdder, this will cause an error but the user will not have the information of why, for example when the item does not exist.
 - [ ] Create a new class for loading buttons to add more elements, like a boolean to check if the button needs an itemstack
 - [ ] Can split a file into several and thus avoid having too large files
-- [ ] Add open link with a book
+- [x] Add open link with a book
 - [ ] Add slot type for create pattern (Allows to fill slot areas as do the outline of the inventory)
 - [ ] Be able to set default values for player data
+- [x] Create a command `/zm download <link>` to download a configuration from a link (Allows to simply share its configurations, from discord for example) 
 
 # Unreleased
 
+# 1.0.3.0
+
 - Create new placeholder ``%zmenu_player_next_page%``, return player next page
 - Create new placeholder ``%zmenu_player_previous_page%``, return player previous page
 - Create new requirement: ``playername``, Check if a text is a player nickname
 - Fixed the display of a button with a playerHead if the text is not a `playerHead`. This avoids server lag when opening inventory.
+- Fixed Numbers saved in PlayerData are not Numbers after a restart. [#59](https://github.com/Maxlego08/zMenu/issues/59)
+- Added Placeholder in head url [#58](https://github.com/Maxlego08/zMenu/issues/58)
+- Added Action - Data placeholder [#56](https://github.com/Maxlego08/zMenu/issues/56)
+- Expand player data commands with add & subtract [#46](https://github.com/Maxlego08/zMenu/issues/46)
+- New features for Commands (Perform action and Auto-completion) [#26](https://github.com/Maxlego08/zMenu/issues/26)
+- You can now open a book
+- Create ``/zm download <link>`` command. You can download configuration files from links, discord links for example.
 
 # 1.0.2.9
 

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.2.9</version>
+  <version>1.0.3.0</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.maxlego08</groupId>
     <artifactId>zmenu</artifactId>
-    <version>1.0.2.9</version>
+    <version>1.0.3.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>

src/fr/maxlego08/menu/MenuItemStack.java

@@ -192,7 +192,7 @@ public ItemStack build(Player player, boolean useCache, Placeholders placeholder
         }
 
         if (this.url != null) {
-            itemStack = this.createSkull(this.url);
+            itemStack = this.createSkull(this.papi(this.url, player));
         }
 
         if (this.potion != null) {

src/fr/maxlego08/menu/ZCommand.java

@@ -2,6 +2,7 @@
 
 import fr.maxlego08.menu.api.command.Command;
 import fr.maxlego08.menu.api.command.CommandArgument;
+import fr.maxlego08.menu.api.requirement.Action;
 import org.bukkit.plugin.Plugin;
 
 import java.io.File;
@@ -16,30 +17,33 @@ public class ZCommand implements Command {
     private final String permission;
     private final String inventory;
     private final List<CommandArgument> arguments;
+    private final List<Action> actions;
 
     private final String path;
     private final File file;
 
 
     /**
-     * @param plugin The plugin where the command comes from
-     * @param command Main command
-     * @param aliases List of aliases
+     * @param plugin     The plugin where the command comes from
+     * @param command    Main command
+     * @param aliases    List of aliases
      * @param permission Command Permission
-     * @param inventory Inventory name
-     * @param arguments List of arguments
-     * @param path file path
-     * @param file File
+     * @param inventory  Inventory name
+     * @param arguments  List of arguments
+     * @param actions    Actions
+     * @param path       file path
+     * @param file       File
      */
     public ZCommand(Plugin plugin, String command, List<String> aliases, String permission, String inventory,
-                    List<CommandArgument> arguments, String path, File file) {
+                    List<CommandArgument> arguments, List<Action> actions, String path, File file) {
         super();
         this.plugin = plugin;
         this.command = command;
         this.aliases = aliases;
         this.permission = permission;
         this.inventory = inventory;
         this.arguments = arguments;
+        this.actions = actions;
         this.path = path;
         this.file = file;
     }
@@ -100,6 +104,11 @@ public String getPath() {
         return path;
     }
 
+    @Override
+    public List<Action> getActions() {
+        return this.actions;
+    }
+
     @Override
     public File getFile() {
         return file;

src/fr/maxlego08/menu/ZCommandArgument.java

@@ -1,26 +1,42 @@
 package fr.maxlego08.menu;
 
 import fr.maxlego08.menu.api.command.CommandArgument;
+import fr.maxlego08.menu.api.requirement.Action;
 
+import java.util.List;
 import java.util.Optional;
 
 public class ZCommandArgument implements CommandArgument {
 
     private final String argument;
     private final String inventory;
     private final boolean isRequired;
+    private final List<Action> actions;
+    private final List<String> autoCompletion;
 
-    public ZCommandArgument(String argument, String inventory, boolean isRequired) {
+    public ZCommandArgument(String argument, String inventory, boolean isRequired, List<Action> actions, List<String> autoCompletion) {
         this.argument = argument;
         this.inventory = inventory;
         this.isRequired = isRequired;
+        this.actions = actions;
+        this.autoCompletion = autoCompletion;
     }
 
     @Override
     public boolean isRequired() {
         return isRequired;
     }
 
+    @Override
+    public List<Action> getActions() {
+        return this.actions;
+    }
+
+    @Override
+    public List<String> getAutoCompletion() {
+        return this.autoCompletion;
+    }
+
     @Override
     public String getArgument() {
         return argument;

src/fr/maxlego08/menu/ZCommandManager.java

@@ -52,7 +52,7 @@ public void registerCommand(Command command) {
         VCommandManager manager = this.plugin.getVCommandManager();
         manager.registerCommand(command);
 
-        List<Command> commands = this.commands.getOrDefault(command.getPlugin().getName(), new ArrayList<Command>());
+        List<Command> commands = this.commands.getOrDefault(command.getPlugin().getName(), new ArrayList<>());
         commands.add(command);
         this.commands.put(command.getPlugin().getName(), commands);
 
@@ -147,7 +147,7 @@ private Object getCraftServerInstance() throws ClassNotFoundException, IllegalAc
     @Override
     public void loadCommand(Plugin plugin, File file) {
 
-        Loader<Command> loader = new CommandLoader(plugin);
+        Loader<Command> loader = new CommandLoader(plugin, this.plugin);
         YamlConfiguration configuration = YamlConfiguration.loadConfiguration(file);
         if (!configuration.contains("commands") || !configuration.isConfigurationSection("commands.")) {
             return;
@@ -218,7 +218,7 @@ public boolean reload(Command command) {
         String path = command.getPath();
         YamlConfiguration configuration = YamlConfiguration.loadConfiguration(file);
 
-        Loader<Command> loader = new CommandLoader(this.plugin);
+        Loader<Command> loader = new CommandLoader(this.plugin, this.plugin);
         try {
             Command newCommand = loader.load(configuration, path, file);
             this.registerCommand(newCommand);

src/fr/maxlego08/menu/ZInventoryManager.java

@@ -31,6 +31,7 @@
 import fr.maxlego08.menu.itemstack.NameSimilar;
 import fr.maxlego08.menu.loader.InventoryLoader;
 import fr.maxlego08.menu.loader.MenuItemStackLoader;
+import fr.maxlego08.menu.loader.actions.BookLoader;
 import fr.maxlego08.menu.loader.actions.BroadcastLoader;
 import fr.maxlego08.menu.loader.actions.BroadcastSoundLoader;
 import fr.maxlego08.menu.loader.actions.ChatLoader;
@@ -277,6 +278,7 @@ public void loadButtons() {
         // Load actions
         buttonManager.registerAction(new BroadcastLoader());
         buttonManager.registerAction(new MessageLoader());
+        buttonManager.registerAction(new BookLoader());
         buttonManager.registerAction(new SoundLoader());
         buttonManager.registerAction(new BroadcastSoundLoader());
         buttonManager.registerAction(new CloseLoader());

src/fr/maxlego08/menu/api/command/Command.java

@@ -1,5 +1,6 @@
 package fr.maxlego08.menu.api.command;
 
+import fr.maxlego08.menu.api.requirement.Action;
 import org.bukkit.plugin.Plugin;
 
 import java.io.File;
@@ -79,4 +80,6 @@ public interface Command {
 	 * @return The path of the command in the configuration file.
 	 */
 	String getPath();
+
+	List<Action> getActions();
 }

src/fr/maxlego08/menu/api/command/CommandArgument.java

@@ -1,5 +1,8 @@
 package fr.maxlego08.menu.api.command;
 
+import fr.maxlego08.menu.api.requirement.Action;
+
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -27,4 +30,8 @@ public interface CommandArgument {
      * @return {@code true} if the argument is required, otherwise {@code false}.
      */
     boolean isRequired();
+
+    List<Action> getActions();
+
+    List<String> getAutoCompletion();
 }