Disabling unfinished skills until they are finished

Changelog.md

@@ -1,7 +1,7 @@
 
-Version 2.1.0
+###### **Version 2.1.0**
 
-Please use Spigot or Paper!
+##### Please use Spigot or Paper!
     
     mcMMO is now built against Spigot-API instead of Bukkit
 
@@ -27,6 +27,7 @@ World Blacklist
     
 Rank System
 
+    Skills that are not yet unlocked will show up as ??? until learned
     Many skills now make use of a rank system!
     Rank level requirements are modified in skillranks.yml
     Woodcutting's Double Drop subskill is now named Harvest Lumber

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

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

@@ -56,9 +56,9 @@ public class WoodcuttingCommand extends SkillCommand {
         canTreeFell = RankUtils.hasUnlockedSubskill(player, SubSkillType.WOODCUTTING_TREE_FELLER) && Permissions.treeFeller(player);
         canDoubleDrop = canUseSubskill(player, SubSkillType.WOODCUTTING_HARVEST_LUMBER) && !skill.getDoubleDropsDisabled() && RankUtils.getRank(player, SubSkillType.WOODCUTTING_HARVEST_LUMBER) >= 1;
         canLeafBlow = canUseSubskill(player, SubSkillType.WOODCUTTING_LEAF_BLOWER);
-        canSplinter = canUseSubskill(player, SubSkillType.WOODCUTTING_SPLINTER);
+        /*canSplinter = canUseSubskill(player, SubSkillType.WOODCUTTING_SPLINTER);
         canBarkSurgeon = canUseSubskill(player, SubSkillType.WOODCUTTING_BARK_SURGEON);
-        canNaturesBounty = canUseSubskill(player, SubSkillType.WOODCUTTING_NATURES_BOUNTY);
+        canNaturesBounty = canUseSubskill(player, SubSkillType.WOODCUTTING_NATURES_BOUNTY);*/
     }
 
     @Override

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

@@ -49,7 +49,7 @@ public enum PrimarySkillType {
     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)),
-    WOODCUTTING(WoodcuttingManager.class, Color.OLIVE, SuperAbilityType.TREE_FELLER, ToolType.AXE, ImmutableList.of(SubSkillType.WOODCUTTING_LEAF_BLOWER, SubSkillType.WOODCUTTING_BARK_SURGEON, SubSkillType.WOODCUTTING_SPLINTER, SubSkillType.WOODCUTTING_NATURES_BOUNTY, SubSkillType.WOODCUTTING_TREE_FELLER, SubSkillType.WOODCUTTING_HARVEST_LUMBER));
+    WOODCUTTING(WoodcuttingManager.class, Color.OLIVE, SuperAbilityType.TREE_FELLER, ToolType.AXE, ImmutableList.of(SubSkillType.WOODCUTTING_LEAF_BLOWER, SubSkillType.WOODCUTTING_TREE_FELLER, SubSkillType.WOODCUTTING_HARVEST_LUMBER));
 
     private Class<? extends SkillManager> managerClass;
     private Color runescapeColor;

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

@@ -94,12 +94,12 @@ public enum SubSkillType {
     UNARMED_IRON_GRIP,
 
     /* Woodcutting */
-    WOODCUTTING_BARK_SURGEON(3),
+/*    WOODCUTTING_BARK_SURGEON(3),*/
     WOODCUTTING_HARVEST_LUMBER(1),
-    WOODCUTTING_LEAF_BLOWER(3),
-    WOODCUTTING_NATURES_BOUNTY(3),
-    WOODCUTTING_SPLINTER(3),
-    WOODCUTTING_TREE_FELLER(5);
+    WOODCUTTING_LEAF_BLOWER(1),
+/*    WOODCUTTING_NATURES_BOUNTY(3),
+    WOODCUTTING_SPLINTER(3),*/
+    WOODCUTTING_TREE_FELLER(1);
 
     private final int numRanks;
     //TODO: SuperAbilityType should also contain flags for active by default? Not sure if it should work that way.