Merge branch 'release/1.0.2.8'

Author: Maxlego08

changelog.md

@@ -32,9 +32,18 @@
 - [ ] 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
+- [ ] Add slot type for create pattern (Allows to fill slot areas as do the outline of the inventory)
 
 # Unreleased
 
+# 1.0.2.8
+
+- Add /zm inventories - Allows access to the inventories of the online inventory editor
+- Add PlayerInteractEvent in DupeListener
+- Fix classic meta with PAPI color
+- Fix NPE with ButtonOption
+
 # 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.
@@ -57,9 +66,10 @@
 
 - Add BlockPlaceEvent for Anti Dupe
 - Add placeholder %zmenu_test% for testing
-- Fix sound action, pitch and volume was reversed
 - Add ``job`` requirement. Check if the player has a job with JobsReborn plugins
 - Added a cache on placeholders. By default, the cache is 500ms. That corresponds to opening a menu. So if you have several times the same placeholder used, it will only be called once.
+- Fix sound action, pitch and volume was reversed
+- Fix commands async
 
 # 1.0.2.5
 

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.2.7</version>
+  <version>1.0.2.8</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -227,6 +227,12 @@
       <version>2.19.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>net.luckperms</groupId>
+      <artifactId>api</artifactId>
+      <version>5.4</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.github.Zrips</groupId>
       <artifactId>Jobs</artifactId>
@@ -236,7 +242,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <xseries.version>9.4.0</xseries.version>
+    <xseries.version>9.9.0</xseries.version>
     <maven.compiler.source>8</maven.compiler.source>
     <folialib.version>0.2.5</folialib.version>
     <maven.compiler.target>8</maven.compiler.target>

pom.xml

@@ -3,12 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.maxlego08</groupId>
     <artifactId>zmenu</artifactId>
-    <version>1.0.2.7</version>
+    <version>1.0.2.8</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <xseries.version>9.4.0</xseries.version>
+        <xseries.version>9.9.0</xseries.version>
         <folialib.version>0.2.5</folialib.version>
         <item-nbt-api.version>2.12.2</item-nbt-api.version>
     </properties>
@@ -262,5 +262,11 @@
             <scope>system</scope>
             <systemPath>${basedir}/libs/Jobs5.2.2.3.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>net.luckperms</groupId>
+            <artifactId>api</artifactId>
+            <version>5.4</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

src/fr/maxlego08/menu/MenuPlugin.java

