diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/command/CommandTalismans.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/command/CommandTalismans.java index 3dd27b5..4ba1611 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/command/CommandTalismans.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/command/CommandTalismans.java @@ -15,7 +15,7 @@ public class CommandTalismans extends PluginCommand { super(plugin, "talismans", "talismans.command.talismans", false); this.addSubcommand(new CommandReload(plugin)) - .addSubcommand(new CommandGive(plugin)); + .addSubcommand(new CommandGive(plugin)); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java index 558db15..57b7fb0 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java @@ -5,7 +5,9 @@ import com.willfp.eco.core.config.interfaces.Config; import com.willfp.eco.core.display.Display; import com.willfp.eco.core.items.CustomItem; import com.willfp.eco.core.items.Items; +import com.willfp.eco.core.items.TestableItem; import com.willfp.eco.core.items.builder.ItemStackBuilder; +import com.willfp.eco.core.recipe.parts.EmptyTestableItem; import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe; import com.willfp.eco.util.StringUtils; import com.willfp.talismans.TalismansPlugin; @@ -153,9 +155,9 @@ public class TalismanLevel { skullBase64 = config.getString(Talismans.GENERAL_LOCATION + "texture"); Integer data = config.getIntOrNull(Talismans.GENERAL_LOCATION + "custom-model-data"); customModelData = data == null || data == -1 ? null : data; - Material material = Material.getMaterial(config.getString(Talismans.GENERAL_LOCATION + "material").toUpperCase()); - Validate.notNull(material, "Material specified for " + this.getKey().getKey() + " is invalid!"); - TalismanUtils.registerTalismanMaterial(material); + TestableItem item = Items.lookup(config.getString(Talismans.GENERAL_LOCATION + "material")); + Validate.isTrue(!(item instanceof EmptyTestableItem), "Material specified for " + this.getKey().getKey() + " is invalid!"); + TalismanUtils.registerTalismanMaterial(item.getItem().getType()); formattedDescription = Arrays.stream( WordUtils.wrap(description, this.getPlugin().getConfigYml().getInt("description.wrap"), "\n", false) @@ -164,7 +166,7 @@ public class TalismanLevel { craftable = config.getBool(Talismans.OBTAINING_LOCATION + "craftable"); - ItemStack out = new ItemStackBuilder(material) + ItemStack out = new ItemStackBuilder(item.getItem()) .setAmount(1) .writeMetaKey(this.getTalisman().getKey(), PersistentDataType.INTEGER, this.getLevel()) .setCustomModelData(data) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java index 95cbcd9..76fce23 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java @@ -30,7 +30,6 @@ import java.text.DecimalFormat; import java.util.Set; import java.util.UUID; -@SuppressWarnings("deprecation") public class WatcherTriggers extends PluginDependent implements Listener { /** * Create new listener for watcher events.