add spears to repair and salvage config defaults

Changelog.txt

@@ -1,5 +1,10 @@
 Version 2.2.046
+    TODO: Test FlatFile DB
+    TODO: Double check locale
+    TODO: Double check plugin.yml permissions
+    TODO: Add notes about permission nodes
     Added Spears combat skill
+    Added Spears to repair.vanilla.yml and salvage.vanilla.yml (see notes)
     Added permissions related to Spears
     Added /spears skill command
     Fixed bug where converting from SQL to FlatFile would not copy data for tridents, crossbows, maces, or spears
@@ -8,6 +13,10 @@ Version 2.2.046
     (Codebase) Database related errors are now more descriptive and have had their logging improved
 
     NOTES:
+    You will need to manually update repair.vanilla.yml and salvage.vanilla.yml to get support for Spears.
+    Or you can delete these config files to have mcMMO regenerate them with the new entries.
+    You can find the default config files in the defaults folder at plugins\mcMMO\defaults after running this mcMMO update at least once.
+    You can use this default file to copy paste if you please.
     If you compile mcMMO you will likely run into errors during unit tests for SQL databases, this is because they now rely on docker being present on the system to load up test containers.
     New SQL database unit tests have been added which leverage test containers to test against real installs of MySQL/MariaDB, which require Docker (or an equivalent) to run.
     If you'd rather not install docker simply just add -DskipTests to your maven instructions when compiling, this doesn't change anything about mcMMO it just skips running through the unit tests during the build.

src/main/resources/repair.vanilla.yml

@@ -55,6 +55,9 @@ Repairables:
     WOODEN_SWORD:
         MinimumLevel: 0
         XpMultiplier: .25
+    WOODEN_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .25
     WOODEN_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
@@ -74,6 +77,9 @@ Repairables:
     STONE_SWORD:
         MinimumLevel: 0
         XpMultiplier: .25
+    STONE_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .25
     STONE_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
@@ -96,6 +102,12 @@ Repairables:
         ItemType: TOOL
         ItemMaterialCategory: COPPER
         RepairMaterial: COPPER_INGOT
+    COPPER_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .3
+        ItemType: TOOL
+        ItemMaterialCategory: COPPER
+        RepairMaterial: COPPER_INGOT
     COPPER_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .2
@@ -152,6 +164,9 @@ Repairables:
     IRON_SWORD:
         MinimumLevel: 0
         XpMultiplier: .5
+    IRON_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .5
     IRON_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .3
@@ -190,6 +205,9 @@ Repairables:
     GOLDEN_SWORD:
         MinimumLevel: 0
         XpMultiplier: 4
+    GOLDEN_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: 4
     GOLDEN_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: 2.6
@@ -222,6 +240,9 @@ Repairables:
     DIAMOND_SWORD:
         MinimumLevel: 0
         XpMultiplier: .5
+    DIAMOND_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .5
     DIAMOND_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .3
@@ -255,6 +276,9 @@ Repairables:
     NETHERITE_SWORD:
         MinimumLevel: 0
         XpMultiplier: .6
+    NETHERITE_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .6
     NETHERITE_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .4

src/main/resources/salvage.vanilla.yml

@@ -50,6 +50,10 @@ Salvageables:
         MinimumLevel: 0
         XpMultiplier: .25
         MaximumQuantity: 2
+    WOODEN_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .16
+        MaximumQuantity: 1
     WOODEN_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
@@ -74,6 +78,10 @@ Salvageables:
         MinimumLevel: 0
         XpMultiplier: .25
         MaximumQuantity: 2
+    STONE_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .16
+        MaximumQuantity: 1
     STONE_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .16
@@ -98,6 +106,10 @@ Salvageables:
         MinimumLevel: 0
         XpMultiplier: .4
         MaximumQuantity: 2
+    COPPER_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .25
+        MaximumQuantity: 1
     COPPER_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .25
@@ -139,6 +151,10 @@ Salvageables:
         MinimumLevel: 0
         XpMultiplier: .5
         MaximumQuantity: 2
+    IRON_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: .3
+        MaximumQuantity: 1
     IRON_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: .3
@@ -186,6 +202,10 @@ Salvageables:
         MinimumLevel: 0
         XpMultiplier: 4
         MaximumQuantity: 2
+    GOLDEN_SPEAR:
+        MinimumLevel: 0
+        XpMultiplier: 4
+        MaximumQuantity: 1
     GOLDEN_SHOVEL:
         MinimumLevel: 0
         XpMultiplier: 2.6
@@ -227,6 +247,10 @@ Salvageables:
         MinimumLevel: 50
         XpMultiplier: .5
         MaximumQuantity: 2
+    DIAMOND_SPEAR:
+        MinimumLevel: 50
+        XpMultiplier: .5
+        MaximumQuantity: 1
     DIAMOND_SHOVEL:
         MinimumLevel: 50
         XpMultiplier: .3
@@ -268,6 +292,10 @@ Salvageables:
         MinimumLevel: 100
         XpMultiplier: .5
         MaximumQuantity: 4
+    NETHERITE_SPEAR:
+        MinimumLevel: 100
+        XpMultiplier: .3
+        MaximumQuantity: 4
     NETHERITE_SHOVEL:
         MinimumLevel: 100
         XpMultiplier: .3