nossr50 5 ani în urmă
părinte
comite
ce1051c364

+ 1 - 2
Changelog.txt

@@ -4,8 +4,7 @@ Version 2.1.122
     mcMMO now treats Nether_Wart_Block and Warped_Wart_Block as leaves
     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
     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
     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
 Version 2.1.121
     Fixed a netherite related bug that prevented mcMMO from functioning correctly
     Fixed a netherite related bug that prevented mcMMO from functioning correctly

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.122-SNAPSHOT</version>
+    <version>2.1.122</version>
     <name>mcMMO</name>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
     <scm>

+ 4 - 7
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);
             Material itemMaterial = Material.matchMaterial(key);
 
 
             if (itemMaterial == null) {
             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
             // Repair Material Type
@@ -99,7 +95,8 @@ public class RepairConfig extends ConfigLoader {
             Material repairMaterial = (repairMaterialName == null ? repairMaterialType.getDefaultMaterial() : Material.matchMaterial(repairMaterialName));
             Material repairMaterial = (repairMaterialName == null ? repairMaterialType.getDefaultMaterial() : Material.matchMaterial(repairMaterialName));
 
 
             if (repairMaterial == null) {
             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
             // Maximum Durability

+ 4 - 8
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);
             Material itemMaterial = Material.matchMaterial(key);
 
 
             if (itemMaterial == null) {
             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
             // Salvage Material Type
@@ -99,7 +94,8 @@ public class SalvageConfig extends ConfigLoader {
             Material salvageMaterial = (salvageMaterialName == null ? salvageMaterialType.getDefaultMaterial() : Material.matchMaterial(salvageMaterialName));
             Material salvageMaterial = (salvageMaterialName == null ? salvageMaterialType.getDefaultMaterial() : Material.matchMaterial(salvageMaterialName));
 
 
             if (salvageMaterial == null) {
             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
             // Maximum Durability