Merge branch 'release/1.0.2.7'

Author: Maxlego08

.gitignore

@@ -0,0 +1,8 @@
+# Don't track content of these folders
+target/
+bin/
+.settings/
+.classpath
+.project
+.idea
+zmenu.iml

LICENSE

@@ -351,7 +351,7 @@ apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
 
-  When you convey a copy of a covered work, you may at your option
+  When you convey a copy of a covered work, you may at your buttonOption
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
@@ -570,7 +570,7 @@ address new problems or concerns.
   Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
+buttonOption of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
@@ -637,7 +637,7 @@ the "copyright" line and a pointer to where the full notice is found.
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+    (at your buttonOption) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

changelog.md

@@ -3,7 +3,7 @@
 - [x] Add anti dupe system with NMS Tag
 - [x] Add the BACK action, to return to the previous inventory when clicking   
 - [x] Add the ability to perform actions when clicking
-- [ ] Improve the firework system to put more option. Being able to put several effects, power etc.
+- [ ] Improve the firework system to put more buttonOption. Being able to put several effects, power etc.
 - [ ] Add a system that allows you to cache an ItemStack, so instead of returning the ItemStack at each opening, there can be several minutes without having to recreate a new ItemStack. For decorations, buttons without placeholders for example.
 - [ ] Add an order to display the list of official addons.
 - [ ] Add a ``/zm help`` command to send to documentation.
