Changelog.txt

@@ -1,3 +1,12 @@
+Version 2.1.130
+    Fixed a bug that prevented Repair from working on the new Netherite weapons/armors
+    mcMMO will now run a script to fix a misspelling of netherite in repair/salvage configs (script only runs once and then never again)
+
+
+    NOTES:
+    Early versions of 1.16 support had Netherite misspelled, the script I added executes before loading those config files to fix the spelling mistakes if it finds any
+    If you are still having issues with Repair/Salvage, delete the repair and salvage .yml files in /plugins/mcMMO and restart the server
+
 Version 2.1.129
     Added new subcommand /mmoxpbar disable - Hides all mcMMO XP bars
     New locale string 'Commands.XPBar.DisableAll'

pom.xml

@@ -167,7 +167,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <version>1.16.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java

@@ -80,6 +80,8 @@ else if (ItemUtils.isGoldArmor(repairItem) || ItemUtils.isGoldTool(repairItem))
                 }
                 else if (ItemUtils.isDiamondArmor(repairItem) || ItemUtils.isDiamondTool(repairItem)) {
                     repairMaterialType = MaterialType.DIAMOND;
+                } else if (ItemUtils.isNetheriteArmor(repairItem) || ItemUtils.isNetheriteTool(repairItem)) {
+                    repairMaterialType = MaterialType.NETHER;
                 }
             }
             else {

src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java

@@ -1,7 +1,9 @@
 package com.gmail.nossr50.config.skills.repair;
 
+import com.gmail.nossr50.datatypes.database.UpgradeType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
+import com.gmail.nossr50.util.FixSpellingNetheriteUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,6 +33,13 @@ public RepairConfigManager(mcMMO plugin) {
                 continue;
             }
 
+
+            if(mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.FIX_SPELLING_NETHERITE_REPAIR)) {
+                //Check spelling mistakes (early versions of 1.16 support had Netherite misspelled)
+                plugin.getLogger().info("Checking for certain invalid material names in Repair config...");
+                FixSpellingNetheriteUtil.processFileCheck(mcMMO.p, fileName, UpgradeType.FIX_SPELLING_NETHERITE_REPAIR);
+            }
+
             RepairConfig rConfig = new RepairConfig(fileName);
             repairables.addAll(rConfig.getLoadedRepairables());
         }

src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java

@@ -1,7 +1,9 @@
 package com.gmail.nossr50.config.skills.salvage;
 
+import com.gmail.nossr50.datatypes.database.UpgradeType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
+import com.gmail.nossr50.util.FixSpellingNetheriteUtil;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,6 +33,14 @@ public SalvageConfigManager(mcMMO plugin) {
                 continue;
             }
 
+
+            if(mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.FIX_SPELLING_NETHERITE_SALVAGE)) {
+                //Check spelling mistakes (early versions of 1.16 support had Netherite misspelled)
+                plugin.getLogger().info("Checking for certain invalid material names in Salvage config...");
+                FixSpellingNetheriteUtil.processFileCheck(mcMMO.p, fileName, UpgradeType.FIX_SPELLING_NETHERITE_SALVAGE);
+            }
+
+
             SalvageConfig salvageConfig = new SalvageConfig(fileName);
             salvageables.addAll(salvageConfig.getLoadedSalvageables());
         }

src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java

@@ -14,4 +14,6 @@ public enum UpgradeType {
     DROP_NAME_UNIQUENESS,
     ADD_SKILL_TOTAL,
     ADD_UNIQUE_PLAYER_DATA,
+    FIX_SPELLING_NETHERITE_SALVAGE,
+    FIX_SPELLING_NETHERITE_REPAIR
 }

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -12,7 +12,6 @@
 import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.HashMap;

src/main/java/com/gmail/nossr50/skills/mining/Mining.java

@@ -3,10 +3,7 @@
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
-import org.bukkit.Material;
 import org.bukkit.block.BlockState;
-import org.bukkit.inventory.ItemStack;
 
 public class Mining {
 

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -18,7 +18,6 @@
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import org.apache.commons.lang.math.RandomUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;

src/main/java/com/gmail/nossr50/util/FixSpellingNetheriteUtil.java

@@ -0,0 +1,60 @@
+package com.gmail.nossr50.util;
+
+import com.gmail.nossr50.datatypes.database.UpgradeType;
+import com.gmail.nossr50.mcMMO;
+
+import java.io.*;
+
+public class FixSpellingNetheriteUtil {
+
+    public static void processFileCheck(mcMMO pluginRef, String fileName, UpgradeType upgradeType) {
+        pluginRef.getLogger().info("Checking " + fileName + " config material names...");
+
+        File configFile = new File(pluginRef.getDataFolder(), fileName);
+        if(configFile.exists()) {
+            BufferedReader bufferedReader = null;
+            FileWriter fileWriter = null;
+            try {
+                bufferedReader = new BufferedReader(new FileReader(configFile));
+                StringBuilder stringBuilder = new StringBuilder();
+                String curLine;
+
+                while ((curLine = bufferedReader.readLine()) != null) {
+                    String fixedLine = curLine.replace("NETHERRITE", "NETHERITE");
+                    stringBuilder.append(fixedLine);
+                    stringBuilder.append("\r\n");
+                }
+
+                //Close
+                bufferedReader.close();
+
+                fileWriter = new FileWriter(configFile);
+                fileWriter.write(stringBuilder.toString());
+                fileWriter.close();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                if(bufferedReader != null) {
+                    try {
+                        bufferedReader.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+
+                    if(fileWriter != null) {
+                        try {
+                            fileWriter.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+
+        pluginRef.getLogger().info("Finished checking "+fileName+" for certain misspelled material names.");
+
+        mcMMO.getUpgradeManager().setUpgradeCompleted(upgradeType);
+    }
+}

src/main/resources/upgrades.yml

@@ -7,3 +7,5 @@ Upgrades_Finished:
     DROP_SQL_PARTY_NAMES: false
     DROP_SPOUT: false
     ADD_ALCHEMY: false
+    FIX_SPELLING_NETHERITE_SALVAGE: false
+    FIX_SPELLING_NETHERITE_REPAIR: false