v1.5.0

Update CWConfig
Refactor component deserialize code to use collection-based methods, instead of loop

Author: KamikotoTkach

README.md

@@ -1,4 +1,4 @@
-# RefreshMenu 1.4.0
+# RefreshMenu 1.5.0
 #### Библиотека на меню для Paper
 
 
@@ -7,7 +7,7 @@
 <dependency>
   <groupId>ru.cwcode.tkach.refreshmenu</groupId>
   <artifactId>RefreshMenu</artifactId>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
   <scope>provided</scope>
 </dependency>
 ```

docs/readme.md

@@ -1,4 +1,4 @@
-# RefreshMenu 1.4.0
+# RefreshMenu 1.5.0
 #### Библиотека на меню для Paper
 ##### Инструкция для настройки конфигов
 

pom.xml

@@ -265,7 +265,7 @@
         <dependency>
             <groupId>ru.cwcode.tkach.config</groupId>
             <artifactId>PaperConfig</artifactId>
-            <version>2.1.0</version>
+            <version>2.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -1,5 +1,6 @@
 package ru.cwcode.tkach.refreshmenu;
 
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import ru.cwcode.tkach.locale.Placeholders;
 import ru.cwcode.tkach.locale.platform.MessagePreprocessor;
@@ -13,13 +14,11 @@ 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 Component deserialize(String string, Placeholders placeholders, Audience viewer, boolean disableItalic) {
+    return MINI_MESSAGE_WRAPPER.deserialize(MESSAGE_PREPROCESSOR.preprocess(string, viewer), placeholders, disableItalic);
   }
 
-  public static List<Component> deserialize(List<String> string, Placeholders placeholders) {
-    return string.stream().map(x -> deserialize(x, placeholders))
-                 .toList();
+  public static List<Component> deserialize(List<String> strings, Placeholders placeholders, Audience viewer, boolean disableItalic) {
+    return MINI_MESSAGE_WRAPPER.deserialize(MESSAGE_PREPROCESSOR.preprocess(strings, viewer), placeholders, disableItalic);
   }
 }

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

@@ -9,6 +9,7 @@
 import ru.cwcode.cwutils.items.ItemBuilder;
 import ru.cwcode.cwutils.items.ItemBuilderFactory;
 import ru.cwcode.tkach.locale.Placeholders;
+import ru.cwcode.tkach.refreshmenu.MenuContext;
 import ru.cwcode.tkach.refreshmenu.Utils;
 
 import java.util.List;
@@ -31,13 +32,11 @@ public HeadIngredient(String name, List<String> description, int amount, String
   }
 
   @Override
-  public ItemStack getItem(Placeholders placeholders) {
+  public ItemStack getItem(MenuContext context) {
     ItemBuilder item = ItemBuilderFactory.of(Material.PLAYER_HEAD);
 
-    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 (name != null) item.name(Utils.deserialize(name, context.view().getPlaceholders(), context.player(), true));
+    if (description != null) item.description(Utils.deserialize(description, context.view().getPlaceholders(), context.player(), true));
     if (amount != 0) item.amount(amount);
 
     if (texture != null) {

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

@@ -6,6 +6,7 @@
 import ru.cwcode.cwutils.items.ItemBuilder;
 import ru.cwcode.cwutils.items.ItemBuilderFactory;
 import ru.cwcode.tkach.locale.Placeholders;
+import ru.cwcode.tkach.refreshmenu.MenuContext;
 import ru.cwcode.tkach.refreshmenu.Utils;
 
 import java.util.List;
@@ -29,13 +30,11 @@ public IngredientImpl() {
   }
 
   @Override
-  public ItemStack getItem(Placeholders placeholders) {
+  public ItemStack getItem(MenuContext context) {
     ItemBuilder item = ItemBuilderFactory.of(type);
 
-    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 (name != null) item.name(Utils.deserialize(name, context.view().getPlaceholders(), context.player(), true));
+    if (description != null) item.description(Utils.deserialize(description, context.view().getPlaceholders(), context.player(), true));
     if (amount != 0) item.amount(amount);
     if (customModelData != 0) item.customModelData(customModelData);
 

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

@@ -127,7 +127,7 @@ public static ShapeBuilder defaultMultiShapeArtExtendedShape() {
 
 
   public Inventory createInventory(View view) {
-    return type.createInventory(view, Utils.deserialize(getName(), view.getPlaceholders()));
+    return type.createInventory(view, Utils.deserialize(getName(), view.getPlaceholders(), null, false));
    }
 
    /**

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

@@ -87,7 +87,7 @@ public void drawInventory(Player player) {
   }
 
   public void updateInventoryTitle(Player player) {
-    PacketListener.setInventoryTitle(player, Utils.deserialize(shape.getName(), getPlaceholders()));
+    PacketListener.setInventoryTitle(player, Utils.deserialize(shape.getName(), getPlaceholders(), player, false));
   }
 
   public void setState(String state, String value) {