Resolve papi placeholders everywhere

Author: KamikotoTkach

src/main/java/ru/cwcode/tkach/refreshmenu/Utils.java

@@ -0,0 +1,25 @@
+package ru.cwcode.tkach.refreshmenu;
+
+import net.kyori.adventure.text.Component;
+import ru.cwcode.tkach.locale.Placeholders;
+import ru.cwcode.tkach.locale.platform.MessagePreprocessor;
+import ru.cwcode.tkach.locale.platform.MiniLocale;
+import ru.cwcode.tkach.locale.wrapper.adventure.MiniMessageWrapper;
+
+import java.util.List;
+
+public class Utils {
+  
+  public static final MessagePreprocessor MESSAGE_PREPROCESSOR = MiniLocale.getInstance().messagePreprocessor();
+  public static final MiniMessageWrapper MINI_MESSAGE_WRAPPER = MiniLocale.getInstance().miniMessageWrapper();
+  
+  public static Component deserialize(String string, Placeholders placeholders) {
+    String preprocess = MESSAGE_PREPROCESSOR.preprocess(string, null);
+    return MINI_MESSAGE_WRAPPER.deserialize(preprocess, placeholders);
+  }
+  
+  public static List<Component> deserialize(List<String> string, Placeholders placeholders) {
+    return string.stream().map(x -> deserialize(x, placeholders))
+                 .toList();
+  }
+}

src/main/java/ru/cwcode/tkach/refreshmenu/inventory/ingredient/HeadIngredient.java

@@ -9,7 +9,7 @@
 import ru.cwcode.cwutils.items.ItemBuilder;
 import ru.cwcode.cwutils.items.ItemBuilderFactory;
 import ru.cwcode.tkach.locale.Placeholders;
-import ru.cwcode.tkach.locale.platform.MiniLocale;
+import ru.cwcode.tkach.refreshmenu.Utils;
 
 import java.util.List;
 import java.util.UUID;
@@ -34,8 +34,10 @@ public HeadIngredient(String name, List<String> description, int amount, String
   public ItemStack getItem(Placeholders placeholders) {
     ItemBuilder item = ItemBuilderFactory.of(Material.PLAYER_HEAD);
 
-    if (name != null) item.name(MiniLocale.getInstance().miniMessageWrapper().deserialize(name, placeholders).decoration(TextDecoration.ITALIC, false));
-    if (description != null) item.description(MiniLocale.getInstance().miniMessageWrapper().deserialize(description, placeholders, true));
+    if (name != null) item.name(Utils.deserialize(name, placeholders).decoration(TextDecoration.ITALIC, false));
+    if (description != null) item.description(Utils.deserialize(description, placeholders).stream()
+                                                   .map(x -> x.decoration(TextDecoration.ITALIC, false))
+                                                   .toList());
     if (amount != 0) item.amount(amount);
 
     if (texture != null) {

src/main/java/ru/cwcode/tkach/refreshmenu/inventory/ingredient/IngredientImpl.java

@@ -6,7 +6,7 @@
 import ru.cwcode.cwutils.items.ItemBuilder;
 import ru.cwcode.cwutils.items.ItemBuilderFactory;
 import ru.cwcode.tkach.locale.Placeholders;
-import ru.cwcode.tkach.locale.platform.MiniLocale;
+import ru.cwcode.tkach.refreshmenu.Utils;
 
 import java.util.List;
 
@@ -32,8 +32,10 @@ public IngredientImpl() {
   public ItemStack getItem(Placeholders placeholders) {
     ItemBuilder item = ItemBuilderFactory.of(type);
 
-    if (name != null) item.name(MiniLocale.getInstance().miniMessageWrapper().deserialize(name, placeholders).decoration(TextDecoration.ITALIC, false));
-    if (description != null) item.description(MiniLocale.getInstance().miniMessageWrapper().deserialize(description, placeholders, true));
+    if (name != null) item.name(Utils.deserialize(name, placeholders).decoration(TextDecoration.ITALIC, false));
+    if (description != null) item.description(Utils.deserialize(description, placeholders).stream()
+                                                   .map(x -> x.decoration(TextDecoration.ITALIC, false))
+                                                   .toList());
     if (amount != 0) item.amount(amount);
     if (customModelData != 0) item.customModelData(customModelData);
 

src/main/java/ru/cwcode/tkach/refreshmenu/inventory/shape/InventoryShape.java

@@ -4,7 +4,7 @@
 import lombok.Setter;
 import org.bukkit.Material;
 import org.bukkit.inventory.Inventory;
-import ru.cwcode.tkach.locale.platform.MiniLocale;
+import ru.cwcode.tkach.refreshmenu.Utils;
 import ru.cwcode.tkach.refreshmenu.inventory.ingredient.Ingredient;
 import ru.cwcode.tkach.refreshmenu.inventory.type.InventoryTypeHolder;
 import ru.cwcode.tkach.refreshmenu.inventory.view.View;
@@ -127,7 +127,7 @@ public static ShapeBuilder defaultMultiShapeArtExtendedShape() {
 
 
   public Inventory createInventory(View view) {
-     return type.createInventory(view, MiniLocale.getInstance().miniMessageWrapper().deserialize(getName(), view.getPlaceholders()));
+    return type.createInventory(view, Utils.deserialize(getName(), view.getPlaceholders()));
    }
 
    /**

src/main/java/ru/cwcode/tkach/refreshmenu/inventory/view/View.java

@@ -14,8 +14,8 @@
 import ru.cwcode.tkach.config.relocate.com.fasterxml.jackson.annotation.JsonTypeInfo;
 import ru.cwcode.tkach.locale.Placeholder;
 import ru.cwcode.tkach.locale.Placeholders;
-import ru.cwcode.tkach.locale.platform.MiniLocale;
 import ru.cwcode.tkach.refreshmenu.MenuContext;
+import ru.cwcode.tkach.refreshmenu.Utils;
 import ru.cwcode.tkach.refreshmenu.inventory.ingredient.Ingredient;
 import ru.cwcode.tkach.refreshmenu.inventory.shape.InventoryShape;
 import ru.cwcode.tkach.refreshmenu.inventory.view.drawer.AbstractDrawer;
@@ -87,7 +87,7 @@ public void drawInventory(Player player) {
   }
 
   public void updateInventoryTitle(Player player) {
-    PacketListener.setInventoryTitle(player, MiniLocale.getInstance().miniMessageWrapper().deserialize(shape.getName(), getPlaceholders()));
+    PacketListener.setInventoryTitle(player, Utils.deserialize(shape.getName(), getPlaceholders()));
   }
 
   public void setState(String state, String value) {