Fixes some savage fail problems

Fixes item not being returned when salvage fails
Removes some redundancy when giving back items
Makes extended salvage return 50% of the salvage (no items if only one item would be returned)
Adds a better message when failing to salvage extended salvage items
Fixes a bug in the caching of smith presets

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

@@ -46,7 +46,7 @@ public enum SmithPreset {
 
     private final SmithPresetFilter[] filters;
     private static final Map<SmithPreset, Set<String>> presetMaterialNames = new HashMap<>();
-    private static final Map<SmithPresetFilter, Set<String>> filterMaterialNames = new HashMap<>();
+    private static final Map<SmithPreset, Map<SmithPresetFilter, Set<String>>> filterMaterialNames = new HashMap<>();
     private static Set<Material> armor = null;
     private static Set<Material> ranged = null;
     private static Set<Material> weapons = null;
@@ -145,8 +145,8 @@ public enum SmithPreset {
                 materialNames = presetMaterialNames.get(preset);
             }
         } else {
-            if (filterMaterialNames.containsKey(filter)) {
-                materialNames = filterMaterialNames.get(filter);
+            if (filterMaterialNames.containsKey(preset) && filterMaterialNames.get(preset).containsKey(filter)) {
+                materialNames = filterMaterialNames.get(preset).get(filter);
             }
         }
 
@@ -154,7 +154,8 @@ public enum SmithPreset {
         if (materialNames == null) {
             if (filter != null) {
                 materialNames = preset.getMaterialNames(filter);
-                filterMaterialNames.put(filter, materialNames);
+                filterMaterialNames.putIfAbsent(preset, new HashMap<>());
+                filterMaterialNames.get(preset).put(filter, materialNames);
             } else {
                 materialNames = preset.getMaterialNames();
                 presetMaterialNames.put(preset, materialNames);

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

@@ -127,10 +127,20 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
      * @return <p>The salvage fail message</p>
      */
     @NotNull
-    public String getFailMessage() {
+    public String getFailSalvageMessage() {
         return asString(ScrapperSetting.FAIL_SALVAGE_MESSAGE);
     }
 
+    /**
+     * Gets the message to display when a scrapper fails to salvage an item without durability
+     *
+     * @return <p>The extended salvage fail message</p>
+     */
+    @NotNull
+    public String getFailExtendedSalvageMessage() {
+        return asString(ScrapperSetting.FAIL_SALVAGE_EXTENDED_MESSAGE);
+    }
+
     /**
      * Gets the message to use for displaying salvage cost
      *

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

@@ -146,6 +146,13 @@ public enum ScrapperSetting implements Setting {
             "next time?", "The message to display when a scrapper fails to salvage an item because of the " +
             "fail chance.", true, true),
 
+    /**
+     * The message displayed if a salvage of an item without durability is unsuccessful
+     */
+    FAIL_SALVAGE_EXTENDED_MESSAGE("failExtendedSalvageMessage", SettingValueType.STRING,
+            "&cWhoops! I was unable to extract much, if any, salvage! Maybe next time?",
+            "The message to display when the scrapper fails to salvage an item without durability", true, true),
+
     /**
      * The message displayed if a player presents a different item after seeing the price to reforge an item
      */