📝 Fix requirements

Author: Maxlego08

API/src/main/java/fr/maxlego08/menu/api/MenuPlugin.java

@@ -263,4 +263,6 @@ public interface MenuPlugin extends Plugin {
     ComponentsManager getComponentsManager();
 
     VInvManager getVInventoryManager();
+
+    String[] getClickRequirementKeys();
 }

src/main/java/fr/maxlego08/menu/ZInventoryManager.java

@@ -815,6 +815,11 @@ public List<ClickType> loadClicks(List<String> loadClicks) {
                 }
             }
         });
+
+        if (clickTypes.isEmpty()) { // Use all clicks by default
+            clickTypes.addAll(Configuration.allClicksType);
+        }
+
         return clickTypes;
     }
 

src/main/java/fr/maxlego08/menu/ZMenuPlugin.java

@@ -189,14 +189,14 @@ public void onEnable() {
         servicesManager.register(Enchantments.class, this.enchantments, this, ServicePriority.Highest);
         servicesManager.register(TitleAnimationManager.class, this.titleAnimationManager, this, ServicePriority.Highest);
 
-        if (this.isPaperOrFolia() && NmsVersion.getCurrentVersion().isDialogsVersion()){
-            if (Configuration.enableMiniMessageFormat){
+        if (this.isPaperOrFolia() && NmsVersion.getCurrentVersion().isDialogsVersion()) {
+            if (Configuration.enableMiniMessageFormat) {
                 Logger.info("Paper server detected, loading Dialogs support");
                 ConfigManager configManager = new ConfigManager(this);
                 this.dialogManager = new ZDialogManager(this, configManager);
                 servicesManager.register(DialogManager.class, this.dialogManager, this, ServicePriority.Highest);
                 ConfigDialogBuilder configDialogBuilder = new ConfigDialogBuilder("zMenu Config", "zMenu Configuration");
-                configManager.registerConfig(configDialogBuilder,Configuration.class, this);
+                configManager.registerConfig(configDialogBuilder, Configuration.class, this);
             } else {
                 Logger.info("Paper server detected but MiniMessage format is disabled, Dialogs support will not be loaded. Enable MiniMessage format in config.yml to use Dialogs.");
             }
@@ -366,7 +366,7 @@ private void registerHooks() {
             this.inventoryManager.registerMaterialLoader(new MMOItemsLoader());
             this.getLogger().info("Registered MMOItems material loader");
         }
-        if (this.isActive(Plugins.PACKETEVENTS)){
+        if (this.isActive(Plugins.PACKETEVENTS)) {
             this.titleAnimationManager.registerLoader("packet-events", new PacketEventTitleAnimationLoader());
         }
     }
@@ -415,7 +415,7 @@ public void onDisable() {
         if (this.vinventoryManager != null) this.vinventoryManager.close();
         this.inventoriesPlayer.restoreAllInventories();
 
-       Configuration.getInstance().save(getConfig(), this.configFile);
+        Configuration.getInstance().save(getConfig(), this.configFile);
 
         YamlFileCache.clearCache();
 
@@ -496,6 +496,11 @@ public ComponentsManager getComponentsManager() {
         return this.componentsManager;
     }
 
+    @Override
+    public String[] getClickRequirementKeys() {
+        return new String[]{"click_requirement.", "click-requirement.", "click_requirements.", "click-requirements.", "clicks_requirement.", "clicks-requirement.", "clicks_requirements.", "clicks-requirements."};
+    }
+
     @Override
     public StorageManager getStorageManager() {
         return this.storageManager;

src/main/java/fr/maxlego08/menu/loader/ZButtonLoader.java

@@ -390,7 +390,7 @@ public Button load(@NonNull YamlConfiguration configuration, @NonNull String pat
         loadRefreshRequirements(button, configuration, path, file);
         // Load actions
         boolean stopOnEmpty = configuration.getBoolean(path + "stop-on-empty", true);
-        List<Action> actions = buttonManager.loadActions((List<Map<String, Object>>) configuration.getList(path + "actions", new ArrayList<>()), path + "actions", file, actionPatterns,true,stopOnEmpty);
+        List<Action> actions = buttonManager.loadActions((List<Map<String, Object>>) configuration.getList(path + "actions", new ArrayList<>()), path + "actions", file, actionPatterns, true, stopOnEmpty);
 
         button.setActions(actions);
 
@@ -436,8 +436,9 @@ private void loadDefaultPatternValues(YamlConfiguration patternConfig, Map<Strin
      * @param file          the file
      * @param path          current path in configuration
      */
-    private void loadClickRequirements(Button button, YamlConfiguration configuration, String path, File file,List<ActionPattern> actionPatterns) throws InventoryException {
-        String[] sectionStrings = {"click_requirement.", "click-requirement.", "click_requirements.", "click-requirements.", "clicks_requirement.", "clicks-requirement.", "clicks_requirements.", "clicks-requirements."};
+    private void loadClickRequirements(Button button, YamlConfiguration configuration, String path, File file, List<ActionPattern> actionPatterns) throws InventoryException {
+
+        String[] sectionStrings = this.plugin.getClickRequirementKeys();
         ConfigurationSection section = null;
         String sectionString = "";
         for (String string : sectionStrings) {
@@ -450,7 +451,7 @@ private void loadClickRequirements(Button button, YamlConfiguration configuratio
         Loader<Requirement> loader = new RequirementLoader(this.plugin);
         List<Requirement> requirements = new ArrayList<>();
         for (String key : section.getKeys(false)) {
-            requirements.add(loader.load(configuration, path + sectionString + key + ".", file,actionPatterns));
+            requirements.add(loader.load(configuration, path + sectionString + key + ".", file, actionPatterns));
         }
         button.setClickRequirements(requirements);
     }

src/main/java/fr/maxlego08/menu/requirement/checker/InventoryRequirementChecker.java

@@ -179,7 +179,7 @@ private void checkButton(YamlConfiguration configuration, InventoryLoadRequireme
      */
     private void checkClickRequirements(YamlConfiguration configuration, InventoryLoadRequirement inventoryLoadRequirement, String path) {
 
-        String[] sectionStrings = {"click_requirement.", "click-requirement.", "click_requirements.", "click-requirements.", "clicks_requirement.", "clicks-requirement.", "clicks_requirements.", "clicks-requirements."};
+        String[] sectionStrings = this.plugin.getClickRequirementKeys();
         ConfigurationSection section = null;
         String sectionString = "";
         for (String string : sectionStrings) {

src/main/resources/inventories/pro_inventory.yml

@@ -43,7 +43,7 @@ name: "#454545sʜᴏᴘ"
 #
 # In the example if below, if the player to the permission "zmenu.shop.show" then the inventory will open, otherwise a message will be sent
 #
-open_requirement:
+open-requirement:
   requirements:
     - type: permission
       permission: "zmenu.shop.show"
@@ -85,9 +85,9 @@ items:
       - 35-44 # slot 35 to 44
 
   #
-  # The item if below will use the click_requirement and view_requirement.
-  # You will have the same configuration items as for the open_requirement.
-  # Attention, for the click_requirement you will have to define several requirements according to your need.
+  # The item if below will use the click-requirement and view-requirement.
+  # You will have the same configuration items as for the open-requirement.
+  # Attention, for the click-requirement you will have to define several requirements according to your need.
   # You also need to specify clicks. So you can create multiple requirements for each click.
   #
   # In the example if below, if the player has enough money, and he has the zmenu.shop.use permission then the item will be displayed, otherwise another item will be displayed.
@@ -96,15 +96,15 @@ items:
   # You want to make a shop with zMenu ? Use zShop https://www.spigotmc.org/resources/zshop-1-8-1-20-advanced-inventory-plugin.74073/
   shop1:
     slot: 22
-    view_requirement:
+    view-requirement:
       requirements:
         - type: placeholder
           placeholder: "%vault_eco_balance%"
           value: 500
           action: SUPERIOR_OR_EQUAL
         - type: permission
           permission: "zmenu.shop.use"
-    click_requirement:
+    click-requirement:
       purchase:
         clicks:
           - ANY # or ALL for all clicks type

src/main/resources/patterns/playtime_reward.yml

@@ -4,7 +4,7 @@ button:
   updateOnClick: true
   page: '%page%'
   slot: '%slot%'
-  view_requirement:
+  view-requirement:
     requirements:
       - type: placeholder
         placeholder: "%zmenu_player_value_playtime_level%"
@@ -27,7 +27,7 @@ button:
       sound: ENTITY_VILLAGER_NO
   else:
     updateOnClick: true
-    view_requirement:
+    view-requirement:
       requirements:
         - type: placeholder
           placeholder: "%zmenu_statistic_hours_played%"
@@ -50,7 +50,7 @@ button:
         - '#ff0000✘ ʏᴏᴜ ᴅᴏɴ’ᴛ ʜᴀᴠᴇ ᴇɴᴏᴜɢʜ ᴘʟᴀʏ ᴛɪᴍᴇ'
     else:
       updateOnClick: true
-      view_requirement:
+      view-requirement:
         requirements:
           - type: placeholder
             placeholder: "%zmenu_player_value_playtime_level%"
@@ -72,7 +72,7 @@ button:
         updateOnClick: true
         refreshOnClick: true
 
-        click_requirement:
+        click-requirement:
           right_click:
             clicks:
               - ALL