Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Wire up salvage config options

Browse Source
This commit is contained in:
nossr50 2019-06-16 09:12:42 -07:00
parent 303b12b79f
commit 3a89ba2139
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
View File

@ -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);

4
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
View File

@ -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) {