kill flux mining

src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java

@@ -58,7 +58,7 @@ public class SmeltingCommand extends SkillCommand {
     protected void permissionsCheck(Player player) {
         canFuelEfficiency = canUseSubskill(player, SubSkillType.SMELTING_FUEL_EFFICIENCY);
         canSecondSmelt = canUseSubskill(player, SubSkillType.SMELTING_SECOND_SMELT);
-        canFluxMine = canUseSubskill(player, SubSkillType.SMELTING_FLUX_MINING);
+        //canFluxMine = canUseSubskill(player, SubSkillType.SMELTING_FLUX_MINING);
         canUnderstandTheArt = Permissions.vanillaXpBoost(player, skill) && RankUtils.hasUnlockedSubskill(player, SubSkillType.SMELTING_UNDERSTANDING_THE_ART);
     }
 

src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java

@@ -45,7 +45,7 @@ public enum PrimarySkillType {
     MINING(MiningManager.class, Color.GRAY, SuperAbilityType.SUPER_BREAKER, ToolType.PICKAXE, ImmutableList.of(SubSkillType.MINING_SUPER_BREAKER, SubSkillType.MINING_DEMOLITIONS_EXPERTISE, SubSkillType.MINING_BIGGER_BOMBS, SubSkillType.MINING_BLAST_MINING, SubSkillType.MINING_DOUBLE_DROPS)),
     REPAIR(RepairManager.class, Color.SILVER, ImmutableList.of(SubSkillType.REPAIR_ARCANE_FORGING, SubSkillType.REPAIR_REPAIR_MASTERY, SubSkillType.REPAIR_SUPER_REPAIR)),
     SALVAGE(SalvageManager.class, Color.ORANGE, ImmutableList.of(SubSkillType.SALVAGE_ADVANCED_SALVAGE, SubSkillType.SALVAGE_ARCANE_SALVAGE)),
-    SMELTING(SmeltingManager.class, Color.YELLOW, ImmutableList.of(SubSkillType.SMELTING_UNDERSTANDING_THE_ART, SubSkillType.SMELTING_FLUX_MINING, SubSkillType.SMELTING_FUEL_EFFICIENCY, SubSkillType.SMELTING_SECOND_SMELT)),
+    SMELTING(SmeltingManager.class, Color.YELLOW, ImmutableList.of(SubSkillType.SMELTING_UNDERSTANDING_THE_ART, /*SubSkillType.SMELTING_FLUX_MINING,*/ SubSkillType.SMELTING_FUEL_EFFICIENCY, SubSkillType.SMELTING_SECOND_SMELT)),
     SWORDS(SwordsManager.class, Color.fromRGB(178, 34, 34), SuperAbilityType.SERRATED_STRIKES, ToolType.SWORD, ImmutableList.of(SubSkillType.SWORDS_SERRATED_STRIKES, SubSkillType.SWORDS_RUPTURE, SubSkillType.SWORDS_COUNTER_ATTACK)),
     TAMING(TamingManager.class, Color.PURPLE, ImmutableList.of(SubSkillType.TAMING_BEAST_LORE, SubSkillType.TAMING_CALL_OF_THE_WILD, SubSkillType.TAMING_ENVIRONMENTALLY_AWARE, SubSkillType.TAMING_FAST_FOOD_SERVICE, SubSkillType.TAMING_GORE, SubSkillType.TAMING_HOLY_HOUND, SubSkillType.TAMING_SHARPENED_CLAWS, SubSkillType.TAMING_SHOCK_PROOF, SubSkillType.TAMING_THICK_FUR, SubSkillType.TAMING_PUMMEL)),
     UNARMED(UnarmedManager.class, Color.BLACK, SuperAbilityType.BERSERK, ToolType.FISTS, ImmutableList.of(SubSkillType.UNARMED_BERSERK, SubSkillType.UNARMED_BLOCK_CRACKER, SubSkillType.UNARMED_ARROW_DEFLECT, SubSkillType.UNARMED_DISARM, SubSkillType.UNARMED_IRON_ARM_STYLE, SubSkillType.UNARMED_IRON_GRIP)),

src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java

@@ -63,7 +63,6 @@ public enum SubSkillType {
     SALVAGE_ARCANE_SALVAGE(8),
 
     /* Smelting */
-    SMELTING_FLUX_MINING(1),
     SMELTING_FUEL_EFFICIENCY(4),
     SMELTING_SECOND_SMELT,
     SMELTING_UNDERSTANDING_THE_ART(8),

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

@@ -16,7 +16,7 @@ public class Smelting {
         return RankUtils.getRank(player, SubSkillType.SMELTING_UNDERSTANDING_THE_ART);
     }
 
-    public static int    fluxMiningUnlockLevel = RankUtils.getUnlockLevel(SubSkillType.SMELTING_FLUX_MINING);
+    //public static int    fluxMiningUnlockLevel = RankUtils.getUnlockLevel(SubSkillType.SMELTING_FLUX_MINING);
 
     protected static int getResourceXp(ItemStack smelting) {
         return mcMMO.getModManager().isCustomOre(smelting.getType()) ? mcMMO.getModManager().getBlock(smelting.getType()).getSmeltingXpGain() : ExperienceConfig.getInstance().getXp(PrimarySkillType.SMELTING, smelting.getType());

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

@@ -31,12 +31,12 @@ public class SmeltingManager extends SkillManager {
         super(mcMMOPlayer, PrimarySkillType.SMELTING);
     }
 
-    public boolean canUseFluxMining(BlockState blockState) {
+    /*public boolean canUseFluxMining(BlockState blockState) {
         return getSkillLevel() >= Smelting.fluxMiningUnlockLevel
                 && BlockUtils.affectedByFluxMining(blockState)
                 && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SMELTING_FLUX_MINING)
                 && !mcMMO.getPlaceStore().isTrue(blockState);
-    }
+    }*/
 
     public boolean isSecondSmeltSuccessful() {
         return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SMELTING_SECOND_SMELT)
@@ -49,7 +49,7 @@ public class SmeltingManager extends SkillManager {
      * @param blockState The {@link BlockState} to check ability activation for
      * @return true if the ability was successful, false otherwise
      */
-    public boolean processFluxMining(BlockState blockState) {
+    /*public boolean processFluxMining(BlockState blockState) {
         Player player = getPlayer();
 
         if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.SMELTING_FLUX_MINING, true)) {
@@ -94,7 +94,7 @@ public class SmeltingManager extends SkillManager {
         }
 
         return false;
-    }
+    }*/
 
     /**
      * Increases burn time for furnace fuel.