From 5d010594dd0a02c6ef00593cdbe2591d46ee0d00 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 31 Jan 2019 15:30:39 -0800
Subject: [PATCH] Temporarily disabled Flux Mining I'll rework this skill in
 the future

---
 Changelog.txt                                             | 1 +
 .../gmail/nossr50/commands/skills/SmeltingCommand.java    | 8 ++++----
 .../java/com/gmail/nossr50/listeners/BlockListener.java   | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 5f3a5f226..e7aa50976 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -8,6 +8,7 @@ Key:
   - Removal
 
 Version 2.1.4
+    Temporarily disabled Flux Mining
     Removed XP from entities that target endermite to prevent easy exploitation (Credits to TheBentoBox for the tip!) [Can be turned off in experience.yml]
     Fixed a bug where static chance skills like Arcane Salvage were using incorrect calculations for success
     Advanced Salvage now uses a rank system
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
index 10b1e8a6c..076c365c9 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java
@@ -39,11 +39,11 @@ public class SmeltingCommand extends SkillCommand {
         }
 
         // FLUX MINING
-        if (canFluxMine) {
+        /*if (canFluxMine) {
             String[] fluxMiningStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.SMELTING_FLUX_MINING);
             str_fluxMiningChance = fluxMiningStrings[0];
             str_fluxMiningChanceLucky = fluxMiningStrings[1];
-        }
+        }*/
         
         // SECOND SMELT
         if (canSecondSmelt) {
@@ -65,11 +65,11 @@ public class SmeltingCommand extends SkillCommand {
     protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
         List<String> messages = new ArrayList<String>();
 
-        if (canFluxMine) {
+        /*if (canFluxMine) {
             messages.add(getStatMessage(SubSkillType.SMELTING_FLUX_MINING, str_fluxMiningChance)
                     + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_fluxMiningChanceLucky) : ""));
             //messages.add(LocaleLoader.getString("Smelting.Ability.FluxMining", str_fluxMiningChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", str_fluxMiningChanceLucky) : ""));
-        }
+        }*/
         
         if (canFuelEfficiency) {
             messages.add(getStatMessage(false, true, SubSkillType.SMELTING_FUEL_EFFICIENCY, burnTimeModifier));
diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
index 0063387bc..e74781fd0 100644
--- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -374,7 +374,7 @@ public class BlockListener implements Listener {
                 }
             }
         }
-        else if (!heldItem.containsEnchantment(Enchantment.SILK_TOUCH)) {
+        /*else if (!heldItem.containsEnchantment(Enchantment.SILK_TOUCH)) {
             SmeltingManager smeltingManager = UserManager.getPlayer(player).getSmeltingManager();
 
             if (smeltingManager.canUseFluxMining(blockState)) {
@@ -383,7 +383,7 @@ public class BlockListener implements Listener {
                     event.setCancelled(true);
                 }
             }
-        }
+        }*/
     }
 
     /**