@@ -112,8 +112,6 @@ public void onEnable() {
         files.add("inventories/pro_inventory.yml");
         files.add("inventories/example_punish.yml");
 
-        // files.add("website/marketplace.yml");
-
         files.add("commands/commands.yml");
         files.add("commands/punish/punish.yml");
 
@@ -129,7 +127,7 @@ public void onEnable() {
                 if (!new File(this.getDataFolder(), filePath).exists()) {
 
                     if (NMSUtils.isNewVersion()) {
-                        saveResource(filePath.replace("inventories/", "inventories/1_13/").replace("website/", "website/1_13/"), filePath, false);
+                        saveResource(filePath.replace("inventories/", "inventories/1_13/"), filePath, false);
                     } else {
                         saveResource(filePath, false);
                     }
@@ -231,6 +229,8 @@ public void onEnable() {
         Logger.info("");
 
 
+        websiteManager.loadPlaceholders();
+
         this.postEnable();
     }
 

src/fr/maxlego08/menu/ZInventoryManager.java

@@ -45,6 +45,7 @@
 import fr.maxlego08.menu.loader.actions.TitleLoader;
 import fr.maxlego08.menu.loader.permissible.ItemPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.JobPermissibleLoader;
+import fr.maxlego08.menu.loader.permissible.LuckPermPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.PermissionPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.PlaceholderPermissibleLoader;
 import fr.maxlego08.menu.loader.permissible.RegexPermissibleLoader;
@@ -263,6 +264,9 @@ public void loadButtons() {
         if (this.plugin.isEnable(Plugins.JOBS)) {
             buttonManager.registerPermissible(new JobPermissibleLoader(buttonManager));
         }
+        if (this.plugin.isEnable(Plugins.LUCKPERMS)) {
+            buttonManager.registerPermissible(new LuckPermPermissibleLoader(buttonManager));
+        }
 
         // Load actions
         buttonManager.registerAction(new BroadcastLoader());

src/fr/maxlego08/menu/api/button/PerformButton.java

@@ -1,5 +1,6 @@
 package fr.maxlego08.menu.api.button;
 
+import fr.maxlego08.menu.api.scheduler.ZScheduler;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 
@@ -55,9 +56,10 @@ public interface PerformButton {
     /**
      * Executes commands based on the player and click type.
      *
-     * @param player The player who will execute the commands.
-     * @param type   The click type.
+     * @param player    The player who will execute the commands.
+     * @param type      The click type.
+     * @param scheduler
      */
-    void execute(Player player, ClickType type);
+    void execute(Player player, ClickType type, ZScheduler scheduler);
 
 }

…lego08/menu/zcore/enums/MessageType.java …axlego08/menu/api/enums/MessageType.javasrc/fr/maxlego08/menu/zcore/enums/MessageType.java renamed to src/fr/maxlego08/menu/api/enums/MessageType.java src/fr/maxlego08/menu/zcore/enums/MessageType.java renamed to src/fr/maxlego08/menu/api/enums/MessageType.java

@@ -1,4 +1,4 @@
-package fr.maxlego08.menu.zcore.enums;
+package fr.maxlego08.menu.api.enums;
 
 public enum MessageType {
 

src/fr/maxlego08/menu/api/requirement/permissible/LuckpermPermissible.java

@@ -0,0 +1,9 @@
+package fr.maxlego08.menu.api.requirement.permissible;
+
+import fr.maxlego08.menu.api.requirement.Permissible;
+
+public interface LuckpermPermissible extends Permissible {
+
+    String getGroupName();
+
+}

src/fr/maxlego08/menu/api/utils/IMessage.java

@@ -0,0 +1,26 @@
+package fr.maxlego08.menu.api.utils;
+
+import fr.maxlego08.menu.api.enums.MessageType;
+
+import java.util.List;
+
+public interface IMessage {
+
+    String getMessage();
+
+    List<String> getMessages();
+
+    MessageType getType();
+
+    String getTitle();
+
+    String getSubTitle();
+
+    int getStart();
+
+    int getEnd();
+
+    int getTime();
+
+
+}

src/fr/maxlego08/menu/api/utils/Placeholders.java

@@ -1,5 +1,7 @@
 package fr.maxlego08.menu.api.utils;
 
+import fr.maxlego08.menu.zcore.logger.Logger;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,14 +25,20 @@ public List<String> parse(List<String> strings) {
 
     public String parse(String string) {
         for (Map.Entry<String, String> entry : placeholders.entrySet()) {
-            string = string.replace("%" + entry.getKey() + "%", entry.getValue());
-            string = string.replace("%upper_" + entry.getKey() + "%", entry.getValue().toUpperCase());
-            string = string.replace("%lower_" + entry.getKey() + "%", entry.getValue().toLowerCase());
-            String capitalize = entry.getValue();
-            if (capitalize.length() > 1) {
-                capitalize = capitalize.substring(0, 1).toUpperCase() + capitalize.substring(1);
+            try {
+
+                string = string.replace("%" + entry.getKey() + "%", entry.getValue());
+                string = string.replace("%upper_" + entry.getKey() + "%", entry.getValue().toUpperCase());
+                string = string.replace("%lower_" + entry.getKey() + "%", entry.getValue().toLowerCase());
+                String capitalize = entry.getValue();
+                if (capitalize.length() > 1) {
+                    capitalize = capitalize.substring(0, 1).toUpperCase() + capitalize.substring(1);
+                }
+                string = string.replace("%capitalize_" + entry.getKey() + "%", capitalize);
+            } catch (Exception exception) {
+                exception.printStackTrace();
+                Logger.info("Error with placeholder key " + entry.getKey() + " !", Logger.LogType.ERROR);
             }
-            string = string.replace("%capitalize_" + entry.getKey() + "%", capitalize);
         }
         return string;
     }