Removes disableMaterialLimitation

Removes the disableMaterialLimitation option
Replaces EnchantmentTarget.BREAKABLE.includes(item) with getMaxDurability(item) > 0 as it seems more generic

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

@@ -49,15 +49,7 @@ public enum GlobalSetting {
      * The cost for repairing a damaged anvil
      */
     ANVIL_DAMAGED_COST("global.damagedAnvilReforgingCost", SettingValueType.POSITIVE_DOUBLE, 20.0,
-            "damagedAnvilReforgingCost"),
+            "damagedAnvilReforgingCost");
-
-    /**
-     * Whether to disable the normal limitation for which items are reforgeAble
-     *
-     * <p>If true, all items instanceof Damageable can be reforged</p>
-     */
-    DISABLE_MATERIAL_LIMITATION("global.disableMaterialLimitation", SettingValueType.BOOLEAN, false,
-            "disableMaterialLimitation");
 
     private final String path;
     private final String parent;

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

@@ -295,15 +295,6 @@ public class GlobalSettings {
         }
     }
 
-    /**
-     * Whether to disable the "EnchantmentTarget.BREAKABLE" limitation
-     *
-     * @return <p>True if the material limitation is disabled</p>
-     */
-    public boolean disableMaterialLimitation() {
-        return asBoolean(GlobalSetting.DISABLE_MATERIAL_LIMITATION);
-    }
-
     /**
      * Gets the given value as a boolean
      *

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

@@ -460,8 +460,7 @@ public class NPCSettings {
             }
 
             Material material = InputParsingHelper.matchMaterial(item);
-            boolean limitationDisabled = BlacksmithPlugin.getInstance().getSettings().disableMaterialLimitation();
+            if (material != null && ItemHelper.isRepairable(new ItemStack(material, 1))) {
-            if (material != null && ItemHelper.isRepairable(new ItemStack(material, 1), limitationDisabled)) {
                 if (!blacklist) {
                     reforgeAbleItems.add(material);
                 } else {

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

@@ -179,8 +179,7 @@ public class BlacksmithTrait extends Trait {
         List<Material> reforgeAbleItems = config.getReforgeAbleItems();
 
         boolean notHoldingAnvil = !this.config.getRepairAnvils() || !ItemHelper.isAnvil(hand.getType(), false);
-        boolean limitationDisabled = BlacksmithPlugin.getInstance().getSettings().disableMaterialLimitation();
+        boolean notHoldingRepairable = !ItemHelper.isRepairable(hand) ||
-        boolean notHoldingRepairable = !ItemHelper.isRepairable(hand, limitationDisabled) ||
                 (!reforgeAbleItems.isEmpty() && !reforgeAbleItems.contains(hand.getType()));
 
         if (notHoldingAnvil && notHoldingRepairable) {

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

@@ -1,7 +1,6 @@
 package net.knarcraft.blacksmith.util;
 
 import org.bukkit.Material;
-import org.bukkit.enchantments.EnchantmentTarget;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
 
@@ -21,12 +20,10 @@ public final class ItemHelper {
      * Gets whether the given item is repairable
      *
      * @param item <p>The item to check</p>
-     * @param disableMaterialLimitation <p>Whether to disable the EnchantmentTarget.BREAKABLE limitation</p>
      * @return <p>True if the item is repairable</p>
      */
