diff --git a/src/main/java/me/blackvein/quests/ItemData.java b/src/main/java/me/blackvein/quests/ItemData.java deleted file mode 100644 index 8e9c1a332..000000000 --- a/src/main/java/me/blackvein/quests/ItemData.java +++ /dev/null @@ -1,19 +0,0 @@ -package me.blackvein.quests; - -import org.bukkit.Material; - -public class ItemData { - - public static Material getMaterial(String name) { - Material material = Material.matchMaterial(name); - if (material == null) { - name = name.toUpperCase().replace(" ", "_"); - for (Material mat : Material.values()) { - if (mat.toString().contains(name)) { - return mat; - } - } - } - return material; - } -} diff --git a/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java b/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java index c4644733d..ecdd2e869 100644 --- a/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import me.blackvein.quests.ItemData; import me.blackvein.quests.Quester; import me.blackvein.quests.Quests; import me.blackvein.quests.util.ColorUtil; @@ -249,12 +248,12 @@ public class ItemStackPrompt extends FixedSetPrompt implements ColorUtil { } } - Material mat = ItemData.getMaterial(input); + Material mat = Material.matchMaterial(input.toUpperCase().replace(" ", "_")); if (mat == null) { cc.getForWhom().sendRawMessage(RED + Lang.get("itemCreateInvalidName")); return new NamePrompt(); } else { - + System.out.println("name - " + mat.name()); cc.setSessionData("tempName", mat.name()); cc.setSessionData("tempAmount", 1);