Updates KnarLib and Spigot

# Conflicts:
#	src/main/java/net/knarcraft/blacksmith/BlacksmithPlugin.java
#	src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java
#	src/main/java/net/knarcraft/blacksmith/formatting/BlacksmithStringFormatter.java
#	src/main/java/net/knarcraft/blacksmith/trait/SalvageSession.java
#	src/main/java/net/knarcraft/blacksmith/trait/ScrapperTrait.java

pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.6-R0.1-SNAPSHOT</version>
+            <version>1.21.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>net.knarcraft</groupId>
             <artifactId>knarlib</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.18</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -92,6 +92,11 @@
             <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.objecthunter</groupId>
+            <artifactId>exp4j</artifactId>
+            <version>0.4.8</version>
+        </dependency>
     </dependencies>
 
     <!-- Build information -->
@@ -127,6 +132,10 @@
                                     <pattern>org.jetbrains.annotations</pattern>
                                     <shadedPattern>net.knarcraft.blacksmith.lib.annotations</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>net.objecthunter.exp4j</pattern>
+                                    <shadedPattern>net.knarcraft.blacksmith.lib.exp4j</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
@@ -141,6 +150,12 @@
                                         <include>org/jetbrains/annotations/**</include>
                                     </includes>
                                 </filter>
+                                <filter>
+                                    <artifact>net.objecthunter:exp4j</artifact>
+                                    <includes>
+                                        <include>net/objecthunter/exp4j/**</include>
+                                    </includes>
+                                </filter>
                             </filters>
                         </configuration>
                     </execution>

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

@@ -13,49 +13,42 @@ import net.knarcraft.blacksmith.command.scrapper.ScrapperConfigCommand;
 import net.knarcraft.blacksmith.command.scrapper.ScrapperConfigTabCompleter;
 import net.knarcraft.blacksmith.command.scrapper.ScrapperEditCommand;
 import net.knarcraft.blacksmith.command.scrapper.ScrapperEditTabCompleter;
-import net.knarcraft.blacksmith.config.StargateYamlConfiguration;
 import net.knarcraft.blacksmith.config.blacksmith.GlobalBlacksmithSettings;
 import net.knarcraft.blacksmith.config.scrapper.GlobalScrapperSettings;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
 import net.knarcraft.blacksmith.listener.NPCClickListener;
 import net.knarcraft.blacksmith.listener.PlayerListener;
 import net.knarcraft.blacksmith.manager.EconomyManager;
+import net.knarcraft.blacksmith.manager.PlayerUsageManager;
 import net.knarcraft.blacksmith.trait.BlacksmithTrait;
 import net.knarcraft.blacksmith.trait.ScrapperTrait;
-import net.knarcraft.blacksmith.util.ConfigHelper;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import net.knarcraft.knarlib.formatting.StringFormatter;
 import net.knarcraft.knarlib.formatting.TranslatableTimeUnit;
 import net.knarcraft.knarlib.formatting.Translator;
+import net.knarcraft.knarlib.plugin.ConfigCommentPlugin;
+import net.knarcraft.knarlib.util.ConfigHelper;
 import net.knarcraft.knarlib.util.UpdateChecker;
-import org.bukkit.command.CommandExecutor;
+import org.bukkit.Bukkit;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.Event;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.logging.Level;
 
 /**
  * Blacksmith's main class
  */
-public class BlacksmithPlugin extends JavaPlugin {
+public class BlacksmithPlugin extends ConfigCommentPlugin {
 
-    private static final String CONFIG_FILE_NAME = "config.yml";
     private static BlacksmithPlugin instance;
     private GlobalBlacksmithSettings blacksmithConfig;
     private GlobalScrapperSettings scrapperConfig;
     private static Translator translator;
-    private static StringFormatter stringFormatter;
-    private FileConfiguration configuration;
 
     /**
      * Constructor required for MockBukkit
@@ -108,29 +101,10 @@ public class BlacksmithPlugin extends JavaPlugin {
         this.reloadConfig();
         blacksmithConfig.load();
         scrapperConfig.load();
-        translator.loadLanguages(this.getDataFolder(), "en", this.getConfiguration().getString(
+        translator.loadLanguages(this.getDataFolder(), "en", this.getConfig().getString(
                 "language", "en"));
     }
 
-    /**
-     * Gets the raw configuration
-     *
-     * @return <p>The raw configuration</p>
-     */
-    @NotNull
-    public FileConfiguration getConfiguration() {
-        return this.configuration;
-    }
-
-    /**
-     * Gets the string formatter to use for formatting
-     *
-     * @return <p>The string formatter to use</p>
-     */
-    public static @NotNull StringFormatter getStringFormatter() {
-        return BlacksmithPlugin.stringFormatter;
-    }
-
     /**
      * Gets the translator to use for translation
      *
@@ -148,20 +122,13 @@ public class BlacksmithPlugin extends JavaPlugin {
     @Override
     public void onEnable() {
         instance = this;
-
+        ConfigHelper.saveDefaults(this);
-        //Copy default config to disk, and add missing configuration values
-        this.saveDefaultConfig();
-        this.getConfig().options().copyDefaults(true);
-        this.reloadConfig();
-        this.saveConfig();
 
         //Migrate from an earlier configuration file syntax if necessary 
-        if (getConfiguration().getString("scrapper.defaults.dropItem") == null) {
+        if (getConfig().getString("scrapper.defaults.dropItem") == null) {
-            ConfigHelper.migrateConfig(this.getDataFolder().getPath().replaceAll("\\\\", "/"),
+            net.knarcraft.knarlib.util.ConfigHelper.migrateConfig(this);
-                    getConfiguration());
-            this.reloadConfig();
         }
-        initializeConfigurations(getConfiguration());
+        initializeConfigurations(getConfig());
 
         //Set up Vault integration
         if (!setUpVault()) {
@@ -183,28 +150,10 @@ public class BlacksmithPlugin extends JavaPlugin {
         //Alert about an update in the console
         UpdateChecker.checkForUpdate(this, "https://api.spigotmc.org/legacy/update.php?resource=105938",
                 () -> this.getDescription().getVersion(), null);
-    }
 
-    @Override
+        // Remove expired scrapper usage data
-    public void reloadConfig() {
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(this, () -> PlayerUsageManager.removeExpiredData(
-        super.reloadConfig();
+                System.currentTimeMillis() - 3600000), 36000, 36000);
-        this.configuration = new StargateYamlConfiguration();
-        this.configuration.options().copyDefaults(true);
-        try {
-            this.configuration.load(new File(getDataFolder(), CONFIG_FILE_NAME));
-        } catch (IOException | InvalidConfigurationException exception) {
-            error("Unable to load the configuration! Message: " + exception.getMessage());
-        }
-    }
-
-    @Override
-    public void saveConfig() {
-        super.saveConfig();
-        try {
-            this.configuration.save(new File(getDataFolder(), CONFIG_FILE_NAME));
-        } catch (IOException exception) {
-            error("Unable to save the configuration! Message: " + exception.getMessage());
-        }
     }
 
     /**
@@ -267,7 +216,7 @@ public class BlacksmithPlugin extends JavaPlugin {
         //Prepare the translator
         translator = new Translator();
         translator.registerMessageCategory(TranslatableTimeUnit.UNIT_SECOND);
-        translator.registerMessageCategory(BlacksmithTranslatableMessage.ITEM_TYPE_ENCHANTMENT);
+        translator.registerMessageCategory(Translatable.ITEM_TYPE_ENCHANTMENT);
         translator.loadLanguages(this.getDataFolder(), "en",
                 fileConfiguration.getString("language", "en"));
         PluginDescriptionFile description = this.getDescription();
@@ -277,7 +226,7 @@ public class BlacksmithPlugin extends JavaPlugin {
         } else {
             prefix = description.getPrefix();
         }
-        BlacksmithPlugin.stringFormatter = new StringFormatter(prefix, translator);
+        FormatBuilder.setStringFormatter(new StringFormatter(prefix, translator));
 
         // This reload is necessary to get values just added to the configuration for some reason
         this.reload();
@@ -319,22 +268,4 @@ public class BlacksmithPlugin extends JavaPlugin {
         registerCommand("preset", new PresetCommand(), new PresetTabCompleter());
     }
 
-    /**
-     * Registers a command
-     *
-     * @param commandName  <p>The name of the command</p>
-     * @param executor     <p>The executor to bind to the command</p>
-     * @param tabCompleter <p>The tab completer to bind to the command, or null</p>
-     */
-    private void registerCommand(@NotNull String commandName, @NotNull CommandExecutor executor,
-                                 @Nullable TabCompleter tabCompleter) {
-        PluginCommand command = this.getCommand(commandName);
-        if (command != null) {
-            command.setExecutor(executor);
-            if (tabCompleter != null) {
-                command.setTabCompleter(tabCompleter);
-            }
-        }
-    }
-
 }

src/main/java/net/knarcraft/blacksmith/command/EditCommand.java

@@ -6,12 +6,12 @@ import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.Setting;
 import net.knarcraft.blacksmith.config.SettingValueType;
 import net.knarcraft.blacksmith.config.Settings;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
 import net.knarcraft.blacksmith.trait.CustomTrait;
 import net.knarcraft.blacksmith.util.ConfigCommandHelper;
 import net.knarcraft.blacksmith.util.InputParsingHelper;
 import net.knarcraft.blacksmith.util.TypeValidationHelper;
-import net.knarcraft.knarlib.formatting.StringFormatter;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -21,9 +21,9 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage.getCurrentValueMessage;
+import static net.knarcraft.blacksmith.formatting.Translatable.getCurrentValueMessage;
-import static net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage.getDefaultValueMessage;
+import static net.knarcraft.blacksmith.formatting.Translatable.getDefaultValueMessage;
-import static net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage.getValueChangedMessage;
+import static net.knarcraft.blacksmith.formatting.Translatable.getValueChangedMessage;
 
 /**
  * A generic implementation of the edit command
@@ -64,8 +64,7 @@ public abstract class EditCommand<K extends CustomTrait<L>, L extends Setting> i
                              @NotNull String[] args) {
         NPC npc = CitizensAPI.getDefaultNPCSelector().getSelected(sender);
         if (npc == null || !npc.hasTrait(traitClass)) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.NO_NPC_SELECTED).error(sender);
-                    BlacksmithTranslatableMessage.NO_NPC_SELECTED);
             return true;
         }
 
@@ -130,8 +129,7 @@ public abstract class EditCommand<K extends CustomTrait<L>, L extends Setting> i
                 return false;
             }
             settings.changeValue(setting, newValue);
-            BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+            getValueChangedMessage(setting.getCommandName(), String.valueOf(newValue)).success(sender);
-                    getValueChangedMessage(setting.getCommandName(), String.valueOf(newValue)));
             //Save the changes immediately to prevent data loss on server crash
             CitizensAPI.getNPCRegistry().saveToStore();
         }
@@ -156,21 +154,19 @@ public abstract class EditCommand<K extends CustomTrait<L>, L extends Setting> i
             return;
         }
 
-        StringFormatter formatter = BlacksmithPlugin.getStringFormatter();
-
         //Find the value of the specified setting
         String commandName = setting.getCommandName();
         String currentValue = String.valueOf(settings.getRawValue(setting));
         String defaultValue = String.valueOf(setting.getDefaultValue());
-        String marker = formatter.getUnFormattedMessage(BlacksmithTranslatableMessage.SETTING_OVERRIDDEN_MARKER);
+        String marker = new FormatBuilder(Translatable.SETTING_OVERRIDDEN_MARKER).toString();
         boolean isMessage = setting.isMessage();
         boolean isSet = !InputParsingHelper.isEmpty(currentValue);
 
         // Display the description for how this setting is used
-        formatter.displaySuccessMessage(sender, setting.getDescription());
+        new FormatBuilder(setting.getDescription()).success(sender);
 
         // Display the default value
-        formatter.displayNeutralMessage(sender, getDefaultValueMessage(commandName, defaultValue));
+        getDefaultValueMessage(commandName, defaultValue).neutral(sender);
         if (isMessage) {
             ConfigCommandHelper.displayRaw(sender, defaultValue);
         }
@@ -181,7 +177,7 @@ public abstract class EditCommand<K extends CustomTrait<L>, L extends Setting> i
         }
 
         // Display the value with a marker if it's customized
-        formatter.displayNeutralMessage(sender, getCurrentValueMessage(commandName, currentValue) + (isSet ? marker : ""));
+        new FormatBuilder(getCurrentValueMessage(commandName, currentValue) + (isSet ? marker : "")).neutral(sender);
 
         if (isMessage) {
             ConfigCommandHelper.displayRaw(sender, currentValue);

src/main/java/net/knarcraft/blacksmith/command/PresetCommand.java

@@ -1,9 +1,9 @@
 package net.knarcraft.blacksmith.command;
 
-import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.SmithPreset;
 import net.knarcraft.blacksmith.config.SmithPresetFilter;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -37,8 +37,7 @@ public class PresetCommand implements CommandExecutor {
                 SmithPresetFilter filter = SmithPresetFilter.valueOf(parts[1]);
 
                 if (!smithPreset.supportsFilter(filter)) {
-                    BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+                    new FormatBuilder(Translatable.INVALID_FILTER_FOR_PRESET).error(sender);
-                            BlacksmithTranslatableMessage.INVALID_FILTER_FOR_PRESET);
                     return false;
                 }
                 includedMaterials = smithPreset.getFilteredMaterials(filter);
@@ -46,8 +45,7 @@ public class PresetCommand implements CommandExecutor {
                 includedMaterials = SmithPreset.valueOf(presetName).getMaterials();
             }
         } catch (IllegalArgumentException exception) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.INVALID_PRESET_OR_FILTER).error(sender);
-                    BlacksmithTranslatableMessage.INVALID_PRESET_OR_FILTER);
             return false;
         }
 
@@ -56,9 +54,8 @@ public class PresetCommand implements CommandExecutor {
         for (Material material : includedMaterials) {
             materialNames.add(material.name());
         }
-        BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+        new FormatBuilder(Translatable.PRESET_MATERIALS).replace("{materials}",
-                BlacksmithPlugin.getStringFormatter().replacePlaceholder(BlacksmithTranslatableMessage.PRESET_MATERIALS,
+                String.join(", ", materialNames)).success(sender);
-                        "{materials}", String.join(", ", materialNames)));
         return true;
     }
 

src/main/java/net/knarcraft/blacksmith/command/ReloadCommand.java

@@ -1,7 +1,8 @@
 package net.knarcraft.blacksmith.command;
 
 import net.knarcraft.blacksmith.BlacksmithPlugin;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -20,7 +21,7 @@ public class ReloadCommand implements TabExecutor {
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
                              @NotNull String[] args) {
         BlacksmithPlugin.getInstance().reload();
-        BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender, BlacksmithTranslatableMessage.PLUGIN_RELOADED);
+        new FormatBuilder(Translatable.PLUGIN_RELOADED).success(sender);
         return true;
     }
 

src/main/java/net/knarcraft/blacksmith/command/blacksmith/BlackSmithConfigCommand.java

@@ -5,13 +5,14 @@ import net.knarcraft.blacksmith.command.ReloadCommand;
 import net.knarcraft.blacksmith.config.SettingValueType;
 import net.knarcraft.blacksmith.config.blacksmith.BlacksmithSetting;
 import net.knarcraft.blacksmith.config.blacksmith.GlobalBlacksmithSettings;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
 import net.knarcraft.blacksmith.formatting.ItemType;
+import net.knarcraft.blacksmith.formatting.Translatable;
 import net.knarcraft.blacksmith.util.ConfigCommandHelper;
 import net.knarcraft.blacksmith.util.InputParsingHelper;
 import net.knarcraft.blacksmith.util.ItemHelper;
 import net.knarcraft.blacksmith.util.TypeValidationHelper;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -92,19 +93,21 @@ public class BlackSmithConfigCommand implements CommandExecutor {
             } else {
                 currentValue = String.valueOf(settings.getPricePerDurabilityPoint(material));
             }
-            BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+            Translatable.getItemCurrentValueMessage(setting.getCommandName(),
-                    BlacksmithTranslatableMessage.getItemCurrentValueMessage(setting.getCommandName(),
+                    ItemType.MATERIAL, material.name(), currentValue).success(sender);
-                            ItemType.MATERIAL, material.name(), currentValue));
             return true;
         } else if (setting == BlacksmithSetting.ENCHANTMENT_COST) {
             Enchantment enchantment = InputParsingHelper.matchEnchantment(selector);
             if (enchantment == null) {
                 return false;
             }
-            BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+            NamespacedKey enchantmentKey = enchantment.getKeyOrNull();
-                    BlacksmithTranslatableMessage.getItemCurrentValueMessage(setting.getCommandName(),
+            if (enchantmentKey == null) {
-                            ItemType.ENCHANTMENT, enchantment.getKey().getKey(),
+                return false;
-                            String.valueOf(settings.getEnchantmentCost(enchantment))));
+            }
+            Translatable.getItemCurrentValueMessage(setting.getCommandName(),
+                    ItemType.ENCHANTMENT, enchantmentKey.getKey(),
+                    String.valueOf(settings.getEnchantmentCost(enchantment))).success(sender);
             return true;
         } else {
             return false;
@@ -154,11 +157,11 @@ public class BlackSmithConfigCommand implements CommandExecutor {
                 return false;
             }
             ItemType itemType = ItemType.ENCHANTMENT;
+            // Note: While depreciated in Spigot, the new method is not available for Paper
+            @SuppressWarnings("deprecation")
             String itemChanged = enchantment.getKey().getKey();
             settings.setEnchantmentCost(enchantment, newPrice);
-            BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+            Translatable.getItemValueChangedMessage(blacksmithSetting.getCommandName(), itemType, itemChanged, newValue).success(sender);
-                    BlacksmithTranslatableMessage.getItemValueChangedMessage(blacksmithSetting.getCommandName(),
-                            itemType, itemChanged, newValue));
             return true;
         } else {
             return false;
@@ -198,9 +201,8 @@ public class BlackSmithConfigCommand implements CommandExecutor {
             }
         }
 
-        BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+        Translatable.getItemValueChangedMessage(blacksmithSetting.getCommandName(),
-                BlacksmithTranslatableMessage.getItemValueChangedMessage(blacksmithSetting.getCommandName(),
+                itemType, itemChanged, String.valueOf(newPrice)).success(sender);
-                        itemType, itemChanged, String.valueOf(newPrice)));
         return true;
     }
 

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

@@ -55,4 +55,9 @@ public enum SettingValueType {
      */
     ENCHANTMENT_LIST,
 
+    /**
+     * Advanced cost, that supports either a simple double, or specifying money cost, permission requirement, exp cost and an item cost
+     */
+    ADVANCED_COST,
+
 }

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

