Fix + Improvement

API/src/main/java/fr/maxlego08/menu/api/animation/PlayerTitleAnimation.java

@@ -60,7 +60,7 @@ public void start(@NotNull Player player, @NotNull List<ItemStack> inventoryCont
                 }
             }
             String title = this.settings.titles().get(this.currentIndex++);
-            this.sendTitle(player, title);
+            this.sendTitle(player, this.plugin.parse(player, title));
             if (!this.settings.showItemsAfterAnimation()) {
                 if (this.settings.itemUpdateInterval() > 0 && this.currentIndex % this.settings.itemUpdateInterval() == 0) {
                     this.sendInventoryContent(player, inventoryContents);

API/src/main/java/fr/maxlego08/menu/api/itemstack/components/ItemNameComponent.java

@@ -2,6 +2,7 @@
 
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -25,7 +26,7 @@ public void apply(@NotNull BuildContext context, @NotNull ItemStack itemStack, @
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta != null) {
 
-            itemMeta.setItemName(this.itemName);
+            itemMeta.setItemName(this.itemName == null ? null : Placeholder.Placeholders.getPlaceholder().setPlaceholders(player, context.getPlaceholders().parse(this.itemName)));
 
             itemStack.setItemMeta(itemMeta);
         }

API/src/main/java/fr/maxlego08/menu/api/itemstack/components/LoreComponent.java

@@ -2,6 +2,7 @@
 
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -27,7 +28,9 @@ public LoreComponent(List<@NotNull String> lore) {
     public void apply(@NotNull BuildContext context, @NotNull ItemStack itemStack, @Nullable Player player) {
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta != null) {
-            itemMeta.setLore(this.lore);
+
+            itemMeta.setLore(Placeholder.Placeholders.getPlaceholder().setPlaceholders(player,context.getPlaceholders().parse(this.lore)));
+
             itemStack.setItemMeta(itemMeta);
         }
     }

API/src/main/java/fr/maxlego08/menu/api/itemstack/components/WritableBookContentComponent.java

@@ -3,6 +3,7 @@
 import fr.maxlego08.menu.api.configuration.Configuration;
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.utils.ItemUtil;
 import fr.maxlego08.menu.zcore.logger.Logger;
 import org.bukkit.entity.Player;
@@ -34,8 +35,8 @@ public WritableBookContentComponent(@Nullable String title, @NotNull List<@NotNu
     @Override
     public void apply(@NotNull BuildContext context, @NotNull ItemStack itemStack, @Nullable Player player) {
         boolean apply = ItemUtil.editMeta(itemStack, BookMeta.class, bookMeta -> {
-            bookMeta.setTitle(this.title);
-            bookMeta.setPages(this.pages);
+            bookMeta.setTitle(this.title != null ? Placeholder.Placeholders.getPlaceholder().setPlaceholders(player, context.getPlaceholders().parse(this.title)) : null);
+            bookMeta.setPages(Placeholder.Placeholders.getPlaceholder().setPlaceholders(player, context.getPlaceholders().parse(this.pages)));
         });
         if (!apply && Configuration.enableDebug)
             Logger.info("Could not apply WritableBookContentComponent to item: " + itemStack.getType().name());

API/src/main/java/fr/maxlego08/menu/api/itemstack/components/WrittenBookContentComponent.java

@@ -3,6 +3,7 @@
 import fr.maxlego08.menu.api.configuration.Configuration;
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.utils.ItemUtil;
 import fr.maxlego08.menu.zcore.logger.Logger;
 import org.bukkit.entity.Player;
@@ -46,10 +47,10 @@ public WrittenBookContentComponent(@Nullable String title, @Nullable String auth
     @Override
     public void apply(@NotNull BuildContext context, @NotNull ItemStack itemStack, @Nullable Player player) {
         boolean apply = ItemUtil.editMeta(itemStack, BookMeta.class, bookMeta -> {
-            bookMeta.setTitle(this.title);
-            bookMeta.setAuthor(this.author);
+            bookMeta.setTitle(this.title == null ? null : Placeholder.Placeholders.getPlaceholder().setPlaceholders(player, context.getPlaceholders().parse(this.title)));
+            bookMeta.setAuthor(this.author == null ? null : Placeholder.Placeholders.getPlaceholder().setPlaceholders(player, context.getPlaceholders().parse(this.author)));
             bookMeta.setGeneration(this.generation);
-            bookMeta.setPages(this.pages);
+            bookMeta.setPages(Placeholder.Placeholders.getPlaceholder().setPlaceholders(player, context.getPlaceholders().parse(this.pages)));
         });
         if (!apply && Configuration.enableDebug)
             Logger.info("Could not apply WritableBookContentComponent to item: " + itemStack.getType().name());

Common/src/main/java/fr/maxlego08/menu/placeholder/AutoPlaceholder.java → API/src/main/java/fr/maxlego08/menu/api/placeholder/AutoPlaceholder.java

@@ -1,4 +1,4 @@
-package fr.maxlego08.menu.placeholder;
+package fr.maxlego08.menu.api.placeholder;
 
 import fr.maxlego08.menu.api.interfaces.ReturnBiConsumer;
 import org.bukkit.OfflinePlayer;

Common/src/main/java/fr/maxlego08/menu/placeholder/DistantPlaceholder.java → API/src/main/java/fr/maxlego08/menu/api/placeholder/DistantPlaceholder.java

@@ -1,4 +1,4 @@
-package fr.maxlego08.menu.placeholder;
+package fr.maxlego08.menu.api.placeholder;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.OfflinePlayer;

Common/src/main/java/fr/maxlego08/menu/placeholder/LocalPlaceholder.java → API/src/main/java/fr/maxlego08/menu/api/placeholder/LocalPlaceholder.java

@@ -1,4 +1,4 @@
-package fr.maxlego08.menu.placeholder;
+package fr.maxlego08.menu.api.placeholder;
 
 import fr.maxlego08.menu.api.MenuPlugin;
 import fr.maxlego08.menu.api.interfaces.ReturnBiConsumer;

Common/src/main/java/fr/maxlego08/menu/placeholder/Placeholder.java → API/src/main/java/fr/maxlego08/menu/api/placeholder/Placeholder.java

@@ -1,4 +1,4 @@
-package fr.maxlego08.menu.placeholder;
+package fr.maxlego08.menu.api.placeholder;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -22,7 +22,7 @@ class Api implements Placeholder {
         private final Placeholder localPlaceholder;
 
         public Api() {
-            PlaceholderExpansion expansion = new fr.maxlego08.menu.placeholder.DistantPlaceholder(LocalPlaceholder.getInstance());
+            PlaceholderExpansion expansion = new fr.maxlego08.menu.api.placeholder.DistantPlaceholder(LocalPlaceholder.getInstance());
             expansion.register();
             localPlaceholder = new Local();
         }

Common/src/main/java/fr/maxlego08/menu/common/utils/ActionHelper.java

@@ -1,7 +1,7 @@
 package fr.maxlego08.menu.common.utils;
 
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.requirement.Action;
-import fr.maxlego08.menu.placeholder.Placeholder;
 import org.bukkit.entity.Player;
 
 import java.util.List;

Common/src/main/java/fr/maxlego08/menu/common/utils/PapiUtils.java

@@ -1,7 +1,7 @@
 package fr.maxlego08.menu.common.utils;
 
 import fr.maxlego08.menu.api.configuration.Configuration;
-import fr.maxlego08.menu.placeholder.Placeholder;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import org.bukkit.OfflinePlayer;
 
 import java.util.ArrayList;

Hooks/Paper/src/main/java/fr/maxlego08/menu/hooks/dialogs/utils/BuilderHelper.java

@@ -1,6 +1,6 @@
 package fr.maxlego08.menu.hooks.dialogs.utils;
 
-import fr.maxlego08.menu.placeholder.Placeholder;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import org.bukkit.entity.Player;
 
 import java.util.List;

Hooks/Paper/src/main/java/fr/maxlego08/menu/itemstack/components/paper/PaperCustomNameComponent.java

@@ -2,8 +2,8 @@
 
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.utils.PaperMetaUpdater;
-import fr.maxlego08.menu.placeholder.Placeholder;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

Hooks/Paper/src/main/java/fr/maxlego08/menu/itemstack/components/paper/PaperLoreComponent.java

@@ -2,8 +2,8 @@
 
 import fr.maxlego08.menu.api.context.BuildContext;
 import fr.maxlego08.menu.api.itemstack.ItemComponent;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.utils.PaperMetaUpdater;
-import fr.maxlego08.menu.placeholder.Placeholder;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.datacomponent.item.ItemLore;
 import org.bukkit.entity.Player;

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

@@ -13,6 +13,8 @@
 import fr.maxlego08.menu.api.font.FontImage;
 import fr.maxlego08.menu.api.interfaces.ReturnBiConsumer;
 import fr.maxlego08.menu.api.pattern.PatternManager;
+import fr.maxlego08.menu.api.placeholder.LocalPlaceholder;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.players.DataManager;
 import fr.maxlego08.menu.api.players.inventory.InventoriesPlayer;
 import fr.maxlego08.menu.api.storage.StorageManager;
@@ -52,9 +54,7 @@
 import fr.maxlego08.menu.loader.materials.ArmorLoader;
 import fr.maxlego08.menu.loader.materials.Base64Loader;
 import fr.maxlego08.menu.pattern.ZPatternManager;
-import fr.maxlego08.menu.placeholder.LocalPlaceholder;
 import fr.maxlego08.menu.placeholder.MenuPlaceholders;
-import fr.maxlego08.menu.placeholder.Placeholder;
 import fr.maxlego08.menu.players.ZDataManager;
 import fr.maxlego08.menu.players.inventory.ZInventoriesPlayer;
 import fr.maxlego08.menu.save.MessageLoader;

src/main/java/fr/maxlego08/menu/loader/components/spigot/SpigotEnchantmentsItemComponentLoader.java

@@ -25,7 +25,7 @@ public SpigotEnchantmentsItemComponentLoader(){
     @Override
     public @Nullable ItemComponent load(@NotNull MenuItemStackContext context, @NotNull File file, @NotNull YamlConfiguration configuration, @NotNull String path, @Nullable ConfigurationSection componentSection) {
         if (componentSection == null) return null;
-        Map<String, Object> values = configuration.getValues(false);
+        Map<String, Object> values = componentSection.getValues(false);
         Map<Enchantment,Integer> enchantments = new HashMap<>();
         for (var entry : values.entrySet()) {
             String enchantmentName = entry.getKey();

src/main/java/fr/maxlego08/menu/placeholder/MenuPlaceholders.java

@@ -17,7 +17,7 @@
 public class MenuPlaceholders extends ZUtils {
 
     public void register(MenuPlugin plugin) {
-        LocalPlaceholder placeholder = LocalPlaceholder.getInstance();
+        fr.maxlego08.menu.api.placeholder.LocalPlaceholder placeholder = fr.maxlego08.menu.api.placeholder.LocalPlaceholder.getInstance();
 
         var inventoryManager = plugin.getInventoryManager();
         placeholder.register("test", (a, b) -> "&ctest");

src/main/java/fr/maxlego08/menu/players/ZDataManager.java

@@ -2,14 +2,14 @@
 
 import fr.maxlego08.menu.ZMenuPlugin;
 import fr.maxlego08.menu.api.interfaces.ReturnConsumer;
+import fr.maxlego08.menu.api.placeholder.LocalPlaceholder;
 import fr.maxlego08.menu.api.players.Data;
 import fr.maxlego08.menu.api.players.DataManager;
 import fr.maxlego08.menu.api.players.PlayerData;
 import fr.maxlego08.menu.api.storage.dto.DataDTO;
 import fr.maxlego08.menu.api.utils.Message;
 import fr.maxlego08.menu.api.utils.OfflinePlayerCache;
 import fr.maxlego08.menu.common.utils.builder.TimerBuilder;
-import fr.maxlego08.menu.placeholder.LocalPlaceholder;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;

src/main/java/fr/maxlego08/menu/website/ZWebsiteManager.java

@@ -7,11 +7,11 @@
 import fr.maxlego08.menu.api.configuration.Configuration;
 import fr.maxlego08.menu.api.exceptions.InventoryException;
 import fr.maxlego08.menu.api.loader.NoneLoader;
+import fr.maxlego08.menu.api.placeholder.LocalPlaceholder;
 import fr.maxlego08.menu.api.utils.Message;
 import fr.maxlego08.menu.api.website.WebsiteManager;
 import fr.maxlego08.menu.common.utils.ZUtils;
 import fr.maxlego08.menu.common.utils.nms.NmsVersion;
-import fr.maxlego08.menu.placeholder.LocalPlaceholder;
 import fr.maxlego08.menu.website.buttons.*;
 import fr.maxlego08.menu.website.request.HttpRequest;
 import org.bukkit.command.CommandSender;

src/main/java/fr/maxlego08/menu/zcore/ZPlugin.java

@@ -4,15 +4,15 @@
 import com.google.gson.GsonBuilder;
 import fr.maxlego08.menu.ZMenuPlugin;
 import fr.maxlego08.menu.api.exceptions.ListenerNullException;
+import fr.maxlego08.menu.api.placeholder.LocalPlaceholder;
+import fr.maxlego08.menu.api.placeholder.Placeholder;
 import fr.maxlego08.menu.api.players.Data;
 import fr.maxlego08.menu.api.utils.EnumInventory;
 import fr.maxlego08.menu.command.VCommand;
 import fr.maxlego08.menu.command.VCommandManager;
 import fr.maxlego08.menu.inventory.VInventory;
 import fr.maxlego08.menu.inventory.VInventoryManager;
 import fr.maxlego08.menu.listener.ListenerAdapter;
-import fr.maxlego08.menu.placeholder.LocalPlaceholder;
-import fr.maxlego08.menu.placeholder.Placeholder;
 import fr.maxlego08.menu.zcore.logger.Logger;
 import fr.maxlego08.menu.zcore.logger.Logger.LogType;
 import fr.maxlego08.menu.zcore.utils.gson.DataAdapter;