-    public static boolean isRepairable(ItemStack item, boolean disableMaterialLimitation) {
+    public static boolean isRepairable(ItemStack item) {
-        return item.getItemMeta() instanceof Damageable && (disableMaterialLimitation ||
+        return item.getItemMeta() instanceof Damageable && getMaxDurability(item) > 0;
-                EnchantmentTarget.BREAKABLE.includes(item));
     }
 
     /**
@@ -79,7 +76,7 @@ public final class ItemHelper {
         List<Material> reforgeAbleMaterials = new ArrayList<>();
         for (Material material : Material.values()) {
             ItemStack item = new ItemStack(material);
-            if (item.getItemMeta() instanceof Damageable && EnchantmentTarget.BREAKABLE.includes(item)) {
+            if (isRepairable(item)) {
                 reforgeAbleMaterials.add(material);
             }
         }

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

@@ -26,13 +26,11 @@ public final class SalvageHelper {
      * @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>
-     * @param limitationDisabled <p>Whether the repairable item limitation is disabled</p>
      * @return <p>The items to return to the user, or null if not salvageable</p>
      */
-    public static List<ItemStack> getSalvage(Server server, ItemStack salvagedItem, List<Material> ignoredSalvage,
+    public static List<ItemStack> getSalvage(Server server, ItemStack salvagedItem, List<Material> ignoredSalvage) {
-                                             boolean limitationDisabled) {
         if (salvagedItem == null || salvagedItem.getAmount() < 1 ||
-                !ItemHelper.isRepairable(salvagedItem, limitationDisabled)) {
+                !ItemHelper.isRepairable(salvagedItem)) {
             return null;
         }
 

src/main/resources/config.yml

@@ -34,10 +34,6 @@ global:
   # The cost of fully repairing a damaged anvil
   damagedAnvilReforgingCost: 20.0
 
-  # This disables the EnchantmentTarget.BREAKABLE limitation. If set to true, all items able to have durability are seen
-  #  as reforgeAble. This should not be set to true unless you have special needs.
-  disableMaterialLimitation: false
-
 # The settings which are set to any new NPC. To change any of these settings for an existing NPC, you must change the 
 #  Citizens NPC file, or use the /blacksmith command
 defaults:

src/test/java/net/knarcraft/blacksmith/util/ItemHelperTest.java

@@ -4,11 +4,11 @@ import be.seeseemelk.mockbukkit.MockBukkit;
 import net.knarcraft.blacksmith.CustomServerMock;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.Damageable;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -36,27 +36,17 @@ public class ItemHelperTest {
                     name.endsWith("_HELMET") || name.equals("ELYTRA") || name.endsWith("BOW") ||
                     name.endsWith("_LEGGINGS") || name.endsWith("_BOOTS") || name.equals("TRIDENT") ||
                     name.equals("FISHING_ROD") || name.equals("FLINT_AND_STEEL") || name.equals("SHEARS")) {
-                assertTrue(ItemHelper.isRepairable(new ItemStack(material, 1), false));
+                assertTrue(ItemHelper.isRepairable(new ItemStack(material, 1)));
             }
         }
-        assertFalse(ItemHelper.isRepairable(new ItemStack(Material.POTATO, 1), false));
+        assertFalse(ItemHelper.isRepairable(new ItemStack(Material.POTATO, 1)));
-        assertFalse(ItemHelper.isRepairable(new ItemStack(Material.DIRT, 1), false));
+        assertFalse(ItemHelper.isRepairable(new ItemStack(Material.DIRT, 1)));
     }
 
     @Test
-    public void isRepairableLimitDisabledTest() {
+    public void getMaxDurabilityTest() {
-        /*The assertFalse pert of this test is kind of pointless, as every material in the game seems to implement
+        assertEquals(1561, ItemHelper.getMaxDurability(new ItemStack(Material.DIAMOND_PICKAXE, 1)));
-        Damageable */
+        assertEquals(0, ItemHelper.getMaxDurability(new ItemStack(Material.POTATO, 1)));
-        for (Material material : Material.values()) {
-            ItemStack itemStack = new ItemStack(material, 1);
-            if (new ItemStack(material, 1).getItemMeta() instanceof Damageable) {
-                assertTrue(ItemHelper.isRepairable(itemStack, true));
-            } else {
-                assertFalse(ItemHelper.isRepairable(itemStack, true));
-            }
-        }
-        assertTrue(ItemHelper.isRepairable(new ItemStack(Material.POTATO, 1), true));
-        assertTrue(ItemHelper.isRepairable(new ItemStack(Material.DIRT, 1), true));
     }
 
 }

src/test/java/net/knarcraft/blacksmith/util/SalvageHelperTest.java

@@ -40,14 +40,14 @@ public class SalvageHelperTest {
     @Test
     public void getNullForInvalidItemTest() {
         //Assert that a non-reforge-able item will return null
-        assertNull(SalvageHelper.getSalvage(server, new ItemStack(Material.POTATO, 1), null, false));
+        assertNull(SalvageHelper.getSalvage(server, new ItemStack(Material.POTATO, 1), null));
     }
 
     @Test
     public void getNullForLessThanOneItemTest() {
         //Assert that 0 or 1 items will return null
-        assertNull(SalvageHelper.getSalvage(server, new ItemStack(Material.IRON_AXE, 0), null, false));
+        assertNull(SalvageHelper.getSalvage(server, new ItemStack(Material.IRON_AXE, 0), null));
-        assertNull(SalvageHelper.getSalvage(server, new ItemStack(Material.IRON_SWORD, -1), null, false));
+        assertNull(SalvageHelper.getSalvage(server, new ItemStack(Material.IRON_SWORD, -1), null));
     }
 
     @Test
@@ -57,7 +57,7 @@ public class SalvageHelperTest {
         expectedSalvage.add(new ItemStack(Material.STICK, 2));
         ItemStack itemToSalvage = new ItemStack(Material.DIAMOND_PICKAXE, 1);
         //Note: Conversion to sets makes sure the order doesn't matter
-        assertEquals(expectedSalvage, new HashSet<>(SalvageHelper.getSalvage(server, itemToSalvage, null, false)));
+        assertEquals(expectedSalvage, new HashSet<>(SalvageHelper.getSalvage(server, itemToSalvage, null)));
     }
 
     @Test
@@ -67,7 +67,7 @@ public class SalvageHelperTest {
         expectedSalvage.add(new ItemStack(Material.STICK, 14));
         ItemStack itemToSalvage = new ItemStack(Material.DIAMOND_PICKAXE, 7);
         //Note: Conversion to sets makes sure the order doesn't matter
-        assertEquals(expectedSalvage, new HashSet<>(SalvageHelper.getSalvage(server, itemToSalvage, null, false)));
+        assertEquals(expectedSalvage, new HashSet<>(SalvageHelper.getSalvage(server, itemToSalvage, null)));
     }
 
     @Test
@@ -82,7 +82,7 @@ public class SalvageHelperTest {
             damageable.setDamage(100);
         }
         itemToSalvage.setItemMeta(meta);
-        List<ItemStack> salvage = SalvageHelper.getSalvage(server, itemToSalvage, null, false);
+        List<ItemStack> salvage = SalvageHelper.getSalvage(server, itemToSalvage, null);
         //Assert that some items are given
         assertNotEquals(salvage, new ArrayList<>());
         //Assert that a damaged item won't give full salvage
@@ -102,7 +102,7 @@ public class SalvageHelperTest {
             damageable.setDamage(100);
         }
         itemToSalvage.setItemMeta(meta);
-        List<ItemStack> salvage = SalvageHelper.getSalvage(server, itemToSalvage, ignoredSalvage, false);
+        List<ItemStack> salvage = SalvageHelper.getSalvage(server, itemToSalvage, ignoredSalvage);
         //Assert that some items are given
         assertNotEquals(salvage, new ArrayList<>());
         //Assert that a damaged diamond pickaxe with sticks ignored returns 2 diamonds a salvage