support minecraft item name

Author: cyilin

src/main/java/cat/nyaa/HamsterEcoHelper/requisition/RequisitionCommands.java

@@ -137,7 +137,7 @@ public void Requisition(CommandSender sender, Arguments args) {
         }
 
         Player player = asPlayer(sender);
-        String itemName = args.next().toUpperCase();
+        String itemName = args.nextString().toUpperCase();
         ItemStack item = null;
         double unitPrice = args.nextDouble("#.##");
         int amount = args.nextInt();
@@ -155,13 +155,11 @@ public void Requisition(CommandSender sender, Arguments args) {
         if (itemName.equals("HAND")) {
             item = getItemInHand(sender).clone();
         } else {
-            try {
-                item = new ItemStack(Material.valueOf(itemName));
-            } catch (IllegalArgumentException e) {
-                msg(sender, "user.error.unknown_item", itemName);
-                return;
+            Material material = Utils.getMaterial(itemName);
+            if (material != null) {
+                item = new ItemStack(material);
             }
-            if (!ReflectionUtils.isValidItem(item)) {
+            if (item == null || !ReflectionUtils.isValidItem(item)) {
                 msg(sender, "user.error.unknown_item", itemName);
                 return;
             }

src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SearchCommands.java

@@ -2,11 +2,13 @@
 
 import cat.nyaa.HamsterEcoHelper.HamsterEcoHelper;
 import cat.nyaa.HamsterEcoHelper.I18n;
+import cat.nyaa.HamsterEcoHelper.utils.Utils;
 import cat.nyaa.HamsterEcoHelper.utils.database.tables.signshop.Sign;
 import cat.nyaa.HamsterEcoHelper.utils.database.tables.signshop.SignShop;
 import cat.nyaa.nyaacore.CommandReceiver;
 import cat.nyaa.nyaacore.LanguageRepository;
 import cat.nyaa.nyaacore.Message;
+import cat.nyaa.nyaacore.utils.ReflectionUtils;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
@@ -105,26 +107,14 @@ public void search(CommandSender sender, Arguments args) {
         boolean matchEnch = matchEnchOnly || advancedOption.contains("ench");
         final int rangeLimit = player == null ? -1 : args.argInt("r", args.argInt("range", -1));
         final Material materialLimit;
-        try {
-            if (itemLimit != null) {
-                int id;
-                try {
-                    id = Integer.parseInt(itemLimit);
-                } catch (NumberFormatException e) {
-                    id = -1;
-                }
-                if (id == -1) {
-                    materialLimit = Material.valueOf(itemLimit.toUpperCase());
-                } else {
-                    materialLimit = Material.getMaterial(id);
-                    if (materialLimit == null) throw new IllegalArgumentException();
-                }
-            } else {
-                materialLimit = null;
+        if (itemLimit != null) {
+            materialLimit = Utils.getMaterial(itemLimit);
+            if (materialLimit == null || materialLimit == Material.AIR || !ReflectionUtils.isValidItem(new ItemStack(materialLimit))) {
+                msg(sender, "user.error.unknown_item", itemLimit);
+                return;
             }
-        } catch (IllegalArgumentException e) {
-            msg(sender, "user.error.unknown_item", itemLimit);
-            return;
+        } else {
+            materialLimit = null;
         }
         while (args.top() != null) {
             keywords.add(args.next().toLowerCase());

src/main/java/cat/nyaa/HamsterEcoHelper/utils/Utils.java

@@ -2,25 +2,17 @@
 
 import cat.nyaa.HamsterEcoHelper.HamsterEcoHelper;
 import cat.nyaa.nyaacore.utils.InventoryUtils;
-import cat.nyaa.nyaacore.utils.ItemStackUtils;
-import cat.nyaa.nyaacore.utils.ReflectionUtils;
-import com.google.common.io.BaseEncoding;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.librazy.nyaautils_lang_checker.LangKey;
 import org.librazy.nyaautils_lang_checker.LangKeyType;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.function.Function;
-import java.util.zip.DataFormatException;
-import java.util.zip.Deflater;
-import java.util.zip.Inflater;
 
 public class Utils {
     public static final Random random = new Random();
@@ -97,4 +89,15 @@ public static String getItemName(ItemStack item) {
         }
         return itemName;
     }
+
+    @SuppressWarnings("deprecation")
+    public static Material getMaterial(String name) {
+        Material m = null;
+        if (name.toLowerCase().contains("minecraft:")) {
+            m = Bukkit.getServer().getUnsafe().getMaterialFromInternalName(name);
+        } else {
+            m = Material.matchMaterial(name);
+        }
+        return m;
+    }
 }