Adds some tests for the salvage helper

src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java

@@ -19,9 +19,12 @@ import net.knarcraft.knarlib.formatting.Translator;
 import net.knarcraft.knarlib.util.UpdateChecker;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
 
+import java.io.File;
 import java.util.logging.Level;
 
 /**
@@ -34,6 +37,22 @@ public class BlacksmithPlugin extends JavaPlugin {
     private static Translator translator;
     private static StringFormatter stringFormatter;
 
+    /**
+     * Constructor required for MockBukkit
+     */
+    @SuppressWarnings("unused")
+    public BlacksmithPlugin() {
+        super();
+    }
+
+    /**
+     * Constructor required for MockBukkit
+     */
+    @SuppressWarnings("unused")
+    protected BlacksmithPlugin(JavaPluginLoader loader, PluginDescriptionFile descriptionFile, File dataFolder, File file) {
+        super(loader, descriptionFile, dataFolder, file);
+    }
+
     /**
      * Gets an instance of the Blacksmith plugin
      *

src/main/java/net/knarcraft/blacksmith/config/NPCSettings.java

@@ -2,9 +2,9 @@ package net.knarcraft.blacksmith.config;
 
 import net.citizensnpcs.api.util.DataKey;
 import net.knarcraft.blacksmith.BlacksmithPlugin;
-import net.knarcraft.blacksmith.trait.BlacksmithTrait;
 import net.knarcraft.blacksmith.util.ConfigHelper;
 import net.knarcraft.blacksmith.util.InputParsingHelper;
+import net.knarcraft.blacksmith.util.ItemHelper;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
@@ -460,7 +460,7 @@ public class NPCSettings {
             }
 
             Material material = InputParsingHelper.matchMaterial(item);
-            if (material != null && BlacksmithTrait.isRepairable(new ItemStack(material, 1))) {
+            if (material != null && ItemHelper.isRepairable(new ItemStack(material, 1))) {
                 if (!blacklist) {
                     reforgeAbleItems.add(material);
                 } else {

src/main/java/net/knarcraft/blacksmith/trait/BlacksmithTrait.java

@@ -11,11 +11,9 @@ import net.knarcraft.blacksmith.util.ItemHelper;
 import net.knarcraft.knarlib.formatting.StringFormatter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.enchantments.EnchantmentTarget;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.Damageable;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -180,7 +178,7 @@ public class BlacksmithTrait extends Trait {
         //Refuse if not repairable, or if reforge-able items is set, but doesn't include the held item
         List<Material> reforgeAbleItems = config.getReforgeAbleItems();
         if ((!this.config.getRepairAnvils() || !ItemHelper.isAnvil(hand.getType(), false)) &&
-                (!isRepairable(hand) || (!reforgeAbleItems.isEmpty() && !reforgeAbleItems.contains(hand.getType())))) {
+                (!ItemHelper.isRepairable(hand) || (!reforgeAbleItems.isEmpty() && !reforgeAbleItems.contains(hand.getType())))) {
             String invalidMessage = StringFormatter.replacePlaceholder(config.getInvalidItemMessage(),
                     "{title}", config.getBlacksmithTitle());
             sendNPCMessage(this.npc, player, invalidMessage);
@@ -225,14 +223,4 @@ public class BlacksmithTrait extends Trait {
         player.getInventory().setItemInMainHand(null);
     }
 
-    /**
-     * Gets whether the given item is repairable
-     *
-     * @param item <p>The item to check</p>
-     * @return <p>True if the item is repairable</p>
-     */
-    public static boolean isRepairable(ItemStack item) {
-        return item.getItemMeta() instanceof Damageable && EnchantmentTarget.BREAKABLE.includes(item);
-    }
-
 }

src/main/java/net/knarcraft/blacksmith/util/ItemHelper.java

@@ -17,6 +17,16 @@ public final class ItemHelper {
 
     }
 
+    /**
+     * Gets whether the given item is repairable
+     *
+     * @param item <p>The item to check</p>
+     * @return <p>True if the item is repairable</p>
+     */
+    public static boolean isRepairable(ItemStack item) {
+        return item.getItemMeta() instanceof Damageable && EnchantmentTarget.BREAKABLE.includes(item);
+    }
+
     /**
      * Gets the max durability of an item
      *

src/main/java/net/knarcraft/blacksmith/util/SalvageHelper.java

@@ -1,8 +1,7 @@
 package net.knarcraft.blacksmith.util;
 
-import net.knarcraft.blacksmith.trait.BlacksmithTrait;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;
 import org.bukkit.inventory.ShapedRecipe;
@@ -24,17 +23,19 @@ public final class SalvageHelper {
      *
      * <p>Note: Only items craft-able in a crafting table are salvageable. Netherite gear is therefore not salvageable.</p>
      *
-     * @param salvagedItem <p>The item stack to salvage</p>
+     * @param server         <p>The server to get recipes from</p>
+     * @param salvagedItem   <p>The item stack to salvage</p>
+     * @param ignoredSalvage <p>Any material which should not be returned as part of the salvage.</p>
      * @return <p>The items to return to the user, or null if not salvageable</p>
      */
-    public static List<ItemStack> getSalvage(ItemStack salvagedItem) {
+    public static List<ItemStack> getSalvage(Server server, ItemStack salvagedItem, List<Material> ignoredSalvage) {
         if (salvagedItem == null || salvagedItem.getAmount() < 1 ||
-                !BlacksmithTrait.isRepairable(salvagedItem)) {
+                !ItemHelper.isRepairable(salvagedItem)) {
             return null;
         }
 
-        for (Recipe recipe : Bukkit.getServer().getRecipesFor(salvagedItem)) {
-            List<ItemStack> salvage = getRecipeSalvage(recipe, salvagedItem);
+        for (Recipe recipe : server.getRecipesFor(salvagedItem)) {
+            List<ItemStack> salvage = getRecipeSalvage(recipe, salvagedItem, ignoredSalvage);
             if (salvage != null) {
                 return salvage;
             }
@@ -46,11 +47,13 @@ public final class SalvageHelper {
     /**
      * Gets the salvage resulting from the given recipe and the given item
      *
-     * @param recipe       <p>The recipe to get salvage for</p>
-     * @param salvagedItem <p>The item to be salvaged</p>
+     * @param recipe         <p>The recipe to get salvage for</p>
+     * @param salvagedItem   <p>The item to be salvaged</p>
+     * @param ignoredSalvage <p>Any material which should not be returned as part of the salvage.</p>
      * @return <p>A list of items, or null if not a valid type of recipe</p>
      */
-    private static List<ItemStack> getRecipeSalvage(Recipe recipe, ItemStack salvagedItem) {
+    private static List<ItemStack> getRecipeSalvage(Recipe recipe, ItemStack salvagedItem,
+                                                    List<Material> ignoredSalvage) {
         List<ItemStack> ingredients;
         if (recipe instanceof ShapedRecipe shapedRecipe) {
             ingredients = getIngredients(shapedRecipe);
@@ -63,6 +66,11 @@ public final class SalvageHelper {
         //Make things easier by eliminating identical stacks
         ingredients = combineStacks(ingredients);
 
+        //Purge any ignored salvage to only calculate salvage using the remaining items
+        if (ignoredSalvage != null) {
+            ingredients.removeIf((item) -> ignoredSalvage.contains(item.getType()));
+        }
+
         //Make sure to give salvage for all items if a stack > 1 is provided
         List<ItemStack> salvage = new ArrayList<>();
         for (int i = 0; i < salvagedItem.getAmount(); i++) {