1.7.7 shop菜单支持物品库 ID

Author: handy-git

src/main/java/cn/handyplus/menu/command/admin/GetItemCommand.java

@@ -1,6 +1,7 @@
 package cn.handyplus.menu.command.admin;
 
 import cn.handyplus.lib.command.IHandyCommandEvent;
+import cn.handyplus.lib.core.MapUtil;
 import cn.handyplus.lib.util.AssertUtil;
 import cn.handyplus.lib.util.BaseUtil;
 import cn.handyplus.lib.util.ItemStackUtil;
@@ -51,10 +52,10 @@ public void onCommand(CommandSender sender, Command cmd, String label, String[]
         } else {
             player = AssertUtil.notPlayer(sender, BaseUtil.getMsgNotColor("noPlayerFailureMsg"));
         }
-        Integer id = AssertUtil.isNumericToInt(args[1], BaseUtil.getMsgNotColor("getMenuItemMsg"));
+        Integer id = AssertUtil.isNumericToInt(args[1], BaseUtil.getMsgNotColor("getMenuItemMsg", MapUtil.of("id", args[1])));
         Optional<MenuItem> menuItem = MenuItemService.getInstance().findById(id);
         if (!menuItem.isPresent()) {
-            MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor("getMenuItemMsg"));
+            MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor("getMenuItemMsg", MapUtil.of("id", String.valueOf(id))));
             return;
         }
         ItemStack itemStack = ItemStackUtil.itemStackDeserialize(menuItem.get().getItemStack());

src/main/java/cn/handyplus/menu/core/MenuCore.java

@@ -15,25 +15,31 @@
 import cn.handyplus.menu.PlayerMenu;
 import cn.handyplus.menu.constants.CommandTypeEnum;
 import cn.handyplus.menu.constants.MenuConstants;
+import cn.handyplus.menu.enter.MenuItem;
 import cn.handyplus.menu.enter.MenuLimit;
 import cn.handyplus.menu.hook.PlaceholderApiUtil;
 import cn.handyplus.menu.hook.PlayerCurrencyUtil;
 import cn.handyplus.menu.hook.PlayerPointsUtil;
 import cn.handyplus.menu.hook.VaultUtil;
 import cn.handyplus.menu.inventory.MenuGui;
 import cn.handyplus.menu.param.MenuButtonParam;
+import cn.handyplus.menu.service.MenuItemService;
 import cn.handyplus.menu.service.MenuLimitService;
 import cn.handyplus.menu.util.MenuUtil;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * 菜单逻辑核心
@@ -384,7 +390,11 @@ private static boolean shopCheck(Player player, MenuButtonParam menuButtonParam)
             String[] shopMaterialStr = shopMaterial.split(":");
             String material = shopMaterialStr[0];
             String number = replaceInput(player, shopMaterialStr[1]);
-            ItemStack itemStack = ItemStackUtil.getItemByMaterial(material);
+            // 获取物品
+            ItemStack itemStack = getItemStack(player, material);
+            if (itemStack == null) {
+                return true;
+            }
             // 多经济处理
             if (currencyPrice > 0) {
                 replaceMap.put("${price}", String.valueOf(currencyPrice));
@@ -408,7 +418,11 @@ private static boolean shopCheck(Player player, MenuButtonParam menuButtonParam)
             String[] shopMaterialStr = shopMaterial.split(":");
             String material = shopMaterialStr[0];
             String number = replaceInput(player, shopMaterialStr[1]);
-            ItemStack itemStack = ItemStackUtil.getItemByMaterial(material);
+            // 获取物品
+            ItemStack itemStack = getItemStack(player, material);
+            if (itemStack == null) {
+                return true;
+            }
             Boolean rst = ItemStackUtil.removeItem(player, itemStack, Integer.valueOf(number), false);
             if (!rst) {
                 MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor("noItem"));
@@ -437,6 +451,34 @@ private static boolean shopCheck(Player player, MenuButtonParam menuButtonParam)
         return false;
     }
 
+    /**
+     * 获取物品
+     *
+     * @param player   玩家
+     * @param material 物品
+     * @return 物品
+     * @since 1.7.7
+     */
+    private static @Nullable ItemStack getItemStack(@NotNull Player player, @NotNull String material) {
+        ItemStack itemStack = null;
+        // 判断是否 物品库格式 [ID] 例如 [1]
+        if (material.startsWith("[") && material.endsWith("]")) {
+            String id = material.substring(1, material.length() - 1);
+            Optional<MenuItem> menuItem = MenuItemService.getInstance().findById(Integer.valueOf(id));
+            if (menuItem.isPresent()) {
+                itemStack = ItemStackUtil.itemStackDeserialize(menuItem.get().getItemStack());
+            }
+        } else {
+            itemStack = ItemStackUtil.getItemByMaterial(material);
+        }
+        // 判断是否为空
+        if (itemStack == null || Material.AIR.equals(itemStack.getType())) {
+            MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor("getMenuItemMsg", MapUtil.of("id", material)));
+            return null;
+        }
+        return itemStack;
+    }
+
     /**
      * 获取商品价格
      *