Finishes the scrapper implementation

src/main/resources/config-migrations.txt

@@ -5,4 +5,5 @@ scrapper.defaults.delaysInSeconds.maximum=scrapper.defaults.maxSalvageWaitTimeSe
 scrapper.defaults.delaysInSeconds.salvageCoolDown=scrapper.defaults.salvageCoolDownSeconds
 blacksmith.defaults.delaysInSeconds.minimum=blacksmith.defaults.minReforgeWaitTimeSeconds
 blacksmith.defaults.delaysInSeconds.maximum=blacksmith.defaults.maxReforgeWaitTimeSeconds
-blacksmith.defaults.delaysInSeconds.reforgeCoolDown=blacksmith.defaults.reforgeCoolDownSeconds
+blacksmith.defaults.delaysInSeconds.reforgeCoolDown=blacksmith.defaults.reforgeCoolDownSeconds
+blacksmith.defaults.enchantmentBlocklist=blacksmith.defaults.enchantmentBlockList

src/main/resources/config.yml

@@ -48,7 +48,7 @@ blacksmith:
     reforgeAbleItems: [ ]
     
     # The enchantments a blacksmith is denied from applying to an item. Disable anything you find too op or annoying.
-    enchantmentBlocklist: [ "binding_curse", "mending", "vanishing_curse" ]
+    enchantmentBlockList: [ "binding_curse", "mending", "vanishing_curse" ]
     
     # The chance to fail reforging an item, which only repairs the item a tiny bit or not at all (0-100)
     failReforgeChance: 10 # Default = 10%
@@ -114,7 +114,7 @@ blacksmith:
 
 # Settings for the scrapper trait
 scrapper:
-  # The settings which apply to all Scrapper NPCs. These can also be changed using the /scrapperconfig command
+  # The settings which apply to all Scrapper NPCs. These can also be changed using the /scrapperConfig command
   global:
     # Exact time displays the exact number of seconds and minutes remaining as part of the scrapping cool-down and
     #  scrapping delay messages, instead of just vaguely hinting at the remaining time.
@@ -123,12 +123,16 @@ scrapper:
     # Whether enchanted salvaged items should return some amount of exp upon salvage
     giveExperience: true
     
-    # Items ignored during salvage calculation. This follows the format: "MATERIAL[,MATERIAL2][,MATERIAL3]:IGNORED", so 
-    # the material or materials listed will ignore the material specified after the ":" when calculating salvage 
+    # Items ignored during salvage calculation. This follows the format: 
+    # "MATERIAL[;MATERIAL2][;MATERIAL3]:IGNORED_MATERIAL[;IGNORED_MATERIAL2]",
+    # so the material or materials listed will ignore the material specified after the ":" when calculating salvage 
     # (* matches any character). This causes the player to lose some items during salvaging, but can prevent cases 
     # where a diamond pickaxe is salvaged and only sticks are returned.
     ignoredSalvage:
-      - "*_SHOVEL,*_PICKAXE,*_AXE,*_HOE,*_SWORD:STICK"
+      - "*_SHOVEL;*_PICKAXE;*_AXE;*_HOE;*_SWORD:STICK"
+    
+    # The cost of using the scrapper
+    basePrice: 0
   
   # 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

src/main/resources/plugin.yml

@@ -13,7 +13,7 @@ commands:
     permission: blacksmith.edit
     usage: /<command> <option> [new value]
     description: Used for configuring the selected blacksmith NPC
-  blacksmithconfig:
+  blacksmithConfig:
     permission: blacksmith.admin
     usage: /<command> <option/reload> [new value]
     description: Used for configuring default blacksmith settings, or global blacksmith settings
@@ -21,7 +21,7 @@ commands:
     permission: blacksmith.edit
     usage: /<command> <option> [new value]
     description: Used for configuring the selected scrapper NPC
-  scrapperconfig:
+  scrapperConfig:
     permission: blacksmith.admin
     usage: /<command> <option/reload> [new value]
     description: Used for configuring default scrapper settings, or global scrapper settings

src/main/resources/strings.yml

@@ -1,5 +1,5 @@
 # The english translation of internal strings. To add your own language, copy everything below, and change "en" to your
-#  own language's code, and change each string. Afterwards, copy this file to Blacksmith's plugin folder, and change the
+#  own language's code, and change each string. Afterward, copy this file to Blacksmith's plugin folder, and change the
 #  language in config.yml to your language's language code.
 en:
   # The format used to display when a setting's value has been changed