diff --git a/Changelog.txt b/Changelog.txt index 038f3d32a..4f141c2ae 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4,8 +4,7 @@ Version 2.1.122 mcMMO now treats Nether_Wart_Block and Warped_Wart_Block as leaves Removed Crimson_Roots and Warped_Roots from Woodcutting XP tables in experience.yml Added Crimson_Roots and Warped_Roots to Herbalism XP tables in experience.yml with a value of 6 XP - - + Fixed some start up bugs for salvage/repair Version 2.1.121 Fixed a netherite related bug that prevented mcMMO from functioning correctly diff --git a/pom.xml b/pom.xml index 2b81a436f..5ae55d786 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.122-SNAPSHOT + 2.1.122 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java index bd4a3a2cf..ef381ebd6 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java @@ -48,12 +48,8 @@ public class RepairConfig extends ConfigLoader { Material itemMaterial = Material.matchMaterial(key); if (itemMaterial == null) { - if(key.toLowerCase().contains("nether")) { - mcMMO.p.getLogger().info("No support for repair item "+key+ " in this version of Minecraft, skipping."); - continue; - } - - reason.add("Invalid material: " + key); + mcMMO.p.getLogger().info("No support for repair item "+key+ " in this version of Minecraft, skipping."); + continue; } // Repair Material Type @@ -99,7 +95,8 @@ public class RepairConfig extends ConfigLoader { Material repairMaterial = (repairMaterialName == null ? repairMaterialType.getDefaultMaterial() : Material.matchMaterial(repairMaterialName)); if (repairMaterial == null) { - reason.add(key + " has an invalid repair material: " + repairMaterialName); + mcMMO.p.getLogger().info("Could not find a valid repair material for item named "+key+", skipping."); + continue; } // Maximum Durability diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java index d46a9af09..3200d8139 100644 --- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java +++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java @@ -45,13 +45,8 @@ public class SalvageConfig extends ConfigLoader { Material itemMaterial = Material.matchMaterial(key); if (itemMaterial == null) { - - if(key.toLowerCase().contains("nether")) { - mcMMO.p.getLogger().info("No support for salvage item "+key+ " in this version of Minecraft, skipping."); - continue; - } - - reason.add("Invalid material: " + key); + mcMMO.p.getLogger().info("No support for salvage item "+key+ " in this version of Minecraft, skipping."); + continue; } // Salvage Material Type @@ -99,7 +94,8 @@ public class SalvageConfig extends ConfigLoader { Material salvageMaterial = (salvageMaterialName == null ? salvageMaterialType.getDefaultMaterial() : Material.matchMaterial(salvageMaterialName)); if (salvageMaterial == null) { - reason.add(key + " has an invalid salvage material: " + salvageMaterialName); + mcMMO.p.getLogger().info("Could not find a salvage material for item named " + key + ", skipping."); + continue; } // Maximum Durability