Merge branch 'release/1.0.3.3'

Author: Maxlego08

changelog.md

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08</groupId>
   <artifactId>zmenu</artifactId>
-  <version>1.0.3.2</version>
+  <version>1.0.3.3</version>
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fr.maxlego08</groupId>
     <artifactId>zmenu</artifactId>
-    <version>1.0.3.2</version>
+    <version>1.0.3.3</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>

pom.xml

@@ -16,7 +16,6 @@
 import fr.maxlego08.menu.zcore.utils.ZUtils;
 import fr.maxlego08.menu.zcore.utils.attribute.AttributeApplier;
 import fr.maxlego08.menu.zcore.utils.meta.Meta;
-import fr.maxlego08.menu.zcore.utils.nms.NMSUtils;
 import fr.maxlego08.menu.zcore.utils.nms.NmsVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
@@ -59,6 +58,8 @@ public class MenuItemStack extends ZUtils {
     private List<String> lore = new ArrayList<>();
     private List<ItemFlag> flags = new ArrayList<>();
     private String displayName;
+    private Map<String, String> translatedDisplayName = new HashMap<>();
+    private Map<String, List<String>> translatedLore = new HashMap<>();
     private boolean isGlowing;
     private String modelID;
     private Map<Enchantment, Integer> enchantments = new HashMap<>();
@@ -236,22 +237,25 @@ public ItemStack build(Player player, boolean useCache, Placeholders placeholder
 
         Material finalMaterial = itemStack.getType();
         ItemMeta itemMeta = itemStack.getItemMeta();
+        String locale = findPlayerLocale(player);
 
         if (itemMeta != null) {
             if (this.displayName != null) {
                 try {
-                    Meta.meta.updateDisplayName(itemMeta, placeholders.parse(this.displayName), offlinePlayer == null ? player : offlinePlayer);
+                    String displayName = locale == null ? this.displayName : this.translatedDisplayName.getOrDefault(locale, this.displayName);
+                    Meta.meta.updateDisplayName(itemMeta, placeholders.parse(displayName), offlinePlayer == null ? player : offlinePlayer);
                 } catch (Exception exception) {
                     Logger.info("Error with update display name for item " + path + " in file " + filePath + " (" + player + ", " + this.displayName + ")", Logger.LogType.ERROR);
                     exception.printStackTrace();
                 }
             }
 
             if (!this.lore.isEmpty()) {
-                Meta.meta.updateLore(itemMeta, placeholders.parse(this.lore), offlinePlayer == null ? player : offlinePlayer);
+                List<String> lore = locale == null ? this.lore : this.translatedLore.getOrDefault(locale, this.lore);
+                Meta.meta.updateLore(itemMeta, placeholders.parse(lore), offlinePlayer == null ? player : offlinePlayer);
             }
 
-            if (this.isGlowing && NMSUtils.getNMSVersion() != 1.7) {
+            if (this.isGlowing) {
 
                 itemMeta.addEnchant(Enchantment.ARROW_DAMAGE, 1, true);
                 itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
@@ -739,4 +743,20 @@ private List<Color> getColors(MapConfiguration section, String key) {
 
         return colors;
     }
+
+    public Map<String, String> getTranslatedDisplayName() {
+        return translatedDisplayName;
+    }
+
+    public void setTranslatedDisplayName(Map<String, String> translatedDisplayName) {
+        this.translatedDisplayName = translatedDisplayName;
+    }
+
+    public Map<String, List<String>> getTranslatedLore() {
+        return translatedLore;
+    }
+
+    public void setTranslatedLore(Map<String, List<String>> translatedLore) {
+        this.translatedLore = translatedLore;
+    }
 }

src/fr/maxlego08/menu/MenuItemStack.java

@@ -127,7 +127,7 @@ public void onEnable() {
             files.forEach(filePath -> {
                 if (!new File(this.getDataFolder(), filePath).exists()) {
 
-                    if (NMSUtils.isNewVersion()) {
+                    if (NmsVersion.nmsVersion.isNewMaterial()) {
                         saveResource(filePath.replace("inventories/", "inventories/1_13/"), filePath, false);
                     } else {
                         saveResource(filePath, false);

src/fr/maxlego08/menu/MenuPlugin.java

@@ -11,13 +11,15 @@ public class ZCommandArgument implements CommandArgument {
     private final String argument;
     private final String inventory;
     private final boolean isRequired;
+    private final boolean performMainAction;
     private final List<Action> actions;
     private final List<String> autoCompletion;
 
-    public ZCommandArgument(String argument, String inventory, boolean isRequired, List<Action> actions, List<String> autoCompletion) {
+    public ZCommandArgument(String argument, String inventory, boolean isRequired, boolean performMainAction, List<Action> actions, List<String> autoCompletion) {
         this.argument = argument;
         this.inventory = inventory;
         this.isRequired = isRequired;
+        this.performMainAction = performMainAction;
         this.actions = actions;
         this.autoCompletion = autoCompletion;
     }
@@ -37,6 +39,11 @@ public List<String> getAutoCompletion() {
         return this.autoCompletion;
     }
 
+    @Override
+    public boolean isPerformMainActions() {
+        return this.performMainAction;
+    }
+
     @Override
     public String getArgument() {
         return argument;

src/fr/maxlego08/menu/ZCommandArgument.java

@@ -20,7 +20,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -31,6 +33,7 @@ public class ZInventory extends ZUtils implements Inventory {
     private final String fileName;
     private final int size;
     private final List<Button> buttons;
+    private Map<String, String> translatedNames = new HashMap<>();
     private List<Pattern> patterns;
     private MenuItemStack fillItemStack;
     private int updateInterval;
@@ -65,6 +68,12 @@ public String getName() {
         return this.name;
     }
 
+    @Override
+    public String getName(Player player) {
+        String locale = findPlayerLocale(player);
+        return locale == null ? this.name : this.translatedNames.getOrDefault(locale, this.name);
+    }
+
     @Override
     public String getFileName() {
         return this.fileName;
@@ -238,6 +247,11 @@ public void setOpenWithItem(OpenWithItem openWithItem) {
         this.openWithItem = openWithItem;
     }
 
+    @Override
+    public Map<String, String> getTranslatedName() {
+        return this.translatedNames;
+    }
+
     public void setClearInventory(boolean clearInventory) {
         this.clearInventory = clearInventory;
     }
@@ -250,4 +264,8 @@ public List<Pattern> getPatterns() {
     public void setPatterns(List<Pattern> patterns) {
         this.patterns = patterns;
     }
+
+    public void setTranslatedNames(Map<String, String> translatedNames) {
+        this.translatedNames = translatedNames;
+    }
 }

src/fr/maxlego08/menu/ZInventory.java

@@ -13,6 +13,7 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * The `Inventory` interface defines the structure and behavior of inventory-related operations.
@@ -37,6 +38,13 @@ public interface Inventory {
      */
     String getName();
 
+    /**
+     * Returns the translated name of the inventory.
+     *
+     * @return The name of the inventory.
+     */
+    String getName(Player player);
+
     /**
      * Returns the name of the file associated with the inventory.
      *
@@ -179,4 +187,6 @@ public interface Inventory {
      * @return The OpenWithItem
      */
     OpenWithItem getOpenWithItem();
+
+    Map<String, String> getTranslatedName();
 }

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

@@ -13,14 +13,14 @@ public interface CommandArgument {
     /**
      * Gets the command argument.
      *
-     * @return The command argument.
+     * @return The command argument as a String.
      */
     String getArgument();
 
     /**
      * Gets the name of the inventory to open with the argument.
      *
-     * @return The optional name of the inventory associated with the argument.
+     * @return An Optional containing the name of the inventory associated with the argument if present, otherwise an empty Optional.
      */
     Optional<String> getInventory();
 
@@ -31,7 +31,24 @@ public interface CommandArgument {
      */
     boolean isRequired();
 
+    /**
+     * Gets the list of actions associated with this command argument.
+     *
+     * @return A list of Action objects associated with the argument.
+     */
     List<Action> getActions();
 
+    /**
+     * Gets a list of strings that can be used for auto-completion of this argument.
+     *
+     * @return A list of strings that can be used to auto-complete the argument.
+     */
     List<String> getAutoCompletion();
+
+    /**
+     * Checks if the main actions should be performed when this argument is used.
+     *
+     * @return {@code true} if the main actions should be performed, otherwise {@code false}.
+     */
+    boolean isPerformMainActions();
 }

src/fr/maxlego08/menu/api/command/CommandArgument.java

@@ -96,14 +96,20 @@ protected CommandType perform(MenuPlugin plugin) {
             }
         }
 
+        boolean performMainActions = lastArgument == null || lastArgument.isPerformMainActions();
+
         InventoryDefault inventoryDefault = new InventoryDefault();
         inventoryDefault.setPlugin(plugin);
-        this.command.getActions().forEach(action -> action.preExecute(player, null, inventoryDefault, placeholders));
+
+
         if (lastArgument != null) {
             lastArgument.getActions().forEach(action -> action.preExecute(player, null, inventoryDefault, placeholders));
         }
 
-        optional.ifPresent(inventory -> manager.openInventory(this.player, inventory));
+        if (performMainActions) {
+            this.command.getActions().forEach(action -> action.preExecute(player, null, inventoryDefault, placeholders));
+            optional.ifPresent(inventory -> manager.openInventory(this.player, inventory));
+        }
 
         return CommandType.SUCCESS;
     }