Browse Source

Wire up salvage config options

nossr50 6 years ago
parent
commit
3a89ba2139

+ 0 - 9
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java

@@ -173,15 +173,6 @@ public class AdvancedConfig extends ConfigValidated {
         return getDoubleValue(SKILLS, FISHING, MASTER_ANGLER, BIOME_MODIFIER);
         return getDoubleValue(SKILLS, FISHING, MASTER_ANGLER, BIOME_MODIFIER);
     }
     }
 
 
-    /* MINING */
-    public double getArcaneSalvageExtractFullEnchantsChance(int rank) {
-        return getDoubleValue(SKILLS, SALVAGE, ARCANE_SALVAGE, EXTRACT_FULL_ENCHANT, RANK, String.valueOf(rank));
-    }
-
-    public double getArcaneSalvageExtractPartialEnchantsChance(int rank) {
-        return getDoubleValue(SKILLS, SALVAGE, ARCANE_SALVAGE, EXTRACT_PARTIAL_ENCHANT, RANK, String.valueOf(rank));
-    }
-
     /* SWORDS */
     /* SWORDS */
     public double getRuptureDamagePlayer() {
     public double getRuptureDamagePlayer() {
         return getDoubleValue(SKILLS, SWORDS, RUPTURE, DAMAGE_PLAYER);
         return getDoubleValue(SKILLS, SWORDS, RUPTURE, DAMAGE_PLAYER);

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java

@@ -200,11 +200,11 @@ public class SalvageManager extends SkillManager {
         if (Permissions.hasSalvageEnchantBypassPerk(getPlayer()))
         if (Permissions.hasSalvageEnchantBypassPerk(getPlayer()))
             return 100.0D;
             return 100.0D;
 
 
-        return AdvancedConfig.getInstance().getArcaneSalvageExtractFullEnchantsChance(getArcaneSalvageRank());
+        return mcMMO.getConfigManager().getConfigSalvage().getConfigArcaneSalvage().getExtractFullEnchantChance().get(getArcaneSalvageRank());
     }
     }
 
 
     public double getExtractPartialEnchantChance() {
     public double getExtractPartialEnchantChance() {
-        return AdvancedConfig.getInstance().getArcaneSalvageExtractPartialEnchantsChance(getArcaneSalvageRank());
+        return mcMMO.getConfigManager().getConfigSalvage().getConfigArcaneSalvage().getExtractPartialEnchantChance().get(getArcaneSalvageRank());
     }
     }
 
 
     private ItemStack arcaneSalvageCheck(Map<Enchantment, Integer> enchants) {
     private ItemStack arcaneSalvageCheck(Map<Enchantment, Integer> enchants) {