Implements enchantment salvage toggle #23

src/main/java/net/knarcraft/blacksmith/config/scrapper/ScrapperNPCSettings.java

@@ -188,7 +188,7 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
      * @return <p>Whether to drop reforged items on the ground</p>
      */
     public boolean getDropItem() {
-        return ConfigHelper.asBoolean(getValue(ScrapperSetting.DROP_ITEM));
+        return asBoolean(ScrapperSetting.DROP_ITEM);
     }
 
     @Override
@@ -228,6 +228,16 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
         return getValue(setting).toString();
     }
 
+    /**
+     * Gets the boolean value of the given setting
+     *
+     * @param setting <p>The setting to get the value of</p>
+     * @return <p>The value of the given setting as a boolean</p>
+     */
+    private boolean asBoolean(@NotNull ScrapperSetting setting) {
+        return ConfigHelper.asBoolean(getValue(setting));
+    }
+
     /**
      * Gets the value of a setting, using the default if not set
      *
@@ -275,7 +285,16 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
      * @return <p>True if extended salvaging is enabled</p>
      */
     public boolean extendedSalvageEnabled() {
-        return ConfigHelper.asBoolean(getValue(ScrapperSetting.EXTENDED_SALVAGE_ENABLED));
+        return asBoolean(ScrapperSetting.EXTENDED_SALVAGE_ENABLED);
+    }
+
+    /**
+     * Whether salvage of enchanted items is enabled
+     *
+     * @return <p>True of this scrapper can salvage enchanted items</p>
+     */
+    public boolean salvageEnchanted() {
+        return asBoolean(ScrapperSetting.SALVAGE_ENCHANTED);
     }
 
     /**
@@ -341,4 +360,15 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
         return asString(ScrapperSetting.PARTIAL_SALVAGE_MESSAGE);
     }
 
+
+    /**
+     * Gets the message to display when explaining that this scrapper is unable to salvage enchanted items
+     *
+     * @return <p>The cannot salvage enchanted message</p>
+     */
+    @NotNull
+    public String getCannotSalvageEnchantedMessage() {
+        return asString(ScrapperSetting.CANNOT_SALVAGE_ENCHANTED_MESSAGE);
+    }
+
 }

src/main/java/net/knarcraft/blacksmith/config/scrapper/ScrapperSetting.java

@@ -72,6 +72,13 @@ public enum ScrapperSetting implements Setting {
      */
     EXTENDED_SALVAGE_ENABLED("extendedSalvageEnabled", SettingValueType.BOOLEAN, false,
             "Whether to enable salvaging of non-repairable items, such as planks", true, false),
+
+    /**
+     * The setting for whether the NPC should allow salvaging of enchanted items
+     */
+    SALVAGE_ENCHANTED("salvageEnchanted", SettingValueType.BOOLEAN, false,
+            "Whether to enable salvaging of enchanted items. This is disabled by default because it's " +
+                    "possible to accidentally salvage items with very good enchantments.", true, false),
     
     /*-----------
      | Messages |
@@ -168,6 +175,10 @@ public enum ScrapperSetting implements Setting {
             "&cI cannot extract all components from that damaged item.&r",
             "The message to display when explaining expected partial yield as part of the cost message", true, true),
 
+    CANNOT_SALVAGE_ENCHANTED_MESSAGE("cannotSalvageEnchantedMessage", SettingValueType.STRING,
+            "&cI'm sorry, but I'm unable to salvage enchanted items!",
+            "The message to display when asked to salvage an enchanted item, and that option is disabled", true, true),
+
     /*------------------
      | Global settings |
      ------------------*/