From b0ce6fb1703b871ec5b67e2ea4fb1bec9eb5d07f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 30 Jun 2020 09:35:47 -0700 Subject: [PATCH] Missing permission nodes + missing repair XP --- Changelog.txt | 8 +++++++- .../gmail/nossr50/config/skills/repair/RepairConfig.java | 2 +- .../nossr50/config/skills/salvage/SalvageConfig.java | 2 +- .../com/gmail/nossr50/datatypes/skills/MaterialType.java | 4 ++-- src/main/resources/experience.yml | 1 + src/main/resources/plugin.yml | 6 ++++++ 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 23c477add..55252c529 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,8 @@ Version 2.1.131 + + New permission node 'mcmmo.ability.repair.netheriterepair' which is included in the mcmmo.defaults permission package + New permission node 'mcmmo.ability.salvage.netheritesalvage' which is included in the mcmmo.defaults permission package + Added Basalt to Bonus Drops for Mining in config.yml (see notes) Added Polished Basalt to Bonus Drops for Mining in config.yml (see notes) Added Blackstone to Bonus Drops for Mining in config.yml (see notes) @@ -24,10 +28,12 @@ Version 2.1.131 Added Stripped Warped Hyphae to Bonus Drops for Woodcutting in config.yml (see notes) Added Red Nether Bricks to Experience tables for Mining in experience.yml (see notes) + Added Netherite to Experience tables for Repair in experience.yml (see notes) NOTES: - This update adds an array of missing entries for bonus drops, without these entries double drops on these items/blocks will not happen. + This update adds quite a few missing entries for bonus drops, without these entries double drops on these items/blocks will not happen. + You should not need to edit your configs to receive these changes. Version 2.1.130 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 5c2f78dac..8449faf2b 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 @@ -81,7 +81,7 @@ public class RepairConfig extends ConfigLoader { else if (ItemUtils.isDiamondArmor(repairItem) || ItemUtils.isDiamondTool(repairItem)) { repairMaterialType = MaterialType.DIAMOND; } else if (ItemUtils.isNetheriteArmor(repairItem) || ItemUtils.isNetheriteTool(repairItem)) { - repairMaterialType = MaterialType.NETHER; + repairMaterialType = MaterialType.NETHERITE; } } else { 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 a5a6fbfd1..0b56f9061 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 @@ -76,7 +76,7 @@ public class SalvageConfig extends ConfigLoader { else if (ItemUtils.isDiamondArmor(salvageItem) || ItemUtils.isDiamondTool(salvageItem)) { salvageMaterialType = MaterialType.DIAMOND; } else if (ItemUtils.isNetheriteTool(salvageItem) || ItemUtils.isNetheriteArmor(salvageItem)) { - salvageMaterialType = MaterialType.NETHER; + salvageMaterialType = MaterialType.NETHERITE; } } else { diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java index 27369419b..26e0f17d9 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java @@ -10,7 +10,7 @@ public enum MaterialType { IRON, GOLD, DIAMOND, - NETHER, + NETHERITE, OTHER; public Material getDefaultMaterial() { @@ -36,7 +36,7 @@ public enum MaterialType { case DIAMOND: return Material.DIAMOND; - case NETHER: + case NETHERITE: if(Material.getMaterial("NETHERITE_SCRAP") != null) return Material.getMaterial("NETHERITE_SCRAP"); else diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index 3600c29ce..739789b93 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -450,6 +450,7 @@ Experience_Values: Iron: 2.5 Gold: 0.3 Diamond: 5.0 + Netherite: 6.0 Leather: 1.6 String: 1.8 Other: 1.5 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 0de7167d5..e9f96d960 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -465,6 +465,7 @@ permissions: mcmmo.ability.repair.arcaneforging: true mcmmo.ability.repair.superrepair: true mcmmo.ability.repair.armorrepair: true + mcmmo.ability.repair.netheriterepair: true mcmmo.ability.repair.diamondrepair: true mcmmo.ability.repair.goldrepair: true mcmmo.ability.repair.ironrepair: true @@ -481,6 +482,8 @@ permissions: description: Allows access to the Arcane Forging ability mcmmo.ability.repair.armorrepair: description: Allows ability to repair armor + mcmmo.ability.repair.netheriterepair: + description: Allows ability to repair Netherite tools & armor mcmmo.ability.repair.diamondrepair: description: Allows ability to repair Diamond tools & armor mcmmo.ability.repair.goldrepair: @@ -517,6 +520,7 @@ permissions: mcmmo.ability.salvage.arcanesalvage: true mcmmo.ability.salvage.armorsalvage: true mcmmo.ability.salvage.diamondsalvage: true + mcmmo.ability.salvage.netheritesalvage: true mcmmo.ability.salvage.goldsalvage: true mcmmo.ability.salvage.ironsalvage: true mcmmo.ability.salvage.leathersalvage: true @@ -532,6 +536,8 @@ permissions: description: Allows access to the Arcane Salvage ability mcmmo.ability.salvage.armorsalvage: description: Allows ability to salvage armor + mcmmo.ability.salvage.netheritesalvage: + description: Allows ability to salvage Netherite tools & armor mcmmo.ability.salvage.diamondsalvage: description: Allows ability to salvage Diamond tools & armor mcmmo.ability.salvage.goldsalvage: