From f9f6d1550e182cd7a4bb24c7fe696b440903a4e4 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 9 Mar 2019 17:31:45 -0800 Subject: [PATCH] Silk Touch toggle in advanced.yml for double drops --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/config/AdvancedConfig.java | 1 + .../java/com/gmail/nossr50/skills/mining/MiningManager.java | 3 +++ src/main/resources/advanced.yml | 1 + 4 files changed, 6 insertions(+) diff --git a/Changelog.txt b/Changelog.txt index 5019b3c46..6f5018c3f 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -8,6 +8,7 @@ Key: - Removal Version 2.1.14 + Added a config option to toggle double drops for Silk Touch pickaxes (advanced.yml "Skills.Mining.DoubleDrops.SilkTouch" Mycelium removed from Woodcutting XP tables (because its soil!) Kelp added to Herbalism XP tables mcMMO now flags blocks moved by piston as not natural to prevent automated XP farms diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index da1271854..42aeaf730 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -903,6 +903,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public int getGreenThumbStageChange() { return config.getInt("Skills.Herbalism.GreenThumb.StageChange", 200); } /* MINING */ + public boolean getDoubleDropSilkTouchEnabled() { return config.getBoolean("Skills.Mining.DoubleDrops.SilkTouch", true); } public int getBlastMiningRankLevel(int rank) { return config.getInt("Skills.Mining.BlastMining.Rank_Levels.Rank_" + rank); } public double getBlastDamageDecrease(int rank) { return config.getDouble("Skills.Mining.BlastMining.BlastDamageDecrease.Rank_" + rank); } public double getOreBonus(int rank) { return config.getDouble("Skills.Mining.BlastMining.OreBonus.Rank_" + rank); } diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java index 69ceac9a9..2ac8978a6 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -87,6 +87,9 @@ public class MiningManager extends SkillManager { boolean silkTouch = player.getInventory().getItemInMainHand().containsEnchantment(Enchantment.SILK_TOUCH); + if(silkTouch && !AdvancedConfig.getInstance().getDoubleDropSilkTouchEnabled()) + return; + //TODO: Make this readable for (int i = mcMMOPlayer.getAbilityMode(skill.getAbility()) ? 2 : 1; i != 0; i--) { if (RandomChanceUtil.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.MINING_DOUBLE_DROPS, player)) { diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 547ba0eb9..fb9c99f4c 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -271,6 +271,7 @@ Skills: ### Mining: DoubleDrops: + SilkTouch: true # ChanceMax: Maximum chance of receiving double drops when on or higher # MaxBonusLevel: Level when of receiving double drops is reached ChanceMax: 100.0