@@ -31,9 +31,28 @@
 - [ ] Add matrix support for slot (like this: https://abstractmenus.github.io/docs/general/item_format.html#way-4-matrix)
 - [ ] 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
 
 # Unreleased
 
+# 1.0.2.7
+
+- Start of development of the [zMenu+](https://m.zmenu.dev/4) paid addon. This addon will be available with the purchase of [Premium](https://minecraft-inventory-builder.com/account-upgrade) upgrade.
+- Huge API Change. This change introduces [zMenu+](https://m.zmenu.dev/4)
+- Create ButtonOption, allows any developer to add options that will be available for all types of buttons.
+- Create PaginateButton interface. This interface allows you to create buttons that need pagination. This interface will manage the number of pages in the inventory.
+- Add matrix support for button slots [#39](https://github.com/Maxlego08/zMenu/issues/39)
+- Add /zm editor, at the moment this command redirects to the online editor
+- Add target placeholder [#48](https://github.com/Maxlego08/zMenu/issues/48)
+- Fix reload command with pattern. The pattern were reload after the inventories 
+- Fix error with InventoryPlayer
+- Fix NmsVersion with 1.8 and 1.9
+- Fix anti-dupe for old version
+- Fix MenuItemStack loader with placeholder check
+- Fix CONTAINS_STRING action for placeholder
+- Fix NMS with 1.20.4
+- Fix method ``getRealSlot`` with isPermanent
+
 # 1.0.2.6
 
 - Add BlockPlaceEvent for Anti Dupe
@@ -284,7 +303,7 @@ More information on the plugin documentation: https://docs.zmenu.dev/
 - Add method getCurrentPlayerInventory in InventoryManager
 - Add method buildDisplayName in Button
 - Add method buildLore in Button
-- Add updateOnClick option, update button if player click on another button
+- Add updateOnClick buttonOption, update button if player click on another button
 - Add button listener method in InventoryManager 
 - Add check for new messages value saving
 - Fix placeholder verification

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.2.6</version>
+  <version>1.0.2.7</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.6</version>
+    <version>1.0.2.7</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>

src/fr/maxlego08/menu/MenuItemStack.java

@@ -15,7 +15,9 @@
 import fr.maxlego08.menu.zcore.utils.meta.Meta;
 import fr.maxlego08.menu.zcore.utils.nms.NMSUtils;
 import fr.maxlego08.menu.zcore.utils.nms.NmsVersion;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemFlag;
@@ -38,6 +40,7 @@ public class MenuItemStack extends ZUtils {
     private final String filePath;
     private final String path;
     private String material;
+    private String targetPlayer;
     private String amount;
     private String url;
     private int data;
@@ -142,8 +145,10 @@ public ItemStack build(Player player, boolean useCache, Placeholders placeholder
             this.material = "STONE";
         }
 
-        String papiMaterial = papi(this.material, player);
-        int amount = this.parseAmount(player);
+        OfflinePlayer offlinePlayer = this.targetPlayer != null ? Bukkit.getOfflinePlayer(papi(placeholders.parse(this.targetPlayer), player)) : null;
+
+        String papiMaterial = papi(placeholders.parse(this.material), offlinePlayer == null ? player : offlinePlayer);
+        int amount = this.parseAmount(offlinePlayer == null ? player : offlinePlayer, placeholders);
 
         try {
             material = getMaterial(Integer.parseInt(papiMaterial));
@@ -221,15 +226,15 @@ public ItemStack build(Player player, boolean useCache, Placeholders placeholder
 
         if (this.displayName != null) {
             try {
-                Meta.meta.updateDisplayName(itemMeta, placeholders.parse(this.displayName), player);
+                Meta.meta.updateDisplayName(itemMeta, placeholders.parse(this.displayName), offlinePlayer == null ? player : offlinePlayer);
             } catch (Exception exception) {
                 Logger.info("Error with update display name for item " + path + " in file " + filePath + " (" + player + ", " + this.displayName + ")", Logger.LogType.ERROR);
                 exception.printStackTrace();
             }
         }
 
         if (!this.lore.isEmpty()) {
-            Meta.meta.updateLore(itemMeta, placeholders.parse(this.lore), player);
+            Meta.meta.updateLore(itemMeta, placeholders.parse(this.lore), offlinePlayer == null ? player : offlinePlayer);
         }
 
         if (this.isGlowing && NMSUtils.getNMSVersion() != 1.7) {
@@ -239,7 +244,8 @@ public ItemStack build(Player player, boolean useCache, Placeholders placeholder
         }
 
         try {
-            int customModelData = Integer.parseInt(papi(this.modelID, player));
+
+            int customModelData = Integer.parseInt(papi(placeholders.parse(this.modelID), offlinePlayer == null ? player : offlinePlayer));
             if (customModelData != 0) itemMeta.setCustomModelData(customModelData);
         } catch (NumberFormatException ignored) {
         }
@@ -263,6 +269,21 @@ public ItemStack build(Player player, boolean useCache, Placeholders placeholder
         return itemStack;
     }
 
+
+    /**
+     * @return the target player
+     */
+    public String getTargetPlayer() {
+        return targetPlayer;
+    }
+
+    /**
+     * @param targetPlayer the targetPlayer to set
+     */
+    public void setTargetPlayer(String targetPlayer) {
+        this.targetPlayer = targetPlayer;
+    }
+
     /**
      * @return the material
      */
@@ -275,7 +296,7 @@ public String getMaterial() {
      */
     public void setMaterial(String material) {
         this.material = material;
-        this.updatePlaceholder(amount);
+        this.updatePlaceholder(material);
     }
 
     /**
@@ -517,6 +538,24 @@ public int parseAmount(Player player) {
         return amount;
     }
 
+    public int parseAmount(Player player, Placeholders placeholders) {
+        int amount = 1;
+        try {
+            amount = Integer.parseInt(papi(placeholders.parse(this.amount), player));
+        } catch (Exception ignored) {
+        }
+        return amount;
+    }
+
+    public int parseAmount(OfflinePlayer offlinePlayer, Placeholders placeholders) {
+        int amount = 1;
+        try {
+            amount = Integer.parseInt(papi(placeholders.parse(this.amount), offlinePlayer));
+        } catch (Exception ignored) {
+        }
+        return amount;
+    }
+
     /**
      * Let's know if the ItemStack needs a placeholder, if not then the ItemStack will be cached
      *
@@ -530,4 +569,5 @@ private void updatePlaceholder(String string) {
     public void setNeedPlaceholderAPI(boolean needPlaceholderAPI) {
         this.needPlaceholderAPI = needPlaceholderAPI;
     }
+
 }

src/fr/maxlego08/menu/MenuPlugin.java

@@ -193,8 +193,8 @@ public void onEnable() {
         this.getSavers().forEach(saver -> saver.load(this.getPersist()));
 
         LocalPlaceholder localPlaceholder = LocalPlaceholder.getInstance();
-        localPlaceholder.register("argument_", (player, value) -> {
-            Optional<String> optional = this.commandManager.getPlayerArgument(player, value);
+        localPlaceholder.register("argument_", (offlinePlayer, value) -> {
+            Optional<String> optional = this.commandManager.getPlayerArgument(offlinePlayer.getUniqueId(), value);
             return optional.orElse(null);
         });
 

src/fr/maxlego08/menu/ZCommandManager.java

@@ -189,11 +189,16 @@ public void setPlayerArgument(Player player, String key, String value) {
     }
 
     @Override
-    public Optional<String> getPlayerArgument(Player player, String key) {
-        Map<String, String> arguments = this.playerArguments.getOrDefault(player.getUniqueId(), new HashMap<>());
+    public Optional<String> getPlayerArgument(UUID uuid, String key) {
+        Map<String, String> arguments = this.playerArguments.getOrDefault(uuid, new HashMap<>());
         return Optional.ofNullable(arguments.getOrDefault(key, null));
     }
 
+    @Override
+    public Optional<String> getPlayerArgument(Player player, String key) {
+        return getPlayerArgument(player.getUniqueId(), key);
+    }
+
     @Override
     public Optional<Command> getCommand(String commandName) {
         return this.getCommands().stream().filter(e -> e.getCommand().equalsIgnoreCase(commandName)).findFirst();

src/fr/maxlego08/menu/ZInventory.java

@@ -2,10 +2,12 @@
 
 import fr.maxlego08.menu.api.Inventory;
 import fr.maxlego08.menu.api.button.Button;
+import fr.maxlego08.menu.api.button.PaginateButton;
 import fr.maxlego08.menu.api.pattern.Pattern;
 import fr.maxlego08.menu.api.players.inventory.InventoriesPlayer;
 import fr.maxlego08.menu.api.requirement.Requirement;
 import fr.maxlego08.menu.api.utils.OpenWithItem;
+import fr.maxlego08.menu.api.utils.Placeholders;
 import fr.maxlego08.menu.inventory.inventories.InventoryDefault;
 import fr.maxlego08.menu.zcore.utils.ZUtils;
 import fr.maxlego08.menu.zcore.utils.inventory.InventoryResult;
@@ -17,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -74,8 +77,7 @@ public Collection<Button> getButtons() {
 
     @Override
     public <T extends Button> List<T> getButtons(Class<T> type) {
-        return this.getButtons().stream().filter(e -> type.isAssignableFrom(e.getClass())).map(type::cast)
-                .collect(Collectors.toList());
+        return this.getButtons().stream().filter(e -> type.isAssignableFrom(e.getClass())).map(type::cast).collect(Collectors.toList());
     }
 
     @Override
@@ -96,16 +98,26 @@ public int getMaxPage(Player player, Object... objects) {
 
     @Override
     public int getMaxPage(Collection<Pattern> patterns, Player player, Object... objects) {
+
+        int maxPage = 1;
+
         List<Button> buttons = new ArrayList<>();
         buttons.addAll(this.buttons);
         buttons.addAll(patterns.stream().flatMap(pattern -> pattern.getButtons().stream()).collect(Collectors.toList()));
 
         Optional<Integer> optional = buttons.stream().map(Button::getSlot).max(Integer::compare);
         if (optional.isPresent()) {
             int maxSlot = optional.get();
-            return (maxSlot / this.size) + 1;
+            maxPage = (maxSlot / this.size) + 1;
         }
-        return 1;
+
+        Optional<PaginateButton> optionalPaginate = this.buttons.stream().filter(button -> button instanceof PaginateButton).map(e -> (PaginateButton) e).sorted(Comparator.comparingInt(e -> ((PaginateButton) e).getPaginationSize(player)).reversed()).findFirst();
+        if (optionalPaginate.isPresent()) {
+            PaginateButton paginateButton = optionalPaginate.get();
+            maxPage = (int) Math.ceil((double) paginateButton.getPaginationSize(player) / paginateButton.getSlots().size());
+        }
+
+        return maxPage;
     }
 
     @Override
@@ -128,7 +140,7 @@ public List<Button> sortPatterns(Pattern pattern, int page, Object... objects) {
     @Override
     public InventoryResult openInventory(Player player, InventoryDefault inventoryDefault) {
 
-        if (openRequirement != null && !openRequirement.execute(player, null, inventoryDefault)) {
+        if (openRequirement != null && !openRequirement.execute(player, null, inventoryDefault, new Placeholders())) {
             return InventoryResult.PERMISSION;
         }
 

src/fr/maxlego08/menu/ZInventoryManager.java

@@ -3,6 +3,7 @@
 import fr.maxlego08.menu.api.ButtonManager;
 import fr.maxlego08.menu.api.Inventory;
 import fr.maxlego08.menu.api.InventoryManager;
+import fr.maxlego08.menu.api.button.ButtonOption;
 import fr.maxlego08.menu.api.event.FastEvent;
 import fr.maxlego08.menu.api.event.events.ButtonLoaderRegisterEvent;
 import fr.maxlego08.menu.api.event.events.InventoryLoadEvent;
@@ -93,6 +94,7 @@
 public class ZInventoryManager extends ZUtils implements InventoryManager {
 
     private final Map<String, List<Inventory>> inventories = new HashMap<>();
+    private final Map<Plugin, List<Class<? extends ButtonOption>>> buttonOptions = new HashMap<>();
     private final List<MaterialLoader> loaders = new ArrayList<>();
     private final MenuPlugin plugin;
     private final Map<UUID, Inventory> currentInventories = new HashMap<>();
@@ -300,7 +302,7 @@ public void loadButtons() {
         registerItemStackVerification(new ModelIdSimilar());
         registerItemStackVerification(new NameSimilar());
 
-        ButtonLoaderRegisterEvent event = new ButtonLoaderRegisterEvent(buttonManager);
+        ButtonLoaderRegisterEvent event = new ButtonLoaderRegisterEvent(buttonManager, this, this.plugin.getPatternManager());
         event.call();
 
         plugin.getWebsiteManager().loadButtons(buttonManager);
@@ -646,4 +648,27 @@ public Collection<ItemStackSimilar> getItemStackVerifications() {
     public ZScheduler getScheduler() {
         return this.plugin.getScheduler();
     }
+
+    @Override
+    public Optional<Class<? extends ButtonOption>> getOption(String name) {
+        return this.buttonOptions.values().stream().flatMap(List::stream).filter(buttonOption -> buttonOption.getName().equalsIgnoreCase(name)).findFirst();
+    }
+
+    @Override
+    public void registerOption(Plugin plugin, Class<? extends ButtonOption> buttonOption) {
+
+        if (getOption(buttonOption.getName()).isPresent()) return;
+
+        this.buttonOptions.computeIfAbsent(plugin, e -> new ArrayList<>()).add(buttonOption);
+    }
+
+    @Override
+    public void unregisterOptions(Plugin plugin) {
+        this.buttonOptions.remove(plugin);
+    }
+
+    @Override
+    public Map<Plugin, List<Class<? extends ButtonOption>>> getOptions() {
+        return this.buttonOptions;
+    }
 }