@@ -1,246 +0,0 @@
-package net.knarcraft.blacksmith.config;
-
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * A YAML configuration which retains all comments
- *
- * <p>This configuration converts all comments to YAML values when loaded, which all start with comment_. When saved,
- * those YAML values are converted to normal text comments. This ensures that the comments aren't removed by the
- * YamlConfiguration during its parsing.</p>
- *
- * <p>Note: When retrieving a configuration section, that will include comments that start with "comment_". You should
- * filter those before parsing input.</p>
- *
- * @author Kristian Knarvik
- * @author Thorin
- */
-public class StargateYamlConfiguration extends YamlConfiguration {
-
-    private static final String START_OF_COMMENT_LINE = "[HASHTAG]";
-    private static final String END_OF_COMMENT = "_endOfComment_";
-    private static final String START_OF_COMMENT = "comment_";
-
-    @Override
-    @NotNull
-    @SuppressWarnings("deprecation")
-    protected String buildHeader() {
-        return "";
-    }
-
-    @Override
-    @NotNull
-    public String saveToString() {
-        // Convert YAML comments to normal comments
-        return this.convertYAMLMappingsToComments(super.saveToString());
-    }
-
-    @Override
-    public void loadFromString(@NotNull String contents) throws InvalidConfigurationException {
-        // Convert normal comments to YAML comments to prevent them from disappearing
-        super.loadFromString(this.convertCommentsToYAMLMappings(contents));
-    }
-
-    /**
-     * Gets a configuration section's keys, without any comment entries
-     *
-     * @param configurationSection <p>The configuration section to get keys for</p>
-     * @param deep                 <p>Whether to get keys for child elements as well</p>
-     * @return <p>The configuration section's keys, with comment entries removed</p>
-     */
-    public static Set<String> getKeysWithoutComments(@NotNull ConfigurationSection configurationSection, boolean deep) {
-        Set<String> keys = new HashSet<>(configurationSection.getKeys(deep));
-        keys.removeIf(key -> key.matches(START_OF_COMMENT + "[0-9]+"));
-        return keys;
-    }
-
-    /**
-     * Reads a file with comments, and recreates them into yaml mappings
-     *
-     * <p>A mapping follows this format: comment_{CommentNumber}: "The comment"
-     * This needs to be done as comments otherwise get removed using
-     * the {@link FileConfiguration#save(File)} method. The config
-     * needs to be saved if a config value has changed.</p>
-     */
-    @NotNull
-    private String convertCommentsToYAMLMappings(@NotNull String configString) {
-        StringBuilder yamlBuilder = new StringBuilder();
-        List<String> currentComment = new ArrayList<>();
-        int commentId = 0;
-        int previousIndentation = 0;
-
-        for (String line : configString.split("\n")) {
-            String trimmed = line.trim();
-            if (trimmed.startsWith("#")) {
-                // Store the indentation of the block
-                if (currentComment.isEmpty()) {
-                    previousIndentation = getIndentation(line);
-                }
-                //Temporarily store the comment line
-                addComment(currentComment, trimmed);
-            } else {
-                addYamlString(yamlBuilder, currentComment, line, previousIndentation, commentId);
-                commentId++;
-                previousIndentation = 0;
-            }
-        }
-        return yamlBuilder.toString();
-    }
-
-    /**
-     * Adds a YAML string to the given string builder
-     *
-     * @param yamlBuilder         <p>The string builder used for building YAML</p>
-     * @param currentComment      <p>The comment to add as a YAML string</p>
-     * @param line                <p>The current line</p>
-     * @param previousIndentation <p>The indentation of the current block comment</p>
-     * @param commentId           <p>The id of the comment</p>
-     */
-    private void addYamlString(@NotNull StringBuilder yamlBuilder, @NotNull List<String> currentComment,
-                               @NotNull String line, int previousIndentation, int commentId) {
-        String trimmed = line.trim();
-        //Write the full formatted comment to the StringBuilder
-        if (!currentComment.isEmpty()) {
-            int indentation = trimmed.isEmpty() ? previousIndentation : getIndentation(line);
-            generateCommentYAML(yamlBuilder, currentComment, commentId, indentation);
-            currentComment.clear();
-        }
-        //Add the non-comment line assuming it isn't empty
-        if (!trimmed.isEmpty()) {
-            yamlBuilder.append(line).append("\n");
-        }
-    }
-
-    /**
-     * Adds the given comment to the given list
-     *
-     * @param commentParts <p>The list to add to</p>
-     * @param comment      <p>The comment to add</p>
-     */
-    private void addComment(@NotNull List<String> commentParts, @NotNull String comment) {
-        if (comment.startsWith("# ")) {
-            commentParts.add(comment.replaceFirst("# ", START_OF_COMMENT_LINE));
-        } else {
-            commentParts.add(comment.replaceFirst("#", START_OF_COMMENT_LINE));
-        }
-    }
-
-    /**
-     * Generates a YAML-compatible string for one comment block
-     *
-     * @param yamlBuilder  <p>The string builder to add the generated YAML to</p>
-     * @param commentLines <p>The lines of the comment to convert into YAML</p>
-     * @param commentId    <p>The unique id of the comment</p>
-     * @param indentation  <p>The indentation to add to every line</p>
-     */
-    private void generateCommentYAML(@NotNull StringBuilder yamlBuilder, @NotNull List<String> commentLines,
-                                     int commentId, int indentation) {
-        String subIndentation = this.addIndentation(indentation + 2);
-        //Add the comment start marker
-        yamlBuilder.append(this.addIndentation(indentation)).append(START_OF_COMMENT).append(commentId).append(": |\n");
-        for (String commentLine : commentLines) {
-            //Add each comment line with the proper indentation
-            yamlBuilder.append(subIndentation).append(commentLine).append("\n");
-        }
-        //Add the comment end marker
-        yamlBuilder.append(subIndentation).append(subIndentation).append(END_OF_COMMENT).append("\n");
-    }
-
-    /**
-     * Converts the internal YAML mapping format to a readable config file
-     *
-     * <p>The internal YAML structure is converted to a string with the same format as a standard configuration file.
-     * The internal structure has comments in the format: START_OF_COMMENT + id + multi-line YAML string +
-     * END_OF_COMMENT.</p>
-     *
-     * @param yamlString <p>A string using the YAML format</p>
-     * @return <p>The corresponding comment string</p>
-     */
-    @NotNull
-    private String convertYAMLMappingsToComments(@NotNull String yamlString) {
-        StringBuilder finalText = new StringBuilder();
-
-        String[] lines = yamlString.split("\n");
-        for (int currentIndex = 0; currentIndex < lines.length; currentIndex++) {
-            String line = lines[currentIndex];
-            String possibleComment = line.trim();
-
-            if (possibleComment.startsWith(START_OF_COMMENT)) {
-                //Add an empty line before every comment block
-                finalText.append("\n");
-                currentIndex = readComment(finalText, lines, currentIndex + 1, getIndentation(line));
-            } else {
-                //Output the configuration key
-                finalText.append(line).append("\n");
-            }
-        }
-
-        return finalText.toString().trim();
-    }
-
-    /**
-     * Fully reads a comment
-     *
-     * @param builder            <p>The string builder to write to</p>
-     * @param lines              <p>The lines to read from</p>
-     * @param startIndex         <p>The index to start reading from</p>
-     * @param commentIndentation <p>The indentation of the read comment</p>
-     * @return <p>The index containing the next non-comment line</p>
-     */
-    private int readComment(@NotNull StringBuilder builder, @NotNull String[] lines, int startIndex,
-                            int commentIndentation) {
-        for (int currentIndex = startIndex; currentIndex < lines.length; currentIndex++) {
-            String line = lines[currentIndex];
-            String possibleComment = line.trim();
-            if (!line.contains(END_OF_COMMENT)) {
-                possibleComment = possibleComment.replace(START_OF_COMMENT_LINE, "");
-                builder.append(addIndentation(commentIndentation)).append("# ").append(possibleComment).append("\n");
-            } else {
-                return currentIndex;
-            }
-        }
-
-        return startIndex;
-    }
-
-    /**
-     * Gets a string containing the given indentation
-     *
-     * @param indentationSpaces <p>The number spaces to use for indentation</p>
-     * @return <p>A string containing the number of spaces specified</p>
-     */
-    @NotNull
-    private String addIndentation(int indentationSpaces) {
-        return " ".repeat(Math.max(0, indentationSpaces));
-    }
-
-
-    /**
-     * Gets the indentation (number of spaces) of the given line
-     *
-     * @param line <p>The line to get indentation of</p>
-     * @return <p>The number of spaces in the line's indentation</p>
-     */
-    private int getIndentation(@NotNull String line) {
-        int spacesFound = 0;
-        for (char aCharacter : line.toCharArray()) {
-            if (aCharacter == ' ') {
-                spacesFound++;
-            } else {
-                break;
-            }
-        }
-        return spacesFound;
-    }
-
-}

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

@@ -3,10 +3,10 @@ package net.knarcraft.blacksmith.config.blacksmith;
 import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.SettingValueType;
 import net.knarcraft.blacksmith.config.Settings;
-import net.knarcraft.blacksmith.config.StargateYamlConfiguration;
 import net.knarcraft.blacksmith.util.ConfigHelper;
 import net.knarcraft.blacksmith.util.InputParsingHelper;
 import net.knarcraft.blacksmith.util.ItemHelper;
