Flux Mining will now be a passive and not an item

Changelog.txt

@@ -29,6 +29,8 @@ Version 2.1.2
     (Skills) Iron Grip now uses a rank system
     (Skills) Disarm now uses a rank system
     (Skills) Arrow Deflect now uses a rank system
+    (Skills) Flux Mining is now a passive effect when you mine ore instead of requiring a special pickaxe
+    (Skills) Removed the Flux Mining mcMMO Pickaxe Item
     (Style) Locked skills now are styled differently in the skill command display
     (Style) Added @ symbol styling for hover tooltips to the locale
     (Style) Added the skill names in the skill commands display to the locale so it can now be edited and styled
@@ -42,6 +44,8 @@ Version 2.1.2
     (Config) Added an option for Passive XP gains to not update XP bars (smelting/brewing)
     (Config) Added warnings if mcMMO finds a MaxBonusLevel of 0 for any skill that incorporates RNG
     (Config) Removed config options for Iron Arm
+    (Config) Removed the options related to the Flux Mining Item
+    (Config) Second Smelt has a max activation chance of 50% instead of 100% (you can update your configs or gen new ones to get this change)
 
 Version 2.1.1
     = Fixed an issue where excavation wasn't using the correct permission node

src/main/java/com/gmail/nossr50/config/Config.java

@@ -393,7 +393,6 @@ public class Config extends AutoUpdateConfigLoader {
     public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); }
     public boolean getChimaeraSoundEnabled() { return config.getBoolean("Items.Chimaera_Wing.Sound_Enabled", true); }
 
-    public boolean getFluxPickaxeEnabled() { return config.getBoolean("Items.Flux_Pickaxe.Enabled", true); }
     public boolean getFluxPickaxeSoundEnabled() { return config.getBoolean("Items.Flux_Pickaxe.Sound_Enabled", true); }
 
     /* Particles */

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -374,7 +374,7 @@ public class BlockListener implements Listener {
                 }
             }
         }
-        else if (ItemUtils.isFluxPickaxe(heldItem) && !heldItem.containsEnchantment(Enchantment.SILK_TOUCH)) {
+        else if (!heldItem.containsEnchantment(Enchantment.SILK_TOUCH)) {
             SmeltingManager smeltingManager = UserManager.getPlayer(player).getSmeltingManager();
 
             if (smeltingManager.canUseFluxMining(blockState)) {

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -492,14 +492,6 @@ public class mcMMO extends JavaPlugin {
             if (Config.getInstance().getChimaeraEnabled()) {
                 getServer().addRecipe(ChimaeraWing.getChimaeraWingRecipe());
             }
-
-            if (Config.getInstance().getFluxPickaxeEnabled()) {
-                getServer().addRecipe(SmeltingManager.getFluxPickaxeRecipe(Material.DIAMOND_PICKAXE));
-                getServer().addRecipe(SmeltingManager.getFluxPickaxeRecipe(Material.GOLDEN_PICKAXE));
-                getServer().addRecipe(SmeltingManager.getFluxPickaxeRecipe(Material.IRON_PICKAXE));
-                getServer().addRecipe(SmeltingManager.getFluxPickaxeRecipe(Material.STONE_PICKAXE));
-                getServer().addRecipe(SmeltingManager.getFluxPickaxeRecipe(Material.WOODEN_PICKAXE));
-            }
         }, 40);
     }
 

src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java

@@ -103,26 +103,6 @@ public class SmeltingManager extends SkillManager {
         return false;
     }
 
-    public static ItemStack getFluxPickaxe(Material material, int amount) {
-        ItemStack itemStack = new ItemStack(material, amount);
-
-        ItemMeta itemMeta = itemStack.getItemMeta();
-        itemMeta.setDisplayName(ChatColor.GOLD + LocaleLoader.getString("Item.FluxPickaxe.Name"));
-
-        List<String> itemLore = itemMeta.hasLore() ? itemMeta.getLore() : new ArrayList<String>();
-        itemLore.add("mcMMO Item");
-        itemLore.add(LocaleLoader.getString("Item.FluxPickaxe.Lore.1"));
-        itemLore.add(LocaleLoader.getString("Item.FluxPickaxe.Lore.2", Smelting.fluxMiningUnlockLevel));
-        itemMeta.setLore(itemLore);
-
-        itemStack.setItemMeta(itemMeta);
-        return itemStack;
-    }
-
-    public static FurnaceRecipe getFluxPickaxeRecipe(Material material) {
-        return new FurnaceRecipe(getFluxPickaxe(material, 1), material);
-    }
-
     /**
      * Increases burn time for furnace fuel.
      *

src/main/java/com/gmail/nossr50/util/ItemUtils.java

@@ -737,13 +737,4 @@ public final class ItemUtils {
         ItemMeta itemMeta = item.getItemMeta();
         return itemMeta.hasDisplayName() && itemMeta.getDisplayName().equals(ChatColor.GOLD + LocaleLoader.getString("Item.ChimaeraWing.Name"));
     }
-
-    public static boolean isFluxPickaxe(ItemStack item) {
-        if (!isMcMMOItem(item)) {
-            return false;
-        }
-
-        ItemMeta itemMeta = item.getItemMeta();
-        return itemMeta.hasDisplayName() && itemMeta.getDisplayName().equals(ChatColor.GOLD + LocaleLoader.getString("Item.FluxPickaxe.Name"));
-    }
 }

src/main/resources/advanced.yml

@@ -412,7 +412,7 @@ Skills:
         SecondSmelt:
             # ChanceMax: Maximum chance of triggering Second Smelt
             # MaxBonusLevel: On this level, the chance to cause Second Smelt will be <ChanceMax>
-            ChanceMax: 100.0
+            ChanceMax: 50.0
             MaxBonusLevel: 100
 
         FluxMining:

src/main/resources/config.yml

@@ -230,7 +230,6 @@ Items:
         Item_Name: FEATHER
         Sound_Enabled: true
     Flux_Pickaxe:
-        Enabled: true
         Sound_Enabled: true
 
 #