From 5f0cc2b09a4bc5478753c92a6a9db19ba8c04ec9 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 11 Jun 2021 14:22:33 -0700
Subject: [PATCH] Fix Smelting not recognizing the new 1.17 smeltables (like
 raw ores)

---
 .../java/com/gmail/nossr50/listeners/InventoryListener.java | 3 +--
 src/main/java/com/gmail/nossr50/locale/LocaleLoader.java    | 4 ++--
 .../java/com/gmail/nossr50/skills/smelting/Smelting.java    | 6 ++++--
 .../com/gmail/nossr50/skills/smelting/SmeltingManager.java  | 2 +-
 src/main/java/com/gmail/nossr50/util/ItemUtils.java         | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
index df4dd6e78..ba80e7ab8 100644
--- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
@@ -66,8 +66,7 @@ public class InventoryListener implements Listener {
                 }
 
                 //Profile doesn't exist
-                if(UserManager.getOfflinePlayer(offlinePlayer) == null)
-                {
+                if(UserManager.getOfflinePlayer(offlinePlayer) == null) {
                     return;
                 }
 
diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
index 0fed62f4f..7f0630165 100644
--- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
+++ b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
@@ -57,7 +57,7 @@ public final class LocaleLoader {
      *
      * @return The properly formatted text component
      */
-    public static TextComponent getTextComponent(String key, Object... messageArguments) {
+    public static @NotNull TextComponent getTextComponent(@NotNull String key, Object... messageArguments) {
         if (bundle == null) {
             initialize();
         }
@@ -113,7 +113,7 @@ public final class LocaleLoader {
         return string;
     }
 
-    public static TextComponent formatComponent(String string, Object... messageArguments) {
+    public static @NotNull TextComponent formatComponent(@NotNull String string, Object... messageArguments) {
         if (messageArguments != null) {
             MessageFormat formatter = new MessageFormat("");
             formatter.applyPattern(string.replace("'", "''"));
diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java
index c6bbccac1..d1367a030 100644
--- a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java
+++ b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java
@@ -4,10 +4,12 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 public class Smelting {
 
-    protected static int getResourceXp(ItemStack smelting) {
-        return mcMMO.getModManager().isCustomOre(smelting.getType()) ? mcMMO.getModManager().getBlock(smelting.getType()).getSmeltingXpGain() : ExperienceConfig.getInstance().getXp(PrimarySkillType.SMELTING, smelting.getType());
+    public static int getSmeltXP(@NotNull ItemStack smelting) {
+        return ExperienceConfig.getInstance().getXp(PrimarySkillType.SMELTING, smelting.getType());
     }
+
 }
diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
index e30100723..90ece98cf 100644
--- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
@@ -113,7 +113,7 @@ public class SmeltingManager extends SkillManager {
     }
 
     public void smeltProcessing(@NotNull FurnaceSmeltEvent furnaceSmeltEvent, @NotNull Furnace furnace) {
-        applyXpGain(Smelting.getResourceXp(furnaceSmeltEvent.getSource()), XPGainReason.PVE, XPGainSource.PASSIVE); //Add XP
+        applyXpGain(Smelting.getSmeltXP(furnaceSmeltEvent.getSource()), XPGainReason.PVE, XPGainSource.PASSIVE); //Add XP
 
         processDoubleSmelt(furnaceSmeltEvent, furnace);
     }
diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java
index 2c66ff84f..d2a69fa14 100644
--- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java
@@ -6,6 +6,7 @@ import com.gmail.nossr50.datatypes.treasure.EnchantmentWrapper;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasureBook;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.smelting.Smelting;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -340,7 +341,7 @@ public final class ItemUtils {
     }
 
     public static boolean isSmeltable(ItemStack item) {
-        return item != null && item.getType().isBlock() && MaterialUtils.isOre(item.getType());
+        return item != null && Smelting.getSmeltXP(item) >= 1;
     }
 
     public static boolean isSmelted(ItemStack item) {