Merge branch 'release/1.0.2.3'

Author: Maxlego08

changelog.md

@@ -27,9 +27,17 @@
 - [ ] Add a tool to transform ItemStack to base64 and vice versa. This tool can be used to all my plugins.
 - [ ] Fix the bug about the `clearInventory: true`. It does not restore inventory when the menu is closed.
 - [ ] Add the support for the `http://textures.minecraft.net/texture/e34969c2684e4f62d5f87875460441a9f849d296c01e4c621636bb6acda696f7` in the URL of a custom head.
+- [ ] Update pom.xml for add {projet.version} in plugin.yml
 
 # Unreleased
 
+# 1.0.2.3
+
+- Fixed the pattern display, they will now appear first and let the more important buttons pass over
+- Fixed MenuItemStack build method, add boolean for use cache or not
+- Fixed PAPI use if player is null
+- Create new button type: JUMP [#34](https://github.com/Maxlego08/zMenu/pull/34)
+
 # 1.0.2.2
 
 - Added open menu with item interaction [#29](https://github.com/Maxlego08/zMenu/pull/29) by EnzoShoes

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.2.2</version>
+  <version>1.0.2.3</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <plugins>
@@ -62,6 +62,10 @@
                   <pattern>com.tcoded.folialib</pattern>
                   <shadedPattern>fr.maxlego08.menu.zcore.utils.folialib</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>de.tr7zw.changeme.nbtapi</pattern>
+                  <shadedPattern>fr.maxlego08.menu.zcore.utils.nbtapi</shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>
@@ -70,6 +74,10 @@
     </plugins>
   </build>
   <repositories>
+    <repository>
+      <id>codemc-repo</id>
+      <url>https://repo.codemc.io/repository/maven-public/</url>
+    </repository>
     <repository>
       <id>xenondevs</id>
       <url>https://repo.xenondevs.xyz/releases</url>
@@ -204,8 +212,11 @@
     </dependency>
   </dependencies>
   <properties>
-    <maven.compiler.target>8</maven.compiler.target>
+    <xseries.version>9.4.0</xseries.version>
     <maven.compiler.source>8</maven.compiler.source>
+    <folialib.version>0.2.5</folialib.version>
+    <maven.compiler.target>8</maven.compiler.target>
+    <item-nbt-api.version>2.12.2</item-nbt-api.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>

pom.xml

@@ -3,11 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.maxlego08</groupId>
     <artifactId>zmenu</artifactId>
-    <version>1.0.2.2</version>
+    <version>1.0.2.3</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>
+        <folialib.version>0.2.5</folialib.version>
+        <item-nbt-api.version>2.12.2</item-nbt-api.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -68,6 +71,10 @@
                                     <pattern>com.tcoded.folialib</pattern>
                                     <shadedPattern>fr.maxlego08.menu.zcore.utils.folialib</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>de.tr7zw.changeme.nbtapi</pattern>
+                                    <shadedPattern>fr.maxlego08.menu.zcore.utils.nbtapi</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
@@ -76,6 +83,11 @@
         </plugins>
     </build>
     <repositories>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.io/repository/maven-public/</url>
+            <layout>default</layout>
+        </repository>
         <repository>
             <id>xenondevs</id>
             <url>https://repo.xenondevs.xyz/releases</url>
@@ -120,6 +132,8 @@
             <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- hooks -->
         <dependency>
             <groupId>xyz.xenondevs.nova</groupId>
             <artifactId>nova-api</artifactId>
@@ -165,14 +179,19 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>9.4.0</version>
+            <version>${xseries.version}</version>
         </dependency>
         <dependency>
             <groupId>com.tcoded</groupId>
             <artifactId>FoliaLib</artifactId>
-            <version>0.2.5</version>
+            <version>${folialib.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>de.tr7zw</groupId>
+            <artifactId>item-nbt-api</artifactId>
+            <version>${item-nbt-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.github.oraxen</groupId>
             <artifactId>oraxen</artifactId>

src/fr/maxlego08/menu/MenuItemStack.java

@@ -5,11 +5,12 @@
 import fr.maxlego08.menu.save.Config;
 import fr.maxlego08.menu.zcore.logger.Logger;
 import fr.maxlego08.menu.zcore.utils.Banner;
-import fr.maxlego08.menu.zcore.utils.ElapsedTime;
 import fr.maxlego08.menu.zcore.utils.Firework;
 import fr.maxlego08.menu.zcore.utils.LeatherArmor;
 import fr.maxlego08.menu.zcore.utils.Potion;
 import fr.maxlego08.menu.zcore.utils.ZUtils;
+import fr.maxlego08.menu.zcore.utils.attribute.AttributeApplier;
+import fr.maxlego08.menu.api.attribute.IAttribute;
 import fr.maxlego08.menu.zcore.utils.meta.Meta;
 import fr.maxlego08.menu.zcore.utils.nms.NMSUtils;
 import fr.maxlego08.menu.zcore.utils.nms.NmsVersion;
@@ -23,12 +24,7 @@
 import org.bukkit.inventory.meta.SkullMeta;
 
 import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 public class MenuItemStack extends ZUtils {
 
@@ -47,6 +43,7 @@ public class MenuItemStack extends ZUtils {
     private boolean isGlowing;
     private String modelID;
     private Map<Enchantment, Integer> enchantments = new HashMap<>();
+    private List<IAttribute> attributes = new ArrayList<>();
     private Banner banner;
     private Firework firework;
     private LeatherArmor leatherArmor;
@@ -115,11 +112,14 @@ public InventoryManager getInventoryManager() {
         return inventoryManager;
     }
 
-    @SuppressWarnings("deprecation")
     public ItemStack build(Player player) {
+        return build(player, true);
+    }
+
+    public ItemStack build(Player player, boolean useCache) {
 
         // If we don’t need PlaceHolderApi, then we use the cache
-        if (!this.needPlaceholderAPI && this.cacheItemStack != null && Config.enableCacheItemStack) {
+        if (!this.needPlaceholderAPI && this.cacheItemStack != null && Config.enableCacheItemStack && useCache) {
             return this.cacheItemStack;
         }
 
@@ -242,10 +242,13 @@ public ItemStack build(Player player) {
             }
         });
 
-        this.flags.forEach(itemMeta::addItemFlags);
+		this.flags.forEach(itemMeta::addItemFlags);
 
         itemStack.setItemMeta(itemMeta);
 
+        AttributeApplier attributeApplier = new AttributeApplier(attributes);
+        attributeApplier.apply(itemStack);
+
         if (!needPlaceholderAPI && Config.enableCacheItemStack) this.cacheItemStack = itemStack;
         return itemStack;
     }
@@ -431,6 +434,20 @@ public void setEnchantments(Map<Enchantment, Integer> enchantments) {
         this.enchantments = enchantments;
     }
 
+    /**
+     * @return the attributes
+     */
+    public List<IAttribute> getAttributes() {
+        return attributes;
+    }
+
+    /**
+     * @param attributes the attributes to set.
+     */
+    public void setAttributes(List<IAttribute> attributes) {
+        this.attributes = attributes;
+    }
+
     /**
      * @return the banner
      */

src/fr/maxlego08/menu/ZInventoryManager.java

@@ -11,12 +11,7 @@
 import fr.maxlego08.menu.api.loader.MaterialLoader;
 import fr.maxlego08.menu.api.utils.MetaUpdater;
 import fr.maxlego08.menu.button.buttons.ZNoneButton;
-import fr.maxlego08.menu.button.loader.BackLoader;
-import fr.maxlego08.menu.button.loader.HomeLoader;
-import fr.maxlego08.menu.button.loader.MainMenuLoader;
-import fr.maxlego08.menu.button.loader.NextLoader;
-import fr.maxlego08.menu.button.loader.NoneLoader;
-import fr.maxlego08.menu.button.loader.PreviousLoader;
+import fr.maxlego08.menu.button.loader.*;
 import fr.maxlego08.menu.exceptions.InventoryException;
 import fr.maxlego08.menu.exceptions.InventoryFileNotFound;
 import fr.maxlego08.menu.api.utils.OpenWithItem;
@@ -281,6 +276,7 @@ public void loadButtons() {
         buttonManager.register(new NextLoader(this.plugin, this));
         buttonManager.register(new PreviousLoader(this.plugin, this));
         buttonManager.register(new MainMenuLoader(this.plugin, this));
+        buttonManager.register(new JumpLoader(this.plugin, this));
 
         // Register ItemStackSimilar
         registerItemStackVerification(new FullSimilar());