Merge branch 'release/1.0.2.9'

Author: Maxlego08

changelog.md

@@ -34,9 +34,26 @@
 - [ ] 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)
+- [ ] Be able to set default values for player data
 
 # Unreleased
 
+# 1.0.2.9
+
+- Added support for [zHead](https://www.spigotmc.org/resources/zhead-database-plugin-for-heads.115717/). A free and open source head database plugin (with more than 72.000 heads)
+- Create new placeholder ``%zmenu_player_page%``, return player page
+- Create new placeholder ``%zmenu_player_max_page%&``, return player max page
+- Change NEXT and PREVIOUS button. If you click right you will go directly to the first or last page.
+- Improve MiniMessage format with italic text
+- Create new file: `default_values.yml`, it will contain all the default values for the placeholders of the player data.
+- Create pattern for Button. You can create a pattern file for a button with placeholders. And in your inventory, just call the pattern with a placeholder list. The placeholders will be replaced by your values and the button will be loaded with the new values. Thus, you can have dozens of similar buttons while reducing your configurations by several hundred lines. More information [here](https://docs.zmenu.dev/configurations/patterns#button).
+- Creation of 5 configurations for zMenu:
+1. PLAYTIME LEVELS - zMenu Configurations: https://minecraft-inventory-builder.com/resources/9
+2. VOTE MENU - zMenu Configurations: https://minecraft-inventory-builder.com/resources/8
+3. DONUTSMP HOME - zMenu Configurations: https://minecraft-inventory-builder.com/resources/7
+4. zAuctionHouse - Hypixel AuctionHouse: https://minecraft-inventory-builder.com/resources/6
+5. zAuctionHouse - DonutSMP AuctionHouse: https://minecraft-inventory-builder.com/resources/5
+
 # 1.0.2.8
 
 - Add /zm inventories - Allows access to the inventories of the online inventory editor

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.2.8</version>
+  <version>1.0.2.9</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -227,6 +227,12 @@
       <version>2.19.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.Maxlego08</groupId>
+      <artifactId>zHead</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>net.luckperms</groupId>
       <artifactId>api</artifactId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.maxlego08</groupId>
     <artifactId>zmenu</artifactId>
-    <version>1.0.2.8</version>
+    <version>1.0.2.9</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
@@ -262,6 +262,12 @@
             <scope>system</scope>
             <systemPath>${basedir}/libs/Jobs5.2.2.3.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.github.Maxlego08</groupId>
+            <artifactId>zHead</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>net.luckperms</groupId>
             <artifactId>api</artifactId>

src/fr/maxlego08/menu/MenuPlugin.java

@@ -25,6 +25,7 @@
 import fr.maxlego08.menu.loader.materials.NovaLoader;
 import fr.maxlego08.menu.loader.materials.OraxenLoader;
 import fr.maxlego08.menu.loader.materials.SlimeFunLoader;
+import fr.maxlego08.menu.loader.materials.ZHeadLoader;
 import fr.maxlego08.menu.pattern.ZPatternManager;
 import fr.maxlego08.menu.placeholder.LocalPlaceholder;
 import fr.maxlego08.menu.players.ZDataManager;
@@ -172,6 +173,9 @@ public void onEnable() {
         if (this.isEnable(Plugins.HEADDATABASE)) {
             this.inventoryManager.registerMaterialLoader(new HeadDatabaseLoader());
         }
+        if (this.isEnable(Plugins.ZHEAD)) {
+            this.inventoryManager.registerMaterialLoader(new ZHeadLoader(this));
+        }
         if (this.isEnable(Plugins.ORAXEN)) {
             this.inventoryManager.registerMaterialLoader(new OraxenLoader());
         }
@@ -198,6 +202,8 @@ public void onEnable() {
 
         this.websiteManager.registerPlaceholders();
         localPlaceholder.register("test", (a, b) -> "&ctest");
+        localPlaceholder.register("player_page", (player, s) -> String.valueOf(this.inventoryManager.getPage(player)));
+        localPlaceholder.register("player_max_page", (player, s) -> String.valueOf(this.inventoryManager.getMaxPage(player)));
 
         ((ZDataManager) this.dataManager).registerPlaceholder(localPlaceholder);
 
@@ -229,7 +235,8 @@ public void onEnable() {
         Logger.info("");
 
 
-        websiteManager.loadPlaceholders();
+        this.websiteManager.loadPlaceholders();
+        this.dataManager.loadDefaultValues();
 
         this.postEnable();
     }

src/fr/maxlego08/menu/ZInventoryManager.java

@@ -61,6 +61,7 @@
 import fr.maxlego08.menu.zcore.utils.plugins.Plugins;
 import fr.maxlego08.menu.zcore.utils.storage.Persist;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -102,6 +103,9 @@ public class ZInventoryManager extends ZUtils implements InventoryManager {
     private final Map<Plugin, FastEvent> fastEventMap = new HashMap<>();
     private final Map<String, ItemStackSimilar> itemStackSimilarMap = new HashMap<>();
 
+    private final Map<UUID, Integer> playerPages = new HashMap<>();
+    private final Map<UUID, Integer> playerMaxPages = new HashMap<>();
+
     public ZInventoryManager(MenuPlugin plugin) {
         super();
         this.plugin = plugin;
@@ -315,6 +319,9 @@ public void loadButtons() {
     @Override
     public void loadInventories() {
 
+        this.playerMaxPages.clear();
+        this.playerPages.clear();
+
         // Check if file exist
         File folder = new File(this.plugin.getDataFolder(), "inventories");
         if (!folder.exists()) {
@@ -675,4 +682,20 @@ public void unregisterOptions(Plugin plugin) {
     public Map<Plugin, List<Class<? extends ButtonOption>>> getOptions() {
         return this.buttonOptions;
     }
+
+    @Override
+    public void setPlayerPage(OfflinePlayer player, int page, int maxPage) {
+        this.playerPages.put(player.getUniqueId(), page);
+        this.playerMaxPages.put(player.getUniqueId(), maxPage);
+    }
+
+    @Override
+    public int getPage(OfflinePlayer player) {
+        return this.playerPages.getOrDefault(player.getUniqueId(), 0);
+    }
+
+    @Override
+    public int getMaxPage(OfflinePlayer player) {
+        return this.playerMaxPages.getOrDefault(player.getUniqueId(), 0);
+    }
 }

src/fr/maxlego08/menu/api/InventoryManager.java

@@ -9,6 +9,7 @@
 import fr.maxlego08.menu.api.utils.MetaUpdater;
 import fr.maxlego08.menu.exceptions.InventoryException;
 import fr.maxlego08.menu.zcore.utils.storage.Savable;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
@@ -432,4 +433,10 @@ public interface InventoryManager extends Savable, Listener {
      * @return An Optional containing the button option class if found, or an empty Optional if not found.
      */
     Optional<Class<? extends ButtonOption>> getOption(String name);
+
+    void setPlayerPage(OfflinePlayer player, int page, int maxPage);
+
+    int getPage(OfflinePlayer player);
+
+    int getMaxPage(OfflinePlayer player);
 }

src/fr/maxlego08/menu/api/players/Data.java

@@ -33,4 +33,8 @@ public interface Data {
      */
     boolean isExpired();
 
+    void add(int amount);
+
+    void remove(int amount);
+
 }

src/fr/maxlego08/menu/api/players/DataManager.java

@@ -52,4 +52,6 @@ public interface DataManager extends Savable {
      */
     void clearPlayer(UUID uniqueId);
 
+    void loadDefaultValues();
+
 }

src/fr/maxlego08/menu/api/requirement/data/ActionPlayerDataType.java

@@ -5,4 +5,8 @@ public enum ActionPlayerDataType {
     SET,
     REMOVE,
 
+    ADD,
+
+    SUBTRACT,
+
 }

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

@@ -9,7 +9,15 @@
 
 public class Placeholders {
 
-    private final Map<String, String> placeholders = new HashMap<>();
+    private final Map<String, String> placeholders;
+
+    public Placeholders(Map<String, String> placeholders) {
+        this.placeholders = placeholders;
+    }
+
+    public Placeholders() {
+        this(new HashMap<>());
+    }
 
     public void register(String key, String value) {
         this.placeholders.put(key, value);
@@ -43,4 +51,36 @@ public String parse(String string) {
         return string;
     }
 
+    public String parse(String string, String key, String value) {
+        try {
+
+            string = string.replace("%" + key + "%", value);
+            string = string.replace("%upper_" + key + "%", value.toUpperCase());
+            string = string.replace("%lower_" + key + "%", value.toLowerCase());
+            String capitalize = value;
+            if (capitalize.length() > 1) {
+                capitalize = capitalize.substring(0, 1).toUpperCase() + capitalize.substring(1);
+            }
+            string = string.replace("%capitalize_" + key + "%", capitalize);
+
+            if (string.contains("%add_one_" + key + "%")) {
+                try {
+                    string = string.replace("%add_one_" + key + "%", String.valueOf(Integer.parseInt(value) + 1));
+                } catch (NumberFormatException ignored) {
+                }
+            }
+
+            if (string.contains("%remove_one_" + key + "%")) {
+                try {
+                    string = string.replace("%remove_one_" + key + "%", String.valueOf(Integer.parseInt(value) - 1));
+                } catch (NumberFormatException ignored) {
+                }
+            }
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            Logger.info("Error with placeholder key " + key + " !", Logger.LogType.ERROR);
+        }
+        return string;
+    }
+
 }