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 61230d10c..a97269e52 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 @@ -74,11 +74,15 @@ public class RepairConfig extends BukkitConfig { } // Repair Material Type + // Prefer the current MaterialType key, falling back to the legacy + // ItemMaterialCategory key so existing admin configs keep working. MaterialType repairMaterialType = MaterialType.OTHER; - String repairMaterialTypeString = config.getString( - "Repairables." + key + ".MaterialType", "OTHER"); + final String materialTypeKey = config.contains("Repairables." + key + ".MaterialType") + ? "Repairables." + key + ".MaterialType" + : "Repairables." + key + ".ItemMaterialCategory"; + final String repairMaterialTypeString = config.getString(materialTypeKey, "OTHER"); - if (!config.contains("Repairables." + key + ".MaterialType")) { + if (!config.contains(materialTypeKey)) { final ItemStack repairItem = new ItemStack(itemMaterial); if (isWoodTool(repairItem)) { 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 c01473db9..dac58de26 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 @@ -99,11 +99,15 @@ public class SalvageConfig extends BukkitConfig { } // Salvage Material Type + // Prefer the current MaterialType key, falling back to the legacy + // ItemMaterialCategory key so existing admin configs keep working. MaterialType salvageMaterialType = MaterialType.OTHER; - final String salvageMaterialTypeString = config.getString( - "Salvageables." + key + ".MaterialType", "OTHER"); + final String materialTypeKey = config.contains("Salvageables." + key + ".MaterialType") + ? "Salvageables." + key + ".MaterialType" + : "Salvageables." + key + ".ItemMaterialCategory"; + final String salvageMaterialTypeString = config.getString(materialTypeKey, "OTHER"); - if (!config.contains("Salvageables." + key + ".MaterialType")) { + if (!config.contains(materialTypeKey)) { final ItemStack salvageItem = new ItemStack(itemMaterial); if (isWoodTool(salvageItem)) { diff --git a/src/main/resources/repair.vanilla.yml b/src/main/resources/repair.vanilla.yml index 837f4deb8..75afdd364 100644 --- a/src/main/resources/repair.vanilla.yml +++ b/src/main/resources/repair.vanilla.yml @@ -9,7 +9,7 @@ ## Valid values are ARMOR, TOOL, and OTHER. ## This defaults to OTHER. # -# ItemMaterialCategory: This is the type of the material of the item to be repaired, this is only important for permissions. +# MaterialType: This is the type of the material of the item to be repaired, this is only important for permissions. ## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, NETHER, and OTHER ## This defaults to OTHER. # @@ -48,7 +48,7 @@ Repairables: MinimumLevel: 0 XpMultiplier: .25 ItemType: OTHER - ItemMaterialCategory: WOOD + MaterialType: WOOD RepairMaterial: OAK_PLANKS MinimumQuantity: 6 MaximumDurability: 336 @@ -100,62 +100,62 @@ Repairables: MinimumLevel: 0 XpMultiplier: .3 ItemType: TOOL - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_SPEAR: MinimumLevel: 0 XpMultiplier: .3 ItemType: TOOL - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_SHOVEL: MinimumLevel: 0 XpMultiplier: .2 ItemType: TOOL - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_PICKAXE: MinimumLevel: 0 XpMultiplier: .6 ItemType: TOOL - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_AXE: MinimumLevel: 0 XpMultiplier: .6 ItemType: TOOL - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_HOE: MinimumLevel: 0 XpMultiplier: .3 ItemType: TOOL - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT # Armor COPPER_HELMET: MinimumLevel: 0 XpMultiplier: 1.8 ItemType: ARMOR - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_CHESTPLATE: MinimumLevel: 0 XpMultiplier: 1.8 ItemType: ARMOR - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_LEGGINGS: MinimumLevel: 0 XpMultiplier: 1.8 ItemType: ARMOR - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT COPPER_BOOTS: MinimumLevel: 0 XpMultiplier: 1.8 ItemType: ARMOR - ItemMaterialCategory: COPPER + MaterialType: COPPER RepairMaterial: COPPER_INGOT # # Iron repairables @@ -337,7 +337,7 @@ Repairables: MinimumLevel: 0 XpMultiplier: .5 ItemType: TOOL - ItemMaterialCategory: STRING + MaterialType: STRING RepairMaterial: STRING MinimumQuantity: 3 MaximumDurability: 326 @@ -345,7 +345,7 @@ Repairables: MinimumLevel: 0 XpMultiplier: .5 ItemType: TOOL - ItemMaterialCategory: STRING + MaterialType: STRING RepairMaterial: STRING MinimumQuantity: 3 MaximumDurability: 100 @@ -356,7 +356,7 @@ Repairables: MinimumLevel: 0 XpMultiplier: 3 ItemType: OTHER - ItemMaterialCategory: OTHER + MaterialType: OTHER RepairMaterial: PHANTOM_MEMBRANE MinimumQuantity: 8 MaximumDurability: 432 @@ -364,7 +364,7 @@ Repairables: MinimumLevel: 0 XpMultiplier: 3 ItemType: TOOL - ItemMaterialCategory: OTHER + MaterialType: OTHER RepairMaterial: PRISMARINE_CRYSTALS MinimumQuantity: 16 MaximumDurability: 250 @@ -372,7 +372,7 @@ Repairables: MinimumLevel: 0 XpMultiplier: 3 ItemType: TOOL - ItemMaterialCategory: OTHER + MaterialType: OTHER RepairMaterial: BREEZE_ROD MinimumQuantity: 4 MaximumDurability: 250 \ No newline at end of file