From 31e4b8b5d413230babb29f8378211f5bcbcabfd2 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Mon, 8 Nov 2021 10:41:34 +0000
Subject: [PATCH] Added eco item lookup syntax to crystals and shards

---
 .../src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java      | 4 +++-
 .../src/main/java/com/willfp/ecoarmor/upgrades/Tier.java      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
index 0d0f8e6..1187c31 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
@@ -6,6 +6,7 @@ import com.willfp.eco.core.config.interfaces.JSONConfig;
 import com.willfp.eco.core.display.Display;
 import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.core.items.CustomItem;
+import com.willfp.eco.core.items.Items;
 import com.willfp.eco.core.items.builder.ItemBuilder;
 import com.willfp.eco.core.items.builder.ItemStackBuilder;
 import com.willfp.eco.core.items.builder.LeatherArmorBuilder;
@@ -37,6 +38,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -176,7 +178,7 @@ public class ArmorSet {
         List<String> shardLore = this.getConfig().getStrings("advancementShardLore");
         shardLore.replaceAll(s -> Display.PREFIX + s);
 
-        ItemStack shard = new ItemStackBuilder(Objects.requireNonNull(Material.getMaterial(this.getPlugin().getConfigYml().getString("advancement-shard-material").toUpperCase())))
+        ItemStack shard = new ItemStackBuilder(Items.lookup(this.getPlugin().getConfigYml().getString("advancement-shard-material").toLowerCase()).getItem())
                 .setDisplayName(this.getConfig().getString("advancementShardName"))
                 .addEnchantment(Enchantment.DURABILITY, 3)
                 .addItemFlag(ItemFlag.HIDE_ENCHANTS)
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
index 8c1b0ba..49299d3 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
@@ -102,7 +102,7 @@ public class Tier extends PluginDependent<EcoPlugin> {
         this.requiredTiersForApplication = this.getConfig().getStrings("requiresTiers");
         NamespacedKey key = this.getPlugin().getNamespacedKeyFactory().create("upgrade_crystal");
 
-        ItemStack out = new ItemStack(Objects.requireNonNull(Material.getMaterial(this.getPlugin().getConfigYml().getString("upgrade-crystal-material").toUpperCase())));
+        ItemStack out = Items.lookup(this.getPlugin().getConfigYml().getString("upgrade-crystal-material").toLowerCase()).getItem();
         ItemMeta outMeta = out.getItemMeta();
         assert outMeta != null;
         PersistentDataContainer container = outMeta.getPersistentDataContainer();