+import net.knarcraft.knarlib.config.StargateYamlConfiguration;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -310,7 +310,7 @@ public class GlobalBlacksmithSettings implements Settings<BlacksmithSetting> {
      */
     private void loadSettings() {
         instance.reloadConfig();
-        FileConfiguration configuration = instance.getConfiguration();
+        FileConfiguration configuration = instance.getConfig();
 
         for (BlacksmithSetting blacksmithSetting : BlacksmithSetting.values()) {
             if (!configuration.contains(blacksmithSetting.getPath())) {
@@ -501,7 +501,7 @@ public class GlobalBlacksmithSettings implements Settings<BlacksmithSetting> {
      * Saves all current settings to the config file
      */
     private void save() {
-        FileConfiguration fileConfiguration = instance.getConfiguration();
+        FileConfiguration fileConfiguration = instance.getConfig();
 
         //Save all default settings
         for (BlacksmithSetting setting : BlacksmithSetting.values()) {
@@ -523,6 +523,8 @@ public class GlobalBlacksmithSettings implements Settings<BlacksmithSetting> {
         //Load all enchantment prices
         ConfigurationSection enchantmentCostNode = getAndCreateSection(fileConfiguration, getBase(BlacksmithSetting.ENCHANTMENT_COST.getPath()));
         for (Enchantment enchantment : this.enchantmentCosts.keySet()) {
+            // Note: While depreciated in Spigot, the new method is not available for Paper
+            //noinspection deprecation
             enchantmentCostNode.set(unNormalizeName(enchantment.getKey().getKey()), this.enchantmentCosts.get(enchantment));
         }
 

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

@@ -145,7 +145,7 @@ public class GlobalScrapperSettings implements Settings<ScrapperSetting> {
      */
     private void loadSettings() {
         instance.reloadConfig();
-        FileConfiguration configuration = instance.getConfiguration();
+        FileConfiguration configuration = instance.getConfig();
 
         for (ScrapperSetting setting : ScrapperSetting.values()) {
             if (!configuration.contains(setting.getPath())) {
@@ -164,7 +164,7 @@ public class GlobalScrapperSettings implements Settings<ScrapperSetting> {
      * Saves all current settings to the config file
      */
     private void save() {
-        FileConfiguration fileConfiguration = instance.getConfiguration();
+        FileConfiguration fileConfiguration = instance.getConfig();
 
         //Save all default settings
         for (ScrapperSetting setting : ScrapperSetting.values()) {
@@ -212,6 +212,24 @@ public class GlobalScrapperSettings implements Settings<ScrapperSetting> {
         return asDouble(ScrapperSetting.NETHERITE_SALVAGE_COST);
     }
 
+    /**
+     * Gets the math formula for the increase in salvage cost
+     *
+     * @return <p>The salvage cost increase formula</p>
+     */
+    public String getSalvageCostIncrease() {
+        return asString(ScrapperSetting.SALVAGE_COST_INCREASE);
+    }
+
+    /**
+     * Gets the math formula for the increase in salvage cooldown
+     *
+     * @return <p>The salvage cooldown increase formula</p>
+     */
+    public String getSalvageCooldownIncrease() {
+        return asString(ScrapperSetting.SALVAGE_COOLDOWN_INCREASE);
+    }
+
     /**
      * Gets trash salvage for the given material
      *
@@ -275,4 +293,15 @@ public class GlobalScrapperSettings implements Settings<ScrapperSetting> {
         }
     }
 
+    /**
+     * Gets the string 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 string</p>
+     */
+    @NotNull
+    private String asString(@NotNull ScrapperSetting setting) {
+        return getValue(setting).toString();
+    }
+
 }

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

@@ -83,6 +83,15 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
         }
     }
 
+    /**
+     * Gets whether this scrapper is able to split an enchanted book
+     *
+     * @return <p>True if this scrapper is able to split an enchanted book</p>
+     */
+    public boolean splitEnchantedBook() {
+        return asBoolean(ScrapperSetting.SPLIT_ENCHANTED_BOOK);
+    }
+
     /**
      * Gets the raw current value of a setting
      *
@@ -171,6 +180,15 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
         return asString(ScrapperSetting.COST_MESSAGE_NETHERITE);
     }
 
+    /**
+     * Gets the message to use for displaying enchanted book salvage cost
+     *
+     * @return <p>The message to use for displaying enchanted book salvage cost</p>
+     */
+    public String getEnchantedBookCostMessage() {
+        return asString(ScrapperSetting.COST_MESSAGE_ENCHANTED_BOOK);
+    }
+
     @Override
     @NotNull
     public String getCoolDownUnexpiredMessage() {
@@ -466,4 +484,24 @@ public class ScrapperNPCSettings implements TraitSettings<ScrapperSetting> {
         return asString(ScrapperSetting.CANNOT_SALVAGE_NETHERITE_MESSAGE);
     }
 
+    /**
+     * Gets the message to display when explaining that this scrapper is unable to salvage enchanted books
+     *
+     * @return <p>The message to display when explaining that this scrapper is unable to salvage enchanted books</p>
+     */
+    @NotNull
+    public String getCannotSalvageEnchantedBookMessage() {
+        return asString(ScrapperSetting.CANNOT_SALVAGE_ENCHANTED_BOOK_MESSAGE);
+    }
+
+    /**
+     * Gets the message to display when explaining that the scrapper cannot salvage an enchanted book with a single enchantment
+     *
+     * @return <p>The message to display when explaining that the scrapper cannot salvage an enchanted book with a single enchantment</p>
+     */
+    @NotNull
+    public String getCannotSplitEnchantedBookFurtherMessage() {
+        return asString(ScrapperSetting.CANNOT_SPLIT_ENCHANTED_BOOK_FURTHER_MESSAGE);
+    }
+
 }

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

@@ -92,6 +92,12 @@ public enum ScrapperSetting implements Setting {
     SALVAGE_NETHERITE("salvageNetherite", SettingValueType.BOOLEAN, true,
             "Whether to enable salvaging of netherite items", true, false),
 
+    /**
+     * The setting for whether the NPC should allow salvaging an enchanted books with several enchantments into several books with one enchantment
+     */
+    SPLIT_ENCHANTED_BOOK("splitEnchantedBook", SettingValueType.BOOLEAN, false, "Whether to enable " +
+            "splitting of enchanted books", true, false),
+    
     /*-----------
      | Messages |
      -----------*/
@@ -194,6 +200,13 @@ public enum ScrapperSetting implements Setting {
             "&eIt will cost &a{cost}&e to salvage that &a{item}&e into diamond!",
             "The message to display when explaining the shown item's netherite salvage cost", true, true),
 
+    /**
+     * The message displayed when displaying the cost of salvaging the player's held enchanted book
+     */
+    COST_MESSAGE_ENCHANTED_BOOK("costMessageEnchantedBook", SettingValueType.STRING,
+            "&eIt will cost &a{cost}&e to salvage that enchanted book!",
+            "The message to display when explaining the shown enchanted book's salvage cost", true, true),
+
     /**
      * The message displayed when explaining that all items will be returned as salvage
      */
@@ -236,6 +249,20 @@ public enum ScrapperSetting implements Setting {
             "&cI'm sorry, but I'm unable to salvage netherite items!",
             "The message to display when asked to salvage netherite items, and that option is disabled", true, true),
 
+    /**
+     * The message displayed when explaining that enchanted book salvage is disabled
+     */
+    CANNOT_SALVAGE_ENCHANTED_BOOK_MESSAGE("cannotSalvageEnchantedBookMessage", SettingValueType.STRING,
+            "&cI'm sorry, but I'm unable to salvage enchanted books!",
+            "The message to display when asked to salvage enchanted books, and the option is disabled", true, true),
+
+    /**
+     * The message displayed when explaining that a player cannot salvage an enchanted book containing a single enchantment
+     */
+    CANNOT_SPLIT_ENCHANTED_BOOK_FURTHER_MESSAGE("cannotSplitEnchantedBookFurtherMessage", SettingValueType.STRING,
+            "&cI'm sorry, but I cannot salvage that enchanted book any further",
+            "The message displayed when a player attempts to  salvage an enchanted book with a single enchantment", true, true),
+
     /**
      * The message displayed when clicking a scrapper with an empty hand
      */
@@ -264,6 +291,20 @@ public enum ScrapperSetting implements Setting {
     NETHERITE_SALVAGE_COST("netheriteSalvagePrice", SettingValueType.POSITIVE_DOUBLE, 15,
             "The cost of using the scrapper to remove netherite from an item", false, false),
 
+    /**
+     * The mathematical formula for increasing salvage cost
+     */
+    SALVAGE_COST_INCREASE("salvageCostIncrease", SettingValueType.STRING, "{cost}*{timesUsed}",
+            "The mathematical formula for salvage cost increase when continually used within the same hour. " +
+                    "This is necessary for some servers where items can be easily farmed. Set to {cost} to disable behavior.", false, false),
+
+    /**
+     * The mathematical formula for increasing salvage cooldown
+     */
+    SALVAGE_COOLDOWN_INCREASE("salvageCooldownIncrease", SettingValueType.STRING, "{cooldown}*{timesUsed}",
+            "The mathematical formula for salvage cooldown increase when continually used within the same hour. " +
+                    "This is necessary for some servers where items can be easily farmed. Set to {cooldown} to disable behavior.", false, false),
+
     /**
      * Whether to display exact time in minutes and seconds when displaying a remaining cool-down
      */

src/main/java/net/knarcraft/blacksmith/container/ActionCost.java

@@ -0,0 +1,280 @@
+package net.knarcraft.blacksmith.container;
+
+import net.knarcraft.blacksmith.BlacksmithPlugin;
+import net.knarcraft.blacksmith.manager.EconomyManager;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.NamespacedKey;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * The cost of performing an action
+ *
+ * @param monetaryCost        <p>The monetary cost of the action</p>
+ * @param expCost             <p>The experience cost of the action</p>
+ * @param itemCost            <p>The item-based cost of the action</p>
+ * @param requiredPermissions <p>The permission required for the action</p>
+ */
+public record ActionCost(double monetaryCost, int expCost, @Nullable ItemStack itemCost,
+                         @NotNull Set<String> requiredPermissions) implements ConfigurationSerializable {
+
+    /**
+     * Changes the monetary cost of this action
+     *
+     * @param monetaryCost <p>The new monetary cost</p>
+     * @return <p>The resulting action cost</p>
+     */
+    public ActionCost changeMonetaryCost(double monetaryCost) {
+        return new ActionCost(monetaryCost, this.expCost, this.itemCost, this.requiredPermissions);
+    }
+
+    /**
+     * Changes the experience cost of this action
+     *
+     * @param expCost <p>The new experience cost</p>
+     * @return <p>The resulting action cost</p>
+     */
+    public ActionCost changeExpCost(int expCost) {
+        return new ActionCost(this.monetaryCost, expCost, this.itemCost, this.requiredPermissions);
+    }
+
+    /**
+     * Changes the item cost of this action
+     *
+     * @param itemCost <p>The new item cost</p>
+     * @return <p>The resulting action cost</p>
+     */
+    public ActionCost changeItemCost(@Nullable ItemStack itemCost) {
+        return new ActionCost(this.monetaryCost, this.expCost, itemCost, this.requiredPermissions);
+    }
+
+    /**
+     * Changes the permission cost of this action
+     *
+     * @param requiredPermissions <p>The new permission cost</p>
+     * @return <p>The resulting action cost</p>
+     */
+    public ActionCost changePermissionCost(@NotNull Set<String> requiredPermissions) {
+        return new ActionCost(this.monetaryCost, this.expCost, this.itemCost, requiredPermissions);
+    }
+
+    /**
+     * Displays this action cost as a string
+     *
+     * @param player <p>The player to calculate the cost for</p>
+     * @return <p>The string representation of this action cost</p>
+     */
+    @NotNull
+    public String displayCost(@NotNull Player player) {
+        StringBuilder builder = new StringBuilder();
+        if (monetaryCost > 0) {
+            builder.append(EconomyManager.format(monetaryCost)).append(", ").append("\n");
+        }
+        if (expCost > 0) {
+            builder.append(expCost).append("exp, ").append("\n");
+        }
+        if (itemCost != null) {
+            NamespacedKey itemName = itemCost.getType().getKeyOrNull();
+            if (itemName != null) {
+                builder.append(itemCost.getAmount()).append(" x ").append(itemName);
+                ItemMeta itemMeta = itemCost.getItemMeta();
+                if (itemMeta != null && itemMeta.hasDisplayName()) {
+                    builder.append("(").append(itemMeta.getDisplayName()).append(")");
+                }
+                if (itemMeta != null && itemMeta.hasLore() && itemMeta.getLore() != null) {
+                    for (String lore : itemMeta.getLore()) {
+                        builder.append("\n").append(lore);
+                    }
+                }
+                builder.append("\n");
+            }
+        }
+        if (!requiredPermissions().isEmpty()) {
+            for (String permission : requiredPermissions()) {
+                if (player.hasPermission(permission)) {
+                    builder.append(ChatColor.DARK_GREEN).append("O ").append(permission).append("\n");
+                } else {
+                    builder.append(ChatColor.DARK_RED).append("X ").append(permission).append("\n");
+                }
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Checks whether the given player is able to pay this action cost
+     *
+     * @param player <p>The player to check</p>
+     * @return <p>True if the player is able to pay</p>
+     */
+    public boolean canPay(@NotNull Player player) {
+        for (String permission : this.requiredPermissions) {
+            if (!player.hasPermission(permission)) {
+                return false;
+            }
+        }
+
+        if (player.getExp() < this.expCost || !EconomyManager.hasEnough(player, this.monetaryCost)) {
+            return false;
+        }
+
+        return hasEnoughValidItemsInInventory(player);
+    }
+
+    /**
+     * Takes exp, money and items from the player, according to this cost
+     *
+     * @param player <p>The player to take the payment from</p>
+     */
+    public void takePayment(@NotNull Player player) {
+        player.giveExp(-expCost);
+        EconomyManager.withdraw(player, monetaryCost);
+        takeItemCost(player);
+    }
+
+    /**
+     * Checks whether the given player has enough items specified as the item cost
+     *
+     * @param player <p>The player to check</p>
+     * @return <p>True if the player has enough items in their inventory</p>
+     */
+    private boolean hasEnoughValidItemsInInventory(@NotNull Player player) {
+        if (this.itemCost == null) {
+            return true;
+        }
+
+        int amountInInventory = 0;
+        for (Map.Entry<Integer, Integer> entry : getValidItems(player).entrySet()) {
+            amountInInventory += entry.getValue();
+        }
+        return this.itemCost.getAmount() >= amountInInventory;
+    }
+
+    /**
+     * Gets all items in a player's inventory equal to the specified item
+     *
+     * @param player <p>The player to get valid items for</p>
+     * @return <p>All valid items in the format: Inventory id -> Amount</p>
+     */
+    @NotNull
+    private Map<Integer, Integer> getValidItems(@NotNull Player player) {
+        if (this.itemCost == null) {
+            return new HashMap<>();
+        }
+
+        PlayerInventory playerInventory = player.getInventory();
+        ItemMeta targetMeta = this.itemCost.getItemMeta();
+        String displayName = null;
+        List<String> lore = null;
+        if (targetMeta != null) {
+            displayName = targetMeta.hasDisplayName() ? targetMeta.getDisplayName() : null;
+            lore = targetMeta.hasLore() ? targetMeta.getLore() : null;
+        }
+
+        Map<Integer, Integer> output = new HashMap<>();
+        HashMap<Integer, ? extends ItemStack> itemsOfType = playerInventory.all(this.itemCost.getType());
+
+        for (Map.Entry<Integer, ? extends ItemStack> entry : itemsOfType.entrySet()) {
+            if (targetMeta != null) {
+                // Only consider item if the name and lore is the same
+                ItemMeta meta = entry.getValue().getItemMeta();
+                if (meta == null || (displayName != null && (!meta.hasDisplayName() ||
+                        !meta.getDisplayName().equals(displayName)) || lore != null && (!meta.hasLore() ||
+                        meta.getLore() == null || !meta.getLore().equals(lore)))) {
+                    continue;
+                }
+            }
+            output.put(entry.getKey(), entry.getValue().getAmount());
+        }
+
+        return output;
+    }
+
+    /**
+     * Takes the amount of items specified as the cost for this action
+     *
+     * @param player <p>The player to take the items from</p>
+     */
+    private void takeItemCost(@NotNull Player player) {
+        if (this.itemCost == null) {
+            return;
+        }
+
+        int clearedAmount = 0;
+        for (Map.Entry<Integer, Integer> entry : getValidItems(player).entrySet()) {
+            int inventory = entry.getKey();
+            int amount = entry.getValue();
+            if (amount <= this.itemCost.getAmount() - clearedAmount) {
+                clearedAmount += amount;
+                player.getInventory().clear(entry.getKey());
+            } else {
+                clearedAmount = this.itemCost.getAmount();
+                ItemStack item = player.getInventory().getItem(inventory);
+                if (item != null) {
+                    item.setAmount(amount - clearedAmount);
+                } else {
+                    BlacksmithPlugin.error("An item changed after calculating item cost. Was unable to take " +
+                            amount + " items");
+                }
+            }
+
+            if (clearedAmount >= this.itemCost.getAmount()) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Loads an action cost from a configuration section
+     *
+     * @param configurationSection <p>The configuration section to load from</p>
+     * @param key                  <p>The key of the cost to load</p>
+     * @return <p>The loaded cost</p>
+     */
+    private static ActionCost loadActionCost(@NotNull ConfigurationSection configurationSection, @NotNull String key) {
+        double cost = configurationSection.getDouble(key, Double.MIN_VALUE);
+        if (cost != Double.MIN_VALUE) {
+            return new ActionCost(cost, 0, null, Set.of());
+        } else {
+            return (ActionCost) configurationSection.get(key);
+        }
+    }
+
+    /**
+     * Deserializes an action cost
+     *
+     * @param serialized <p>The serialized action cost</p>
+     * @return <p>The deserialized action cost</p>
+     */
+    @SuppressWarnings({"unused", "unchecked"})
+    public static ActionCost deserialize(Map<String, Object> serialized) {
+        double monetaryCost = (double) serialized.get("monetaryCost");
+        int expCost = (int) serialized.get("expCost");
+        ItemStack itemCost = (ItemStack) serialized.get("itemCost");
+        Set<String> requiredPermissions = (Set<String>) serialized.get("requiredPermissions");
+        return new ActionCost(monetaryCost, expCost, itemCost, requiredPermissions);
+    }
+
+    @Override
+    public @NotNull Map<String, Object> serialize() {
+        Map<String, Object> serialized = new HashMap<>();
+        serialized.put("monetaryCost", Optional.of(this.monetaryCost));
+        serialized.put("expCost", Optional.of(this.expCost));
+        serialized.put("itemCost", itemCost);
+        serialized.put("requiredPermissions", this.requiredPermissions);
+        return serialized;
+    }
+
+}

src/main/java/net/knarcraft/blacksmith/event/AbstractBlacksmithPluginEvent.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
@@ -13,15 +14,18 @@ public abstract class AbstractBlacksmithPluginEvent extends Event implements Bla
 
     protected final NPC npc;
     protected final Player player;
+    protected final Entity entity;
 
     /**
      * Instantiates a new blacksmith plugin event
      *
      * @param npc    <p>The NPC involved in the event</p>
+     * @param entity <p>The entity of the NPC</p>
      * @param player <p>The player involved in the event</p>
      */
-    public AbstractBlacksmithPluginEvent(@NotNull NPC npc, @NotNull Player player) {
+    public AbstractBlacksmithPluginEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player) {
         this.npc = npc;
+        this.entity = entity;
         this.player = player;
     }
 
@@ -31,6 +35,12 @@ public abstract class AbstractBlacksmithPluginEvent extends Event implements Bla
         return this.npc;
     }
 
+    @Override
+    @NotNull
+    public Entity getEntity() {
+        return this.entity;
+    }
+
     @Override
     @NotNull
     public Player getPlayer() {

src/main/java/net/knarcraft/blacksmith/event/BlacksmithPluginEvent.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,6 +19,14 @@ public interface BlacksmithPluginEvent {
     @NotNull
     NPC getNpc();
 
+    /**
+     * Gets the entity of the NPC
+     *
+     * @return <p>The NPC entity</p>
+     */
+    @NotNull
+    Entity getEntity();
+
     /**
      * Gets the player involved in the event
      *

src/main/java/net/knarcraft/blacksmith/event/BlacksmithReforgeFailEvent.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -15,10 +16,12 @@ public class BlacksmithReforgeFailEvent extends AbstractBlacksmithPluginEvent im
     /**
      * Instantiates a new blacksmith reforge fail event
      *
-     * @param npc <p>The NPC involved in the event</p>
+     * @param npc    <p>The NPC involved in the event</p>
+     * @param entity <p>The entity of the NPC</p>
+     * @param player <p>The player that initiated the session</p>
      */
-    public BlacksmithReforgeFailEvent(@NotNull NPC npc, @NotNull Player player) {
+    public BlacksmithReforgeFailEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player) {
-        super(npc, player);
+        super(npc, entity, player);
     }
 
     /**

src/main/java/net/knarcraft/blacksmith/event/BlacksmithReforgeStartEvent.java

@@ -2,6 +2,7 @@ package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.Material;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -19,13 +20,14 @@ public class BlacksmithReforgeStartEvent extends AbstractBlacksmithPluginEvent i
      * Instantiates a new blacksmith reforge start event
      *
      * @param npc             <p>The NPC involved in the event</p>
+     * @param entity          <p>The entity of the NPC</p>
      * @param player          <p>The player involved in the event</p>
      * @param durationTicks   <p>The duration of the reforge</p>
      * @param craftingStation <p>The appropriate crafting station for this reforging</p>
      */
-    public BlacksmithReforgeStartEvent(@NotNull NPC npc, @NotNull Player player, long durationTicks,
+    public BlacksmithReforgeStartEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player, long durationTicks,
                                        @NotNull Material craftingStation) {
-        super(npc, player);
+        super(npc, entity, player);
         this.durationTicks = durationTicks;
         this.craftingStation = craftingStation;
     }

src/main/java/net/knarcraft/blacksmith/event/BlacksmithReforgeSucceedEvent.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -16,10 +17,11 @@ public class BlacksmithReforgeSucceedEvent extends AbstractBlacksmithPluginEvent
      * Instantiates a new blacksmith reforge succeed event
      *
      * @param npc    <p>The NPC involved in the event</p>
+     * @param entity <p>The entity of the NPC</p>
      * @param player <p>The player involved in the event</p>
      */
-    public BlacksmithReforgeSucceedEvent(@NotNull NPC npc, @NotNull Player player) {
+    public BlacksmithReforgeSucceedEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player) {
-        super(npc, player);
+        super(npc, entity, player);
     }
 
     /**

src/main/java/net/knarcraft/blacksmith/event/NPCSoundEvent.java

@@ -3,6 +3,7 @@ package net.knarcraft.blacksmith.event;
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.Sound;
 import org.bukkit.SoundCategory;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
@@ -25,15 +26,16 @@ public class NPCSoundEvent extends AbstractBlacksmithPluginEvent implements Canc
      * Instantiates a new NPC sound event
      *
      * @param npc           <p>The NPC playing the sound</p>
+     * @param entity        <p>The entity playing the sound</p>
      * @param player        <p>The player whose interaction triggered the sound</p>
      * @param soundCategory <p>The category the sound is to play in</p>
      * @param sound         <p>The sound to play</p>
      * @param volume        <p>The volume of the played sound</p>
      * @param pitch         <p>The pitch of the played sound</p>
      */
-    public NPCSoundEvent(@NotNull NPC npc, @NotNull Player player, @NotNull SoundCategory soundCategory,
+    public NPCSoundEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player, @NotNull SoundCategory soundCategory,
                          @NotNull Sound sound, float volume, float pitch) {
-        super(npc, player);
+        super(npc, entity, player);
         this.soundCategory = soundCategory;
         this.sound = sound;
         this.volume = volume;

src/main/java/net/knarcraft/blacksmith/event/ScrapperSalvageFailEvent.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -16,10 +17,11 @@ public class ScrapperSalvageFailEvent extends AbstractBlacksmithPluginEvent impl
      * Instantiates a new scrapper salvage fail event
      *
      * @param npc    <p>The NPC involved in the event</p>
+     * @param entity <p>The entity of the NPC</p>
      * @param player <p>The player involved in the event</p>
      */
-    public ScrapperSalvageFailEvent(@NotNull NPC npc, @NotNull Player player) {
+    public ScrapperSalvageFailEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player) {
-        super(npc, player);
+        super(npc, entity, player);
     }
 
     /**

src/main/java/net/knarcraft/blacksmith/event/ScrapperSalvageStartEvent.java

@@ -2,6 +2,7 @@ package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
 import org.bukkit.Material;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -20,13 +21,14 @@ public class ScrapperSalvageStartEvent extends AbstractBlacksmithPluginEvent imp
      * Instantiates a new scrapper salvage start event
      *
      * @param npc             <p>The NPC involved in the event</p>
+     * @param entity          <p>The entity of the NPC</p>
      * @param player          <p>The player involved in the event</p>
      * @param durationTicks   <p>The duration of the salvage</p>
      * @param craftingStation <p>The appropriate crafting station for this salvaging</p>
      */
-    public ScrapperSalvageStartEvent(@NotNull NPC npc, @NotNull Player player, long durationTicks,
+    public ScrapperSalvageStartEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player, long durationTicks,
                                      @NotNull Material craftingStation) {
-        super(npc, player);
+        super(npc, entity, player);
         this.durationTicks = durationTicks;
         this.craftingStation = craftingStation;
     }

src/main/java/net/knarcraft/blacksmith/event/ScrapperSalvageSucceedEvent.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.event;
 
 import net.citizensnpcs.api.npc.NPC;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
@@ -16,10 +17,11 @@ public class ScrapperSalvageSucceedEvent extends AbstractBlacksmithPluginEvent i
      * Instantiates a new scrapper salvage succeed event
      *
      * @param npc    <p>The NPC involved in the event</p>
+     * @param entity <p>The entity of the NPC</p>
      * @param player <p>The player involved in the event</p>
      */
-    public ScrapperSalvageSucceedEvent(@NotNull NPC npc, @NotNull Player player) {
+    public ScrapperSalvageSucceedEvent(@NotNull NPC npc, @NotNull Entity entity, @NotNull Player player) {
-        super(npc, player);
+        super(npc, entity, player);
     }
 
     /**

src/main/java/net/knarcraft/blacksmith/formatting/BlacksmithStringFormatter.java

@@ -1,33 +0,0 @@
-package net.knarcraft.blacksmith.formatting;
-
-import net.citizensnpcs.api.npc.NPC;
-import net.knarcraft.blacksmith.BlacksmithPlugin;
-import net.knarcraft.knarlib.property.ColorConversion;
-import net.knarcraft.knarlib.util.ColorHelper;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-
-/**
- * A formatter for formatting displayed messages
- */
-public final class BlacksmithStringFormatter {
-
-    private BlacksmithStringFormatter() {
-
-    }
-
-    /**
-     * Sends a message from a blacksmith NPC to a player
-     *
-     * @param npc     <p>The NPC sending the message</p>
-     * @param player  <p>The player to send the message to</p>
-     * @param message <p>The message to send</p>
-     */
-    public static void sendNPCMessage(NPC npc, Player player, String message) {
-        player.sendMessage(BlacksmithPlugin.getStringFormatter().replacePlaceholders(
-                BlacksmithTranslatableMessage.NPC_TALK_FORMAT, List.of("{npc}", "{message}"),
-                List.of(npc.getName(), ColorHelper.translateColorCodes(message, ColorConversion.RGB))));
-    }
-
-}

src/main/java/net/knarcraft/blacksmith/formatting/ItemType.java

@@ -1,7 +1,6 @@
 package net.knarcraft.blacksmith.formatting;
 
-import net.knarcraft.blacksmith.BlacksmithPlugin;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
-import net.knarcraft.knarlib.formatting.StringFormatter;
 
 /**
  * An enum representing all item types used in messages
@@ -16,12 +15,10 @@ public enum ItemType {
      *
      * @return <p>The name of this item type</p>
      */
-    public String getItemTypeName() {
+    public FormatBuilder getItemTypeName() {
-        StringFormatter stringFormatter = BlacksmithPlugin.getStringFormatter();
         return switch (this) {
-            case MATERIAL -> stringFormatter.getUnFormattedMessage(BlacksmithTranslatableMessage.ITEM_TYPE_MATERIAL);
+            case MATERIAL -> new FormatBuilder(Translatable.ITEM_TYPE_MATERIAL);
-            case ENCHANTMENT ->
+            case ENCHANTMENT -> new FormatBuilder(Translatable.ITEM_TYPE_ENCHANTMENT);
-                    stringFormatter.getUnFormattedMessage(BlacksmithTranslatableMessage.ITEM_TYPE_ENCHANTMENT);
         };
     }
 

src/main/java/net/knarcraft/blacksmith/formatting/NPCFormatter.java

@@ -0,0 +1,40 @@
+package net.knarcraft.blacksmith.formatting;
+
+import net.citizensnpcs.api.npc.NPC;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A formatter for formatting displayed messages
+ */
+public final class NPCFormatter {
+
+    private NPCFormatter() {
+
+    }
+
+    /**
+     * Sends a message from a blacksmith NPC to a player
+     *
+     * @param npc     <p>The NPC sending the message</p>
+     * @param player  <p>The player to send the message to</p>
+     * @param message <p>The message to send</p>
+     */
+    public static void sendNPCMessage(@NotNull NPC npc, @NotNull Player player, @NotNull String message) {
+        new FormatBuilder(Translatable.NPC_TALK_FORMAT).replace("{npc}",
+                npc.getName()).replace("{message}", message).displayColored(player);
+    }
+
+    /**
+     * Sends a message from a blacksmith NPC to a player
+     *
+     * @param npc           <p>The NPC sending the message</p>
+     * @param player        <p>The player to send the message to</p>
+     * @param formatBuilder <p>The format builder to send</p>
+     */
+    public static void sendNPCMessage(@NotNull NPC npc, @NotNull Player player, @NotNull FormatBuilder formatBuilder) {
+        sendNPCMessage(npc, player, formatBuilder.toString());
+    }
+
+}

src/main/java/net/knarcraft/blacksmith/formatting/TimeFormatter.java

@@ -1,6 +1,7 @@
 package net.knarcraft.blacksmith.formatting;
 
 import net.knarcraft.blacksmith.BlacksmithPlugin;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 
 import java.util.Arrays;
 import java.util.List;
@@ -53,8 +54,7 @@ public final class TimeFormatter {
      * @return <p>Text describing the time interval</p>
      */
     private static String getMessageFromInterval(TimeInterval interval) {
-        String text = BlacksmithPlugin.getStringFormatter().getUnFormattedMessage(
+        String text = new FormatBuilder(Translatable.valueOf(interval.name())).toString();
-                BlacksmithTranslatableMessage.valueOf(interval.name()));
 
         //Choose a random entry if a comma-separated list is provided
         if (text.contains(",")) {

src/main/java/net/knarcraft/blacksmith/formatting/Translatable.java

@@ -1,19 +1,16 @@
 package net.knarcraft.blacksmith.formatting;
 
-import net.knarcraft.blacksmith.BlacksmithPlugin;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
-import net.knarcraft.knarlib.formatting.StringReplacer;
 import net.knarcraft.knarlib.formatting.TranslatableMessage;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 /**
  * An enum containing all translatable global messages
  *
  * <p>This does not include NPC messages as they are configurable per-npc, and can be translated by changing the
  * default message values in the main config file.</p>
  */
-public enum BlacksmithTranslatableMessage implements TranslatableMessage {
+public enum Translatable implements TranslatableMessage {
 
     /**
      * The message displayed when a configuration value has been successfully changed
@@ -143,18 +140,22 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
     /**
      * The format to use for formatting any message spoken by a blacksmith NPC
      */
-    NPC_TALK_FORMAT;
+    NPC_TALK_FORMAT,
+
+    /**
+     * The text to display when explaining that a cost must be a positive double
+     */
+    DOUBLE_COST_REQUIRED;
 
     /**
      * Gets the message to display when displaying the raw value of messages
      *
      * @param rawValue <p>The raw value to display</p>
-     * @return <p>The message to display</p>
+     * @return <p>The format builder to display</p>
      */
     @NotNull
-    public static String getRawValueMessage(@NotNull String rawValue) {
+    public static FormatBuilder getRawValueMessage(@NotNull String rawValue) {
-        return BlacksmithPlugin.getStringFormatter().replacePlaceholder(BlacksmithTranslatableMessage.RAW_VALUE,
+        return new FormatBuilder(Translatable.RAW_VALUE).color().replace("{rawValue}", rawValue);
-                "{rawValue}", rawValue);
     }
 
     /**
@@ -162,12 +163,12 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      *
      * @param setting  <p>The setting whose value has been changed</p>
      * @param newValue <p>The new value of the setting</p>
-     * @return <p>The string to display to a user</p>
+     * @return <p>The format builder to display to a user</p>
      */
     @NotNull
-    public static String getValueChangedMessage(@NotNull String setting, @NotNull String newValue) {
+    public static FormatBuilder getValueChangedMessage(@NotNull String setting, @NotNull String newValue) {
-        return BlacksmithPlugin.getStringFormatter().replacePlaceholders(BlacksmithTranslatableMessage.VALUE_CHANGED,
+        return new FormatBuilder(Translatable.VALUE_CHANGED).replace("{setting}", setting).
-                List.of("{setting}", "{newValue}"), List.of(setting, newValue));
+                replace("{newValue}", newValue);
     }
 
     /**
@@ -177,18 +178,14 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @param itemType <p>The type of item changed ("material" or "enchantment")</p>
      * @param item     <p>The item the setting was changed for (a material or an enchantment name)</p>
      * @param newValue <p>The new value of the setting</p>
-     * @return <p>The string to display to a user</p>
+     * @return <p>The format builder to display to a user</p>
      */
     @NotNull
-    public static String getItemValueChangedMessage(@NotNull String setting, @NotNull ItemType itemType,
+    public static FormatBuilder getItemValueChangedMessage(@NotNull String setting, @NotNull ItemType itemType,
-                                                    @NotNull String item, @NotNull String newValue) {
+                                                           @NotNull String item, @NotNull String newValue) {
-        StringReplacer stringReplacer = new StringReplacer(BlacksmithPlugin.getStringFormatter().getUnFormattedMessage(
+        return new FormatBuilder(Translatable.VALUE_FOR_ITEM_CHANGED).replace("{setting}", setting).
-                BlacksmithTranslatableMessage.VALUE_FOR_ITEM_CHANGED));
+                replace("{itemType}", itemType.getItemTypeName()).replace("{item}", item).
-        stringReplacer.add("{setting}", setting);
+                replace("{newValue}", newValue);
-        stringReplacer.add("{itemType}", itemType.getItemTypeName());
-        stringReplacer.add("{item}", item);
-        stringReplacer.add("{newValue}", newValue);
-        return stringReplacer.replace();
     }
 
     /**
@@ -196,13 +193,12 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      *
      * @param setting      <p>The setting whose value is shown</p>
      * @param defaultValue <p>The default value of the setting</p>
-     * @return <p>The string to display to a user</p>
+     * @return <p>The format builder to display to a user</p>
      */
     @NotNull
-    public static String getDefaultValueMessage(@NotNull String setting, @NotNull String defaultValue) {
+    public static FormatBuilder getDefaultValueMessage(@NotNull String setting, @NotNull String defaultValue) {
-        return BlacksmithPlugin.getStringFormatter().replacePlaceholders(BlacksmithTranslatableMessage.DEFAULT_VALUE,
+        return new FormatBuilder(Translatable.DEFAULT_VALUE).replace("{setting}", setting).
-                List.of("{setting}", "{defaultValue}"),
+                replace("{defaultValue}", defaultValue);
-                List.of(setting, defaultValue));
     }
 
     /**
@@ -210,13 +206,12 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      *
      * @param setting      <p>The setting whose value is shown</p>
      * @param currentValue <p>The current value of the setting</p>
-     * @return <p>The string to display to a user</p>
+     * @return <p>The format builder to display to a user</p>
      */
     @NotNull
-    public static String getCurrentValueMessage(@NotNull String setting, @NotNull String currentValue) {
+    public static FormatBuilder getCurrentValueMessage(@NotNull String setting, @NotNull String currentValue) {
-        return BlacksmithPlugin.getStringFormatter().replacePlaceholders(BlacksmithTranslatableMessage.CURRENT_VALUE,
+        return new FormatBuilder(Translatable.CURRENT_VALUE).replace("{setting}", setting).
-                List.of("{setting}", "{currentValue}"),
+                replace("{currentValue}", currentValue);
-                List.of(setting, currentValue));
     }
 
     /**
@@ -226,24 +221,20 @@ public enum BlacksmithTranslatableMessage implements TranslatableMessage {
      * @param itemType     <p>The type of item shown ("material" or "enchantment")</p>
      * @param item         <p>The item the setting is shown for (a material or an enchantment name)</p>
      * @param currentValue <p>The current value of the setting</p>
-     * @return <p>The string to display to a user</p>
+     * @return <p>The format builder to display to a user</p>
      */
     @NotNull
-    public static String getItemCurrentValueMessage(@NotNull String setting, @NotNull ItemType itemType,
+    public static FormatBuilder getItemCurrentValueMessage(@NotNull String setting, @NotNull ItemType itemType,
-                                                    @NotNull String item, @NotNull String currentValue) {
+                                                           @NotNull String item, @NotNull String currentValue) {
-        StringReplacer stringReplacer = new StringReplacer(BlacksmithPlugin.getStringFormatter().getUnFormattedMessage(
+        return new FormatBuilder(Translatable.CURRENT_VALUE_FOR_ITEM).replace("{setting}", setting).
-                BlacksmithTranslatableMessage.CURRENT_VALUE_FOR_ITEM));
+                replace("{itemType}", itemType.getItemTypeName()).replace("{item}", item).
-        stringReplacer.add("{setting}", setting);
+                replace("{currentValue}", currentValue);
-        stringReplacer.add("{itemType}", itemType.getItemTypeName());
-        stringReplacer.add("{item}", item);
-        stringReplacer.add("{currentValue}", currentValue);
-        return stringReplacer.replace();
     }
 
     @Override
     @NotNull
     public TranslatableMessage[] getAllMessages() {
-        return BlacksmithTranslatableMessage.values();
+        return Translatable.values();
     }
 
 }

src/main/java/net/knarcraft/blacksmith/listener/NPCClickListener.java

@@ -2,10 +2,11 @@ package net.knarcraft.blacksmith.listener;
 
 import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.knarcraft.blacksmith.BlacksmithPlugin;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
 import net.knarcraft.blacksmith.trait.BlacksmithTrait;
 import net.knarcraft.blacksmith.trait.CustomTrait;
 import net.knarcraft.blacksmith.trait.ScrapperTrait;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -44,8 +45,7 @@ public class NPCClickListener implements Listener {
 
         //Permission check
         if (!player.hasPermission("blacksmith.use")) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(player,
+            new FormatBuilder(Translatable.PERMISSION_DENIED).error(player);
-                    BlacksmithTranslatableMessage.PERMISSION_DENIED);
             return;
         }
 

src/main/java/net/knarcraft/blacksmith/manager/EconomyManager.java

@@ -5,7 +5,10 @@ import net.knarcraft.blacksmith.config.blacksmith.GlobalBlacksmithSettings;
 import net.knarcraft.blacksmith.config.scrapper.GlobalScrapperSettings;
 import net.knarcraft.blacksmith.property.SalvageMethod;
 import net.knarcraft.blacksmith.util.ItemHelper;
+import net.knarcraft.knarlib.formatting.StringReplacer;
 import net.milkbowl.vault.economy.Economy;
+import net.objecthunter.exp4j.Expression;
+import net.objecthunter.exp4j.ExpressionBuilder;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -54,10 +57,12 @@ public class EconomyManager {
      *
      * @param player        <p>The player holding an item</p>
      * @param salvageMethod <p>The salvage method to check</p>
+     * @param item          <p>The item to be salvaged</p>
      * @return <p>Whether the player cannot pay for the salvage</p>
      */
-    public static boolean cannotPayForSalvage(@NotNull Player player, @NotNull SalvageMethod salvageMethod) {
+    public static boolean cannotPayForSalvage(@NotNull Player player, @NotNull SalvageMethod salvageMethod, @NotNull ItemStack item) {
-        return economy.getBalance(player) - getSalvageCost(salvageMethod) < 0;
+        // TODO: Account for advanced cost options
+        return economy.getBalance(player) - getSalvageCost(salvageMethod, item, player) < 0;
     }
 
     /**
@@ -76,26 +81,61 @@ public class EconomyManager {
      * Gets the human-readable cost of salvaging an item
      *
      * @param salvageMethod <p>The salvage method to get the cost for</p>
+     * @param item          <p>The item to be salvaged</p>
+     * @param player        <p>The player to provide the cost to</p>
      * @return <p>The formatted cost</p>
      */
     @NotNull
-    public static String formatSalvageCost(@NotNull SalvageMethod salvageMethod) {
+    public static String formatSalvageCost(@NotNull SalvageMethod salvageMethod, @NotNull ItemStack item,
-        return economy.format(getSalvageCost(salvageMethod));
+                                           @NotNull Player player) {
+        return economy.format(getSalvageCost(salvageMethod, item, player));
+    }
+
+    /**
+     * Gets whether the given player has enough money to pay the given cost
+     *
+     * @param player <p>The player to check</p>
+     * @param cost   <p>The required cost</p>
+     * @return <p>True if the player has enough money to cover the cost</p>
+     */
+    public static boolean hasEnough(@NotNull Player player, double cost) {
+        return economy.getBalance(player) >= cost;
+    }
+
+    /**
+     * Formats a number as an economy cost
+     *
+     * @param cost <p>The cost to format</p>
+     * @return <p>The formatted cost</p>
+     */
+    @NotNull
+    public static String format(double cost) {
+        return economy.format(cost);
     }
 
     /**
      * Gets the cost of salvaging using the specified method
      *
      * @param salvageMethod <p>The salvage method to get cost for</p>
+     * @param item          <p>The item to be salvaged</p>
      * @return <p>The salvage cost</p>
      */
-    private static double getSalvageCost(@NotNull SalvageMethod salvageMethod) {
+    private static double getSalvageCost(@NotNull SalvageMethod salvageMethod, @NotNull ItemStack item,
+                                         @NotNull Player player) {
         GlobalScrapperSettings settings = BlacksmithPlugin.getInstance().getGlobalScrapperSettings();
-        return switch (salvageMethod) {
+        double baseCost = switch (salvageMethod) {
             case SALVAGE, EXTENDED_SALVAGE -> settings.getSalvageCost();
             case NETHERITE -> settings.getNetheriteSalvageCost();
             case ARMOR_TRIM -> settings.getArmorTrimSalvageCost();
+            case ENCHANTED_BOOK -> getEnchantedBookSalvageCost(item);
         };
+
+        StringReplacer replacer = new StringReplacer(settings.getSalvageCostIncrease());
+        replacer.add("{cost}", String.valueOf(baseCost));
+        replacer.add("{timesUsed}", String.valueOf(PlayerUsageManager.getUsages(player,
+                System.currentTimeMillis() - 3600000)));
+        Expression expression = new ExpressionBuilder(replacer.replace()).build();
+        return Math.max(expression.evaluate(), baseCost);
     }
 
     /**
@@ -119,12 +159,26 @@ public class EconomyManager {
      * @param salvageMethod <p>The salvage method to withdraw for</p>
      */
     public static void withdrawScrapper(@NotNull Player player, @NotNull SalvageMethod salvageMethod) {
-        double cost = getSalvageCost(salvageMethod);
+        double cost = getSalvageCost(salvageMethod, player.getInventory().getItemInMainHand(), player);
         if (cost > 0) {
             economy.withdrawPlayer(player, cost);
         }
     }
 
+    /**
+     * Withdraws money from a player
+     *
+     * @param player       <p>The player to withdraw from</p>
+     * @param monetaryCost <p>The cost to withdraw</p>
+     * @throws IllegalArgumentException <p>If a negative cost is given</p>
+     */
+    public static void withdraw(@NotNull Player player, double monetaryCost) {
+        if (monetaryCost < 0) {
+            throw new IllegalArgumentException("Cannot withdraw a negative amount");
+        }
+        economy.withdrawPlayer(player, monetaryCost);
+    }
+
     /**
      * Gets the cost of the item in the given player's main hand
      *
@@ -183,6 +237,24 @@ public class EconomyManager {
         return price;
     }
 
+    /**
+     * Gets the cost of scrapping an enchanted book
+     *
+     * @param item <p>The enchanted book to calculate cost for</p>
+     * @return <p>The cost of scrapping the enchanted book</p>
+     */
+    private static double getEnchantedBookSalvageCost(@NotNull ItemStack item) {
+        // TODO: Properly implement this
+        /*GlobalScrapperSettings settings = BlacksmithPlugin.getInstance().getGlobalScrapperSettings();
+        
+        double cost = settings.getEnchantedBookSalvageCost();
+        if (settings.multiplyEnchantedBookSalvageCost()) {
+            cost *= SalvageHelper.getEnchantmentCount(item) - 1;
+        }
+        return SalvageHelper.getEnchantmentCount(item) * cost;*/
+        return 1000000;
+    }
+
     /**
      * Sets up Vault for economy
      *

src/main/java/net/knarcraft/blacksmith/manager/PlayerUsageManager.java

@@ -0,0 +1,75 @@
+package net.knarcraft.blacksmith.manager;
+
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A manager for keeping track of players using scrappers
+ */
+public class PlayerUsageManager {
+
+    private static final Map<Player, Set<Long>> playerUsages = new HashMap<>();
+
+    /**
+     * Register that a player has used a scrapper
+     *
+     * @param player <p>The player using a scrapper</p>
+     */
+    public static void registerUsage(@NotNull Player player) {
+        playerUsages.putIfAbsent(player, new HashSet<>());
+        Set<Long> usages = playerUsages.get(player);
+        usages.add(System.currentTimeMillis());
+    }
+
+    /**
+     * Gets how many times the given player has used a scrapper after the given timestamp
+     *
+     * @param player         <p>The player to check usages for</p>
+     * @param afterTimestamp <p>The timestamp of when to start looking for usages</p>
+     * @return <p>The number of scrapper uses for the given player</p>
+     */
+    public static int getUsages(@NotNull Player player, @NotNull Long afterTimestamp) {
+        Set<Long> usages = playerUsages.get(player);
+        if (usages == null) {
+            return 0;
+        }
+
+        int uses = 0;
+        Set<Long> expired = new HashSet<>();
+        for (Long usageTime : usages) {
+            if (usageTime < afterTimestamp) {
+                expired.add(usageTime);
+            } else {
+                uses++;
+            }
+        }
+
+        // Remove expired data
+        usages.removeAll(expired);
+
+        return uses;
+    }
+
+    /**
+     * Removes all expired timestamps
+     *
+     * @param afterTimestamp <p>The timestamp for the earliest time of valid timestamps</p>
+     */
+    public static void removeExpiredData(@NotNull Long afterTimestamp) {
+        for (Set<Long> usageSet : playerUsages.values()) {
+            Set<Long> expired = new HashSet<>();
+            for (Long item : usageSet) {
+                if (item < afterTimestamp) {
+                    expired.add(item);
+                }
+            }
+            usageSet.removeAll(expired);
+        }
+    }
+
+}

src/main/java/net/knarcraft/blacksmith/property/CostType.java

@@ -0,0 +1,49 @@
+package net.knarcraft.blacksmith.property;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The type of costs applicable to an advanced cost configuration
+ */
+public enum CostType {
+
+    /**
+     * A monetary cost from an economy plugin
+     */
+    ECONOMY,
+
+    /**
+     * A permission requirement, rather than a cost
+     */
+    PERMISSION,
+
+    /**
+     * In-game experience levels
+     */
+    EXP,
+
+    /**
+     * A specific item is consumed
+     */
+    ITEM,
+    ;
+
+    /**
+     * Parses a text string denoting a cost type
+     *
+     * @param input <p>The input to parse</p>
+     * @return <p>The parsed cost type, or null if not matched</p>
+     */
+    @Nullable
+    public static CostType parse(@NotNull String input) {
+        String normalized = input.trim().toUpperCase();
+        for (CostType costType : CostType.values()) {
+            if (normalized.equals(costType.name())) {
+                return costType;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/net/knarcraft/blacksmith/property/SalvageMethod.java

@@ -25,4 +25,9 @@ public enum SalvageMethod {
      */
     NETHERITE,
 
+    /**
+     * Splitting enchantments of an enchanted book
+     */
+    ENCHANTED_BOOK,
+
 }

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

@@ -4,9 +4,10 @@ import net.citizensnpcs.api.util.DataKey;
 import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.blacksmith.BlacksmithNPCSettings;
 import net.knarcraft.blacksmith.config.blacksmith.BlacksmithSetting;
+import net.knarcraft.blacksmith.formatting.NPCFormatter;
 import net.knarcraft.blacksmith.manager.EconomyManager;
 import net.knarcraft.blacksmith.util.ItemHelper;
-import net.knarcraft.knarlib.formatting.StringFormatter;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -15,8 +16,6 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithStringFormatter.sendNPCMessage;
-
 /**
  * The class representing the Blacksmith NPC trait
  */
@@ -69,7 +68,7 @@ public class BlacksmithTrait extends CustomTrait<BlacksmithSetting> {
     public void startSession(@NotNull Player player) {
         ItemStack hand = player.getInventory().getItemInMainHand();
         if (hand.getType().isAir()) {
-            sendNPCMessage(this.npc, player, config.getNoItemMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, config.getNoItemMessage());
             return;
         }
 
@@ -81,26 +80,30 @@ public class BlacksmithTrait extends CustomTrait<BlacksmithSetting> {
                 (!reforgeAbleItems.isEmpty() && !reforgeAbleItems.contains(hand.getType()));
 
         if (notHoldingAnvil && notHoldingRepairable) {
-            String invalidMessage = StringFormatter.replacePlaceholder(config.getInvalidItemMessage(),
+            NPCFormatter.sendNPCMessage(this.npc, player, new FormatBuilder(config.getInvalidItemMessage()).
-                    "{title}", config.getBlacksmithTitle());
+                    replace("{title}", config.getBlacksmithTitle()));
-            sendNPCMessage(this.npc, player, invalidMessage);
             return;
         }
 
         if (ItemHelper.getDamage(hand) == 0 && !ItemHelper.isAnvil(hand.getType(), true)) {
-            sendNPCMessage(this.npc, player, config.getNotDamagedMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, config.getNotDamagedMessage());
             return;
         }
 
         //Start a new reforge session for the player
         currentSessionStartTime = System.currentTimeMillis();
-        session = new ReforgeSession(this, player, npc, config);
+        try {
+            session = new ReforgeSession(this, player, npc, config);
+        } catch (IllegalArgumentException exception) {
+            BlacksmithPlugin.error(exception.getMessage());
+            return;
+        }
 
         //Tell the player the cost of repairing the item
         String cost = EconomyManager.formatBlacksmithCost(player);
         String itemName = hand.getType().name().toLowerCase().replace('_', ' ');
-        sendNPCMessage(this.npc, player, config.getCostMessage().replace("{cost}", cost).replace("{item}",
+        NPCFormatter.sendNPCMessage(this.npc, player, config.getCostMessage().replace("{cost}", cost).
-                itemName));
+                replace("{item}", itemName));
     }
 
     @Override

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

@@ -2,14 +2,18 @@ package net.knarcraft.blacksmith.trait;
 
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.Trait;
+import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.Setting;
 import net.knarcraft.blacksmith.config.Settings;
 import net.knarcraft.blacksmith.config.TraitSettings;
+import net.knarcraft.blacksmith.formatting.NPCFormatter;
 import net.knarcraft.blacksmith.formatting.TimeFormatter;
 import net.knarcraft.blacksmith.manager.EconomyManager;
-import net.knarcraft.knarlib.formatting.StringFormatter;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.jetbrains.annotations.NotNull;
@@ -18,11 +22,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithStringFormatter.sendNPCMessage;
-
 /**
  * A custom trait that utilizes sessions
  */
@@ -75,7 +76,7 @@ public abstract class CustomTrait<K extends Setting> extends Trait {
     public void continueSession(@NotNull Player player) {
         //Another player is using the blacksmith
         if (session.isNotInSession(player)) {
-            sendNPCMessage(this.npc, player, config.getBusyWithPlayerMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, config.getBusyWithPlayerMessage());
             return;
         }
 
@@ -83,8 +84,8 @@ public abstract class CustomTrait<K extends Setting> extends Trait {
         if (session.isRunning()) {
             int timeRemaining = (int) ((session.getFinishTime() - System.currentTimeMillis()) / 1000);
             boolean showExactTime = showExactTime();
-            sendNPCMessage(this.npc, player, StringFormatter.replacePlaceholder(config.getBusyWorkingMessage(),
+            NPCFormatter.sendNPCMessage(this.npc, player, new FormatBuilder(config.getBusyWorkingMessage()).
-                    "{time}", TimeFormatter.formatTime(showExactTime, timeRemaining)));
+                    replace("{time}", TimeFormatter.formatTime(showExactTime, timeRemaining)));
             return;
         }
         if (session.isSessionInvalid()) {
@@ -145,16 +146,21 @@ public abstract class CustomTrait<K extends Setting> extends Trait {
             if (!calendar.after(coolDowns.get(playerId))) {
                 int secondDifference = (int) (coolDowns.get(playerId).getTimeInMillis() - calendar.getTimeInMillis()) / 1000;
                 boolean exactTime = showExactTime();
-                sendNPCMessage(this.npc, player, StringFormatter.replacePlaceholder(config.getCoolDownUnexpiredMessage(),
+                NPCFormatter.sendNPCMessage(this.npc, player, new FormatBuilder(config.getCoolDownUnexpiredMessage()).
-                        "{time}", TimeFormatter.formatTime(exactTime, secondDifference)));
+                        replace("{time}", TimeFormatter.formatTime(exactTime, secondDifference)));
                 return false;
             }
             coolDowns.remove(playerId);
         }
 
         //If already in a session, but the player has failed to interact, and left the blacksmith, allow a new session
+        Entity entity = npc.getEntity();
+        if (entity == null) {
+            BlacksmithPlugin.error("NPC session could not be started, as the NPC does not have a valid entity");
+            return false;
+        }
         if (session != null && !session.isRunning() && (System.currentTimeMillis() > currentSessionStartTime + 10 * 1000 ||
-                this.npc.getEntity().getLocation().distance(session.getPlayer().getLocation()) > 20)) {
+                entity.getLocation().distance(session.getPlayer().getLocation()) > 20)) {
             session = null;
         }
         return true;
@@ -174,7 +180,7 @@ public abstract class CustomTrait<K extends Setting> extends Trait {
      * @param player <p>The player that initiated the reforge</p>
      */
     private void startMainAction(@NotNull NPC npc, @NotNull Player player) {
-        sendNPCMessage(this.npc, player, config.getStartWorkingMessage());
+        NPCFormatter.sendNPCMessage(this.npc, player, config.getStartWorkingMessage());
 
         boolean isBlacksmith = this instanceof BlacksmithTrait;
 
@@ -183,16 +189,21 @@ public abstract class CustomTrait<K extends Setting> extends Trait {
         } else if (this.session instanceof SalvageSession salvageSession) {
             EconomyManager.withdrawScrapper(player, salvageSession.salvageMethod);
         }
-
-        session.scheduleAction();
         PlayerInventory playerInventory = player.getInventory();
         ItemStack heldItem = player.getInventory().getItemInMainHand();
+        session.scheduleAction();
 
         //Display the item in the NPC's hand
-        if (npc.getEntity() instanceof Player) {
+        Entity entity = npc.getEntity();
-            ((Player) npc.getEntity()).getInventory().setItemInMainHand(heldItem);
+        if (entity instanceof Player playerNPC) {
-        } else {
+            playerNPC.getInventory().setItemInMainHand(heldItem);
-            Objects.requireNonNull(((LivingEntity) npc.getEntity()).getEquipment()).setItemInMainHand(heldItem);
+        } else if (entity instanceof LivingEntity) {
+            EntityEquipment equipment = ((LivingEntity) entity).getEquipment();
+            if (equipment != null) {
+                ((LivingEntity) entity).getEquipment().setItemInMainHand(heldItem);
+            } else {
+                BlacksmithPlugin.warn("Failed to update NPC item, as its equipment was irretrievable.");
+            }
         }
         //Remove the item from the player's inventory
         if (this.session instanceof SalvageSession salvageSession) {

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

@@ -5,6 +5,7 @@ import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.blacksmith.BlacksmithNPCSettings;
 import net.knarcraft.blacksmith.event.BlacksmithReforgeFailEvent;
 import net.knarcraft.blacksmith.event.BlacksmithReforgeSucceedEvent;
+import net.knarcraft.blacksmith.formatting.NPCFormatter;
 import net.knarcraft.blacksmith.manager.EconomyManager;
 import net.knarcraft.blacksmith.util.InputParsingHelper;
 import net.knarcraft.blacksmith.util.ItemHelper;
@@ -15,17 +16,15 @@ import org.bukkit.Sound;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 import java.util.Random;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithStringFormatter.sendNPCMessage;
-
 /**
  * A representation of the session between a player and a blacksmith
  */
@@ -60,6 +59,8 @@ public class ReforgeSession extends Session implements Runnable {
 
             enchantments = new ArrayList<>();
             for (Enchantment enchantment : enchantmentRegistry) {
+                // Note: While depreciated in Spigot, the new method is not available for Paper
+                //noinspection deprecation
                 enchantments.add(enchantment.getKey().getKey());
             }
         }
@@ -70,12 +71,12 @@ public class ReforgeSession extends Session implements Runnable {
         // Prevent player from switching items during session
         ItemStack itemInHand = this.player.getInventory().getItemInMainHand();
         if (!itemToReforge.equals(itemInHand)) {
-            sendNPCMessage(this.npc, this.player, this.config.getItemChangedMessage());
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getItemChangedMessage());
             return true;
         }
         // The player is unable to pay
         if (EconomyManager.cannotPayForHeldItemReforge(this.player)) {
-            sendNPCMessage(this.npc, this.player, this.config.getInsufficientFundsMessage());
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getInsufficientFundsMessage());
             return true;
         }
         return false;
@@ -103,14 +104,19 @@ public class ReforgeSession extends Session implements Runnable {
     @Override
     public void run() {
         boolean success = reforgeItem();
-        sendNPCMessage(this.npc, this.player, success ? this.config.getSuccessMessage() : this.config.getFailMessage());
+        NPCFormatter.sendNPCMessage(this.npc, this.player, success ? this.config.getSuccessMessage() : this.config.getFailMessage());
         playSound(success ? Sound.BLOCK_ANVIL_USE : Sound.ENTITY_VILLAGER_NO);
 
         //Stop the reforged item from displaying in the blacksmith's hand
-        if (this.npc.getEntity() instanceof Player) {
+        if (this.entity instanceof Player playerNPC) {
-            ((Player) this.npc.getEntity()).getInventory().setItemInMainHand(null);
+            playerNPC.getInventory().setItemInMainHand(null);
-        } else {
+        } else if (this.entity instanceof LivingEntity) {
-            Objects.requireNonNull(((LivingEntity) this.npc.getEntity()).getEquipment()).setItemInMainHand(null);
+            EntityEquipment equipment = ((LivingEntity) this.entity).getEquipment();
+            if (equipment != null) {
+                equipment.setItemInMainHand(null);
+            } else {
+                BlacksmithPlugin.warn("Failed to clear Blacksmith item, as its equipment was irretrievable.");
+            }
         }
 
         //Give the item back to the player
@@ -129,8 +135,7 @@ public class ReforgeSession extends Session implements Runnable {
      * Gives the reforged item back to the player
      */
     private void giveReforgedItem() {
-        giveResultingItem(this.config.getMaxReforgeDelay() > 0, this.config.getDropItem(), this.npc,
+        giveResultingItem(this.config.getMaxReforgeDelay() > 0, this.config.getDropItem(), this.itemToReforge);
-                this.itemToReforge);
     }
 
     /**
@@ -141,11 +146,11 @@ public class ReforgeSession extends Session implements Runnable {
     private boolean reforgeItem() {
         if (random.nextInt(100) < this.config.getFailChance()) {
             failReforge();
-            BlacksmithPlugin.getInstance().callEvent(new BlacksmithReforgeFailEvent(this.npc, this.player));
+            BlacksmithPlugin.getInstance().callEvent(new BlacksmithReforgeFailEvent(this.npc, this.entity, this.player));
             return false;
         } else {
             succeedReforge();
-            BlacksmithPlugin.getInstance().callEvent(new BlacksmithReforgeSucceedEvent(this.npc, this.player));
+            BlacksmithPlugin.getInstance().callEvent(new BlacksmithReforgeSucceedEvent(this.npc, this.entity, this.player));
             return true;
         }
     }

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

@@ -5,25 +5,28 @@ import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.scrapper.ScrapperNPCSettings;
 import net.knarcraft.blacksmith.event.ScrapperSalvageFailEvent;
 import net.knarcraft.blacksmith.event.ScrapperSalvageSucceedEvent;
+import net.knarcraft.blacksmith.formatting.NPCFormatter;
 import net.knarcraft.blacksmith.manager.EconomyManager;
+import net.knarcraft.blacksmith.manager.PlayerUsageManager;
 import net.knarcraft.blacksmith.property.SalvageMethod;
 import net.knarcraft.blacksmith.util.ItemHelper;
 import net.knarcraft.blacksmith.util.SalvageHelper;
+import net.knarcraft.knarlib.formatting.StringReplacer;
+import net.objecthunter.exp4j.Expression;
+import net.objecthunter.exp4j.ExpressionBuilder;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 import java.util.Random;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithStringFormatter.sendNPCMessage;
-
 /**
  * A representation of the session between a player and a scrapper
  */
@@ -66,12 +69,14 @@ public class SalvageSession extends Session implements Runnable {
         // Prevent player from switching items during session
         ItemStack itemInHand = this.player.getInventory().getItemInMainHand();
         if (!itemToSalvage.equals(itemInHand)) {
-            sendNPCMessage(this.npc, this.player, this.config.getItemChangedMessage());
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getItemChangedMessage());
             return true;
         }
 
-        if (EconomyManager.cannotPayForSalvage(this.player, this.salvageMethod)) {
+        // TODO: Check item cost. If 
-            sendNPCMessage(this.npc, this.player, this.config.getInsufficientFundsMessage());
+
+        if (EconomyManager.cannotPayForSalvage(this.player, this.salvageMethod, this.itemToSalvage)) {
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getInsufficientFundsMessage());
             return true;
         }
         return false;
@@ -94,6 +99,7 @@ public class SalvageSession extends Session implements Runnable {
             case EXTENDED_SALVAGE -> Material.CRAFTING_TABLE;
             case SALVAGE -> Material.ANVIL;
             case NETHERITE, ARMOR_TRIM -> Material.SMITHING_TABLE;
+            case ENCHANTED_BOOK -> Material.ENCHANTING_TABLE;
         };
     }
 
@@ -105,10 +111,15 @@ public class SalvageSession extends Session implements Runnable {
         salvageItem();
 
         //Stop the reforged item from displaying in the scrapper's hand
-        if (this.npc.getEntity() instanceof Player) {
+        if (this.entity instanceof Player playerNPC) {
-            ((Player) this.npc.getEntity()).getInventory().setItemInMainHand(null);
+            playerNPC.getInventory().setItemInMainHand(null);
-        } else {
+        } else if (this.entity instanceof LivingEntity) {
-            Objects.requireNonNull(((LivingEntity) this.npc.getEntity()).getEquipment()).setItemInMainHand(null);
+            EntityEquipment equipment = ((LivingEntity) this.entity).getEquipment();
+            if (equipment != null) {
+                equipment.setItemInMainHand(null);
+            } else {
+                BlacksmithPlugin.warn("Failed to clear Scrapper item, as its equipment was irretrievable.");
+            }
         }
 
         //Mark this scrapper as available
@@ -116,8 +127,14 @@ public class SalvageSession extends Session implements Runnable {
 
         // Start cool-down
         Calendar wait = Calendar.getInstance();
-        wait.add(Calendar.SECOND, this.config.getSalvageCoolDown());
+        StringReplacer replacer = new StringReplacer(BlacksmithPlugin.getInstance().getGlobalScrapperSettings().getSalvageCooldownIncrease());
+        replacer.add("{cooldown}", String.valueOf(this.config.getSalvageCoolDown()));
+        replacer.add("{timesUsed}", String.valueOf(PlayerUsageManager.getUsages(player, System.currentTimeMillis() - 3600000)));
+        Expression expression = new ExpressionBuilder(replacer.replace()).build();
+
+        wait.add(Calendar.SECOND, Math.max((int) expression.evaluate(), this.config.getSalvageCoolDown()));
         this.scrapperTrait.addCoolDown(this.player.getUniqueId(), wait);
+        PlayerUsageManager.registerUsage(this.player);
     }
 
     /**
@@ -136,12 +153,12 @@ public class SalvageSession extends Session implements Runnable {
         if (random.nextInt(100) < this.config.getFailChance()) {
             playSound(Sound.ENTITY_VILLAGER_NO);
             failSalvage();
-            BlacksmithPlugin.getInstance().callEvent(new ScrapperSalvageFailEvent(this.npc, this.player));
+            BlacksmithPlugin.getInstance().callEvent(new ScrapperSalvageFailEvent(this.npc, this.entity, this.player));
         } else {
             playSound(Sound.BLOCK_ANVIL_USE);
             giveSalvage();
-            BlacksmithPlugin.getInstance().callEvent(new ScrapperSalvageSucceedEvent(this.npc, this.player));
+            BlacksmithPlugin.getInstance().callEvent(new ScrapperSalvageSucceedEvent(this.npc, this.entity, this.player));
-            sendNPCMessage(this.npc, this.player, this.config.getSuccessMessage());
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getSuccessMessage());
         }
     }
 
@@ -155,16 +172,15 @@ public class SalvageSession extends Session implements Runnable {
         if (ItemHelper.getMaxDurability(this.itemToSalvage) > 0) {
             //Damage the item if possible
             damageItemRandomly(this.itemToSalvage);
-            giveResultingItem(this.config.getMaxSalvageDelay() > 0, this.config.getDropItem(), this.npc,
+            giveResultingItem(this.config.getMaxSalvageDelay() > 0, this.config.getDropItem(), this.itemToSalvage);
-                    this.itemToSalvage);
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getFailSalvageMessage());
-            sendNPCMessage(this.npc, this.player, this.config.getFailSalvageMessage());
         } else {
             // Give half the salvage
             List<ItemStack> halfSalvage = SalvageHelper.pickRandomSalvage(this.salvage, new ArrayList<>(), 0.5);
             for (ItemStack item : halfSalvage) {
-                giveResultingItem(this.config.getMaxSalvageDelay() > 0, this.config.getDropItem(), this.npc, item);
+                giveResultingItem(this.config.getMaxSalvageDelay() > 0, this.config.getDropItem(), item);
             }
-            sendNPCMessage(this.npc, this.player, this.config.getFailExtendedSalvageMessage());
+            NPCFormatter.sendNPCMessage(this.npc, this.player, this.config.getFailExtendedSalvageMessage());
         }
     }
 
@@ -177,7 +193,7 @@ public class SalvageSession extends Session implements Runnable {
         this.player.giveExpLevels(this.enchantmentLevels);
         BlacksmithPlugin.debug("Giving salvage " + this.salvage);
         for (ItemStack item : this.salvage) {
-            giveResultingItem(this.config.getMaxSalvageDelay() > 0, this.config.getDropItem(), this.npc, item);
+            giveResultingItem(this.config.getMaxSalvageDelay() > 0, this.config.getDropItem(), item);
         }
     }
 

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

@@ -4,22 +4,25 @@ import net.citizensnpcs.api.util.DataKey;
 import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.SmithPreset;
 import net.knarcraft.blacksmith.config.SmithPresetFilter;
+import net.knarcraft.blacksmith.config.scrapper.GlobalScrapperSettings;
 import net.knarcraft.blacksmith.config.scrapper.ScrapperNPCSettings;
 import net.knarcraft.blacksmith.config.scrapper.ScrapperSetting;
 import net.knarcraft.blacksmith.container.RecipeResult;
 import net.knarcraft.blacksmith.container.SalvageResult;
+import net.knarcraft.blacksmith.formatting.NPCFormatter;
 import net.knarcraft.blacksmith.manager.EconomyManager;
 import net.knarcraft.blacksmith.property.SalvageMethod;
 import net.knarcraft.blacksmith.property.SalvageState;
 import net.knarcraft.blacksmith.util.ItemHelper;
 import net.knarcraft.blacksmith.util.SalvageHelper;
-import net.knarcraft.knarlib.formatting.StringFormatter;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import net.knarcraft.knarlib.formatting.StringReplacer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ArmorMeta;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,8 +31,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithStringFormatter.sendNPCMessage;
-
 /**
  * The class representing a scrapper NPC trait
  */
@@ -86,7 +87,7 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
     public void startSession(@NotNull Player player) {
         ItemStack itemInHand = player.getInventory().getItemInMainHand().clone();
         if (itemInHand.getType().isAir()) {
-            sendNPCMessage(this.npc, player, config.getNoItemMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, config.getNoItemMessage());
             return;
         }
 
@@ -95,8 +96,8 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
 
         // Check if the item can be salvaged
         if (!canBeSalvaged(itemInHand, salvageAbleItems, extended)) {
-            sendNPCMessage(this.npc, player, StringFormatter.replacePlaceholder(getSettings().getInvalidItemMessage(),
+            NPCFormatter.sendNPCMessage(this.npc, player, new FormatBuilder(getSettings().getInvalidItemMessage()).
-                    "{title}", getSettings().getScrapperTitle()));
+                    replace("{title}", getSettings().getScrapperTitle()));
             BlacksmithPlugin.debug("Cannot salvage provided item: " + itemInHand);
             return;
         }
@@ -109,10 +110,15 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
 
         //Start a new scrapper session for the player
         currentSessionStartTime = System.currentTimeMillis();
-        session = new SalvageSession(this, player, npc, getSettings(), result.salvage(),
+        try {
-                result.salvageMethod(), result.requiredAmount());
+            session = new SalvageSession(this, player, npc, getSettings(), result.salvage(),
+                    result.salvageMethod(), result.requiredAmount());
+        } catch (IllegalArgumentException exception) {
+            BlacksmithPlugin.error(exception.getMessage());
+            return;
+        }
         // Print the cost to the player
-        printCostMessage(player, itemInHand, EconomyManager.formatSalvageCost(result.salvageMethod()),
+        printCostMessage(player, itemInHand, EconomyManager.formatSalvageCost(result.salvageMethod(), itemInHand, player),
                 result.salvageMethod());
     }
 
@@ -140,6 +146,13 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
             return result;
         }
 
+        result = isEnchantedBookSalvage(player, itemInHand);
+        if (result.salvageState() == SalvageState.NO_SALVAGE) {
+            return null;
+        } else if (result.salvageState() == SalvageState.FOUND_SALVAGE) {
+            return result;
+        }
+
         result = isNormalSalvage(player, itemInHand, extended);
         if (result.salvageState() == SalvageState.NO_SALVAGE) {
             return null;
@@ -163,15 +176,15 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
 
         // As there is no recipe for netherite items, the check needs to be after the netherite salvage check
         if (!SalvageHelper.isSalvageable(player.getServer(), itemInHand)) {
-            sendNPCMessage(this.npc, player, StringFormatter.replacePlaceholder(getSettings().getInvalidItemMessage(),
+            NPCFormatter.sendNPCMessage(this.npc, player, new FormatBuilder(getSettings().getInvalidItemMessage()).
-                    "{title}", getSettings().getScrapperTitle()));
+                    replace("{title}", getSettings().getScrapperTitle()));
             BlacksmithPlugin.debug("Provided with non-salvage-able item " + itemInHand);
             return new SalvageResult(SalvageMethod.SALVAGE, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
         }
 
-        // Check if the item is enchanted, and whether this blacksmith can salvage it
+        // Check if the item is enchanted, and whether this scrapper can salvage it
         if (!itemInHand.getEnchantments().isEmpty() && !getSettings().salvageEnchanted()) {
-            sendNPCMessage(this.npc, player, getSettings().getCannotSalvageEnchantedMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSalvageEnchantedMessage());
             return new SalvageResult(SalvageMethod.SALVAGE, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
         }
 
@@ -180,7 +193,7 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
         SalvageMethod method = ItemHelper.isRepairable(itemInHand) ? SalvageMethod.SALVAGE : SalvageMethod.EXTENDED_SALVAGE;
         boolean noUsefulSalvage = recipeResult == null || recipeResult.salvage().isEmpty();
         if (noUsefulSalvage) {
-            sendNPCMessage(this.npc, player, getSettings().getTooDamagedMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getTooDamagedMessage());
             return new SalvageResult(method, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
         } else {
             return new SalvageResult(method, recipeResult.salvage(), SalvageState.FOUND_SALVAGE,
@@ -188,6 +201,37 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
         }
     }
 
+    /**
+     * Gets the result of trying to salvage the item as an enchanted book
+     *
+     * @param player     <p>The player trying to salvage the item</p>
+     * @param itemInHand <p>The item to be salvaged</p>
+     * @return <p>The result of attempting the salvage</p>
+     */
+    private SalvageResult isEnchantedBookSalvage(@NotNull Player player, @NotNull ItemStack itemInHand) {
+        if (itemInHand.getType() != Material.ENCHANTED_BOOK ||
+                !(itemInHand.getItemMeta() instanceof EnchantmentStorageMeta)) {
+            return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, new ArrayList<>(), SalvageState.INCORRECT_METHOD, 0);
+        }
+
+        if (!getSettings().splitEnchantedBook()) {
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSalvageEnchantedBookMessage());
+            return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
+        }
+
+        if (SalvageHelper.getEnchantmentCount(itemInHand) <= 1) {
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSplitEnchantedBookFurtherMessage());
+            return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
+        }
+
+        List<ItemStack> salvage = SalvageHelper.getEnchantedBookSalvage(itemInHand);
+        boolean noUsefulSalvage = salvage == null || salvage.isEmpty();
+        if (noUsefulSalvage) {
+            return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
+        }
+        return new SalvageResult(SalvageMethod.ENCHANTED_BOOK, salvage, SalvageState.FOUND_SALVAGE, 1);
+    }
+
     /**
      * Gets the result of trying to salvage the item as a netherite applied item
      *
@@ -202,7 +246,7 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
         }
 
         if (!getSettings().salvageNetherite()) {
-            sendNPCMessage(this.npc, player, getSettings().getCannotSalvageNetheriteMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSalvageNetheriteMessage());
             return new SalvageResult(SalvageMethod.NETHERITE, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
         }
 
@@ -228,13 +272,13 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
         }
 
         if (!getSettings().salvageArmorTrims()) {
-            sendNPCMessage(this.npc, player, getSettings().getCannotSalvageArmorTrimMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getCannotSalvageArmorTrimMessage());
             return new SalvageResult(SalvageMethod.ARMOR_TRIM, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
         }
 
         List<ItemStack> salvage = SalvageHelper.getArmorTrimSalvage(itemInHand, armorMeta);
         if (salvage == null || salvage.isEmpty()) {
-            sendNPCMessage(this.npc, player, getSettings().getArmorTrimSalvageNotFoundMessage());
+            NPCFormatter.sendNPCMessage(this.npc, player, getSettings().getArmorTrimSalvageNotFoundMessage());
             return new SalvageResult(SalvageMethod.ARMOR_TRIM, new ArrayList<>(), SalvageState.NO_SALVAGE, 0);
         }
 
@@ -255,7 +299,7 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
         replacer.add("{cost}", cost);
         replacer.add("{item}", itemInHand.getType().name().toLowerCase().replace('_', ' '));
         if (salvageMethod == SalvageMethod.ARMOR_TRIM) {
-            sendNPCMessage(this.npc, player, replacer.replace(getSettings().getArmorTrimCostMessage()));
+            NPCFormatter.sendNPCMessage(this.npc, player, replacer.replace(getSettings().getArmorTrimCostMessage()));
         } else if (salvageMethod == SalvageMethod.SALVAGE || salvageMethod == SalvageMethod.EXTENDED_SALVAGE) {
             String expectedYield;
             if (ItemHelper.getDamage(itemInHand) <= 0) {
@@ -264,14 +308,35 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
                 expectedYield = getSettings().getPartialSalvageMessage();
             }
             replacer.add("{yield}", expectedYield);
-            sendNPCMessage(this.npc, player, replacer.replace(getSettings().getCostMessage()));
+            NPCFormatter.sendNPCMessage(this.npc, player, replacer.replace(getSettings().getCostMessage()));
         } else if (salvageMethod == SalvageMethod.NETHERITE) {
-            sendNPCMessage(this.npc, player, replacer.replace(getSettings().getNetheriteCostMessage()));
+            NPCFormatter.sendNPCMessage(this.npc, player, replacer.replace(getSettings().getNetheriteCostMessage()));
+        } else if (salvageMethod == SalvageMethod.ENCHANTED_BOOK) {
+            StringReplacer replacer2 = new StringReplacer();
+            replacer2.add("{cost}", getEnchantedBookCost());
+            NPCFormatter.sendNPCMessage(this.npc, player, replacer2.replace(getSettings().getEnchantedBookCostMessage()));
         } else {
             BlacksmithPlugin.error("Unrecognized salvage method " + salvageMethod);
         }
     }
 
+    private String getEnchantedBookCost() {
+        // TODO: If both an item and money is required, print both requirements
+        // TODO: If only money is required, print the money requirement
+        // TODO: If an item requirement is set, print the item requirement
+
+        GlobalScrapperSettings scrapperSettings = BlacksmithPlugin.getInstance().getGlobalScrapperSettings();
+        /*String moneyCost = EconomyManager.format(scrapperSettings.getEnchantedBookSalvageCost());
+        //ItemStack itemCost = scrapperSettings.
+        if (scrapperSettings.requireMoneyAndItemForEnchantedBookSalvage()) {
+            // TODO: Print both with a + between them (if item has a special name, use that instead of the material name)
+
+        } else {
+            // TODO: If the item is not null, print it, otherwise print the monetary cost
+        }*/
+        return "";
+    }
+
     @Override
     protected boolean showExactTime() {
         return BlacksmithPlugin.getInstance().getGlobalScrapperSettings().showExactTime();
@@ -286,8 +351,8 @@ public class ScrapperTrait extends CustomTrait<ScrapperSetting> {
      * @return <p>True if the item can be theoretically salvaged</p>
      */
     private boolean canBeSalvaged(@NotNull ItemStack item, @NotNull List<Material> salvageAbleItems, boolean extended) {
-        return (extended || ItemHelper.isRepairable(item)) &&
+        return item.getType() == Material.ENCHANTED_BOOK || ((extended || ItemHelper.isRepairable(item)) &&
-                (salvageAbleItems.isEmpty() || salvageAbleItems.contains(item.getType()));
+                (salvageAbleItems.isEmpty() || salvageAbleItems.contains(item.getType())));
     }
 
     /**

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

@@ -26,6 +26,7 @@ public abstract class Session implements Runnable {
     protected static final Random random = new Random();
     protected final Player player;
     protected final NPC npc;
+    protected final Entity entity;
     protected long finishTime;
     protected int taskId;
 
@@ -38,6 +39,10 @@ public abstract class Session implements Runnable {
     public Session(@NotNull Player player, @NotNull NPC npc) {
         this.player = player;
         this.npc = npc;
+        this.entity = npc.getEntity();
+        if (entity == null) {
+            throw new IllegalArgumentException("Tried to start session for an NPC without an assigned entity.");
+        }
     }
 
     /**
@@ -103,9 +108,9 @@ public abstract class Session implements Runnable {
 
         BlacksmithPlugin instance = BlacksmithPlugin.getInstance();
         if (this instanceof ReforgeSession) {
-            instance.callEvent(new BlacksmithReforgeStartEvent(npc, player, actionDelayTicks, getCraftingStation()));
+            instance.callEvent(new BlacksmithReforgeStartEvent(this.npc, this.entity, this.player, actionDelayTicks, getCraftingStation()));
         } else if (this instanceof SalvageSession) {
-            instance.callEvent(new ScrapperSalvageStartEvent(npc, player, actionDelayTicks, getCraftingStation()));
+            instance.callEvent(new ScrapperSalvageStartEvent(this.npc, this.entity, this.player, actionDelayTicks, getCraftingStation()));
         }
 
         taskId = scheduler.scheduleSyncDelayedTask(BlacksmithPlugin.getInstance(), this, actionDelayTicks);
@@ -116,14 +121,13 @@ public abstract class Session implements Runnable {
      *
      * @param hasDelay     <p>Whether the session was delayed, or if the item was processed instantly</p>
      * @param dropItem     <p>Whether the item should be dropped on the ground</p>
-     * @param npc          <p>The NPC holding the item</p>
      * @param itemToReturn <p>The item to return to the player</p>
      */
-    protected void giveResultingItem(boolean hasDelay, boolean dropItem, @NotNull NPC npc, @NotNull ItemStack itemToReturn) {
+    protected void giveResultingItem(boolean hasDelay, boolean dropItem, @NotNull ItemStack itemToReturn) {
         if (hasDelay) {
             //If the player isn't online, or the player cannot fit the item, drop the item to prevent it from disappearing
             if (dropItem || !this.player.isOnline() || !ItemHelper.canFitItem(this.player.getInventory(), itemToReturn)) {
-                this.player.getWorld().dropItemNaturally(npc.getEntity().getLocation(), itemToReturn);
+                this.player.getWorld().dropItemNaturally(this.entity.getLocation(), itemToReturn);
             } else {
                 this.player.getInventory().addItem(itemToReturn);
             }
@@ -172,7 +176,7 @@ public abstract class Session implements Runnable {
      * @param sound <p>The sound to play</p>
      */
     protected void playSound(Sound sound) {
-        playSound(this.npc.getEntity(), sound);
+        playSound(this.entity, sound);
     }
 
     /**
@@ -187,14 +191,13 @@ public abstract class Session implements Runnable {
             return;
         }
 
-        NPCSoundEvent event = new NPCSoundEvent(this.npc, this.player, SoundCategory.AMBIENT, sound, 0.5f, 1.0f);
+        NPCSoundEvent event = new NPCSoundEvent(this.npc, this.entity, this.player, SoundCategory.AMBIENT, sound, 0.5f, 1.0f);
         BlacksmithPlugin.getInstance().callEvent(event);
         if (event.isCancelled()) {
             return;
         }
 
-        world.playSound(event.getNpc().getEntity(), event.getSound(), event.getSoundCategory(), event.getVolume(),
+        world.playSound(event.getEntity(), event.getSound(), event.getSoundCategory(), event.getVolume(), event.getPitch());
-                event.getPitch());
     }
 
 }

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

@@ -1,20 +1,18 @@
 package net.knarcraft.blacksmith.util;
 
-import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.Setting;
 import net.knarcraft.blacksmith.config.SettingValueType;
 import net.knarcraft.blacksmith.config.Settings;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
-import net.knarcraft.knarlib.formatting.StringFormatter;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
-import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 
-import static net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage.getCurrentValueMessage;
+import static net.knarcraft.blacksmith.formatting.Translatable.getCurrentValueMessage;
-import static net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage.getDefaultValueMessage;
+import static net.knarcraft.blacksmith.formatting.Translatable.getDefaultValueMessage;
-import static net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage.getValueChangedMessage;
+import static net.knarcraft.blacksmith.formatting.Translatable.getValueChangedMessage;
 
 /**
  * A helper class for the configuration command
@@ -43,8 +41,7 @@ public final class ConfigCommandHelper {
             newValue = String.join(" ", Arrays.asList(args).subList(1, args.length));
         }
         settings.changeValue(detectedSetting, newValue);
-        BlacksmithPlugin.getStringFormatter().displaySuccessMessage(sender,
+        getValueChangedMessage(detectedSetting.getCommandName(), newValue).success(sender);
-                getValueChangedMessage(detectedSetting.getCommandName(), newValue));
     }
 
     /**
@@ -57,7 +54,6 @@ public final class ConfigCommandHelper {
     public static <K extends Setting> void displayCurrentValue(@NotNull K setting,
                                                                @NotNull Settings<K> settings,
                                                                @NotNull CommandSender sender) {
-        StringFormatter formatter = BlacksmithPlugin.getStringFormatter();
         boolean printRawValue = false;
 
         //Find the value of the specified setting
@@ -70,17 +66,17 @@ public final class ConfigCommandHelper {
         }
 
         // Display the description of the setting
-        formatter.displaySuccessMessage(sender, setting.getDescription());
+        new FormatBuilder(setting.getDescription()).success(sender);
 
         // Display the setting's default value
-        formatter.displayNeutralMessage(sender, getDefaultValueMessage(setting.getCommandName(), defaultValue));
+        getDefaultValueMessage(setting.getCommandName(), defaultValue).neutral(sender);
         if (printRawValue) {
             displayRaw(sender, defaultValue);
         }
 
         // Display the current value of the setting
-        formatter.displayNeutralMessage(sender, getCurrentValueMessage(setting.getCommandName(), currentValue));
+        getCurrentValueMessage(setting.getCommandName(), currentValue).neutral(sender);
-        if (printRawValue) {
+        if (!currentValue.equals(defaultValue) && printRawValue) {
             displayRaw(sender, currentValue);
         }
     }
@@ -92,8 +88,7 @@ public final class ConfigCommandHelper {
      * @param value  <p>The value to display raw</p>
      */
     public static void displayRaw(@NotNull CommandSender sender, @NotNull String value) {
-        sender.sendMessage(BlacksmithTranslatableMessage.getRawValueMessage(
+        new FormatBuilder(Translatable.RAW_VALUE).color().replace("{rawValue}", value).displayRaw(sender);
-                value.replace(ChatColor.COLOR_CHAR, '&')));
     }
 
 }

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

@@ -1,22 +1,10 @@
 package net.knarcraft.blacksmith.util;
 
-import net.knarcraft.blacksmith.BlacksmithPlugin;
-import net.knarcraft.blacksmith.config.StargateYamlConfiguration;
-import net.knarcraft.knarlib.property.ColorConversion;
-import net.knarcraft.knarlib.util.FileHelper;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.MemorySection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A helper class for getting an object value as the correct type
@@ -106,103 +94,4 @@ public final class ConfigHelper {
         }
     }
 
-    /**
-     * Changes all configuration values from the old name to the new name
-     *
-     * @param dataFolderPath       <p>The path to this plugin's data</p>
-     * @param currentConfiguration <p>The current config to back up</p>
-     */
-    public static void migrateConfig(@NotNull String dataFolderPath, @NotNull FileConfiguration currentConfiguration) {
-        BlacksmithPlugin instance = BlacksmithPlugin.getInstance();
-
-        //Save the old config just in case something goes wrong
-        try {
-            currentConfiguration.save(new File(dataFolderPath, "config.yml.old"));
-        } catch (IOException exception) {
-            BlacksmithPlugin.warn("Unable to save old backup and do migration");
-            return;
-        }
-
-        //Load old and new configuration
-        instance.reloadConfig();
-        FileConfiguration oldConfiguration = instance.getConfig();
-        InputStream configStream = FileHelper.getInputStreamForInternalFile("/config.yml");
-        if (configStream == null) {
-            BlacksmithPlugin.error("Could not migrate the configuration, as the internal configuration could not be read!");
-            return;
-        }
-        YamlConfiguration newConfiguration = StargateYamlConfiguration.loadConfiguration(
-                FileHelper.getBufferedReaderFromInputStream(configStream));
-
-        //Read all available config migrations
-        Map<String, String> migrationFields;
-        try {
-            InputStream migrationStream = FileHelper.getInputStreamForInternalFile("/config-migrations.txt");
-            if (migrationStream == null) {
-                BlacksmithPlugin.error("Could not migrate the configuration, as the internal migration paths could not be read!");
-                return;
-            }
-            migrationFields = FileHelper.readKeyValuePairs(FileHelper.getBufferedReaderFromInputStream(migrationStream),
-                    "=", ColorConversion.NORMAL);
-        } catch (IOException exception) {
-            BlacksmithPlugin.warn("Unable to load config migration file");
-            return;
-        }
-
-        //Replace old config names with the new ones
-        for (String key : migrationFields.keySet()) {
-            if (oldConfiguration.contains(key)) {
-                migrateProperty(migrationFields, key, oldConfiguration);
-            }
-        }
-
-        // Copy all keys to the new config
-        for (String key : StargateYamlConfiguration.getKeysWithoutComments(oldConfiguration, true)) {
-            if (oldConfiguration.get(key) instanceof MemorySection) {
-                continue;
-            }
-            newConfiguration.set(key, oldConfiguration.get(key));
-        }
-
-        try {
-            newConfiguration.save(new File(dataFolderPath, "config.yml"));
-        } catch (IOException exception) {
-            BlacksmithPlugin.warn("Unable to save migrated config");
-        }
-
-        instance.reloadConfig();
-    }
-
-    /**
-     * Migrates one configuration property
-     *
-     * @param migrationFields  <p>The configuration fields to be migrated</p>
-     * @param key              <p>The key/path of the property to migrate</p>
-     * @param oldConfiguration <p>The original pre-migration configuration</p>
-     */
-    private static void migrateProperty(@NotNull Map<String, String> migrationFields, @NotNull String key,
-                                        @NotNull FileConfiguration oldConfiguration) {
-        String newPath = migrationFields.get(key);
-        Object oldValue = oldConfiguration.get(key);
-        if (!newPath.trim().isEmpty()) {
-            if (oldConfiguration.isConfigurationSection(key)) {
-                // Copy each value of a configuration section
-                ConfigurationSection sourceSection = oldConfiguration.getConfigurationSection(key);
-                ConfigurationSection destinationSection = oldConfiguration.createSection(newPath);
-                if (sourceSection == null) {
-                    return;
-                }
-                for (String path : StargateYamlConfiguration.getKeysWithoutComments(sourceSection, true)) {
-                    destinationSection.set(path, sourceSection.get(path));
-                }
-            } else {
-                // Copy the value to the new path
-                oldConfiguration.set(newPath, oldValue);
-            }
-        }
-
-        // Remove the old path's value
-        oldConfiguration.set(key, null);
-    }
-
 }

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

@@ -0,0 +1,288 @@
+package net.knarcraft.blacksmith.util;
+
+import net.knarcraft.blacksmith.container.ActionCost;
+import net.knarcraft.blacksmith.formatting.Translatable;
+import net.knarcraft.blacksmith.property.CostType;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.permissions.Permission;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringJoiner;
+
+/**
+ * A helper class for setting action costs
+ */
+public final class CostHelper {
+
+    private static List<String> plugins;
+    private static Map<String, List<String>> permissions;
+
+    private CostHelper() {
+
+    }
+
+    /**
+     * Parses a simple double cost
+     *
+     * @param commandSender <p>The command sender to notify of any problems</p>
+     * @param costString    <p>The string to parse into a cost</p>
+     * @return <p>The parsed cost</p>
+     * @throws IllegalArgumentException <p>If the specified cost is invalid</p>
+     */
+    public static double parseSimpleCost(@NotNull CommandSender commandSender,
+                                         @NotNull String costString) throws IllegalArgumentException {
+        try {
+            double cost = Double.parseDouble(costString);
+            if (cost < 0) {
+                throw new NumberFormatException();
+            }
+            return cost;
+        } catch (NumberFormatException exception) {
+            new FormatBuilder(Translatable.DOUBLE_COST_REQUIRED).error(commandSender);
+            throw new IllegalArgumentException("Invalid cost given");
+        }
+    }
+
+    /**
+     * Shows tab-completion actions for altering a cost
+     *
+     * @param arguments <p>The arguments given by the user</p>
+     * @return <p>The available tab-complete options</p>
+     */
+    public static @Nullable List<String> tabCompleteCost(@NotNull String[] arguments) {
+        if (plugins == null) {
+            loadAvailablePermissions();
+        }
+
+        if (arguments.length == 1) {
+            return List.of("simple", "advanced");
+        } else if (arguments.length == 2) {
+            if (arguments[0].equalsIgnoreCase("simple")) {
+                return List.of("");
+            } else {
+                return List.of("add", "set", "clear");
+            }
+        } else if (arguments.length == 3) {
+            if (arguments[0].equalsIgnoreCase("simple")) {
+                return List.of("");
+            } else {
+                return List.of("economy", "item", "exp", "permission");
+            }
+        } else if (arguments.length == 4) {
+            CostType costType = CostType.parse(arguments[2]);
+            if (costType == null) {
+                return null;
+            }
+            return switch (costType) {
+                case PERMISSION -> tabCompletePermission(arguments[3]);
+                case ECONOMY -> List.of("0.5", "1", "10");
+                case EXP -> List.of("1, 5, 10");
+                case ITEM -> List.of();
+            };
+        }
+        return List.of();
+    }
+
+    /**
+     * Modifies the cost of an action
+     *
+     * @param arguments <p>The arguments given by a player</p>
+     * @param oldCost   <p>The previous cost of the action</p>
+     * @param player    <p>The player attempting to alter the action cost</p>
+     * @return <p>The modified action cost, or null if something went wrong</p>
+     */
+    @Nullable
+    public static ActionCost modifyActionCost(@NotNull String[] arguments, @NotNull ActionCost oldCost,
+                                              @NotNull Player player) {
+        CostType costType;
+        if (arguments.length > 2) {
+            costType = CostType.parse(arguments[2]);
+        } else {
+            costType = null;
+        }
+
+        switch (arguments[1].toLowerCase()) {
+            case "add":
+                if (costType == null) {
+                    player.sendMessage("Invalid cost type specified!");
+                    return null;
+                }
+                return parseCost(costType, Arrays.copyOfRange(arguments, 2, arguments.length), oldCost, player);
+            case "clear":
+                // Clears one or all fields of a cost
+                if (costType == null) {
+                    return new ActionCost(0, 0, null, Set.of());
+                } else {
+                    return switch (costType) {
+                        case EXP -> oldCost.changeExpCost(0);
+                        case ITEM -> oldCost.changeItemCost(null);
+                        case ECONOMY -> oldCost.changeMonetaryCost(0);
+                        case PERMISSION -> oldCost.changePermissionCost(Set.of());
+                    };
+                }
+            case "set":
+                if (costType == null) {
+                    player.sendMessage("Invalid cost type specified!");
+                    return null;
+                }
+                return parseCost(costType, Arrays.copyOfRange(arguments, 2, arguments.length),
+                        new ActionCost(0, 0, null, Set.of()), player);
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Parses an advanced action cost
+     *
+     * @param costType  <p>The type of cost to parse</p>
+     * @param arguments <p>The arguments given by the player</p>
+     * @param oldCost   <p>The old cost to modify</p>
+     * @param player    <p>The player changing the value</p>
+     * @return <p>The new action cost, or null if the process failed.</p>
+     */
+    @Nullable
+    private static ActionCost parseCost(@NotNull CostType costType, @NotNull String[] arguments, @NotNull ActionCost oldCost,
+                                        @NotNull Player player) {
+        switch (costType) {
+            case ECONOMY:
+                double economyCost = Double.parseDouble(arguments[0]);
+                if (economyCost < 0) {
+                    player.sendMessage("Cost cannot be negative!");
+                    return null;
+                }
+                return oldCost.changeMonetaryCost(economyCost);
+            case ITEM:
+                ItemStack itemCost = player.getInventory().getItemInMainHand();
+                if (itemCost.getType().isAir()) {
+                    player.sendMessage("You have no item in your main hand");
+                    return null;
+                }
+                return oldCost.changeItemCost(itemCost);
+            case PERMISSION:
+                Set<String> permissionSet = new HashSet<>(Arrays.asList(arguments[0].split(",")));
+                return oldCost.changePermissionCost(permissionSet);
+            case EXP:
+                int expCost = Integer.parseInt(arguments[0]);
+                if (expCost < 0) {
+                    player.sendMessage("Exp cost cannot be negative!");
+                    return null;
+                }
+                return oldCost.changeExpCost(expCost);
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Gets the tab complete value for the permission typed
+     *
+     * @param typedNode <p>The full permission node typed by the player</p>
+     * @return <p>All known valid auto-complete options</p>
+     */
+    private static @NotNull List<String> tabCompletePermission(@NotNull String typedNode) {
+        StringBuilder permissionListString = new StringBuilder();
+        if (typedNode.contains(",")) {
+            String[] permissionList = typedNode.split(",");
+            for (int i = 0; i < permissionList.length - 1; i++) {
+                permissionListString.append(permissionList[i]);
+                permissionListString.append(",");
+            }
+            typedNode = permissionList[permissionList.length - 1];
+        }
+        String permissionPrefix = permissionListString.toString();
+        List<String> output;
+        if (typedNode.contains(".")) {
+            List<String> matchingPermissions = permissions.get(typedNode.substring(0, typedNode.lastIndexOf(".")));
+            if (matchingPermissions == null) {
+                if (permissionPrefix.isEmpty()) {
+                    output = new ArrayList<>();
+                } else {
+                    List<String> onlyPrefix = new ArrayList<>();
+                    onlyPrefix.add(permissionPrefix);
+                    output = onlyPrefix;
+                }
+            } else {
+                //Filter by the typed text
+                output = filterMatching(matchingPermissions, typedNode);
+            }
+        } else {
+            output = plugins;
+        }
+
+        //Add previous permissions in the comma-separated lists as a prefix
+        if (permissionPrefix.isEmpty()) {
+            return output;
+        } else {
+            List<String> prefixed = new ArrayList<>(output.size());
+            for (String matchingCompletion : output) {
+                prefixed.add(permissionPrefix + matchingCompletion);
+            }
+            return prefixed;
+        }
+    }
+
+    /**
+     * Find completable strings which match the text typed by the command's sender
+     *
+     * @param values    <p>The values to filter</p>
+     * @param typedText <p>The text the player has started typing</p>
+     * @return <p>The given string values which start with the player's typed text</p>
+     */
+    private static @NotNull List<String> filterMatching(@NotNull List<String> values, @NotNull String typedText) {
+        List<String> configValues = new ArrayList<>();
+        for (String value : values) {
+            if (value.toLowerCase().startsWith(typedText.toLowerCase())) {
+                configValues.add(value);
+            }
+        }
+        return configValues;
+    }
+
+    /**
+     * Loads all permissions available from bukkit plugins
+     */
+    private static void loadAvailablePermissions() {
+        plugins = new ArrayList<>();
+        permissions = new HashMap<>();
+
+        for (Permission permission : Bukkit.getPluginManager().getPermissions()) {
+            loadPermission(permission.getName());
+        }
+    }
+
+    /**
+     * Loads a given permission into the proper lists and maps
+     *
+     * @param permissionName <p>The permission to load</p>
+     */
+    private static void loadPermission(@NotNull String permissionName) {
+        String[] permissionParts = permissionName.split("\\.");
+        if (permissionParts.length == 1 && !plugins.contains(permissionParts[0])) {
+            plugins.add(permissionParts[0]);
+        } else if (permissionParts.length > 1) {
+            StringJoiner pathJoiner = new StringJoiner(".");
+            for (int j = 0; j < permissionParts.length - 1; j++) {
+                pathJoiner.add(permissionParts[j]);
+            }
+            String path = pathJoiner.toString();
+            List<String> permissionList = permissions.computeIfAbsent(path, k -> new ArrayList<>());
+            permissionList.add(permissionName);
+
+            loadPermission(path);
+        }
+    }
+
+}

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

@@ -2,6 +2,7 @@ package net.knarcraft.blacksmith.util;
 
 import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.container.RecipeResult;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.enchantments.Enchantment;
@@ -10,6 +11,8 @@ import org.bukkit.inventory.Recipe;
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.ShapelessRecipe;
 import org.bukkit.inventory.meta.ArmorMeta;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.trim.ArmorTrim;
 import org.bukkit.inventory.meta.trim.TrimMaterial;
 import org.jetbrains.annotations.NotNull;
@@ -44,6 +47,51 @@ public final class SalvageHelper {
         trimMaterialToMaterial.put(TrimMaterial.REDSTONE, Material.REDSTONE);
     }
 
+    /**
+     * Gets salvage for an enchanted book
+     *
+     * @param itemStack <p>The enchanted book(s) to salvage</p>
+     * @return <p>The resulting salvage</p>
+     * @throws RuntimeException <p>If generated enchanted book metadata is null</p>
+     */
+    @Nullable
+    public static List<ItemStack> getEnchantedBookSalvage(@NotNull ItemStack itemStack) {
+        ItemMeta meta = itemStack.getItemMeta();
+        List<ItemStack> output = new ArrayList<>();
+
+        if (!(meta instanceof EnchantmentStorageMeta enchantmentStorageMeta)) {
+            return null;
+        }
+
+        Map<Enchantment, Integer> enchantmentMap = enchantmentStorageMeta.getStoredEnchants();
+        for (Map.Entry<Enchantment, Integer> enchantmentEntry : enchantmentMap.entrySet()) {
+            EnchantmentStorageMeta enchantmentMeta = (EnchantmentStorageMeta) Bukkit.getServer().getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
+            if (enchantmentMeta == null) {
+                throw new RuntimeException("Unable to create enchanted book metadata.");
+            }
+            enchantmentMeta.addStoredEnchant(enchantmentEntry.getKey(), enchantmentEntry.getValue(), true);
+            ItemStack newBook = new ItemStack(Material.ENCHANTED_BOOK, 1);
+            newBook.setItemMeta(enchantmentMeta);
+            output.add(newBook);
+        }
+
+        return output;
+    }
+
+    /**
+     * Gets the number of enchantments applied to an enchanted book
+     *
+     * @param itemStack <p>The enchanted book to check</p>
+     * @return <p>The number of enchantments, or -1 if not an enchanted book</p>
+     */
+    public static int getEnchantmentCount(@NotNull ItemStack itemStack) {
+        ItemMeta meta = itemStack.getItemMeta();
+        if (!(meta instanceof EnchantmentStorageMeta enchantmentStorageMeta)) {
+            return -1;
+        }
+        return enchantmentStorageMeta.getStoredEnchants().size();
+    }
+
     /**
      * Gets salvage for a given netherite item
      *
@@ -88,6 +136,8 @@ public final class SalvageHelper {
         } else {
             return null;
         }
+        // Note: While depreciated in Spigot, the new method is not available for Paper
+        @SuppressWarnings("deprecation")
         Material patternMaterial = Material.matchMaterial(armorTrim.getPattern().getKey().getKey() +
                 "_ARMOR_TRIM_SMITHING_TEMPLATE");
         if (patternMaterial != null) {

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

@@ -38,6 +38,8 @@ public final class TabCompleteValuesHelper {
             case MATERIAL -> getAllReforgeAbleMaterialNames();
             case ENCHANTMENT, ENCHANTMENT_LIST -> getAllEnchantments();
             case STRING_LIST -> List.of("*_SHOVEL,*_PICKAXE,*_AXE,*_HOE,*_SWORD:STICK,SMITHING_TABLE:*_PLANKS");
+            // TODO: Change this to something that makes sense
+            case ADVANCED_COST -> List.of();
         };
     }
 
@@ -77,6 +79,8 @@ public final class TabCompleteValuesHelper {
 
         List<String> enchantments = new ArrayList<>();
         for (Enchantment enchantment : enchantmentRegistry) {
+            // Note: While depreciated in Spigot, the new method is not available for Paper
+            //noinspection deprecation
             enchantments.add(enchantment.getKey().getKey());
         }
         return enchantments;

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

@@ -1,8 +1,8 @@
 package net.knarcraft.blacksmith.util;
 
-import net.knarcraft.blacksmith.BlacksmithPlugin;
 import net.knarcraft.blacksmith.config.SettingValueType;
-import net.knarcraft.blacksmith.formatting.BlacksmithTranslatableMessage;
+import net.knarcraft.blacksmith.formatting.Translatable;
+import net.knarcraft.knarlib.formatting.FormatBuilder;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
@@ -36,7 +36,8 @@ public final class TypeValidationHelper {
                 case STRING -> isNonEmptyString(value, sender);
                 case POSITIVE_INTEGER -> isPositiveInteger(value, sender);
                 case PERCENTAGE -> isPercentage(value, sender);
-                case BOOLEAN -> true;
+                // TODO: Implement proper advanced cost checking
+                case BOOLEAN, ADVANCED_COST -> true;
                 case REFORGE_ABLE_ITEMS, STRING_LIST -> isStringList(value, sender);
                 case MATERIAL -> isMaterial(value, sender);
                 case ENCHANTMENT -> isEnchantment(value, sender);
@@ -59,8 +60,7 @@ public final class TypeValidationHelper {
         boolean isMaterial = value instanceof Material || (value instanceof String string &&
                 InputParsingHelper.matchMaterial(string) != null);
         if (!isMaterial && sender != null) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.ITEM_TYPE_MATERIAL).error(sender);
-                    BlacksmithTranslatableMessage.ITEM_TYPE_MATERIAL);
         }
         return isMaterial;
     }
@@ -104,8 +104,7 @@ public final class TypeValidationHelper {
         boolean isEnchantment = value instanceof Enchantment || (value instanceof String string &&
                 InputParsingHelper.matchEnchantment(string) != null);
         if (!isEnchantment && sender != null) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.ITEM_TYPE_ENCHANTMENT).error(sender);
-                    BlacksmithTranslatableMessage.ITEM_TYPE_ENCHANTMENT);
         }
         return isEnchantment;
     }
@@ -120,8 +119,7 @@ public final class TypeValidationHelper {
     private static boolean isStringList(@Nullable Object value, @Nullable CommandSender sender) {
         boolean isStringList = value instanceof String[] || value instanceof List<?> || value instanceof String;
         if (!isStringList && sender != null) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.INPUT_STRING_LIST_REQUIRED).error(sender);
-                    BlacksmithTranslatableMessage.INPUT_STRING_LIST_REQUIRED);
         }
         return isStringList;
     }
@@ -137,8 +135,7 @@ public final class TypeValidationHelper {
         boolean isPercentage = value != null && isPositiveInteger(value, null) &&
                 ConfigHelper.asInt(value) >= 0 && ConfigHelper.asInt(value) <= 100;
         if (!isPercentage && sender != null) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.INPUT_PERCENTAGE_REQUIRED).error(sender);
-                    BlacksmithTranslatableMessage.INPUT_PERCENTAGE_REQUIRED);
         }
         return isPercentage;
     }
@@ -153,8 +150,7 @@ public final class TypeValidationHelper {
     private static boolean isNonEmptyString(@Nullable Object value, @Nullable CommandSender sender) {
         boolean isString = value instanceof String string && !string.isBlank();
         if (!isString && sender != null) {
-            BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+            new FormatBuilder(Translatable.INPUT_STRING_REQUIRED).error(sender);
-                    BlacksmithTranslatableMessage.INPUT_STRING_REQUIRED);
         }
         return isString;
     }
@@ -171,8 +167,7 @@ public final class TypeValidationHelper {
             return value != null && ConfigHelper.asDouble(value) >= 0.0;
         } catch (NumberFormatException | NullPointerException exception) {
             if (sender != null) {
-                BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+                new FormatBuilder(Translatable.INPUT_POSITIVE_DOUBLE_REQUIRED).error(sender);
-                        BlacksmithTranslatableMessage.INPUT_POSITIVE_DOUBLE_REQUIRED);
             }
             return false;
         }
@@ -190,8 +185,7 @@ public final class TypeValidationHelper {
             return value != null && ConfigHelper.asInt(value) >= 0;
         } catch (NumberFormatException | NullPointerException exception) {
             if (sender != null) {
-                BlacksmithPlugin.getStringFormatter().displayErrorMessage(sender,
+                new FormatBuilder(Translatable.INPUT_POSITIVE_INTEGER_REQUIRED).error(sender);
-                        BlacksmithTranslatableMessage.INPUT_POSITIVE_INTEGER_REQUIRED);
             }
             return false;
         }

src/main/resources/config.yml

@@ -142,6 +142,14 @@ scrapper:
     # The cost of using the scrapper to remove netherite from an item
     netheriteSalvagePrice: 15
     
+    # The mathematical formula for salvage cost increase when continually used within the same hour. This is necessary 
+    # for some servers where items can be easily farmed. Set to {cost} to disable behavior.
+    salvageCostIncrease: "{cost}*{timesUsed}"
+    
+    # The mathematical formula for salvage cooldown increase when continually used within the same hour. This is
+    # necessary for some servers where items can be easily farmed. Set to {cooldown} to disable behavior.
+    salvageCooldownIncrease: "{cooldown}*{timesUsed}"
+  
   # The settings which are set to any new scrapper NPC. To change any of these settings for an existing NPC, you must 
   # change the Citizens NPC file, or use the /scrapper command
   defaults:
@@ -182,6 +190,9 @@ scrapper:
     # Whether to enable salvaging of netherite items
     salvageNetherite: true
     
+    # Whether to enable salvaging an enchanted books with several enchantments into several books with one enchantment
+    splitEnchantedBook: false
+    
     # Default values for messages used by NPCs
     messages:
       # The message to display when another player is using the scrapper
@@ -226,6 +237,9 @@ scrapper:
       # The message to display when explaining the shown item's netherite salvage cost
       costMessageNetherite: "&eIt will cost &a{cost}&e to salvage that &a{item}&e into diamond!"
       
+      # The message to display when explaining the shown enchanted book's salvage cost
+      costMessageEnchantedBook: "&eIt will cost &a{cost}&e to salvage that enchanted book!"
+      
       # The yield message to display if trying to salvage a non-damaged item
       fullSalvageMessage: "&aI should be able to extract all components from that pristine item.&r"
       
@@ -244,5 +258,11 @@ scrapper:
       # The message to display when asked to salvage netherite items, and that option is disabled
       cannotSalvageNetheriteMessage: "&cI'm sorry, but I'm unable to salvage netherite items!"
       
+      # The message displayed when explaining that enchanted book salvage is disabled
+      cannotSalvageEnchantedBookMessage: "&cI'm sorry, but I'm unable to salvage enchanted books!"
+      
+      # The message displayed when a player attempts to  salvage an enchanted book with a single enchantment
+      cannotSplitEnchantedBookFurtherMessage: "&cI'm sorry, but I cannot salvage that enchanted book any further"
+      
       # The message to display when a scrapper is clicked with an empty hand
       noItemMessage: "Please present the item you want to salvage"

src/main/resources/strings.yml

@@ -43,7 +43,7 @@ en:
   # The format used when displaying any duration remaining
   DURATION_FORMAT: "in {time} {unit}"
   # The format used when NPCs talk to players ({npc} = The NPC's name, {message} is the actual message contents)
-  NPC_TALK_FORMAT: "&a[{npc}] -> You:&r {message}"
+  NPC_TALK_FORMAT: "&a[{npc}&r&a] -> You:&r {message}"
   # Translation of the duration of less than a second
   UNIT_NOW: "imminently"
   # Translation of seconds in singular form
@@ -90,3 +90,5 @@ en:
   INTERVAL_MORE_THAN_5_MINUTES: "in quite a while"
   # The marker shown when displaying values overridden for the selected NPC (not shown if the NPC inherits the default value)
   SETTING_OVERRIDDEN_MARKER: " [NPC]"
+  # The translation of the text displayed when a cost is expected, but a non-number is provided
+  DOUBLE_COST_REQUIRED: "You must supply a numeric (double) cost"