Fix casing

People will complain if we don’t

.gitignore

@@ -2,7 +2,6 @@
 /.classpath
 /.project
 /.settings
-/dependency-reduced-pom.xml
 
 # netbeans
 /nbproject

Changelog.txt

@@ -7,137 +7,17 @@ Key:
   ! Change
   - Removal
 
-Version 2.1.0
- + Added JSON integration to all Skill Commands
- + Added config setting to enable or disable classic mcMMO skill scaling
- + (Config) Added rank settings for the new Woodcutting skill
- + (Config) Added configurable parameters for the new Tree Feller
- + (Config) Added classic toggle for Tree Feller
- + (Chat) Added ability for admins to spy on party chat (off unless toggled on)
- + (Commands) Added toggle command /mcchatspy
- + (API) Added many missing SubSkills to SubSkill class
- + (Permissions) Added permission node mcmmo.commands.mcchatspy & mcmmo.commands.mcchatspy.others
- + (Permissions) Added permission nodes for Harvest Lumber, Splinter, Nature's Bounty, and Bark Surgeon
- + (Locale) Added locale strings for new Woodcutting abilities
- + (Locale) Added locale strings for mcchatspy command
- + (Locale) Added locale strings for JSON integration
- + (Locale) Added locale strings for Taming's Pummel SubSkill
- + (Locale) Added locale strings for Unarmed's Block Cracker SubSkill
- - (Locale) Removed localizations with the following codes for being almost empty: id, HR_hr, et_EE, lv, lt, no, pl_PL, pt_PT, tr_TR
- - (Config) Removed SkillShot's IncreaseLevel & IncreasePercentage (replaced by RankDamageMultiplier)
- - (Config) Removed AxeMastery's MaxBonus & MaxBonusLevel (replaced by RankDamageMultiplier)
- ! (Skills) Woodcutting's Double Drop subskill is now named Harvest Lumber
- ! (Skills) Archery's Skill Shot now uses a rank system
- ! (Skills) Axe's Axe Mastery now uses a rank system
- ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle
- ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect
- ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack
- ! (Config) Archery.Retrieve in advanced.yml is now Archery.ArrowRetrieval
- ! (Config) Axes.CriticalHit in advanced.yml is now Axes.CriticalStrikes
- ! (Config) Archery's Skill Shot now uses RankDamageMultiplier for its damage bonus calculations
- ! (Config) Axe's Axe mastery now uses RankDamageMultiplier for its damage bonus calculations
- ! (Permissions) Replaced the old Double Drop permission node for woodcutting with a new Harvest Lumber permission node
- ! (Permissions) Fast Food Service permission node renamed to mcmmo.ability.taming.fastfoodservice
- ! (Permissions) Counter Attack permission node renamed to mcmmo.ability.swords.counterattack
- ! (Permissions) Arrow Deflect permission node renamed to mcmmo.ability.unarmed.arrowdeflect
- ! (Permissions) Iron Arm Style permission node renamed to mcmmo.ability.unarmed.ironarmstyle
- ! (Locale) Removed redundant information from some skill names and descriptions en_US (other locales will need to be updated)
- ! (Locale) SubSkill locale keys are now located at {ParentSkill}.SubSkill.SubSkillName
- ! (Locale) Super Abilities no longer have (ABILITY) in their Skill.Effect strings
- ! (API) mcMMO is now built against Spigot-API instead of Bukkit
- ! (API) SkillType is now PrimarySkill
- ! (API) SecondarySkill is now SubSkill
- ! (API) AbilityType is now SuperAbility
- ! (API) SecondaryAbilityEvent is now SubSkillEvent
- ! (API) SecondarySkill ENUM is being updated to have the parent skill as a prefix and a getter method for grabbing the parent skill
- ! (API) GREEN_THUMB_PLANT & GREEN_THUMB_BLOCK are replaced by GREEN_THUMB
- ! Skill Super Powers (Tree Feller, etc...) will now require level 10+ to use
- ! (Skills) mcMMO skills will now be on a scale from 1-100 instead of 0-1000 (for existing mcMMO installs this is opt-in and off by default)
- ! (Code) Refactored some unreadable code relating to SecondaryAbility activation in SkillUtils
-
-
-Version 2.0.0
- = Fixed an interaction between Tree Feller and Stripped Wood
- ! Fireworks no longer fire by default for ability activation/deactivation
- ! Website has been changed and the MOTD string relating to it reflects this
- ! Discord link added to mcMMO command
- ! Updated misc strings relating to mcMMO
-
-
-Version 1.5.05-SNAPSHOT
-
-Version 1.5.04
- + Added option to config.yml to control mcMMO generated sound volume
- + Added option to config.yml to truncate existing player skill levels that exceed the skill level cap
- + Falling blocks persist mcMMO natural data
- = Woodcutting double drops correctly identify acacia and dark oak logs
- = Skill Reset command now correctly identifies arguments
- = Hylian Treasure config options are now actually used
- = Child skills now use parent skills configured skill caps properly
- = Auto Update config now properly works
- ! Item dropped from blocks now drop from the center
- ! Potions Config updated for 1.9
- ! Flux mining now simulates a block break event for other plugins to act upon
- ! Zombie Pigmen spawned from nether portals are now considered spawner mobs
- ! Flux Pickaxe lore now appends to existing lore as opposed to replacing it
- ! Party chat no longer displays colors when logged in server console
- - Treefeller no longer lowers exp for big trees
- - No longer supports 1.8 :(
- - Removed plugin metrics
-
-Version 1.5.03
- = Fixed bug where absorption hearts could be attacked by allied players
- = Fixed bug where new forms of stone would drop the wrong type when mined with Silk Touch
- = Fixed bug where blocks would not get tracked correctly when using sticky pistons and slime blocks in certain situations
- = Fixed bug where config value for Daze damage was ignored
- = Fixed UUID updater to not lose data on errors
- = Fixed bug where uuid update could result in large amounts of user data being deleted
- = Fixed bug where custom potions were missed in potion stage calculation
- = Fixed piston dupe bugs permanently
- = Fixed bug involving user name changes
- = Fixed old user purge to properly calculate months
- = Fixed bug where Repair would incorrectly check items
- = Fixed bug where apostrophes in locale files would not read correctly
- = Fixed bug where treasure data was limited to 255 instead of Short.MAX_VALUE
- ! Moved more user loading calculations to async loading thread to reduce lag on login
-
-Version 1.5.02
- + Added option to config.yml for Chimaera Wings to stop using bed spawn points
- + Added option to config.yml to let non-tools in hand count as unarmed
- + Added option to experience.yml to control XP gained by killing bred animals
- + Added support for 1.8 mobs and features
- = Fixed bug where no Mining XP was granted when Flux Mining was successful
- = Fixed bug with UUID conversions in Flatfile
- = Fixed a couple Dupe bugs that were introduced recently
- = Fixed bug where MobHealthbarTypes were not saved between server restarts
- ! Changed Flux Mining mechanics. In order to use the ability, you need to infuse a pickaxe with furnace powers first.
- ! Scoreboard tips are only shown a couple of times to the player, instead of once per login session
- ! Changed Archery distance multiplier to be configurable
- ! Archery distance XP bonus cannot exceed indefinitely anymore
-
-Version 1.5.01
+Version 1.5.01-dev
  + Added new child skill; Salvage
- + Added UUID support!
- + Added SQL connection pooling and async loading!
- + Added the long awaited Diminished Returns feature
  + Added new feature to Herbalism. Instantly-regrown crops are protected from being broken for 1 second
  + Added option to config.yml to show the /mcstats scoreboard automatically after logging in
  + Added option to config.yml for Alchemy. Skills.Alchemy.Prevent_Hopper_Transfer_Bottles
- + Added option to config.yml for Scoreboards, display "Ability" instead of ability names on the scoreboards
- + Added options to experience.yml for Dirt and Sand variations
  + Added support for `MATERIAL|data` format in treasures.yml
  + Added API to experience events to get XP gain reason
  + Added API to check if an entity is bleeding
- + Added API to ExperienceAPI to get the amount of XP needed for a level
- + Added API class SkillAPI used to get a list of valid skill names
- + Added API events for hardcore features, McMMOPlayerPreDeathPenaltyEvent, McMMOPlayerStatLossEvent and McMMOPlayerVampirismEvent
- + Added API to ExperienceAPI to specify if XP can be shared
  + Added options to tools.yml and armor.yml config files to set a pretty repair material name
  + Added full support for repairables in tools.yml and armor.yml config files
- + Added magical mod config file import command, for Cauldron 1.7+. Check wiki for usage
- + Added particle effects and sounds to "Call of the Wild" (Taming)
- + Added summon length to "Call of the Wild". Summons will now commit suicide after their lifespan expires
- + Added feature which makes tamed wolves attack a target shot by the owner
+ + Added new API class SkillAPI used to get a list of valid skill names
  = Fixed bug where pistons would mess with the block tracking
  = Fixed bug where the Updater was running on the main thread.
  = Fixed bug when players would use /ptp without being in a party
@@ -155,7 +35,6 @@ Version 1.5.01
  = Fixed bug where party chat was using non thread safe methods
  = Fixed bug where Blast Mining unlock levels could be to high in certain occasions
  = Fixed bug where Blast Minings ability "Demolition Expert" would not work
- = Fixed bug where Repair_Material_Quantity wasn't read in mod config files
  ! Changed SecondaryAbilityEvent to implement Cancellable and it now gets fired for damage related secondary abilities
  ! Changed the way mcMMO handles bonus damage, updated for the new damage event API
  ! Changed player data saving. Save tasks are now asynchronous
@@ -164,9 +43,6 @@ Version 1.5.01
  ! Changed Alchemy XP distribution. XP is granted based on the stage of the potion.
  ! Changed behavior of the Blast Mining ability "Demolition Expert"; now only decreases damage for the ability user
  ! Updated for new getOnlinePlayers() behavior
- ! Updated for new blocks and entities
- ! Changed McMMOPlayerDeathPenaltyEvent to get fired after hardcore penalty calculations, use McMMOPlayerPreDeathPenaltyEvent for old behavior
- ! Moved Refresh_Chunks setting from hidden.yml to config.yml
  - Removed salvage ability from Repair, salvage has it's own (child) skill now
 
 Version 1.5.00

README.md

@@ -1,40 +1,40 @@
 # mcMMO
 ## The RPG lovers mod
 
-## Website
-I'm working on a brand new website for mcMMO
-
-You can check it out here http://www.mcmmo.org
-
-I plan to post links to our new wiki (its still under development), downloads, and dev blogs there.
-
-
-### Builds
-Currently, you can obtain our builds via the Spigot resource page: https://www.spigotmc.org/resources/official-mcmmo.63489/
+### Dev builds
+Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).
 
 ### Brief Description
 The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
 
 ## About the Team
+
 mcMMO is currently developed by a team of individuals from all over the world.
-
-### Project Lead & Founder
-[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
-
-### Former Lead
-[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
+### Glorious Leader
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
+(https://github.com/gmcferrin)
 
 ### Developers
-[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)](https://github.com/bm01)
-[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)](https://github.com/Glitchfinder)
-[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)](https://github.com/NuclearW)
-[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)](https://github.com/shatteredbeam)
-[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)](https://github.com/TfT-02)
-[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)](https://github.com/t00thpick1)
-[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)](https://github.com/riking)
+[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
+(https://github.com/bm01)
+[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
+(https://github.com/Glitchfinder)
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)]
+(https://github.com/nossr50)
+[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)]
+(https://github.com/NuclearW)
+[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)]
+(https://github.com/shatteredbeam)
+[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
+(https://github.com/TfT-02)
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
+(https://github.com/t00thpick1)
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
+(https://github.com/riking)
 
 ### Special thanks
-[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)](https://github.com/EasyMFnE)  
+[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)]
+(https://github.com/EasyMFnE)  
 Added the Alchemy skill
 
 ## Compiling
@@ -44,7 +44,8 @@ mcMMO uses Maven 3 to manage dependencies, packaging, and shading of necessary c
 The typical command used to build mcMMO is: `mvn clean package install`
 
 Required Libraries:
-* Bukkit
 * JUnit
+* EMetrics
+* Bukkit
 
-https://www.spigotmc.org/resources/official-mcmmo.63489/ for more up to date information.
+http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

extras/mods/1.6.x/advancedgenetics.tools.yml

@@ -1,14 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Advanced Genetics 1.4.3
-Bows:
-    # Genetic
-    X31179:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X31197
-        Repair_Material_Pretty_Name: "Cell"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 1501

extras/mods/1.6.x/appliedenergistics.blocks.yml

@@ -1,9 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Applied Energistics rv14-finale3
-Mining:
-    # Certus Quartz Ore
-    X4076|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/appliedenergistics.tools.yml

@@ -1,65 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Applied Energistics rv14-finale3
-Axes:
-    # Quartz
-    X4365:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X4362
-        Repair_Material_Pretty_Name: "Certus Quartz"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 3
-        Durability: 250
-
-Hoes:
-    # Quartz
-    X4366:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X4362
-        Repair_Material_Pretty_Name: "Certus Quartz"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 2
-
-Pickaxes:
-    # Quartz
-    X4368:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X4362
-        Repair_Material_Pretty_Name: "Certus Quartz"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 3
-        Durability: 250
-
-Shovels:
-    # Quartz
-    X4367:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X4362
-        Repair_Material_Pretty_Name: "Certus Quartz"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 1
-        Durability: 750
-
-Swords:
-    # Quartz
-    X4369:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X4362
-        Repair_Material_Pretty_Name: "Certus Quartz"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 2
-        Durability: 250

extras/mods/1.6.x/bigreactors.blocks.yml

@@ -1,9 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Big Reactors 0.3.4A2
-Mining:
-    # Yellorite
-    X1750|0:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/biomesoplenty.armor.yml

@@ -1,77 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of BoP 1.2.1.434
-Boots:
-    # Wading
-    X21269:
-        Repairable: false
-        Durability: 9999
-    # Muddy
-    X21283:
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 26
-    # Amethyst
-    X21293:
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 520
-
-Chestplates:
-    # Muddy
-    X21281:
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 32
-    # Amethyst
-    X21291:
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 640
-
-Helmets:
-    # Muddy
-    X21280:
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 22
-    # Amethyst
-    X21290:
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 440
-
-Leggings:
-    # Muddy
-    X21280:
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 30
-    # Amethyst
-    X21290:
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 600

extras/mods/1.6.x/biomesoplenty.blocks.yml

@@ -1,44 +0,0 @@
-# Config wrote by M1cr0man
-# Incomplete! Only covers ores
-# Up to date as of BoP 1.2.1.434
-Mining:
-    # Red Rock
-    X162|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Amethyst
-    X1921|0:
-        XP_Gain: 200
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Ruby
-    X1921|2:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Peridot
-    X1921|4:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Topaz
-    X1921|6:
-        XP_Gain: 200
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Tanzanite
-    X1921|8:
-        XP_Gain: 200
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Malachite
-    X1921|10:
-        XP_Gain: 200
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Sapphire
-    X1921|12:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/biomesoplenty.tools.yml

@@ -1,121 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of BoP 1.2.1.434
-Axes:
-    # Amethyst
-    X21287:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 2013
-    # Muddy
-    X21277:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 32
-
-Hoes:
-    # Amethyst
-    X21288:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 2013
-    # Muddy
-    X21278:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 32
-
-Pickaxes:
-    # Amethyst
-    X21286:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 2013
-    # Muddy
-    X21276:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 32
-
-Shovels:
-    # Amethyst
-    X21285:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 2013
-    # Muddy
-    X21275:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 32
-
-Swords:
-    # Amethyst
-    X21284:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X21264
-        Repair_Material_Pretty_Name: "Amethyst"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 2013
-    # Muddy
-    X21274:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 1
-        Repairable: true
-        Repair_Material: X21263
-        Repair_Material_Pretty_Name: "Mud Ball"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 32

extras/mods/1.6.x/emasher.armor.yml

@@ -1,31 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Emasher Resource 1.2.3.5
-Boots:
-    # Hemp
-    X9301:
-        Repairable: true
-        Repair_Material: X9291
-        Repair_Material_Pretty_Name: "Hemp"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 65
-
-Chestplates:
-    # Hemp
-    X9299:
-        Repairable: true
-        Repair_Material: X9291
-        Repair_Material_Pretty_Name: "Hemp"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 80
-
-Leggings:
-    # Hemp
-    X9300:
-        Repairable: true
-        Repair_Material: X9291
-        Repair_Material_Pretty_Name: "Hemp"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 75

extras/mods/1.6.x/emasher.blocks.yml

@@ -1,44 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Emasher Resource 1.2.3.5
-Mining:
-    # Bauxite
-    X1565|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Cassiterite
-    X1565|1:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Emery
-    X1565|2:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Galena
-    X1565|3:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Native Copper
-    X1565|4:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Petlandite
-    X1565|5:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Ruby
-    X1565|6:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Sapphire
-    X1565|7:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/extrautilities.tools.yml

@@ -1,54 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Extra Utilities 1.0.3c
-Axes:
-    # Healing
-    X10264:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X10258
-        Repair_Material_Pretty_Name: "Unstable Ingot"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 1561
-
-Hoes:
-    # Reversing
-    X10265:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: true
-        Repair_Material: X10258
-        Repair_Material_Pretty_Name: "Unstable Ingot"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 1561
-
-Pickaxes:
-    # Destruction
-    X10263:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: false
-        Durability: 6244
-
-Shovels:
-    # Erosion
-    X10262:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: false
-        Durability: 6244
-
-Swords:
-    # Etheric
-    X10261:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 4
-        Repairable: false
-        Durability: 1561

extras/mods/1.6.x/factorization.blocks.yml

@@ -1,9 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Factorization 0.8.34
-Mining:
-    # Dark Iron Ore
-    X1004|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/forestry.blocks.yml

@@ -1,19 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Forestry 2.3.1.1
-Mining:
-    # Apatite
-    X1398|0:
-        XP_Gain: 100
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Copper
-    X1398|1:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Tin
-    X1398|2:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/forestry.tools.yml

@@ -1,27 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Forestry 2.3.1.1
-Pickaxes:
-    # Survivalist
-    X13261:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X5261
-        Repair_Material_Pretty_Name: "Bronze Ingot"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 200
-
-Shovels:
-    # Survivalist
-    X13264:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X5261
-        Repair_Material_Pretty_Name: "Bronze Ingot"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 200

extras/mods/1.6.x/minefactoryreloaded.armor.yml

@@ -1,11 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Minefactory Reloaded 2.7.9 Final
-Boots:
-    # Plastic
-    X12306:
-        Repairable: true
-        Repair_Material: X12249
-        Repair_Material_Pretty_Name: "Plastic Sheets"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 39

extras/mods/1.6.x/natura.armor.yml

@@ -1,41 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Natura 2.1.14
-Boots:
-    # Impskin
-    X12712:
-        Repairable: true
-        Repair_Material: X12660
-        Repair_Material_Pretty_Name: "Imp Leather"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 4
-        Durability: 429
-
-Chestplates:
-    # Impskin
-    X12710:
-        Repairable: true
-        Repair_Material: X12660
-        Repair_Material_Pretty_Name: "Imp Leather"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 8
-        Durability: 528
-
-Helmets:
-    # Impskin
-    X12709:
-        Repairable: true
-        Repair_Material: X12660
-        Repair_Material_Pretty_Name: "Imp Leather"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 5
-        Durability: 363
-
-Leggings:
-    # Impskin
-    X12709:
-        Repairable: true
-        Repair_Material: X12660
-        Repair_Material_Pretty_Name: "Imp Leather"
-        Repair_Material_Data_Value: 6
-        Repair_Material_Quantity: 7
-        Durability: 495

extras/mods/1.6.x/natura.tools.yml

@@ -1,272 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Natura 2.1.14
-Axes:
-    # Bloodwood
-    X12685:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Bloodwood Planks"
-        Repair_Material_Data_Value: 4
-        Repair_Material_Quantity: 3
-        Durability: 350
-    # Darkwood
-    X12689:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Darkwood Planks"
-        Repair_Material_Data_Value: 11
-        Repair_Material_Quantity: 3
-        Durability: 131
-    # Fusewood
-    X12693:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Fusewood Planks"
-        Repair_Material_Data_Value: 12
-        Repair_Material_Quantity: 3
-        Durability: 250
-    # Ghostwood
-    X12681:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Ghostwood Planks"
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 3
-        Durability: 59
-    # Quartz
-    X12697:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: QUARTZ_BLOCK
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 131
-
-Bows:
-    # Bloodwood
-    X12706:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X12677
-        Repair_Material_Pretty_Name: "Bloodwood Stick"
-        Repair_Material_Data_Value: 4
-        Repair_Material_Quantity: 3
-        Durability: 1501
-    # Darkwood
-    X12707:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X12677
-        Repair_Material_Pretty_Name: "Darkwood Stick"
-        Repair_Material_Data_Value: 11
-        Repair_Material_Quantity: 3
-        Durability: 162
-    # Fusewood
-    X12708:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X12677
-        Repair_Material_Pretty_Name: "Fusewood Stick"
-        Repair_Material_Data_Value: 12
-        Repair_Material_Quantity: 3
-        Durability: 28
-    # Ghostwood
-    X12705:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X12677
-        Repair_Material_Pretty_Name: "Ghostwood Stick"
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 3
-        Durability: 384
-
-
-Pickaxes:
-    # Bloodwood
-    X12683:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Bloodwood Planks"
-        Repair_Material_Data_Value: 4
-        Repair_Material_Quantity: 3
-        Durability: 350
-    # Darkwood
-    X12687:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Darkwood Planks"
-        Repair_Material_Data_Value: 11
-        Repair_Material_Quantity: 3
-        Durability: 131
-    # Fusewood
-    X12691:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Fusewood Planks"
-        Repair_Material_Data_Value: 12
-        Repair_Material_Quantity: 3
-        Durability: 250
-    # Ghostwood
-    X12679:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Ghostwood Planks"
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 3
-        Durability: 59
-    # Quartz
-    X12695:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: QUARTZ_BLOCK
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 3
-        Durability: 131
-
-Shovels:
-    # Bloodwood
-    X12684:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Bloodwood Planks"
-        Repair_Material_Data_Value: 4
-        Repair_Material_Quantity: 1
-        Durability: 350
-    # Darkwood
-    X12688:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Darkwood Planks"
-        Repair_Material_Data_Value: 11
-        Repair_Material_Quantity: 1
-        Durability: 131
-    # Fusewood
-    X12692:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Fusewood Planks"
-        Repair_Material_Data_Value: 12
-        Repair_Material_Quantity: 1
-        Durability: 250
-    # Ghostwood
-    X12680:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Ghostwood Planks"
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 1
-        Durability: 59
-    # Quartz
-    X12696:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: QUARTZ_BLOCK
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 1
-        Durability: 131
-
-Swords:
-    # Bloodwood
-    X12682:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Bloodwood Planks"
-        Repair_Material_Data_Value: 4
-        Repair_Material_Quantity: 2
-        Durability: 350
-    # Darkwood
-    X12686:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Darkwood Planks"
-        Repair_Material_Data_Value: 11
-        Repair_Material_Quantity: 2
-        Durability: 131
-    # Fusewood
-    X12690:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Fusewood Planks"
-        Repair_Material_Data_Value: 12
-        Repair_Material_Quantity: 2
-        Durability: 250
-    # Ghostwood
-    X12678:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: X3262
-        Repair_Material_Pretty_Name: "Ghostwood Planks"
-        Repair_Material_Data_Value: 2
-        Repair_Material_Quantity: 2
-        Durability: 59
-    # Quartz
-    X12694:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: true
-        Repair_Material: QUARTZ_BLOCK
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 2
-        Durability: 131

extras/mods/1.6.x/projectred.blocks.yml

@@ -1,29 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Project Red 4.3.5.30
-Mining:
-    # Ruby
-    X2130|0:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Sapphire
-    X2130|1:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Peridot
-    X2130|2:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Marble
-    X2131|0:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false
-    # Basalt
-    X2131|3:
-        XP_Gain: 30
-        Double_Drops_Enabled: true
-        Is_Ore: false

extras/mods/1.6.x/projectred.tools.yml

@@ -1,176 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Project Red 4.3.5.30
-Axes:
-    # Ruby
-    X9353:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Ruby"
-        Repair_Material_Data_Value: 37
-        Repair_Material_Quantity: 3
-        Durability: 500
-    # Sapphire
-    X9354:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Sapphire"
-        Repair_Material_Data_Value: 38
-        Repair_Material_Quantity: 3
-        Durability: 500
-    # Peridot
-    X9355:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Peridot"
-        Repair_Material_Data_Value: 39
-        Repair_Material_Quantity: 3
-        Durability: 500
-
-Hoes:
-    # Ruby
-    X9356:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Ruby"
-        Repair_Material_Data_Value: 37
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Sapphire
-    X9357:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Sapphire"
-        Repair_Material_Data_Value: 38
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Peridot
-    X9358:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Peridot"
-        Repair_Material_Data_Value: 39
-        Repair_Material_Quantity: 2
-        Durability: 500
-
-Pickaxes:
-    # Ruby
-    X9359:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Ruby"
-        Repair_Material_Data_Value: 37
-        Repair_Material_Quantity: 3
-        Durability: 500
-    # Sapphire
-    X9360:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Sapphire"
-        Repair_Material_Data_Value: 38
-        Repair_Material_Quantity: 3
-        Durability: 500
-    # Peridot
-    X9361:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Peridot"
-        Repair_Material_Data_Value: 39
-        Repair_Material_Quantity: 3
-        Durability: 500
-
-Shovels:
-    # Ruby
-    X9362:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Ruby"
-        Repair_Material_Data_Value: 37
-        Repair_Material_Quantity: 1
-        Durability: 500
-    # Sapphire
-    X9363:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Sapphire"
-        Repair_Material_Data_Value: 38
-        Repair_Material_Quantity: 1
-        Durability: 500
-    # Peridot
-    X9364:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Peridot"
-        Repair_Material_Data_Value: 39
-        Repair_Material_Quantity: 1
-        Durability: 500
-
-Swords:
-    # Ruby
-    X9365:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Ruby"
-        Repair_Material_Data_Value: 37
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Sapphire
-    X9366:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Sapphire"
-        Repair_Material_Data_Value: 38
-        Repair_Material_Quantity: 2
-        Durability: 500
-    # Peridot
-    X9368:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X9281
-        Repair_Material_Pretty_Name: "Peridot"
-        Repair_Material_Data_Value: 39
-        Repair_Material_Quantity: 2
-        Durability: 500

extras/mods/1.6.x/railcraft.armor.yml

@@ -1,49 +1,44 @@
-# Config wrote by Dragyn, updated by M1cr0man
-# Up to date as of Railcraft 8.4.0.0
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Boots
+###
 Boots:
-    # Steel
     X7758:
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 325
-
+        Repair_Material_Quantity: 2
+        Durability: 500       
+#
+#  Settings for Chestplates
+###
 Chestplates:
-    # Steel
     X7761:
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 400
-
+        Repair_Material_Quantity: 2
+        Durability: 500        
+#
+#  Settings for Helmets
+###
 Helmets:
-    # Steel
     X7759:
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 275
-
+        Repair_Material_Quantity: 2
+        Durability: 500       
+#
+#  Settings for Leggings
+###
 Leggings:
-    # Steel
     X7760:
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 375
-    # Overalls
-    X7757:
-        Repairable: true
-        Repair_Material: WOOL
-        Repair_Material_Pretty_Name: "Light Blue Wool"
-        Repair_Material_Data_Value: 3
-        Repair_Material_Quantity: 7
-        Durability: 75
+        Repair_Material_Quantity: 2
+        Durability: 500
+        

extras/mods/1.6.x/railcraft.tools.yml

@@ -1,66 +1,76 @@
-# Config wrote by Dragyn, updated by M1cr0man
-# Up to date as of Railcraft 8.4.0.0
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Axes
+###
 Axes:
     # Steel
     X7819:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
 
+
+#
+#  Settings for Hoes
+###
 Hoes:
     # Steel
     X7820:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
 
+#
+#  Settings for Pickaxes
+###
 Pickaxes:
     # Steel
     X7821:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
-
+#
+#  Settings for Shovels
+###
 Shovels:
     # Steel
     X7823:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
-
+#
+#  Settings for Swords
+###
 Swords:
     # Steel
     X7824:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 500
+        Durability: 500

extras/mods/1.6.x/stargatetech2.blocks.yml

@@ -1,9 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Stargate Tech 2 Alpha 0.7.3
-Mining:
-    # Naquadah Ore
-    X1005|0:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/thermalexpansion.armor.yml

@@ -1,41 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Thermal Expansion 3.0.0.7
-Boots:
-    # Invar
-    X31973:
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 4
-        Durability: 325
-
-Chestplates:
-    # Invar
-    X31975:
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 8
-        Durability: 400
-
-Helmets:
-    # Invar
-    X31976:
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 5
-        Durability: 275
-
-Leggings:
-    # Invar
-    X31976:
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 7
-        Durability: 375

extras/mods/1.6.x/thermalexpansion.blocks.yml

@@ -1,29 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Thermal Expansion 3.0.0.7
-Mining:
-    # Copper
-    X4064|0:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Tin
-    X4064|1:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Silver
-    X4064|2:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Lead
-    X4064|3:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Ferrous
-    X4064|4:
-        XP_Gain: 300
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/thermalexpansion.tools.yml

@@ -1,66 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Thermal Expansion 3.0.0.7
-Axes:
-    # Invar
-    X31969:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 3
-        Durability: 450
-
-Hoes:
-    # Invar
-    X31968:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 2
-        Durability: 450
-
-Pickaxes:
-    # Invar
-    X31970:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 3
-        Durability: 450
-
-Shovels:
-    # Invar
-    X31971:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 1
-        Durability: 450
-
-Swords:
-    # Invar
-    X31972:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 3
-        Repairable: true
-        Repair_Material: X31978
-        Repair_Material_Pretty_Name: "Invar Ingot"
-        Repair_Material_Data_Value: 71
-        Repair_Material_Quantity: 2
-        Durability: 450

extras/mods/1.6.x/tinkersconstruct.armor.yml

@@ -1,74 +0,0 @@
-# Config wrote by M1cr0man
-# Up to date as of Tinker's Construct 1.5.5.7
-# Also covers Tinker's Steelworks 0.0.4.2-fix2
-Boots:
-    # Wooden (Repaired with Oak Wood)
-    X14366:
-        Repairable: true
-        Repair_Material: LOG
-        Repair_Material_Pretty_Name: "Oak Wood"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 26
-    # Steel
-    X14771:
-        Repairable: true
-        Repair_Material: X14276
-        Repair_Material_Pretty_Name: "Steel Ingot"
-        Repair_Material_Data_Value: 16
-        Repair_Material_Quantity: 4
-        Durability: 325
-
-Chestplates:
-    # Wooden (Repaired with Oak Wood)
-    X14364:
-        Repairable: true
-        Repair_Material: LOG
-        Repair_Material_Pretty_Name: "Oak Wood"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 32
-    # Steel
-    X14769:
-        Repairable: true
-        Repair_Material: X14276
-        Repair_Material_Pretty_Name: "Steel Ingot"
-        Repair_Material_Data_Value: 16
-        Repair_Material_Quantity: 8
-        Durability: 400
-
-Helmets:
-    # Wooden (Repaired with Oak Wood)
-    X14362:
-        Repairable: true
-        Repair_Material: LOG
-        Repair_Material_Pretty_Name: "Oak Wood"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 22
-    # Steel
-    X14768:
-        Repairable: true
-        Repair_Material: X14276
-        Repair_Material_Pretty_Name: "Steel Ingot"
-        Repair_Material_Data_Value: 16
-        Repair_Material_Quantity: 5
-        Durability: 275
-
-Leggings:
-    # Wooden (Repaired with Oak Wood)
-    X14362:
-        Repairable: true
-        Repair_Material: LOG
-        Repair_Material_Pretty_Name: "Oak Wood"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 30
-    # Steel
-    X14768:
-        Repairable: true
-        Repair_Material: X14276
-        Repair_Material_Pretty_Name: "Steel Ingot"
-        Repair_Material_Data_Value: 16
-        Repair_Material_Quantity: 7
-        Durability: 375

extras/mods/1.6.x/tinkersconstruct.blocks.yml

@@ -1,55 +0,0 @@
-# Config wrote by M1cr0man
-# Possibly incomplete. Only covers ores
-# Up to date as of Tinker's Construct 1.5.5.7
-Excavation:
-    # Iron
-    X1488|0:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-    # Gold
-    X1488|1:
-        XP_Gain: 350
-        Double_Drops_Enabled: true
-    # Copper
-    X1488|2:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-    # Tin
-    X1488|3:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-    # Aluminum
-    X1488|4:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-    # Cobalt
-    X1488|5:
-        XP_Gain: 500
-        Double_Drops_Enabled: true
-
-Mining:
-    # Cobalt
-    X1475|1:
-        XP_Gain: 500
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Ardite
-    X1475|2:
-        XP_Gain: 500
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Copper
-    X1475|3:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Tin
-    X1475|4:
-        XP_Gain: 175
-        Double_Drops_Enabled: true
-        Is_Ore: true
-    # Aluminium 
-    X1475|5:
-        XP_Gain: 250
-        Double_Drops_Enabled: true
-        Is_Ore: true

extras/mods/1.6.x/tinkersconstruct.tools.yml

@@ -1,149 +0,0 @@
-# Config wrote by M1cr0man
-# Abilites for Pickaxes and Shovels disabled due to a bug
-# Repair disabled as mcMMO does not support NBTTag - based tools
-# Up to date as of Tinker's Construct 1.5.5.7
-# Also covers Tinker's Steelworks 0.0.4.2-fix2
-Axes:
-    # Hatchets
-    X14309:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Mattocks
-    X14316:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Lumber Axes
-    X14317:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Battle Axes
-    X14327:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-
-Bows:
-    # Shortbows
-    X14319:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-
-Hoes:
-    # Mattocks
-    X14316:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Scythes
-    X14323:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-
-Pickaxes:
-    # Pickaxes
-    X14307:
-        XP_Modifier: 1.0
-        Ability_Enabled: false
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Hammers
-    X14326:
-        XP_Modifier: 1.0
-        Ability_Enabled: false
-        Tier: 2
-        Repairable: false
-        Durability: 500
-
-Shovels:
-    # Shovels
-    X14308:
-        XP_Modifier: 1.0
-        Ability_Enabled: false
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Mattocks
-    X14316:
-        XP_Modifier: 1.0
-        Ability_Enabled: false
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Excavators
-    X14325:
-        XP_Modifier: 1.0
-        Ability_Enabled: false
-        Tier: 2
-        Repairable: false
-        Durability: 500
-
-Swords:
-    # Broadswords
-    X14311:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Longswords
-    X14312:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Rapiers
-    X14313:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Daggers
-    X14321:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Cleavers
-    X14324:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Battle Axes
-    X14327:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500
-    # Cutlasses
-    X14328:
-        XP_Modifier: 1.0
-        Ability_Enabled: true
-        Tier: 2
-        Repairable: false
-        Durability: 500

extras/mods/1.6.x/twilightforest.armor.yml

@@ -1,161 +1,134 @@
-# Config wrote by Dragyn, updated by M1cr0man
-# Up to date as of Twilight Forest 1.20.5
-Boots:
+# Config created by Dragyn
+# Created For twilightforest-1.20.3 
+#
+#
+#  Settings for Boots
+###
+Boots:  
     # Ironwood
     X27978:
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 260
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Fiery
     X27995:
         Repairable: true
         Repair_Material: X27991
-        Repair_Material_Pretty_Name: "Fiery Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 325
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Stealeaf
     X28002:
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 260
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Knightmetal
     X28037:
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 4
-        Durability: 260
-
+        Repair_Material_Quantity: 2
+        Durability: 500
+        
+#
+#  Settings for Chestplates
+###
 Chestplates:
     # Ironwood
     X27976:
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 320
-    # Naga Scale
-    X27958:
-        Repairable: true
-        Repair_Material: X27957
-        Repair_Material_Pretty_Name: "Naga Scale"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 336
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Fiery
     X27993:
         Repairable: true
         Repair_Material: X27991
-        Repair_Material_Pretty_Name: "Fiery Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 400
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Stealeaf
     X28000:
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 320
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Knightmetal
     X28035:
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 8
-        Durability: 320
-    # Phantom
-    X28035:
-        Repairable: false
-        Durability: 480
+        Repair_Material_Quantity: 2
+        Durability: 500
 
+#
+#  Settings for Helmets
+###
 Helmets:
     # Ironwood
     X27975:
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 220
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Fiery
     X27992:
         Repairable: true
         Repair_Material: X27991
-        Repair_Material_Pretty_Name: "Fiery Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 275
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Stealeaf
     X27999:
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 220
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Knightmetal
     X28034:
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 5
-        Durability: 220
-    # Phantom
-    X28034:
-        Repairable: false
-        Durability: 330
+        Repair_Material_Quantity: 2
+        Durability: 500
 
+#
+#  Settings for Leggings
+###
 Leggings:
     # Ironwood
     X27977:
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 300
-    # Naga Scale
-    X27959:
-        Repairable: true
-        Repair_Material: X27957
-        Repair_Material_Pretty_Name: "Naga Scale"
-        Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 315
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Fiery
     X27994:
         Repairable: true
         Repair_Material: X27991
-        Repair_Material_Pretty_Name: "Fiery Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 375
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Stealeaf
     X28001:
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 300
+        Repair_Material_Quantity: 2
+        Durability: 500
     # Knightmetal
     X28036:
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
-        Repair_Material_Quantity: 7
-        Durability: 300
+        Repair_Material_Quantity: 2
+        Durability: 500

extras/mods/1.6.x/twilightforest.tools.yml

@@ -1,181 +1,186 @@
-# Config wrote by Dragyn, updated by M1cr0man
-# Up to date as of Twilight Forest 1.20.5
+# Config created by Dragyn
+# Created For twilightforest-1.20.3 
+#
+#
+#  Settings for Axes
+###
 Axes:
     # Ironwood
     X27982:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500
     # Steeleaf
-    X28006:
-        XP_Modifier: 1.0
+    X31989:
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 131
+        Durability: 500
     # Knightmetal
     X28040:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500
     # Minotaur
-    X28008:
-        XP_Modifier: 1.0
+    X31984:
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
-        Repairable: false
-        Durability: 1561
+        Repairable: true
+        Repair_Material: X264
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
 
+
+#
+#  Settings for Hoes
+###
 Hoes:
     # Ironwood
     X27983:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500
     # Steeleaf
-    X28007:
-        XP_Modifier: 1.0
+    X31988:
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 131
+        Durability: 500
 
+#
+#  Settings for Pickaxes
+###
 Pickaxes:
     # Ironwood
     X27981:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500
     # Fiery
     X27997:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27991
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 1024
+        Durability: 500
     # Steeleaf
     X28005:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 131
+        Durability: 500
     # Knightmetal
     X28039:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
-
+        Durability: 500
+#
+#  Settings for Shovels
+###
 Shovels:
     # Ironwood
     X27980:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500
     # Steeleaf
     X28004:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 131
-
+        Durability: 500
+#
+#  Settings for Swords
+###
 Swords:
     # Ironwood
     X27979:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27974
-        Repair_Material_Pretty_Name: "Ironwood Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500
     # Fiery
     X27996:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27991
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 1024
+        Durability: 500
     # Steeleaf
     X28003:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X27998
-        Repair_Material_Pretty_Name: "Steeleaf"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 131
+        Durability: 500
     # Knightmetal
     X28038:
-        XP_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X28032
-        Repair_Material_Pretty_Name: "Knightmetal Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 512
+        Durability: 500

pom.xml

@@ -2,16 +2,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>1.5.01-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
         <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
         <system>GitHub</system>
     </issueManagement>
-    <packaging>jar</packaging>
     <build>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>mcMMO</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -39,14 +38,6 @@
                     <include>*.yml</include>
                 </includes>
             </resource>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                </includes>
-            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -54,8 +45,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                     <excludes>
                     </excludes>
                 </configuration>
@@ -80,27 +71,27 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>1.5</version>
                 <configuration>
                     <artifactSet>
                         <includes>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
                             <include>commons-logging:commons-logging</include>
-                            <include>org.apache.tomcat:tomcat-jdbc</include>
-                            <include>org.apache.tomcat:tomcat-juli</include>
+                            <include>net.snaq:dbpool</include>
                         </includes>
                     </artifactSet>
                     <relocations>
+                        <relocation>
+                            <pattern>com.turt2live.metrics</pattern>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>org.apache.commons.logging</pattern>
                             <shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>org.apache.juli</pattern>
-                            <shadedPattern>com.gmail.nossr50.database.tomcat.juli</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache.tomcat</pattern>
-                            <shadedPattern>com.gmail.nossr50.database.tomcat</shadedPattern>
+                            <pattern>net.snaq</pattern>
+                            <shadedPattern>com.gmail.nossr50.dbpool</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -124,16 +115,25 @@
     </build>
     <repositories>
         <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>Plugin MetricsExtension</id>
+            <url>http://repo.turt2live.com</url>
         </repository>
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>LATEST</version>
+            <type>jar</type>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -142,13 +142,31 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jdbc</artifactId>
-            <version>7.0.52</version>
-            <scope>compile</scope>
+            <groupId>com.turt2live.metrics</groupId>
+            <artifactId>MetricsExtension</artifactId>
+            <version>0.0.5-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>net.snaq</groupId>
+            <artifactId>dbpool</artifactId>
+            <version>5.1</version>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>md_5-snapshots</id>
+            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
+    </ciManagement>
 </project>

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.gmail.nossr50.mcMMO
-

src/main/java/com/gmail/nossr50/api/AbilityAPI.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.api;
 
-import com.gmail.nossr50.datatypes.skills.SuperAbility;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -12,37 +12,37 @@ public final class AbilityAPI {
     private AbilityAPI() {}
 
     public static boolean berserkEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.BERSERK);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK);
     }
 
     public static boolean gigaDrillBreakerEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.GIGA_DRILL_BREAKER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
     }
 
     public static boolean greenTerraEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.GREEN_TERRA);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GREEN_TERRA);
     }
 
     public static boolean serratedStrikesEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.SERRATED_STRIKES);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
     }
 
     public static boolean skullSplitterEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.SKULL_SPLITTER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SKULL_SPLITTER);
     }
 
     public static boolean superBreakerEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.SUPER_BREAKER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SUPER_BREAKER);
     }
 
     public static boolean treeFellerEnabled(Player player) {
-        return UserManager.getPlayer(player).getAbilityMode(SuperAbility.TREE_FELLER);
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.TREE_FELLER);
     }
 
     public static boolean isAnyAbilityEnabled(Player player) {
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-        for (SuperAbility ability : SuperAbility.values()) {
+        for (AbilityType ability : AbilityType.values()) {
             if (mcMMOPlayer.getAbilityMode(ability)) {
                 return true;
             }
@@ -56,31 +56,31 @@ public final class AbilityAPI {
     }
 
     public static void setBerserkCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.BERSERK, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.BERSERK, cooldown);
     }
 
     public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.GIGA_DRILL_BREAKER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
     }
 
     public static void setGreenTerraCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.GREEN_TERRA, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GREEN_TERRA, cooldown);
     }
 
     public static void setSerratedStrikesCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.SERRATED_STRIKES, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SERRATED_STRIKES, cooldown);
     }
 
     public static void setSkullSplitterCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.SKULL_SPLITTER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SKULL_SPLITTER, cooldown);
     }
 
     public static void setSuperBreakerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.SUPER_BREAKER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SUPER_BREAKER, cooldown);
     }
 
     public static void setTreeFellerCooldown(Player player, long cooldown) {
-        UserManager.getPlayer(player).setAbilityDATS(SuperAbility.TREE_FELLER, cooldown);
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
     }
 
     public static boolean isBleeding(LivingEntity entity) {

src/main/java/com/gmail/nossr50/api/ExperienceAPI.java

@@ -3,20 +3,16 @@ package com.gmail.nossr50.api;
 import java.util.Set;
 import java.util.UUID;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.api.exceptions.InvalidFormulaTypeException;
 import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
 import com.gmail.nossr50.api.exceptions.InvalidSkillException;
 import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException;
-import com.gmail.nossr50.api.exceptions.McMMOPlayerNotFoundException;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.datatypes.experience.FormulaType;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.player.UserManager;
@@ -34,7 +30,7 @@ public final class ExperienceAPI {
      * @return true if this is a valid mcMMO skill
      */
     public static boolean isValidSkillType(String skillType) {
-        return PrimarySkill.getSkill(skillType) != null;
+        return SkillType.getSkill(skillType) != null;
     }
 
     /**
@@ -48,7 +44,7 @@ public final class ExperienceAPI {
      * @return true if this is a valid, non-child mcMMO skill
      */
     public static boolean isNonChildSkill(String skillType) {
-        PrimarySkill skill = PrimarySkill.getSkill(skillType);
+        SkillType skill = SkillType.getSkill(skillType);
 
         return skill != null && !skill.isChildSkill();
     }
@@ -88,30 +84,7 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addRawXP(Player player, String skillType, float XP, String xpGainReason) {
-        addRawXP(player, skillType, XP, xpGainReason, false);
-    }
-
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     * @param isUnshared true if the XP cannot be shared with party members
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addRawXP(Player player, String skillType, float XP, String xpGainReason, boolean isUnshared) {
-        if (isUnshared) {
-            getPlayer(player).beginUnsharedXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
-            return;
-        }
-
-        getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
     }
 
     /**
@@ -193,7 +166,7 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addMultipliedXP(Player player, String skillType, int XP, String xpGainReason) {
-        getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
     }
 
     /**
@@ -243,32 +216,9 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason) {
-        addModifiedXP(player, skillType, XP, xpGainReason, false);
-    }
+        SkillType skill = getSkillType(skillType);
 
-    /**
-     * Adds XP to the player, calculates for XP Rate and skill modifier.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     * @param isUnshared true if the XP cannot be shared with party members
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason, boolean isUnshared) {
-        PrimarySkill skill = getSkillType(skillType);
-
-        if (isUnshared) {
-            getPlayer(player).beginUnsharedXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
-            return;
-        }
-
-        getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
     }
 
     /**
@@ -285,7 +235,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
-        PrimarySkill skill = getSkillType(skillType);
+        SkillType skill = getSkillType(skillType);
 
         addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
@@ -322,31 +272,7 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addXP(Player player, String skillType, int XP, String xpGainReason) {
-        addXP(player, skillType, XP, xpGainReason, false);
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
-     * and party sharing.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @param xpGainReason The reason to gain XP
-     * @param isUnshared true if the XP cannot be shared with party members
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
-     */
-    public static void addXP(Player player, String skillType, int XP, String xpGainReason, boolean isUnshared) {
-        if (isUnshared) {
-            getPlayer(player).beginUnsharedXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
-            return;
-        }
-
-        getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
     }
 
     /**
@@ -362,7 +288,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXP(Player player, String skillType) {
-        return getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -413,7 +339,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getXPRaw(Player player, String skillType) {
-        return getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
@@ -464,7 +390,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPToNextLevel(Player player, String skillType) {
-        return getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -515,9 +441,9 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPRemaining(Player player, String skillType) {
-        PrimarySkill skill = getNonChildSkillType(skillType);
+        SkillType skill = getNonChildSkillType(skillType);
 
-        PlayerProfile profile = getPlayer(player).getProfile();
+        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
 
         return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
     }
@@ -537,7 +463,7 @@ public final class ExperienceAPI {
      */
     @Deprecated
     public static int getOfflineXPRemaining(String playerName, String skillType) {
-        PrimarySkill skill = getNonChildSkillType(skillType);
+        SkillType skill = getNonChildSkillType(skillType);
         PlayerProfile profile = getOfflineProfile(playerName);
 
         return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
@@ -557,7 +483,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getOfflineXPRemaining(UUID uuid, String skillType) {
-        PrimarySkill skill = getNonChildSkillType(skillType);
+        SkillType skill = getNonChildSkillType(skillType);
         PlayerProfile profile = getOfflineProfile(uuid);
 
         return profile.getXpToLevel(skill) - profile.getSkillXpLevelRaw(skill);
@@ -575,7 +501,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addLevel(Player player, String skillType, int levels) {
-        getPlayer(player).addLevels(getSkillType(skillType), levels);
+        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
     }
 
     /**
@@ -593,12 +519,12 @@ public final class ExperienceAPI {
     @Deprecated
     public static void addLevelOffline(String playerName, String skillType, int levels) {
         PlayerProfile profile = getOfflineProfile(playerName);
-        PrimarySkill skill = getSkillType(skillType);
+        SkillType skill = getSkillType(skillType);
 
         if (skill.isChildSkill()) {
-            Set<PrimarySkill> parentSkills = FamilyTree.getParents(skill);
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
 
-            for (PrimarySkill parentSkill : parentSkills) {
+            for (SkillType parentSkill : parentSkills) {
                 profile.addLevels(parentSkill, (levels / parentSkills.size()));
             }
 
@@ -624,12 +550,12 @@ public final class ExperienceAPI {
      */
     public static void addLevelOffline(UUID uuid, String skillType, int levels) {
         PlayerProfile profile = getOfflineProfile(uuid);
-        PrimarySkill skill = getSkillType(skillType);
+        SkillType skill = getSkillType(skillType);
 
         if (skill.isChildSkill()) {
-            Set<PrimarySkill> parentSkills = FamilyTree.getParents(skill);
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
 
-            for (PrimarySkill parentSkill : parentSkills) {
+            for (SkillType parentSkill : parentSkills) {
                 profile.addLevels(parentSkill, (levels / parentSkills.size()));
             }
 
@@ -653,7 +579,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevel(Player player, String skillType) {
-        return getPlayer(player).getSkillLevel(getSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -698,7 +624,7 @@ public final class ExperienceAPI {
      * @return the power level of the player
      */
     public static int getPowerLevel(Player player) {
-        return getPlayer(player).getPowerLevel();
+        return UserManager.getPlayer(player).getPowerLevel();
     }
 
     /**
@@ -716,7 +642,7 @@ public final class ExperienceAPI {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(playerName);
 
-        for (PrimarySkill type : PrimarySkill.NON_CHILD_SKILLS) {
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
             powerLevel += profile.getSkillLevel(type);
         }
 
@@ -737,7 +663,7 @@ public final class ExperienceAPI {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(uuid);
 
-        for (PrimarySkill type : PrimarySkill.NON_CHILD_SKILLS) {
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
             powerLevel += profile.getSkillLevel(type);
         }
 
@@ -849,7 +775,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void setLevel(Player player, String skillType, int skillLevel) {
-        getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
+        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -898,7 +824,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void setXP(Player player, String skillType, int newValue) {
-        getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -949,7 +875,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void removeXP(Player player, String skillType, int xp) {
-        getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
     }
 
     /**
@@ -987,35 +913,8 @@ public final class ExperienceAPI {
         getOfflineProfile(uuid).removeXp(getNonChildSkillType(skillType), xp);
     }
 
-    /**
-     * Check how much XP is needed for a specific level with the selected level curve.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param level The level to get the amount of XP for
-     *
-     * @throws InvalidFormulaTypeException if the given formulaType is not valid
-     */
-    public static int getXpNeededToLevel(int level) {
-        return mcMMO.getFormulaManager().getCachedXpToLevel(level, ExperienceConfig.getInstance().getFormulaType());
-    }
-
-    /**
-     * Check how much XP is needed for a specific level with the provided level curve.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param level The level to get the amount of XP for
-     * @param formulaType The formula type to get the amount of XP for
-     *
-     * @throws InvalidFormulaTypeException if the given formulaType is not valid
-     */
-    public static int getXpNeededToLevel(int level, String formulaType) {
-        return mcMMO.getFormulaManager().getCachedXpToLevel(level, getFormulaType(formulaType));
-    }
-
     // Utility methods follow.
-    private static void addOfflineXP(UUID playerUniqueId, PrimarySkill skill, int XP) {
+    private static void addOfflineXP(UUID playerUniqueId, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerUniqueId);
 
         profile.addXp(skill, XP);
@@ -1023,7 +922,7 @@ public final class ExperienceAPI {
     }
 
     @Deprecated
-    private static void addOfflineXP(String playerName, PrimarySkill skill, int XP) {
+    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerName);
 
         profile.addXp(skill, XP);
@@ -1052,8 +951,8 @@ public final class ExperienceAPI {
         return profile;
     }
 
-    private static PrimarySkill getSkillType(String skillType) throws InvalidSkillException {
-        PrimarySkill skill = PrimarySkill.getSkill(skillType);
+    private static SkillType getSkillType(String skillType) throws InvalidSkillException {
+        SkillType skill = SkillType.getSkill(skillType);
 
         if (skill == null) {
             throw new InvalidSkillException();
@@ -1062,8 +961,8 @@ public final class ExperienceAPI {
         return skill;
     }
 
-    private static PrimarySkill getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
-        PrimarySkill skill = getSkillType(skillType);
+    private static SkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
+        SkillType skill = getSkillType(skillType);
 
         if (skill.isChildSkill()) {
             throw new UnsupportedOperationException("Child skills do not have XP");
@@ -1081,22 +980,4 @@ public final class ExperienceAPI {
 
         return xpGainReason;
     }
-
-    private static FormulaType getFormulaType(String formula) throws InvalidFormulaTypeException {
-        FormulaType formulaType = FormulaType.getFormulaType(formula);
-
-        if (formulaType == null) {
-            throw new InvalidFormulaTypeException();
-        }
-
-        return formulaType;
-    }
-
-    private static McMMOPlayer getPlayer(Player player) throws McMMOPlayerNotFoundException {
-        if (!UserManager.hasPlayerDataKey(player)) {
-            throw new McMMOPlayerNotFoundException(player);
-        }
-
-        return UserManager.getPlayer(player);
-    }
 }

src/main/java/com/gmail/nossr50/api/PartyAPI.java

@@ -1,17 +1,14 @@
 package com.gmail.nossr50.api;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.UUID;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyLeader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -82,7 +79,7 @@ public final class PartyAPI {
         Party party = PartyManager.getParty(partyName);
 
         if (party == null) {
-            party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName);
+            party = new Party(player.getName(), partyName);
         }
 
         PartyManager.addToParty(UserManager.getPlayer(player), party);
@@ -108,7 +105,7 @@ public final class PartyAPI {
      * @return the leader of the party
      */
     public static String getPartyLeader(String partyName) {
-        return PartyManager.getPartyLeaderName(partyName);
+        return PartyManager.getPartyLeader(partyName);
     }
 
     /**
@@ -117,11 +114,10 @@ public final class PartyAPI {
      * This function is designed for API usage.
      *
      * @param partyName The name of the party to set the leader of
-     * @param playerName The playerName to set as leader
+     * @param player The player to set as leader
      */
-    @Deprecated
-    public static void setPartyLeader(String partyName, String playerName) {
-        PartyManager.setPartyLeader(mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId(), PartyManager.getParty(partyName));
+    public static void setPartyLeader(String partyName, String player) {
+        PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
     }
 
     /**
@@ -136,8 +132,8 @@ public final class PartyAPI {
     public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
         List<OfflinePlayer> members = new ArrayList<OfflinePlayer>();
 
-        for (UUID memberUniqueId : PartyManager.getAllMembers(player).keySet()) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberUniqueId);
+        for (String memberName : PartyManager.getAllMembers(player)) {
+            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
             members.add(member);
         }
         return members;
@@ -151,20 +147,7 @@ public final class PartyAPI {
      * @param player The player to check
      * @return all the player names in the player's party
      */
-    @Deprecated
     public static LinkedHashSet<String> getMembers(Player player) {
-        return (LinkedHashSet<String>) PartyManager.getAllMembers(player).values();
-    }
-
-    /**
-     * Get a list of all player names and uuids in this player's party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to check
-     * @return all the player names and uuids in the player's party
-     */
-    public static LinkedHashMap<UUID, String> getMembersMap(Player player) {
         return PartyManager.getAllMembers(player);
     }
 

src/main/java/com/gmail/nossr50/api/SkillAPI.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 
 public final class SkillAPI {
     private SkillAPI() {}
@@ -18,7 +18,7 @@ public final class SkillAPI {
      * @return a list of strings with valid skill names
      */
     public static List<String> getSkills() {
-        return getListFromEnum(Arrays.asList(PrimarySkill.values()));
+        return getListFromEnum(Arrays.asList(SkillType.values()));
     }
 
     /**
@@ -30,7 +30,7 @@ public final class SkillAPI {
      * @return a list of strings with valid skill names
      */
     public static List<String> getNonChildSkills() {
-        return getListFromEnum(PrimarySkill.NON_CHILD_SKILLS);
+        return getListFromEnum(SkillType.NON_CHILD_SKILLS);
     }
 
     /**
@@ -42,7 +42,7 @@ public final class SkillAPI {
      * @return a list of strings with valid skill names
      */
     public static List<String> getChildSkills() {
-        return getListFromEnum(PrimarySkill.CHILD_SKILLS);
+        return getListFromEnum(SkillType.CHILD_SKILLS);
     }
 
     /**
@@ -54,7 +54,7 @@ public final class SkillAPI {
      * @return a list of strings with valid skill names
      */
     public static List<String> getCombatSkills() {
-        return getListFromEnum(PrimarySkill.COMBAT_SKILLS);
+        return getListFromEnum(SkillType.COMBAT_SKILLS);
     }
 
     /**
@@ -66,7 +66,7 @@ public final class SkillAPI {
      * @return a list of strings with valid skill names
      */
     public static List<String> getGatheringSkills() {
-        return getListFromEnum(PrimarySkill.GATHERING_SKILLS);
+        return getListFromEnum(SkillType.GATHERING_SKILLS);
     }
 
     /**
@@ -78,14 +78,14 @@ public final class SkillAPI {
      * @return a list of strings with valid skill names
      */
     public static List<String> getMiscSkills() {
-        return getListFromEnum(PrimarySkill.MISC_SKILLS);
+        return getListFromEnum(SkillType.MISC_SKILLS);
     }
 
-    private static List<String> getListFromEnum(List<PrimarySkill> skillsTypes) {
+    private static List<String> getListFromEnum(List<SkillType> skillsTypes) {
         List<String> skills = new ArrayList<String>();
 
-        for (PrimarySkill primarySkill : skillsTypes) {
-            skills.add(primarySkill.name());
+        for (SkillType skillType : skillsTypes) {
+            skills.add(skillType.name());
         }
 
         return skills;

src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java

@@ -1,9 +0,0 @@
-package com.gmail.nossr50.api.exceptions;
-
-public class InvalidFormulaTypeException extends RuntimeException {
-    private static final long serialVersionUID = 3368670229490121886L;
-
-    public InvalidFormulaTypeException() {
-        super("That is not a valid FormulaType.");
-    }
-}

src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java

@@ -1,11 +0,0 @@
-package com.gmail.nossr50.api.exceptions;
-
-import org.bukkit.entity.Player;
-
-public class McMMOPlayerNotFoundException extends RuntimeException {
-    private static final long serialVersionUID = 761917904993202836L;
-
-    public McMMOPlayerNotFoundException(Player player) {
-        super("McMMOPlayer object was not found for: " + player.getName() + " " + player.getUniqueId());
-    }
-}

src/main/java/com/gmail/nossr50/chat/ChatManager.java

@@ -1,9 +1,5 @@
 package com.gmail.nossr50.chat;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
@@ -37,36 +33,6 @@ public abstract class ChatManager {
         message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
 
         sendMessage();
-
-        /*
-         * Party Chat Spying
-         * Party messages will be copied to people with the mcmmo.admin.chatspy permission node
-         */
-        if(event instanceof McMMOPartyChatEvent)
-        {
-            //We need to grab the party chat name
-            McMMOPartyChatEvent partyChatEvent = (McMMOPartyChatEvent) event;
-
-            //Find the people with permissions
-            for(Player player : event.getPlugin().getServer().getOnlinePlayers())
-            {
-                //Check for toggled players
-                if(UserManager.getPlayer(player).isPartyChatSpying())
-                {
-                    Party adminParty = UserManager.getPlayer(player).getParty();
-
-                    //Only message admins not part of this party
-                    if(adminParty != null)
-                    {
-                        //TODO: Incorporate JSON
-                        if(!adminParty.getName().equalsIgnoreCase(partyChatEvent.getParty()))
-                            player.sendMessage(ChatColor.GOLD+"[SPY: "+ChatColor.GREEN+partyChatEvent.getParty()+ChatColor.GOLD+"] "+message);
-                    } else {
-                        player.sendMessage(ChatColor.GOLD+"[SPY: "+ChatColor.GREEN+partyChatEvent.getParty()+ChatColor.GOLD+"] "+message);
-                    }
-                }
-            }
-        }
     }
 
     public void handleChat(String senderName, String message) {

src/main/java/com/gmail/nossr50/commands/KrakenCommand.java

@@ -29,10 +29,6 @@ public class KrakenCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
                 return true;
 

src/main/java/com/gmail/nossr50/commands/MHDCommand.java

@@ -1,46 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.FlatfileDatabaseManager;
-import com.gmail.nossr50.database.SQLDatabaseManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.player.UserManager;
-
-import com.google.common.collect.ImmutableList;
-
-public class MHDCommand implements TabExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (mcMMO.getDatabaseManager() instanceof SQLDatabaseManager) {
-            SQLDatabaseManager m = (SQLDatabaseManager) mcMMO.getDatabaseManager();
-            m.resetMobHealthSettings();
-            for (McMMOPlayer player : UserManager.getPlayers()) {
-                player.getProfile().setMobHealthbarType(Config.getInstance().getMobHealthbarDefault());
-            }
-            sender.sendMessage("Mob health reset");
-            return true;
-        }
-        if (mcMMO.getDatabaseManager() instanceof FlatfileDatabaseManager) {
-            FlatfileDatabaseManager m = (FlatfileDatabaseManager) mcMMO.getDatabaseManager();
-            m.resetMobHealthSettings();
-            for (McMMOPlayer player : UserManager.getPlayers()) {
-                player.getProfile().setMobHealthbarType(Config.getInstance().getMobHealthbarDefault());
-            }
-            sender.sendMessage("Mob health reset");
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        return ImmutableList.of();
-    }
-}

src/main/java/com/gmail/nossr50/commands/McImportCommand.java

@@ -1,351 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.skills.ModConfigType;
-import com.gmail.nossr50.util.Misc;
-
-public class McImportCommand implements CommandExecutor {
-    int fileAmount;
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-            case 0:
-                importModConfig();
-                return true;
-
-            default:
-                return false;
-        }
-    }
-
-    public boolean importModConfig() {
-        String importFilePath = mcMMO.getModDirectory() + File.separator + "import";
-        File importFile = new File(importFilePath, "import.log");
-        mcMMO.p.getLogger().info("Starting import of mod materials...");
-        fileAmount = 0;
-
-        HashMap<ModConfigType, ArrayList<String>> materialNames = new HashMap<ModConfigType, ArrayList<String>>();
-
-        BufferedReader in = null;
-
-        try {
-            // Open the file
-            in = new BufferedReader(new FileReader(importFile));
-
-            String line;
-            String materialName;
-            String modName;
-
-            // While not at the end of the file
-            while ((line = in.readLine()) != null) {
-                String[] split1 = line.split("material ");
-
-                if (split1.length != 2) {
-                    continue;
-                }
-
-                String[] split2 = split1[1].split(" with");
-
-                if (split2.length != 2) {
-                    continue;
-                }
-
-                materialName = split2[0];
-
-                // Categorise each material under a mod config type
-                ModConfigType type = ModConfigType.getModConfigType(materialName);
-
-                if (!materialNames.containsKey(type)) {
-                    materialNames.put(type, new ArrayList<String>());
-                }
-
-                materialNames.get(type).add(materialName);
-                continue;
-            }
-        }
-        catch (FileNotFoundException e) {
-            mcMMO.p.getLogger().warning("Could not find " + importFile.getAbsolutePath() + " ! (No such file or directory)");
-            mcMMO.p.getLogger().warning("Copy and paste latest.log to " + importFile.getParentFile().getAbsolutePath() + " and rename it to import.log");
-            return false;
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        finally {
-            tryClose(in);
-        }
-
-        createOutput(materialNames);
-
-        mcMMO.p.getLogger().info("Import finished! Created " + fileAmount + " files!");
-        return true;
-    }
-
-    private void createOutput(HashMap<ModConfigType, ArrayList<String>> materialNames) {
-        for (ModConfigType modConfigType : materialNames.keySet()) {
-            HashMap<String, ArrayList<String>> materialNamesType = new HashMap<String, ArrayList<String>>();
-
-            for (String materialName : materialNames.get(modConfigType)) {
-                String modName = Misc.getModName(materialName);
-
-                if (!materialNamesType.containsKey(modName)) {
-                    materialNamesType.put(modName, new ArrayList<String>());
-                }
-
-                materialNamesType.get(modName).add(materialName);
-            }
-
-            createOutput(modConfigType, materialNamesType);
-        }
-
-    }
-
-    private void tryClose(Closeable c) {
-        if (c == null) {
-            return;
-        }
-        try {
-            c.close();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void createOutput(ModConfigType modConfigType, HashMap<String, ArrayList<String>> materialNames) {
-        File outputFilePath = new File(mcMMO.getModDirectory() + File.separator + "output");
-        if (!outputFilePath.exists() && !outputFilePath.mkdirs()) {
-            mcMMO.p.getLogger().severe("Could not create output directory! " + outputFilePath.getAbsolutePath());
-        }
-
-        FileWriter out = null;
-        String type = modConfigType.name().toLowerCase();
-
-        for (String modName : materialNames.keySet()) {
-            File outputFile = new File(outputFilePath, modName + "." + type + ".yml");
-            mcMMO.p.getLogger().info("Creating " + outputFile.getName());
-            try {
-                if (outputFile.exists() && !outputFile.delete()) {
-                    mcMMO.p.getLogger().severe("Not able to delete old output file! " + outputFile.getAbsolutePath());
-                }
-
-                if (!outputFile.createNewFile()) {
-                    mcMMO.p.getLogger().severe("Could not create output file! " + outputFile.getAbsolutePath());
-                    continue;
-                }
-
-                StringBuilder writer = new StringBuilder();
-                HashMap<String, ArrayList<String>> configSections = getConfigSections(modConfigType, modName, materialNames);
-
-                if (configSections == null) {
-                    mcMMO.p.getLogger().severe("Something went wrong!! type is " + type);
-                    return;
-                }
-
-                // Write the file, go through each skill and write all the materials
-                for (String configSection : configSections.keySet()) {
-                    if (configSection.equals("UNIDENTIFIED")) {
-                        writer.append("# This isn't a valid config section and all materials in this category need to be").append("\r\n");
-                        writer.append("# copy and pasted to a valid section of this config file.").append("\r\n");
-                    }
-                    writer.append(configSection).append(":").append("\r\n");
-
-                    for (String line : configSections.get(configSection)) {
-                        writer.append(line).append("\r\n");
-                    }
-
-                    writer.append("\r\n");
-                }
-
-                out = new FileWriter(outputFile);
-                out.write(writer.toString());
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-                return;
-            }
-            finally {
-                tryClose(out);
-                fileAmount++;
-            }
-        }
-    }
-
-    private HashMap<String, ArrayList<String>> getConfigSections(ModConfigType type, String modName, HashMap<String, ArrayList<String>> materialNames) {
-        switch (type) {
-            case BLOCKS:
-                return getConfigSectionsBlocks(modName, materialNames);
-            case TOOLS:
-                return getConfigSectionsTools(modName, materialNames);
-            case ARMOR:
-                return getConfigSectionsArmor(modName, materialNames);
-            case UNKNOWN:
-                return getConfigSectionsUnknown(modName, materialNames);
-        }
-
-        return null;
-    }
-
-    private HashMap<String, ArrayList<String>> getConfigSectionsBlocks(String modName, HashMap<String, ArrayList<String>> materialNames) {
-        HashMap<String, ArrayList<String>> configSections = new HashMap<String, ArrayList<String>>();
-
-        // Go through all the materials and categorise them under a skill
-        for (String materialName : materialNames.get(modName)) {
-            String skillName = "UNIDENTIFIED";
-            if (materialName.contains("ORE")) {
-                skillName = "Mining";
-            }
-            else if (materialName.contains("LOG") || materialName.contains("LEAVES")) {
-                skillName = "Woodcutting";
-            }
-            else if (materialName.contains("GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
-                skillName = "Herbalism";
-            }
-            else if (materialName.contains("DIRT") || materialName.contains("SAND")) {
-                skillName = "Excavation";
-            }
-
-            if (!configSections.containsKey(skillName)) {
-                configSections.put(skillName, new ArrayList<String>());
-            }
-
-            ArrayList<String> skillContents = configSections.get(skillName);
-            skillContents.add("    " + materialName + "|0:");
-            skillContents.add("    " + "    " + "XP_Gain: 99");
-            skillContents.add("    " + "    " + "Double_Drops_Enabled: true");
-
-            if (skillName.equals("Mining")) {
-                skillContents.add("    " + "    " + "Smelting_XP_Gain: 9");
-            }
-            else if (skillName.equals("Woodcutting")) {
-                skillContents.add("    " + "    " + "Is_Log: " + materialName.contains("LOG"));
-            }
-        }
-
-        return configSections;
-    }
-
-    private HashMap<String, ArrayList<String>> getConfigSectionsTools(String modName, HashMap<String, ArrayList<String>> materialNames) {
-        HashMap<String, ArrayList<String>> configSections = new HashMap<String, ArrayList<String>>();
-
-        // Go through all the materials and categorise them under a tool type
-        for (String materialName : materialNames.get(modName)) {
-            String toolType = "UNIDENTIFIED";
-            if (materialName.contains("PICKAXE")) {
-                toolType = "Pickaxes";
-            }
-            else if (materialName.contains("AXE")) {
-                toolType = "Axes";
-            }
-            else if (materialName.contains("BOW")) {
-                toolType = "Bows";
-            }
-            else if (materialName.contains("HOE")) {
-                toolType = "Hoes";
-            }
-            else if (materialName.contains("SHOVEL") || materialName.contains("SPADE")) {
-                toolType = "Shovels";
-            }
-            else if (materialName.contains("SWORD")) {
-                toolType = "Swords";
-            }
-
-            if (!configSections.containsKey(toolType)) {
-                configSections.put(toolType, new ArrayList<String>());
-            }
-
-            ArrayList<String> skillContents = configSections.get(toolType);
-            skillContents.add("    " + materialName + ":");
-            skillContents.add("    " + "    " + "XP_Modifier: 1.0");
-            skillContents.add("    " + "    " + "Tier: 1");
-            skillContents.add("    " + "    " + "Ability_Enabled: true");
-            addRepairableLines(materialName, skillContents);
-        }
-
-        return configSections;
-    }
-
-    private HashMap<String, ArrayList<String>> getConfigSectionsArmor(String modName, HashMap<String, ArrayList<String>> materialNames) {
-        HashMap<String, ArrayList<String>> configSections = new HashMap<String, ArrayList<String>>();
-
-        // Go through all the materials and categorise them under an armor type
-        for (String materialName : materialNames.get(modName)) {
-            String toolType = "UNIDENTIFIED";
-            if (materialName.contains("BOOT") || materialName.contains("SHOE")) {
-                toolType = "Boots";
-            }
-            else if (materialName.contains("CHESTPLATE") || materialName.contains("CHEST")) {
-                toolType = "Chestplates";
-            }
-            else if (materialName.contains("HELM") || materialName.contains("HAT")) {
-                toolType = "Helmets";
-            }
-            else if (materialName.contains("LEGGINGS") || materialName.contains("LEGS") || materialName.contains("PANTS")) {
-                toolType = "Leggings";
-            }
-
-            if (!configSections.containsKey(toolType)) {
-                configSections.put(toolType, new ArrayList<String>());
-            }
-
-            ArrayList<String> skillContents = configSections.get(toolType);
-            skillContents.add("    " + materialName + ":");
-            addRepairableLines(materialName, skillContents);
-        }
-
-        return configSections;
-    }
-
-    private void addRepairableLines(String materialName, ArrayList<String> skillContents) {
-        skillContents.add("    " + "    " + "Repairable: true");
-        skillContents.add("    " + "    " + "Repair_Material: REPAIR_MATERIAL_NAME");
-        skillContents.add("    " + "    " + "Repair_Material_Data_Value: 0");
-        skillContents.add("    " + "    " + "Repair_Material_Quantity: 9");
-        skillContents.add("    " + "    " + "Repair_Material_Pretty_Name: Repair Item Name");
-        skillContents.add("    " + "    " + "Repair_MinimumLevel: 0");
-        skillContents.add("    " + "    " + "Repair_XpMultiplier: 1.0");
-
-        Material material = Material.matchMaterial(materialName);
-        short durability = (material == null) ? (short) 9999 : material.getMaxDurability();
-        skillContents.add("    " + "    " + "Durability: " + ((durability > 0) ? durability : (short) 9999));
-    }
-
-    private HashMap<String, ArrayList<String>> getConfigSectionsUnknown(String modName, HashMap<String, ArrayList<String>> materialNames) {
-        HashMap<String, ArrayList<String>> configSections = new HashMap<String, ArrayList<String>>();
-
-        // Go through all the materials and print them
-        for (String materialName : materialNames.get(modName)) {
-            String configKey = "UNIDENTIFIED";
-
-            if (!configSections.containsKey(configKey)) {
-                configSections.put(configKey, new ArrayList<String>());
-            }
-
-            ArrayList<String> skillContents = configSections.get(configKey);
-            skillContents.add("    " + materialName);
-        }
-
-        return configSections;
-    }
-}

src/main/java/com/gmail/nossr50/commands/McmmoCommand.java

@@ -27,7 +27,7 @@ public class McmmoCommand implements CommandExecutor {
 
                 if (Config.getInstance().getDonateMessageEnabled()) {
                     sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
                 }
 
                 if (Permissions.showversion(sender)) {

src/main/java/com/gmail/nossr50/commands/MobhealthCommand.java

@@ -37,10 +37,6 @@ public class MobhealthCommand implements TabExecutor {
             return true;
         }
 
-        if (!CommandUtils.hasPlayerDataKey(sender)) {
-            return true;
-        }
-
         switch (args.length) {
             case 1:
                 try {

src/main/java/com/gmail/nossr50/commands/ToggleCommand.java

@@ -28,10 +28,6 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 applyCommandAction(UserManager.getPlayer(sender.getName()));
                 return true;
 

src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -41,10 +41,6 @@ public abstract class ChatCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 mcMMOPlayer = UserManager.getPlayer(sender.getName());
 
                 if (mcMMOPlayer.isChatEnabled(chatMode)) {
@@ -57,10 +53,6 @@ public abstract class ChatCommand implements TabExecutor {
                 return true;
 
             case 1:
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 if (CommandUtils.shouldEnableToggle(args[0])) {
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;

src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java

@@ -1,30 +0,0 @@
-package com.gmail.nossr50.commands.chat;
-
-import com.gmail.nossr50.commands.ToggleCommand;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import org.bukkit.command.CommandSender;
-
-public class McChatSpy extends ToggleCommand {
-    @Override
-    protected boolean hasOtherPermission(CommandSender sender) {
-        return Permissions.adminChatSpyOthers(sender);
-    }
-
-    @Override
-    protected boolean hasSelfPermission(CommandSender sender) {
-        return Permissions.adminChatSpy(sender);
-    }
-
-    @Override
-    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
-        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.AdminChatSpy." + (mcMMOPlayer.isPartyChatSpying() ? "Disabled" : "Enabled")));
-        mcMMOPlayer.togglePartyChatSpying();
-    }
-
-    @Override
-    protected void sendSuccessMessage(CommandSender sender, String playerName) {
-        sender.sendMessage(LocaleLoader.getString("Commands.AdminChatSpy.Toggle", playerName));
-    }
-}

src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java

@@ -62,7 +62,7 @@ public class ConvertDatabaseCommand implements CommandExecutor {
                         mcMMO.getDatabaseManager().saveUser(profile);
                     }
 
-                    new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                    new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
                 }
 
                 new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);

src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
@@ -22,7 +22,7 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
         profile.addLevels(skill, value);
 
@@ -40,7 +40,7 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill) {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
     }
 }

src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -22,7 +22,7 @@ public class AddxpCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         if (player != null) {
             UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND);
         }
@@ -38,7 +38,7 @@ public class AddxpCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill) {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName()));
     }
 }

src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java

@@ -38,7 +38,7 @@ public class ConvertExperienceCommand implements CommandExecutor {
                 new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                    new PlayerProfileLoadingTask(player).runTaskTimerAsynchronously(mcMMO.p, 1, 20); // 1 Tick delay to ensure the player is marked as online before we begin loading
                 }
 
                 return true;

src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -2,10 +2,7 @@ package com.gmail.nossr50.commands.experience;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -15,15 +12,17 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+
 import com.google.common.collect.ImmutableList;
 
 public abstract class ExperienceCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PrimarySkill skill;
+        SkillType skill;
 
         switch (args.length) {
             case 2:
@@ -40,18 +39,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                skill = PrimarySkill.getSkill(args[0]);
+                skill = SkillType.getSkill(args[0]);
 
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
                 }
 
-                if (skill != null && skill.isChildSkill())
-                {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
-                    return true;
-                }
-
                 editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
                 return true;
 
@@ -65,18 +58,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                skill = PrimarySkill.getSkill(args[1]);
+                skill = SkillType.getSkill(args[1]);
 
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
                 }
 
-                if (skill != null && skill.isChildSkill())
-                {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
-                    return true;
-                }
-
                 int value = Integer.parseInt(args[2]);
 
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
@@ -84,12 +71,7 @@ public abstract class ExperienceCommand implements TabExecutor {
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    UUID uuid = null;
-                    OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(playerName);
-                    if (player != null) {
-                        uuid = player.getUniqueId();
-                    }
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -116,7 +98,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                 List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
-                return StringUtil.copyPartialMatches(args[1], PrimarySkill.SKILL_NAMES, new ArrayList<String>(PrimarySkill.SKILL_NAMES.size()));
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
             default:
                 return ImmutableList.of();
         }
@@ -124,15 +106,15 @@ public abstract class ExperienceCommand implements TabExecutor {
 
     protected abstract boolean permissionsCheckSelf(CommandSender sender);
     protected abstract boolean permissionsCheckOthers(CommandSender sender);
-    protected abstract void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value);
+    protected abstract void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value);
     protected abstract void handlePlayerMessageAll(Player player, int value);
-    protected abstract void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill);
+    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
 
     private boolean validateArguments(CommandSender sender, String skillName, String value) {
         return !(CommandUtils.isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && CommandUtils.isInvalidSkill(sender, skillName)));
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkill skill) {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
         if (skill == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
         }
@@ -141,10 +123,10 @@ public abstract class ExperienceCommand implements TabExecutor {
         }
     }
 
-    protected void editValues(Player player, PlayerProfile profile, PrimarySkill skill, int value) {
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
         if (skill == null) {
-            for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) {
-                handleCommand(player, profile, primarySkill, value);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                handleCommand(player, profile, skillType, value);
             }
 
             if (player != null) {

src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
@@ -22,7 +22,7 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill, int value) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         int skillLevel = profile.getSkillLevel(skill);
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
 
@@ -46,7 +46,7 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkill skill) {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
     }
 }

src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java

@@ -2,10 +2,7 @@ package com.gmail.nossr50.commands.experience;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -15,12 +12,14 @@ import org.bukkit.util.StringUtil;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
+
 import com.google.common.collect.ImmutableList;
 
 /**
@@ -30,7 +29,6 @@ import com.google.common.collect.ImmutableList;
 public class SkillresetCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PrimarySkill skill;
         switch (args.length) {
             case 1:
                 if (CommandUtils.noConsoleUsage(sender)) {
@@ -46,14 +44,7 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
-                if (args[0].equalsIgnoreCase("all")) {
-                    skill = null;
-                }
-                else {
-                    skill = PrimarySkill.getSkill(args[1]);
-                }
-
-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill);
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]));
                 return true;
 
             case 2:
@@ -66,11 +57,12 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
+                SkillType skill;
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
                 }
                 else {
-                    skill = PrimarySkill.getSkill(args[1]);
+                    skill = SkillType.getSkill(args[1]);
                 }
 
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
@@ -78,12 +70,7 @@ public class SkillresetCommand implements TabExecutor {
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    UUID uuid = null;
-                    OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(playerName);
-                    if (player != null) {
-                        uuid = player.getUniqueId();
-                    }
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -110,13 +97,13 @@ public class SkillresetCommand implements TabExecutor {
                 List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
-                return StringUtil.copyPartialMatches(args[1], PrimarySkill.SKILL_NAMES, new ArrayList<String>(PrimarySkill.SKILL_NAMES.size()));
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
             default:
                 return ImmutableList.of();
         }
     }
 
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkill skill) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill) {
         int levelsRemoved = profile.getSkillLevel(skill);
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
 
@@ -142,15 +129,15 @@ public class SkillresetCommand implements TabExecutor {
         player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
     }
 
-    protected void handlePlayerMessageSkill(Player player, PrimarySkill skill) {
+    protected void handlePlayerMessageSkill(Player player, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
     }
 
     private boolean validateArguments(CommandSender sender, String skillName) {
-        return skillName.equalsIgnoreCase("all") || !CommandUtils.isInvalidSkill(sender, skillName);
+        return !(CommandUtils.isInvalidSkill(sender, skillName) && !skillName.equalsIgnoreCase("all"));
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkill skill) {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
         if (skill == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
         }
@@ -159,10 +146,10 @@ public class SkillresetCommand implements TabExecutor {
         }
     }
 
-    protected void editValues(Player player, PlayerProfile profile, PrimarySkill skill) {
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill) {
         if (skill == null) {
-            for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) {
-                handleCommand(player, profile, primarySkill);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                handleCommand(player, profile, skillType);
             }
 
             if (player != null) {

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.command.CommandSender;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -20,10 +20,10 @@ public class HardcoreCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected boolean checkEnabled(PrimarySkill skill) {
+    protected boolean checkEnabled(SkillType skill) {
         if (skill == null) {
-            for (PrimarySkill primarySkill : PrimarySkill.values()) {
-                if (!primarySkill.getHardcoreStatLossEnabled()) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreStatLossEnabled()) {
                     return false;
                 }
             }
@@ -35,12 +35,12 @@ public class HardcoreCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected void enable(PrimarySkill skill) {
+    protected void enable(SkillType skill) {
         toggle(true, skill);
     }
 
     @Override
-    protected void disable(PrimarySkill skill) {
+    protected void disable(SkillType skill) {
         toggle(false, skill);
     }
 
@@ -50,10 +50,10 @@ public class HardcoreCommand extends HardcoreModeCommand {
         sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
     }
 
-    private void toggle(boolean enable, PrimarySkill skill) {
+    private void toggle(boolean enable, SkillType skill) {
         if (skill == null) {
-            for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) {
-                primarySkill.setHardcoreStatLossEnabled(enable);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreStatLossEnabled(enable);
             }
         }
         else {

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java

@@ -4,12 +4,12 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -76,7 +76,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                     return true;
                 }
 
-                PrimarySkill skill = PrimarySkill.getSkill(args[0]);
+                SkillType skill = SkillType.getSkill(args[0]);
 
                 if (!CommandUtils.isChildSkill(sender, skill)) {
                     return true;
@@ -125,8 +125,8 @@ public abstract class HardcoreModeCommand implements TabExecutor {
 
     protected abstract boolean checkTogglePermissions(CommandSender sender);
     protected abstract boolean checkModifyPermissions(CommandSender sender);
-    protected abstract boolean checkEnabled(PrimarySkill skill);
-    protected abstract void enable(PrimarySkill skill);
-    protected abstract void disable(PrimarySkill skill);
+    protected abstract boolean checkEnabled(SkillType skill);
+    protected abstract void enable(SkillType skill);
+    protected abstract void disable(SkillType skill);
     protected abstract void modify(CommandSender sender, double newPercentage);
 }

src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java

@@ -4,7 +4,7 @@ import org.bukkit.command.CommandSender;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -20,10 +20,10 @@ public class VampirismCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected boolean checkEnabled(PrimarySkill skill) {
+    protected boolean checkEnabled(SkillType skill) {
         if (skill == null) {
-            for (PrimarySkill primarySkill : PrimarySkill.values()) {
-                if (!primarySkill.getHardcoreVampirismEnabled()) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreVampirismEnabled()) {
                     return false;
                 }
             }
@@ -35,12 +35,12 @@ public class VampirismCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected void enable(PrimarySkill skill) {
+    protected void enable(SkillType skill) {
         toggle(true, skill);
     }
 
     @Override
-    protected void disable(PrimarySkill skill) {
+    protected void disable(SkillType skill) {
         toggle(false, skill);
     }
 
@@ -50,10 +50,10 @@ public class VampirismCommand extends HardcoreModeCommand {
         sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
     }
 
-    private void toggle(boolean enable, PrimarySkill skill) {
+    private void toggle(boolean enable, SkillType skill) {
         if (skill == null) {
-            for (PrimarySkill primarySkill : PrimarySkill.NON_CHILD_SKILLS) {
-                primarySkill.setHardcoreVampirismEnabled(enable);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreVampirismEnabled(enable);
             }
         }
         else {

src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java

@@ -1,12 +1,10 @@
 package com.gmail.nossr50.commands.party;
 
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
@@ -20,14 +18,13 @@ public class PartyChangeOwnerCommand implements CommandExecutor {
             case 2:
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
 
-                if (!playerParty.hasMember(target.getUniqueId())) {
+                if (!playerParty.getMembers().contains(targetName)) {
                     sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
                     return true;
                 }
 
-                PartyManager.setPartyLeader(target.getUniqueId(), playerParty);
+                PartyManager.setPartyLeader(targetName, playerParty);
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -71,11 +71,6 @@ public class PartyCommand implements TabExecutor {
         }
 
         Player player = (Player) sender;
-
-        if (!UserManager.hasPlayerDataKey(player)) {
-            return true;
-        }
-
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (args.length < 1) {
@@ -134,7 +129,7 @@ public class PartyCommand implements TabExecutor {
         }
 
         // Party leader commands
-        if (!mcMMOPlayer.getParty().getLeader().getUniqueId().equals(player.getUniqueId())) {
+        if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
             sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
             return true;
         }

src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java

@@ -22,7 +22,7 @@ public class PartyKickCommand implements CommandExecutor {
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String targetName = CommandUtils.getMatchedPlayerName(args[1]);
 
-                if (!playerParty.hasMember(targetName)) {
+                if (!playerParty.getMembers().contains(targetName)) {
                     sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
                     return true;
                 }

src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java

@@ -36,7 +36,7 @@ public class PartyRenameCommand implements CommandExecutor {
                     return true;
                 }
 
-                String leaderName = playerParty.getLeader().getPlayerName();
+                String leaderName = playerParty.getLeader();
 
                 for (Player member : playerParty.getOnlineMembers()) {
                     if (!PartyManager.handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java

@@ -44,7 +44,7 @@ public class PartyAllianceInviteCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (!mcMMOTarget.getParty().getLeader().getUniqueId().equals(target.getUniqueId())) {
+                if (!mcMMOTarget.getParty().getLeader().equalsIgnoreCase(targetName)) {
                     player.sendMessage(LocaleLoader.getString("Party.Target.NotOwner", targetName));
                     return true;
                 }

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

@@ -42,11 +42,6 @@ public class PtpCommand implements TabExecutor {
         }
 
         Player player = (Player) sender;
-
-        if (!UserManager.hasPlayerDataKey(player)) {
-            return true;
-        }
-
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
         if (!mcMMOPlayer.inParty()) {

src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.commands.player;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -14,6 +13,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -34,10 +34,6 @@ public class InspectCommand implements TabExecutor {
                 if (mcMMOPlayer == null) {
                     PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
 
-                    if (!CommandUtils.isLoaded(sender, profile)) {
-                        return true;
-                    }
-
                     if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
                         return true;
                     }
@@ -53,17 +49,17 @@ public class InspectCommand implements TabExecutor {
                     sender.sendMessage(LocaleLoader.getString("Inspect.OfflineStats", playerName));
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-                    for (PrimarySkill skill : PrimarySkill.GATHERING_SKILLS) {
+                    for (SkillType skill : SkillType.GATHERING_SKILLS) {
                         sender.sendMessage(CommandUtils.displaySkill(profile, skill));
                     }
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-                    for (PrimarySkill skill : PrimarySkill.COMBAT_SKILLS) {
+                    for (SkillType skill : SkillType.COMBAT_SKILLS) {
                         sender.sendMessage(CommandUtils.displaySkill(profile, skill));
                     }
 
                     sender.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-                    for (PrimarySkill skill : PrimarySkill.MISC_SKILLS) {
+                    for (SkillType skill : SkillType.MISC_SKILLS) {
                         sender.sendMessage(CommandUtils.displaySkill(profile, skill));
                     }
 

src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands.player;
 
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.SuperAbility;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -10,6 +9,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -24,10 +24,6 @@ public class MccooldownCommand implements TabExecutor {
             return true;
         }
 
-        if (!CommandUtils.hasPlayerDataKey(sender)) {
-            return true;
-        }
-
         switch (args.length) {
             case 0:
                 Player player = (Player) sender;
@@ -45,7 +41,7 @@ public class MccooldownCommand implements TabExecutor {
                 player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Header"));
                 player.sendMessage(LocaleLoader.getString("mcMMO.NoSkillNote"));
 
-                for (SuperAbility ability : SuperAbility.values()) {
+                for (AbilityType ability : AbilityType.values()) {
                     if (!ability.getPermissions(player)) {
                         continue;
                     }

src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java

@@ -7,7 +7,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
-import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
@@ -35,10 +34,6 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 display(sender, sender.getName());
 
                 return true;
@@ -49,10 +44,6 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
                 McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
 
@@ -97,13 +88,6 @@ public class McrankCommand implements TabExecutor {
                 return;
             }
 
-            if (((Player) sender).hasMetadata(mcMMO.databaseCommandKey)) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Database.Processing"));
-                return;
-            } else {
-                ((Player) sender).setMetadata(mcMMO.databaseCommandKey, new FixedMetadataValue(mcMMO.p, null));
-            }
-
             mcMMOPlayer.actualizeDatabaseATS();
         }
 

src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java

@@ -22,10 +22,6 @@ public class McstatsCommand implements TabExecutor {
             return true;
         }
 
-        if (!CommandUtils.hasPlayerDataKey(sender)) {
-            return true;
-        }
-
         switch (args.length) {
             case 0:
                 Player player = (Player) sender;

src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java

@@ -1,30 +1,31 @@
 package com.gmail.nossr50.commands.player;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.google.common.collect.ImmutableList;
 
 public class MctopCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PrimarySkill skill = null;
+        SkillType skill = null;
 
         switch (args.length) {
             case 0:
@@ -69,62 +70,46 @@ public class MctopCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                return StringUtil.copyPartialMatches(args[0], PrimarySkill.SKILL_NAMES, new ArrayList<String>(PrimarySkill.SKILL_NAMES.size()));
+                return StringUtil.copyPartialMatches(args[0], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
             default:
                 return ImmutableList.of();
         }
     }
 
-    private void display(int page, PrimarySkill skill, CommandSender sender, Command command) {
+    private void display(int page, SkillType skill, CommandSender sender, Command command) {
         if (skill != null && !Permissions.mctop(sender, skill)) {
             sender.sendMessage(command.getPermissionMessage());
             return;
         }
 
         if (sender instanceof Player) {
-            if (!CommandUtils.hasPlayerDataKey(sender)) {
-                return;
-            }
-
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
             long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
 
             if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
-                double seconds = ((mcMMOPlayer.getDatabaseATS() + cooldownMillis) - System.currentTimeMillis()) / 1000;
-                if (seconds < 1) {
-                    seconds = 1;
-                }
-
-                sender.sendMessage(LocaleLoader.formatString(LocaleLoader.getString("Commands.Database.Cooldown"), seconds));
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                 return;
             }
 
-            if (((Player) sender).hasMetadata(mcMMO.databaseCommandKey)) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Database.Processing"));
-                return;
-            } else {
-                ((Player) sender).setMetadata(mcMMO.databaseCommandKey, new FixedMetadataValue(mcMMO.p, null));
-            }
-
             mcMMOPlayer.actualizeDatabaseATS();
         }
 
         display(page, skill, sender);
     }
 
-    private void display(int page, PrimarySkill skill, CommandSender sender) {
+    private void display(int page, SkillType skill, CommandSender sender) {
         boolean useBoard = (sender instanceof Player) && (Config.getInstance().getTopUseBoard());
         boolean useChat = !useBoard || Config.getInstance().getTopUseChat();
 
         new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
     }
 
-    private PrimarySkill extractSkill(CommandSender sender, String skillName) {
+    private SkillType extractSkill(CommandSender sender, String skillName) {
         if (CommandUtils.isInvalidSkill(sender, skillName)) {
             return null;
         }
 
-        PrimarySkill skill = PrimarySkill.getSkill(skillName);
+        SkillType skill = SkillType.getSkill(skillName);
 
         if (CommandUtils.isChildSkill(sender, skill)) {
             return null;

src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java

@@ -1,15 +0,0 @@
-package com.gmail.nossr50.commands.server;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-/**
- * This command facilitates switching the skill system scale between classic and modern scale
- */
-public class Mcmmoupgrade implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        return false;
-    }
-}

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -25,28 +23,28 @@ public class AcrobaticsCommand extends SkillCommand {
     private boolean canGracefulRoll;
 
     public AcrobaticsCommand() {
-        super(PrimarySkill.ACROBATICS);
+        super(SkillType.ACROBATICS);
     }
 
     @Override
     protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        // ACROBATICS_DODGE
+        // DODGE
         if (canDodge) {
-            String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ACROBATICS_DODGE, isLucky);
+            String[] dodgeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DODGE, isLucky);
             dodgeChance = dodgeStrings[0];
             dodgeChanceLucky = dodgeStrings[1];
         }
 
-        // ACROBATICS_ROLL
+        // ROLL
         if (canRoll) {
-            String[] rollStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ACROBATICS_ROLL, isLucky);
+            String[] rollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.ROLL, isLucky);
             rollChance = rollStrings[0];
             rollChanceLucky = rollStrings[1];
         }
 
-        // GRACEFUL ACROBATICS_ROLL
+        // GRACEFUL ROLL
         if (canGracefulRoll) {
-            String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ACROBATICS_GRACEFUL_ROLL, isLucky);
+            String[] gracefulRollStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GRACEFUL_ROLL, isLucky);
             gracefulRollChance = gracefulRollStrings[0];
             gracefulRollChanceLucky = gracefulRollStrings[1];
         }
@@ -54,9 +52,9 @@ public class AcrobaticsCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canDodge = Permissions.isSubSkillEnabled(player, SubSkill.ACROBATICS_DODGE);
-        canRoll = Permissions.isSubSkillEnabled(player, SubSkill.ACROBATICS_ROLL);
-        canGracefulRoll = Permissions.isSubSkillEnabled(player, SubSkill.ACROBATICS_GRACEFUL_ROLL);
+        canDodge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DODGE);
+        canRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ROLL);
+        canGracefulRoll = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GRACEFUL_ROLL);
     }
 
     @Override
@@ -96,13 +94,4 @@ public class AcrobaticsCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ACROBATICS);
-
-        return textComponents;
-    }
 }

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

@@ -3,13 +3,11 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.alchemy.Alchemy.Tier;
 import com.gmail.nossr50.skills.alchemy.AlchemyManager;
@@ -28,7 +26,7 @@ public class AlchemyCommand extends SkillCommand {
     private boolean canConcoctions;
 
     public AlchemyCommand() {
-        super(PrimarySkill.ALCHEMY);
+        super(SkillType.ALCHEMY);
     }
 
     protected String[] calculateAbilityDisplayValues(Player player, boolean isLucky) {
@@ -43,14 +41,14 @@ public class AlchemyCommand extends SkillCommand {
 
     @Override
     protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
-        // ALCHEMY_CATALYSIS
+        // CATALYSIS
         if (canCatalysis) {
             String[] catalysisStrings = calculateAbilityDisplayValues(player, isLucky);
             brewSpeed = catalysisStrings[0];
             brewSpeedLucky = catalysisStrings[1];
         }
 
-        // ALCHEMY_CONCOCTIONS
+        // CONCOCTIONS
         if (canConcoctions) {
             AlchemyManager alchemyManager = UserManager.getPlayer(player).getAlchemyManager();
             tier = alchemyManager.getTier();
@@ -61,8 +59,8 @@ public class AlchemyCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canCatalysis = Permissions.isSubSkillEnabled(player, SubSkill.ALCHEMY_CATALYSIS);
-        canConcoctions = Permissions.isSubSkillEnabled(player, SubSkill.ALCHEMY_CONCOCTIONS);
+        canCatalysis = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS);
+        canConcoctions = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS);
     }
 
     @Override
@@ -102,13 +100,4 @@ public class AlchemyCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ALCHEMY);
-
-        return textComponents;
-    }
 }

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

@@ -4,7 +4,6 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.archery.Archery;
 import com.gmail.nossr50.util.Permissions;
@@ -25,7 +23,7 @@ public class ArcheryCommand extends SkillCommand {
     private boolean canRetrieve;
 
     public ArcheryCommand() {
-        super(PrimarySkill.ARCHERY);
+        super(SkillType.ARCHERY);
     }
 
     @Override
@@ -33,19 +31,19 @@ public class ArcheryCommand extends SkillCommand {
         // SKILL SHOT
         if (canSkillShot) {
             double bonus = (skillValue / Archery.skillShotIncreaseLevel) * Archery.skillShotIncreasePercentage;
-            skillShotBonus = percent.format(Archery.getSkillShotBonusDamage(player, 0));
+            skillShotBonus = percent.format(Math.min(bonus, Archery.skillShotMaxBonusPercentage));
         }
 
-        // ARCHERY_DAZE
+        // DAZE
         if (canDaze) {
-            String[] dazeStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ARCHERY_DAZE, isLucky);
+            String[] dazeStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DAZE, isLucky);
             dazeChance = dazeStrings[0];
             dazeChanceLucky = dazeStrings[1];
         }
 
-        // ARCHERY_ARROW_RETRIEVAL
+        // RETRIEVE
         if (canRetrieve) {
-            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ARCHERY_ARROW_RETRIEVAL, isLucky);
+            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.RETRIEVE, isLucky);
             retrieveChance = retrieveStrings[0];
             retrieveChanceLucky = retrieveStrings[1];
         }
@@ -53,9 +51,9 @@ public class ArcheryCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canSkillShot = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_SKILL_SHOT);
-        canDaze = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_DAZE);
-        canRetrieve = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_ARROW_RETRIEVAL);
+        canSkillShot = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SKILL_SHOT);
+        canDaze = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DAZE);
+        canRetrieve = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.RETRIEVE);
     }
 
     @Override
@@ -95,13 +93,4 @@ public class ArcheryCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ARCHERY);
-
-        return textComponents;
-    }
 }

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.axes.Axes;
 import com.gmail.nossr50.util.Permissions;
@@ -28,7 +26,7 @@ public class AxesCommand extends SkillCommand {
     private boolean canGreaterImpact;
 
     public AxesCommand() {
-        super(PrimarySkill.AXES);
+        super(SkillType.AXES);
     }
 
     @Override
@@ -47,24 +45,24 @@ public class AxesCommand extends SkillCommand {
 
         // CRITICAL HIT
         if (canCritical) {
-            String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SubSkill.AXES_CRITICAL_STRIKES, isLucky);
+            String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.CRITICAL_HIT, isLucky);
             critChance = criticalHitStrings[0];
             critChanceLucky = criticalHitStrings[1];
         }
 
         // AXE MASTERY
         if (canAxeMastery) {
-            axeMasteryDamage = Axes.getAxeMasteryBonusDamage(player);
+            axeMasteryDamage = Math.min(skillValue / (Axes.axeMasteryMaxBonusLevel / Axes.axeMasteryMaxBonus), Axes.axeMasteryMaxBonus);
         }
     }
 
     @Override
     protected void permissionsCheck(Player player) {
         canSkullSplitter = Permissions.skullSplitter(player);
-        canCritical = Permissions.isSubSkillEnabled(player, SubSkill.AXES_CRITICAL_STRIKES);
-        canAxeMastery = Permissions.isSubSkillEnabled(player, SubSkill.AXES_AXE_MASTERY);
-        canImpact = Permissions.isSubSkillEnabled(player, SubSkill.AXES_ARMOR_IMPACT);
-        canGreaterImpact = Permissions.isSubSkillEnabled(player, SubSkill.AXES_GREATER_IMPACT);
+        canCritical = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CRITICAL_HIT);
+        canAxeMastery = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.AXE_MASTERY);
+        canImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARMOR_IMPACT);
+        canGreaterImpact = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GREATER_IMPACT);
     }
 
     @Override
@@ -120,13 +118,4 @@ public class AxesCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.AXES);
-
-        return textComponents;
-    }
 }

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -20,7 +18,7 @@ public class ExcavationCommand extends SkillCommand {
     private boolean canTreasureHunt;
 
     public ExcavationCommand() {
-        super(PrimarySkill.EXCAVATION);
+        super(SkillType.EXCAVATION);
     }
 
     @Override
@@ -36,7 +34,7 @@ public class ExcavationCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canGigaDrill = Permissions.gigaDrillBreaker(player);
-        canTreasureHunt = Permissions.isSubSkillEnabled(player, SubSkill.EXCAVATION_TREASURE_HUNTER);
+        canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.EXCAVATION_TREASURE_HUNTER);
     }
 
     @Override
@@ -64,13 +62,4 @@ public class ExcavationCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.EXCAVATION);
-
-        return textComponents;
-    }
 }

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

@@ -3,16 +3,14 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.treasure.Rarity;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.fishing.Fishing;
@@ -46,7 +44,7 @@ public class FishingCommand extends SkillCommand {
     private boolean canIceFish;
 
     public FishingCommand() {
-        super(PrimarySkill.FISHING);
+        super(SkillType.FISHING);
     }
 
     @Override
@@ -78,7 +76,7 @@ public class FishingCommand extends SkillCommand {
             magicChance = percent.format(totalEnchantChance / 100.0);
         }
 
-        // FISHING_SHAKE
+        // SHAKE
         if (canShake) {
             String[] shakeStrings = calculateAbilityDisplayValues(UserManager.getPlayer(player).getFishingManager().getShakeProbability(), isLucky);
             shakeChance = shakeStrings[0];
@@ -113,12 +111,12 @@ public class FishingCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canTreasureHunt = Permissions.isSubSkillEnabled(player, SubSkill.FISHING_TREASURE_HUNTER);
-        canMagicHunt = Permissions.isSubSkillEnabled(player, SubSkill.FISHING_MAGIC_HUNTER);
-        canShake = Permissions.isSubSkillEnabled(player, SubSkill.FISHING_SHAKE);
-        canFishermansDiet = Permissions.isSubSkillEnabled(player, SubSkill.FISHING_FISHERMANS_DIET);
-        canMasterAngler = Permissions.isSubSkillEnabled(player, SubSkill.FISHING_MASTER_ANGLER);
-        canIceFish = Permissions.isSubSkillEnabled(player, SubSkill.FISHING_ICE_FISHING);
+        canTreasureHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHING_TREASURE_HUNTER);
+        canMagicHunt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MAGIC_HUNTER);
+        canShake = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHAKE);
+        canFishermansDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FISHERMANS_DIET);
+        canMasterAngler = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MASTER_ANGLER);
+        canIceFish = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ICE_FISHING);
     }
 
     @Override
@@ -204,13 +202,4 @@ public class FishingCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.FISHING);
-
-        return textComponents;
-    }
 }

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

@@ -1,18 +1,17 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.herbalism.Herbalism;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.herbalism.Herbalism;
+import com.gmail.nossr50.util.Permissions;
+
 public class HerbalismCommand extends SkillCommand {
     private String greenTerraLength;
     private String greenTerraLengthEndurance;
@@ -36,7 +35,7 @@ public class HerbalismCommand extends SkillCommand {
     private boolean canShroomThumb;
 
     public HerbalismCommand() {
-        super(PrimarySkill.HERBALISM);
+        super(SkillType.HERBALISM);
     }
 
     @Override
@@ -57,28 +56,28 @@ public class HerbalismCommand extends SkillCommand {
         if (canGreenThumbBlocks || canGreenThumbPlants) {
             greenThumbStage = calculateRank(skillValue, Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);
 
-            String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, SubSkill.HERBALISM_GREEN_THUMB, isLucky);
+            String[] greenThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GREEN_THUMB_PLANT, isLucky);
             greenThumbChance = greenThumbStrings[0];
             greenThumbChanceLucky = greenThumbStrings[1];
         }
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SubSkill.HERBALISM_DOUBLE_DROPS, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.HERBALISM_DOUBLE_DROPS, isLucky);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
 
         // HYLIAN LUCK
         if (hasHylianLuck) {
-            String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, SubSkill.HERBALISM_HYLIAN_LUCK, isLucky);
+            String[] hylianLuckStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.HYLIAN_LUCK, isLucky);
             hylianLuckChance = hylianLuckStrings[0];
             hylianLuckChanceLucky = hylianLuckStrings[1];
         }
 
         // SHROOM THUMB
         if (canShroomThumb) {
-            String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, SubSkill.HERBALISM_SHROOM_THUMB, isLucky);
+            String[] shroomThumbStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SHROOM_THUMB, isLucky);
             shroomThumbChance = shroomThumbStrings[0];
             shroomThumbChanceLucky = shroomThumbStrings[1];
         }
@@ -86,13 +85,13 @@ public class HerbalismCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        hasHylianLuck = Permissions.isSubSkillEnabled(player, SubSkill.HERBALISM_HYLIAN_LUCK);
+        hasHylianLuck = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HYLIAN_LUCK);
         canGreenTerra = Permissions.greenTerra(player);
-        canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.WHEAT) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.BEETROOT) || Permissions.greenThumbPlant(player, Material.NETHER_WART) || Permissions.greenThumbPlant(player, Material.COCOA);
-        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLESTONE_WALL) || Permissions.greenThumbBlock(player, Material.STONE_BRICKS);
-        canFarmersDiet = Permissions.isSubSkillEnabled(player, SubSkill.HERBALISM_FARMERS_DIET);
-        canDoubleDrop = Permissions.isSubSkillEnabled(player, SubSkill.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
-        canShroomThumb = Permissions.isSubSkillEnabled(player, SubSkill.HERBALISM_SHROOM_THUMB);
+        canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
+        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
+        canFarmersDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET);
+        canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
+        canShroomThumb = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHROOM_THUMB);
     }
 
     @Override
@@ -164,13 +163,4 @@ public class HerbalismCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.HERBALISM);
-
-        return textComponents;
-    }
 }

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

@@ -3,13 +3,11 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.mining.BlastMining;
 import com.gmail.nossr50.skills.mining.BlastMining.Tier;
@@ -37,7 +35,7 @@ public class MiningCommand extends SkillCommand {
     private boolean canDemoExpert;
 
     public MiningCommand() {
-        super(PrimarySkill.MINING);
+        super(SkillType.MINING);
     }
 
     @Override
@@ -51,7 +49,7 @@ public class MiningCommand extends SkillCommand {
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SubSkill.MINING_DOUBLE_DROPS, isLucky);
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.MINING_DOUBLE_DROPS, isLucky);
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
@@ -74,7 +72,7 @@ public class MiningCommand extends SkillCommand {
         canBiggerBombs = Permissions.biggerBombs(player);
         canBlast = Permissions.remoteDetonation(player);
         canDemoExpert = Permissions.demolitionsExpertise(player);
-        canDoubleDrop = Permissions.isSubSkillEnabled(player, SubSkill.MINING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
+        canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.MINING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
         canSuperBreaker = Permissions.superBreaker(player);
     }
 
@@ -152,13 +150,4 @@ public class MiningCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.MINING);
-
-        return textComponents;
-    }
 }

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

@@ -1,24 +1,23 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.MaterialType;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.locale.LocaleLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.repair.ArcaneForging;
 import com.gmail.nossr50.skills.repair.ArcaneForging.Tier;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
 import com.gmail.nossr50.util.player.UserManager;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class RepairCommand extends SkillCommand {
     private String repairMasteryBonus;
@@ -43,14 +42,14 @@ public class RepairCommand extends SkillCommand {
     private int stoneLevel;
 
     public RepairCommand() {
-        super(PrimarySkill.REPAIR);
+        super(SkillType.REPAIR);
     }
 
     @Override
     protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // We're using pickaxes here, not the best but it works
         Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
-        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLDEN_PICKAXE);
+        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE);
         Repairable ironRepairable = mcMMO.getRepairableManager().getRepairable(Material.IRON_PICKAXE);
         Repairable stoneRepairable = mcMMO.getRepairableManager().getRepairable(Material.STONE_PICKAXE);
 
@@ -67,7 +66,7 @@ public class RepairCommand extends SkillCommand {
 
         // SUPER REPAIR
         if (canSuperRepair) {
-            String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, SubSkill.REPAIR_SUPER_REPAIR, isLucky);
+            String[] superRepairStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SUPER_REPAIR, isLucky);
             superRepairChance = superRepairStrings[0];
             superRepairChanceLucky = superRepairStrings[1];
         }
@@ -75,9 +74,9 @@ public class RepairCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canSuperRepair = Permissions.isSubSkillEnabled(player, SubSkill.REPAIR_SUPER_REPAIR);
-        canMasterRepair = Permissions.isSubSkillEnabled(player, SubSkill.REPAIR_REPAIR_MASTERY);
-        canArcaneForge = Permissions.isSubSkillEnabled(player, SubSkill.REPAIR_ARCANE_FORGING);
+        canSuperRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SUPER_REPAIR);
+        canMasterRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.REPAIR_MASTERY);
+        canArcaneForge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_FORGING);
         canRepairDiamond = Permissions.repairMaterialType(player, MaterialType.DIAMOND);
         canRepairGold = Permissions.repairMaterialType(player, MaterialType.GOLD);
         canRepairIron = Permissions.repairMaterialType(player, MaterialType.IRON);
@@ -157,13 +156,4 @@ public class RepairCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.REPAIR);
-
-        return textComponents;
-    }
 }

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.salvage.Salvage;
 import com.gmail.nossr50.skills.salvage.SalvageManager;
@@ -20,7 +18,7 @@ public class SalvageCommand extends SkillCommand {
     private boolean canArcaneSalvage;
 
     public SalvageCommand() {
-        super(PrimarySkill.SALVAGE);
+        super(SkillType.SALVAGE);
     }
 
     @Override
@@ -31,8 +29,8 @@ public class SalvageCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canAdvancedSalvage = Permissions.isSubSkillEnabled(player, SubSkill.SALVAGE_ADVANCED_SALVAGE);
-        canArcaneSalvage = Permissions.isSubSkillEnabled(player, SubSkill.SALVAGE_ARCANE_SALVAGE);
+        canAdvancedSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ADVANCED_SALVAGE);
+        canArcaneSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_SALVAGE);
     }
 
     @Override
@@ -78,13 +76,4 @@ public class SalvageCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SALVAGE);
-
-        return textComponents;
-    }
 }

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

@@ -4,13 +4,17 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Set;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.Motd;
@@ -22,16 +26,9 @@ import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.PerksUtils;
 
 import com.google.common.collect.ImmutableList;
-import net.md_5.bungee.api.ChatColor;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
 
 public abstract class SkillCommand implements TabExecutor {
-    protected PrimarySkill skill;
+    protected SkillType skill;
     private String skillName;
 
     protected DecimalFormat percent = new DecimalFormat("##0.00%");
@@ -39,7 +36,7 @@ public abstract class SkillCommand implements TabExecutor {
 
     private CommandExecutor skillGuideCommand;
 
-    public SkillCommand(PrimarySkill skill) {
+    public SkillCommand(SkillType skill) {
         this.skill = skill;
         skillName = skill.getName();
         skillGuideCommand = new SkillGuideCommand(skill);
@@ -51,10 +48,6 @@ public abstract class SkillCommand implements TabExecutor {
             return true;
         }
 
-        if (!CommandUtils.hasPlayerDataKey(sender)) {
-            return true;
-        }
-
         switch (args.length) {
             case 0:
                 Player player = (Player) sender;
@@ -71,24 +64,49 @@ public abstract class SkillCommand implements TabExecutor {
                     ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
                 }
 
-                sendSkillCommandHeader(player, mcMMOPlayer, (int) skillValue);
+                if (!skill.isChildSkill()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
+                    player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + StringUtils.getCapitalized(skill.toString()))));
+                    player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, mcMMOPlayer.getSkillXpLevel(skill), mcMMOPlayer.getXpToLevel(skill)));
+                }
+                else {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", skillName + " " + LocaleLoader.getString("Skills.Child")));
+                    player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain.Child")));
+                    player.sendMessage(LocaleLoader.getString("Effects.Child", (int) skillValue));
 
-                //Make JSON text components
-                List<TextComponent> subskillTextComponents = getTextComponents(player);
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents")));
+                    Set<SkillType> parents = FamilyTree.getParents(skill);
 
-
-                //Subskills Header
-                player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.SubSkills")));
-
-                //Send JSON text components
-                for(TextComponent tc : subskillTextComponents)
-                {
-                    player.spigot().sendMessage(new TextComponent[]{tc, new TextComponent(": TESTING")});
+                    for (SkillType parent : parents) {
+                        player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)));
+                    }
                 }
 
-                //Stats
-                getStatMessages(player, isLucky, hasEndurance, skillValue);
+                List<String> effectMessages = effectsDisplay();
 
+                if (!effectMessages.isEmpty()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
+
+                    if (isLucky) {
+                        player.sendMessage(Motd.PERK_PREFIX + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc", skillName)));
+                    }
+
+                    for (String message : effectMessages) {
+                        player.sendMessage(message);
+                    }
+                }
+
+                List<String> statsMessages = statsDisplay(player, skillValue, hasEndurance, isLucky);
+
+                if (!statsMessages.isEmpty()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
+
+                    for (String message : statsMessages) {
+                        player.sendMessage(message);
+                    }
+                }
+
+                player.sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase()));
                 return true;
 
             default:
@@ -96,60 +114,6 @@ public abstract class SkillCommand implements TabExecutor {
         }
     }
 
-    private void getStatMessages(Player player, boolean isLucky, boolean hasEndurance, float skillValue) {
-        List<String> statsMessages = statsDisplay(player, skillValue, hasEndurance, isLucky);
-
-        if (!statsMessages.isEmpty()) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-
-            for (String message : statsMessages) {
-                player.sendMessage(message);
-            }
-        }
-
-        player.sendMessage(LocaleLoader.getString("Guides.Available", skillName, skillName.toLowerCase()));
-    }
-
-    private void sendSkillCommandHeader(Player player, McMMOPlayer mcMMOPlayer, int skillValue) {
-        if (!skill.isChildSkill()) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
-            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain." + StringUtils.getCapitalized(skill.toString()))));
-            player.sendMessage(LocaleLoader.getString("Effects.Level", skillValue, mcMMOPlayer.getSkillXpLevel(skill), mcMMOPlayer.getXpToLevel(skill)));
-        } else {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", skillName + " " + LocaleLoader.getString("Skills.Child")));
-            player.sendMessage(LocaleLoader.getString("Commands.XPGain", LocaleLoader.getString("Commands.XPGain.Child")));
-            player.sendMessage(LocaleLoader.getString("Effects.Child", skillValue));
-
-            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Skills.Parents")));
-            Set<PrimarySkill> parents = FamilyTree.getParents(skill);
-
-            for (PrimarySkill parent : parents) {
-                player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)));
-            }
-        }
-    }
-
-    private void displayOldSkillCommand(Player player, McMMOPlayer mcMMOPlayer, boolean isLucky, boolean hasEndurance, float skillValue) {
-        //Send headers
-        sendSkillCommandHeader(player, mcMMOPlayer, (int) skillValue);
-
-        List<String> effectMessages = effectsDisplay();
-
-        if (!effectMessages.isEmpty()) {
-            player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-
-            if (isLucky) {
-                player.sendMessage(Motd.PERK_PREFIX + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.Lucky.Name"), LocaleLoader.getString("Perks.Lucky.Desc", skillName)));
-            }
-
-            for (String message : effectMessages) {
-                player.sendMessage(message);
-            }
-        }
-
-        getStatMessages(player, isLucky, hasEndurance, skillValue);
-    }
-
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
@@ -173,10 +137,10 @@ public abstract class SkillCommand implements TabExecutor {
         return displayValues;
     }
 
-    protected String[] calculateAbilityDisplayValues(float skillValue, SubSkill subSkill, boolean isLucky) {
-        int maxBonusLevel = AdvancedConfig.getInstance().getMaxBonusLevel(subSkill);
+    protected String[] calculateAbilityDisplayValues(float skillValue, SecondaryAbility skillAbility, boolean isLucky) {
+        int maxBonusLevel = AdvancedConfig.getInstance().getMaxBonusLevel(skillAbility);
 
-        return calculateAbilityDisplayValues((AdvancedConfig.getInstance().getMaxChance(subSkill) / maxBonusLevel) * Math.min(skillValue, maxBonusLevel), isLucky);
+        return calculateAbilityDisplayValues((AdvancedConfig.getInstance().getMaxChance(skillAbility) / maxBonusLevel) * Math.min(skillValue, maxBonusLevel), isLucky);
     }
 
     protected String[] calculateLengthDisplayValues(Player player, float skillValue) {
@@ -198,6 +162,4 @@ public abstract class SkillCommand implements TabExecutor {
     protected abstract List<String> effectsDisplay();
 
     protected abstract List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky);
-
-    protected abstract List<TextComponent> getTextComponents(Player player);
 }

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

@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.StringUtils;
 
@@ -17,7 +17,7 @@ public class SkillGuideCommand implements CommandExecutor {
 
     private String invalidPage = LocaleLoader.getString("Guides.Page.Invalid");
 
-    public SkillGuideCommand(PrimarySkill skill) {
+    public SkillGuideCommand(SkillType skill) {
         header = LocaleLoader.getString("Guides.Header", skill.getName());
         guide = getGuide(skill);
     }
@@ -86,7 +86,7 @@ public class SkillGuideCommand implements CommandExecutor {
         return allStrings;
     }
 
-    private ArrayList<String> getGuide(PrimarySkill skill) {
+    private ArrayList<String> getGuide(SkillType skill) {
         ArrayList<String> guide = new ArrayList<String>();
 
         for (int i = 0; i < 10; i++) {

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

@@ -3,13 +3,11 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.smelting.Smelting;
 import com.gmail.nossr50.skills.smelting.Smelting.Tier;
@@ -29,7 +27,7 @@ public class SmeltingCommand extends SkillCommand {
     private boolean canVanillaXPBoost;
 
     public SmeltingCommand() {
-        super(PrimarySkill.SMELTING);
+        super(SkillType.SMELTING);
     }
 
     @Override
@@ -41,7 +39,7 @@ public class SmeltingCommand extends SkillCommand {
 
         // SECOND SMELT
         if (canSecondSmelt) {
-            String[] secondSmeltStrings = calculateAbilityDisplayValues(skillValue, SubSkill.SMELTING_SECOND_SMELT, isLucky);
+            String[] secondSmeltStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.SECOND_SMELT, isLucky);
             secondSmeltChance = secondSmeltStrings[0];
             secondSmeltChanceLucky = secondSmeltStrings[1];
         }
@@ -56,9 +54,9 @@ public class SmeltingCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canFuelEfficiency = Permissions.isSubSkillEnabled(player, SubSkill.SMELTING_FUEL_EFFICIENCY);
-        canSecondSmelt = Permissions.isSubSkillEnabled(player, SubSkill.SMELTING_SECOND_SMELT);
-        canFluxMine = Permissions.isSubSkillEnabled(player, SubSkill.SMELTING_FLUX_MINING);
+        canFuelEfficiency = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY);
+        canSecondSmelt = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SECOND_SMELT);
+        canFluxMine = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FLUX_MINING);
         canVanillaXPBoost = Permissions.vanillaXpBoost(player, skill);
     }
 
@@ -119,13 +117,4 @@ public class SmeltingCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SWORDS);
-
-        return textComponents;
-    }
 }

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

@@ -3,13 +3,11 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.swords.Swords;
 import com.gmail.nossr50.util.Permissions;
@@ -28,7 +26,7 @@ public class SwordsCommand extends SkillCommand {
     private boolean canBleed;
 
     public SwordsCommand() {
-        super(PrimarySkill.SWORDS);
+        super(SkillType.SWORDS);
     }
 
     @Override
@@ -40,18 +38,18 @@ public class SwordsCommand extends SkillCommand {
             serratedStrikesLengthEndurance = serratedStrikesStrings[1];
         }
 
-        // SWORDS_BLEED
+        // BLEED
         if (canBleed) {
-            bleedLength = (skillValue >= AdvancedConfig.getInstance().getMaxBonusLevel(SubSkill.SWORDS_BLEED)) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
+            bleedLength = (skillValue >= AdvancedConfig.getInstance().getMaxBonusLevel(SecondaryAbility.BLEED)) ? Swords.bleedMaxTicks : Swords.bleedBaseTicks;
 
-            String[] bleedStrings = calculateAbilityDisplayValues(skillValue, SubSkill.SWORDS_BLEED, isLucky);
+            String[] bleedStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.BLEED, isLucky);
             bleedChance = bleedStrings[0];
             bleedChanceLucky = bleedStrings[1];
         }
 
-        // SWORDS_COUNTER_ATTACK
+        // COUNTER
         if (canCounter) {
-            String[] counterStrings = calculateAbilityDisplayValues(skillValue, SubSkill.SWORDS_COUNTER_ATTACK, isLucky);
+            String[] counterStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.COUNTER, isLucky);
             counterChance = counterStrings[0];
             counterChanceLucky = counterStrings[1];
         }
@@ -59,8 +57,8 @@ public class SwordsCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canBleed = Permissions.isSubSkillEnabled(player, SubSkill.SWORDS_BLEED);
-        canCounter = Permissions.isSubSkillEnabled(player, SubSkill.SWORDS_COUNTER_ATTACK);
+        canBleed = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.BLEED);
+        canCounter = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.COUNTER);
         canSerratedStrike = Permissions.serratedStrikes(player);
     }
 
@@ -104,13 +102,4 @@ public class SwordsCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SWORDS);
-
-        return textComponents;
-    }
 }

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

@@ -3,18 +3,15 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.taming.Taming;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
 
 public class TamingCommand extends SkillCommand {
     private String goreChance;
@@ -31,13 +28,13 @@ public class TamingCommand extends SkillCommand {
     private boolean canHolyHound;
 
     public TamingCommand() {
-        super(PrimarySkill.TAMING);
+        super(SkillType.TAMING);
     }
 
     @Override
     protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         if (canGore) {
-            String[] goreStrings = calculateAbilityDisplayValues(skillValue, SubSkill.TAMING_GORE, isLucky);
+            String[] goreStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.GORE, isLucky);
             goreChance = goreStrings[0];
             goreChanceLucky = goreStrings[1];
         }
@@ -45,15 +42,15 @@ public class TamingCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
-        canBeastLore = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_BEAST_LORE);
+        canBeastLore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.BEAST_LORE);
         canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
-        canEnvironmentallyAware = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_ENVIRONMENTALLY_AWARE);
-        canFastFood = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_FAST_FOOD_SERVICE);
-        canGore = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_GORE);
-        canSharpenedClaws = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_SHARPENED_CLAWS);
-        canShockProof = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_SHOCK_PROOF);
-        canThickFur = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_THICK_FUR);
-        canHolyHound = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_HOLY_HOUND);
+        canEnvironmentallyAware = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ENVIROMENTALLY_AWARE);
+        canFastFood = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FAST_FOOD);
+        canGore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GORE);
+        canSharpenedClaws = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHARPENED_CLAWS);
+        canShockProof = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHOCK_PROOF);
+        canThickFur = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.THICK_FUR);
+        canHolyHound = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HOLY_HOUND);
     }
 
     @Override
@@ -94,13 +91,9 @@ public class TamingCommand extends SkillCommand {
 
         if (canCallWild) {
             messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-            int costOcelot = Config.getInstance().getTamingCOTWCost(EntityType.OCELOT);
-            String itemOcelot = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.OCELOT));
-            int costWolf = Config.getInstance().getTamingCOTWCost(EntityType.WOLF);
-            String itemWolf = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.WOLF));
-            int costHorse = Config.getInstance().getTamingCOTWCost(EntityType.HORSE);
-            String itemHorse = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.HORSE));
-            messages.add(LocaleLoader.getString("Taming.Effect.14", costOcelot, itemOcelot, costWolf, itemWolf, costHorse, itemHorse));
+            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWCost(EntityType.OCELOT)));
+            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWCost(EntityType.WOLF)));
+            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWCost(EntityType.HORSE)));
         }
 
         return messages;
@@ -170,13 +163,4 @@ public class TamingCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.TAMING);
-
-        return textComponents;
-    }
 }

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

@@ -3,12 +3,10 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.unarmed.Unarmed;
 import com.gmail.nossr50.util.Permissions;
@@ -31,7 +29,7 @@ public class UnarmedCommand extends SkillCommand {
     private boolean canIronGrip;
 
     public UnarmedCommand() {
-        super(PrimarySkill.UNARMED);
+        super(SkillType.UNARMED);
     }
 
     @Override
@@ -43,16 +41,16 @@ public class UnarmedCommand extends SkillCommand {
             berserkLengthEndurance = berserkStrings[1];
         }
 
-        // UNARMED_DISARM
+        // DISARM
         if (canDisarm) {
-            String[] disarmStrings = calculateAbilityDisplayValues(skillValue, SubSkill.UNARMED_DISARM, isLucky);
+            String[] disarmStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DISARM, isLucky);
             disarmChance = disarmStrings[0];
             disarmChanceLucky = disarmStrings[1];
         }
 
-        // UNARMED_ARROW_DEFLECT
+        // DEFLECT
         if (canDeflect) {
-            String[] deflectStrings = calculateAbilityDisplayValues(skillValue, SubSkill.UNARMED_ARROW_DEFLECT, isLucky);
+            String[] deflectStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.DEFLECT, isLucky);
             deflectChance = deflectStrings[0];
             deflectChanceLucky = deflectStrings[1];
         }
@@ -64,7 +62,7 @@ public class UnarmedCommand extends SkillCommand {
 
         // IRON GRIP
         if (canIronGrip) {
-            String[] ironGripStrings = calculateAbilityDisplayValues(skillValue, SubSkill.UNARMED_IRON_GRIP, isLucky);
+            String[] ironGripStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.IRON_GRIP, isLucky);
             ironGripChance = ironGripStrings[0];
             ironGripChanceLucky = ironGripStrings[1];
         }
@@ -73,10 +71,10 @@ public class UnarmedCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canBerserk = Permissions.berserk(player);
-        canIronArm = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_IRON_ARM_STYLE);
-        canDeflect = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_ARROW_DEFLECT);
-        canDisarm = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_DISARM);
-        canIronGrip = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_IRON_GRIP);
+        canIronArm = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.IRON_ARM);
+        canDeflect = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DEFLECT);
+        canDisarm = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.DISARM);
+        canIronGrip = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.IRON_GRIP);
         // TODO: Apparently we forgot about block cracker?
     }
 
@@ -134,13 +132,4 @@ public class UnarmedCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.UNARMED);
-
-        return textComponents;
-    }
 }

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

@@ -3,13 +3,11 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.SkillTextComponentFactory;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 
@@ -22,12 +20,9 @@ public class WoodcuttingCommand extends SkillCommand {
     private boolean canTreeFell;
     private boolean canLeafBlow;
     private boolean canDoubleDrop;
-    private boolean canSplinter;
-    private boolean canBarkSurgeon;
-    private boolean canNaturesBounty;
 
     public WoodcuttingCommand() {
-        super(PrimarySkill.WOODCUTTING);
+        super(SkillType.WOODCUTTING);
     }
 
     @Override
@@ -41,29 +36,17 @@ public class WoodcuttingCommand extends SkillCommand {
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            if(AdvancedConfig.getInstance().isSubSkillClassic(SubSkill.WOODCUTTING_HARVEST_LUMBER))
-                setDoubleDropClassicChanceStrings(skillValue, isLucky);
-            else
-            {
-                //TODO: Set up datastrings for new harvest
-            }
+            String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SecondaryAbility.WOODCUTTING_DOUBLE_DROPS, isLucky);
+            doubleDropChance = doubleDropStrings[0];
+            doubleDropChanceLucky = doubleDropStrings[1];
         }
     }
 
-    private void setDoubleDropClassicChanceStrings(float skillValue, boolean isLucky) {
-        String[] doubleDropStrings = calculateAbilityDisplayValues(skillValue, SubSkill.WOODCUTTING_HARVEST_LUMBER, isLucky);
-        doubleDropChance = doubleDropStrings[0];
-        doubleDropChanceLucky = doubleDropStrings[1];
-    }
-
     @Override
     protected void permissionsCheck(Player player) {
         canTreeFell = Permissions.treeFeller(player);
-        canDoubleDrop = Permissions.isSubSkillEnabled(player, SubSkill.WOODCUTTING_HARVEST_LUMBER) && !skill.getDoubleDropsDisabled();
-        canLeafBlow = Permissions.isSubSkillEnabled(player, SubSkill.WOODCUTTING_LEAF_BLOWER);
-        canSplinter = Permissions.isSubSkillEnabled(player, SubSkill.WOODCUTTING_SPLINTER);
-        canBarkSurgeon = Permissions.isSubSkillEnabled(player, SubSkill.WOODCUTTING_BARK_SURGEON);
-        canNaturesBounty = Permissions.isSubSkillEnabled(player, SubSkill.WOODCUTTING_NATURES_BOUNTY);
+        canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
+        canLeafBlow = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.LEAF_BLOWER);
     }
 
     @Override
@@ -82,20 +65,6 @@ public class WoodcuttingCommand extends SkillCommand {
             messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.4"), LocaleLoader.getString("Woodcutting.Effect.5")));
         }
 
-        if (canSplinter) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.6"), LocaleLoader.getString("Woodcutting.Effect.7")));
-        }
-
-        if(canBarkSurgeon) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.8"), LocaleLoader.getString("Woodcutting.Effect.9")));
-        }
-
-        if(canNaturesBounty) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Woodcutting.Effect.10"), LocaleLoader.getString("Woodcutting.Effect.11")));
-        }
-
-
-
         return messages;
     }
 
@@ -124,15 +93,4 @@ public class WoodcuttingCommand extends SkillCommand {
 
         return messages;
     }
-
-    @Override
-    protected List<TextComponent> getTextComponents(Player player) {
-        List<TextComponent> textComponents = new ArrayList<>();
-
-        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.WOODCUTTING);
-
-        return textComponents;
-    }
-
-
 }

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

@@ -4,14 +4,15 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.fishing.Fishing;
 import com.gmail.nossr50.skills.mining.BlastMining;
 import com.gmail.nossr50.skills.repair.ArcaneForging;
 import com.gmail.nossr50.skills.salvage.Salvage;
 import com.gmail.nossr50.skills.smelting.Smelting;
+import com.gmail.nossr50.util.StringUtils;
 
 public class AdvancedConfig extends AutoUpdateConfigLoader {
     private static AdvancedConfig instance;
@@ -34,11 +35,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         // Validate all the settings!
         List<String> reason = new ArrayList<String>();
 
-        /*
-         * In the future this method will check keys for all skills, but for now it only checks overhauled skills
-         */
-        checkKeys(reason);
-
         /* GENERAL */
         if (getAbilityLength() < 1) {
             reason.add("Skills.General.Ability.IncreaseLevel should be at least 1!");
@@ -49,11 +45,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         /* ACROBATICS */
-        if (getMaxChance(SubSkill.ACROBATICS_DODGE) < 1) {
+        if (getMaxChance(SecondaryAbility.DODGE) < 1) {
             reason.add("Skills.Acrobatics.Dodge.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.ACROBATICS_DODGE) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.DODGE) < 1) {
             reason.add("Skills.Acrobatics.Dodge.MaxBonusLevel should be at least 1!");
         }
 
@@ -61,11 +57,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Acrobatics.Dodge.DamageModifier should be greater than 1!");
         }
 
-        if (getMaxChance(SubSkill.ACROBATICS_ROLL) < 1) {
+        if (getMaxChance(SecondaryAbility.ROLL) < 1) {
             reason.add("Skills.Acrobatics.Roll.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.ACROBATICS_ROLL) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.ROLL) < 1) {
             reason.add("Skills.Acrobatics.Roll.MaxBonusLevel should be at least 1!");
         }
 
@@ -73,11 +69,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Acrobatics.Roll.DamageThreshold should be at least 0!");
         }
 
-        if (getMaxChance(SubSkill.ACROBATICS_GRACEFUL_ROLL) < 1) {
+        if (getMaxChance(SecondaryAbility.GRACEFUL_ROLL) < 1) {
             reason.add("Skills.Acrobatics.GracefulRoll.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.ACROBATICS_GRACEFUL_ROLL) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.GRACEFUL_ROLL) < 1) {
             reason.add("Skills.Acrobatics.GracefulRoll.MaxBonusLevel should be at least 1!");
         }
 
@@ -118,55 +114,65 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         /* ARCHERY */
-
-        if (getSkillShotRankDamageMultiplier() <= 0) {
-            reason.add("Skills.Archery.SkillShot.RankDamageMultiplier should be greater than 0!");
+        if (getSkillShotIncreaseLevel() < 1) {
+            reason.add("Skills.Archery.SkillShot.IncreaseLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.ARCHERY_DAZE) < 1) {
-            reason.add("Skills.Archery.Daze.ChanceMax should be at least 1!");
+        if (getSkillShotIncreasePercentage() <= 0) {
+            reason.add("Skills.Archery.SkillShot.IncreasePercentage should be greater than 0!");
         }
 
-        if (getMaxBonusLevel(SubSkill.ARCHERY_DAZE) < 1) {
-            reason.add("Skills.Archery.Daze.MaxBonusLevel should be at least 1!");
+        if (getSkillShotBonusMax() < 0) {
+            reason.add("Skills.Archery.SkillShot.MaxBonus should be at least 0!");
+        }
+
+        if (getMaxChance(SecondaryAbility.DAZE) < 1) {
+            reason.add("Skills.Acrobatics.Daze.ChanceMax should be at least 1!");
+        }
+
+        if (getMaxBonusLevel(SecondaryAbility.DAZE) < 1) {
+            reason.add("Skills.Acrobatics.Daze.MaxBonusLevel should be at least 1!");
         }
 
         if (getDazeBonusDamage() < 0) {
-            reason.add("Skills.Archery.Daze.BonusDamage should be at least 0!");
+            reason.add("Skills.Acrobatics.Daze.BonusDamage should be at least 0!");
         }
 
-        if (getMaxChance(SubSkill.ARCHERY_ARROW_RETRIEVAL) < 1) {
-            reason.add("Skills.Archery.Retrieve.ChanceMax should be at least 1!");
+        if (getMaxChance(SecondaryAbility.RETRIEVE) < 1) {
+            reason.add("Skills.Acrobatics.Retrieve.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.ARCHERY_ARROW_RETRIEVAL) < 1) {
-            reason.add("Skills.Archery.Retrieve.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SecondaryAbility.RETRIEVE) < 1) {
+            reason.add("Skills.Acrobatics.Retrieve.MaxBonusLevel should be at least 1!");
         }
 
         if (getForceMultiplier() < 0) {
-            reason.add("Skills.Archery.ForceMultiplier should be at least 0!");
+            reason.add("Skills.Acrobatics.ForceMultiplier should be at least 0!");
         }
 
         /* AXES */
-        if(getAxeMasteryRankDamageMultiplier() < 0)
-        {
-            reason.add("Skills.Axes.AxeMastery.RankDamageMultiplier should be at least 0!");
+        if (getAxeMasteryBonusMax() < 1) {
+            reason.add("Skills.Axes.AxeMastery.MaxBonus should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.AXES_CRITICAL_STRIKES) < 1) {
+        if (getAxeMasteryMaxBonusLevel() < 1) {
+            reason.add("Skills.Axes.AxeMastery.MaxBonusLevel should be at least 1!");
+        }
+
+        if (getMaxChance(SecondaryAbility.CRITICAL_HIT) < 1) {
             reason.add("Skills.Axes.CriticalHit.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.AXES_CRITICAL_STRIKES) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.CRITICAL_HIT) < 1) {
             reason.add("Skills.Axes.CriticalHit.MaxBonusLevel should be at least 1!");
         }
 
-        if (getCriticalStrikesPVPModifier() < 1) {
-            reason.add("Skills.Axes.CriticalStrikes.PVP_Modifier should be at least 1!");
+        if (getCriticalHitPVPModifier() < 1) {
+            reason.add("Skills.Axes.CriticalHit.PVP_Modifier should be at least 1!");
         }
 
-        if (getCriticalStrikesPVPModifier() < 1) {
-            reason.add("Skills.Axes.CriticalStrikes.PVE_Modifier should be at least 1!");
+        if (getCriticalHitPVEModifier() < 1) {
+            reason.add("Skills.Axes.CriticalHit.PVE_Modifier should be at least 1!");
         }
 
         if (getGreaterImpactChance() < 1) {
@@ -194,7 +200,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         if (getSkullSplitterModifier() < 1) {
-            reason.add("Skills.Axes.SkullSplitter.DamageModifier should be at least 1!");
+            reason.add("Skills.Axes.SkullSplitter.DamagerModifier should be at least 1!");
         }
 
         /* FISHING */
@@ -259,44 +265,44 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Herbalism.GreenThumb.StageChange should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.HERBALISM_GREEN_THUMB) < 1) {
+        if (getMaxChance(SecondaryAbility.GREEN_THUMB_PLANT) < 1) {
             reason.add("Skills.Herbalism.GreenThumb.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.HERBALISM_GREEN_THUMB) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.GREEN_THUMB_PLANT) < 1) {
             reason.add("Skills.Herbalism.GreenThumb.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.HERBALISM_DOUBLE_DROPS) < 1) {
+        if (getMaxChance(SecondaryAbility.HERBALISM_DOUBLE_DROPS) < 1) {
             reason.add("Skills.Herbalism.DoubleDrops.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.HERBALISM_DOUBLE_DROPS) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.HERBALISM_DOUBLE_DROPS) < 1) {
             reason.add("Skills.Herbalism.DoubleDrops.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.HERBALISM_HYLIAN_LUCK) < 1) {
+        if (getMaxChance(SecondaryAbility.HYLIAN_LUCK) < 1) {
             reason.add("Skills.Herbalism.HylianLuck.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.HERBALISM_HYLIAN_LUCK) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.HYLIAN_LUCK) < 1) {
             reason.add("Skills.Herbalism.HylianLuck.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.HERBALISM_SHROOM_THUMB) < 1) {
+        if (getMaxChance(SecondaryAbility.SHROOM_THUMB) < 1) {
             reason.add("Skills.Herbalism.ShroomThumb.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.HERBALISM_SHROOM_THUMB) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.SHROOM_THUMB) < 1) {
             reason.add("Skills.Herbalism.ShroomThumb.MaxBonusLevel should be at least 1!");
         }
 
         /* MINING */
-        if (getMaxChance(SubSkill.MINING_DOUBLE_DROPS) < 1) {
+        if (getMaxChance(SecondaryAbility.MINING_DOUBLE_DROPS) < 1) {
             reason.add("Skills.Mining.DoubleDrops.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.MINING_DOUBLE_DROPS) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.MINING_DOUBLE_DROPS) < 1) {
             reason.add("Skills.Mining.DoubleDrops.MaxBonusLevel should be at least 1!");
         }
 
@@ -365,11 +371,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Repair.RepairMastery.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.REPAIR_SUPER_REPAIR) < 1) {
+        if (getMaxChance(SecondaryAbility.SUPER_REPAIR) < 1) {
             reason.add("Skills.Repair.SuperRepair.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.REPAIR_SUPER_REPAIR) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.SUPER_REPAIR) < 1) {
             reason.add("Skills.Repair.SuperRepair.MaxBonusLevel should be at least 1!");
         }
 
@@ -414,8 +420,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Salvage.MaxPercentageLevel should be at least 1!");
         }
 
-        if (getAdvancedSalvageUnlockLevel() < 0) {
-            reason.add("Skills.Salvage.AdvancedSalvage.UnlockLevel should be at least 0!");
+        if (getAdvancedSalvageUnlockLevel() < 1) {
+            reason.add("Skills.Salvage.AdvancedSalvage.UnlockLevel should be at least 1!");
         }
 
         List<Salvage.Tier> salvageTierList = Arrays.asList(Salvage.Tier.values());
@@ -436,8 +442,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             if (tier != Salvage.Tier.EIGHT) {
                 Salvage.Tier nextTier = salvageTierList.get(salvageTierList.indexOf(tier) - 1);
 
-                if (getArcaneSalvageRankLevel(tier) > getArcaneSalvageRankLevel(nextTier)) {
-                    reason.add("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical() + " should be less than or equal to Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + nextTier.toNumerical() + "!");
+                if (getArcaneSalvageRankLevel(tier) >= getArcaneSalvageRankLevel(nextTier)) {
+                    reason.add("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical() + " should be less than Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + nextTier.toNumerical() + "!");
                 }
 
                 if (getArcaneSalvageExtractFullEnchantsChance(tier) > getArcaneSalvageExtractFullEnchantsChance(nextTier)) {
@@ -459,11 +465,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Smelting.FuelEfficiency.Multiplier should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.SMELTING_SECOND_SMELT) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.SECOND_SMELT) < 1) {
             reason.add("Skills.Smelting.SecondSmelt.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.SMELTING_SECOND_SMELT) < 1) {
+        if (getMaxChance(SecondaryAbility.SECOND_SMELT) < 1) {
             reason.add("Skills.Smelting.SecondSmelt.ChanceMax should be at least 1!");
         }
 
@@ -500,11 +506,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         /* SWORDS */
-        if (getMaxChance(SubSkill.SWORDS_BLEED) < 1) {
+        if (getMaxChance(SecondaryAbility.BLEED) < 1) {
             reason.add("Skills.Swords.Bleed.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.SWORDS_BLEED) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.BLEED) < 1) {
             reason.add("Skills.Swords.Bleed.MaxBonusLevel should be at least 1!");
         }
 
@@ -520,16 +526,16 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Swords.Bleed.BaseTicks should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.SWORDS_COUNTER_ATTACK) < 1) {
-            reason.add("Skills.Swords.CounterAttack.ChanceMax should be at least 1!");
+        if (getMaxChance(SecondaryAbility.COUNTER) < 1) {
+            reason.add("Skills.Swords.Counter.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.SWORDS_COUNTER_ATTACK) < 1) {
-            reason.add("Skills.Swords.CounterAttack.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SecondaryAbility.COUNTER) < 1) {
+            reason.add("Skills.Swords.Counter.MaxBonusLevel should be at least 1!");
         }
 
         if (getCounterModifier() < 1) {
-            reason.add("Skills.Swords.CounterAttack.DamageModifier should be at least 1!");
+            reason.add("Skills.Swords.Counter.DamageModifier should be at least 1!");
         }
 
         if (getSerratedStrikesModifier() < 1) {
@@ -542,11 +548,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
 
         /* TAMING */
 
-        if (getMaxChance(SubSkill.TAMING_GORE) < 1) {
+        if (getMaxChance(SecondaryAbility.GORE) < 1) {
             reason.add("Skills.Taming.Gore.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.TAMING_GORE) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.GORE) < 1) {
             reason.add("Skills.Taming.Gore.MaxBonusLevel should be at least 1!");
         }
 
@@ -603,58 +609,57 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         /* UNARMED */
-        if (getMaxChance(SubSkill.UNARMED_DISARM) < 1) {
+        if (getMaxChance(SecondaryAbility.DISARM) < 1) {
             reason.add("Skills.Unarmed.Disarm.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.UNARMED_DISARM) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.DISARM) < 1) {
             reason.add("Skills.Unarmed.Disarm.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.UNARMED_ARROW_DEFLECT) < 1) {
-            reason.add("Skills.Unarmed.ArrowDeflect.ChanceMax should be at least 1!");
+        if (getMaxChance(SecondaryAbility.DEFLECT) < 1) {
+            reason.add("Skills.Unarmed.Deflect.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.UNARMED_ARROW_DEFLECT) < 1) {
-            reason.add("Skills.Unarmed.ArrowDeflect.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SecondaryAbility.DEFLECT) < 1) {
+            reason.add("Skills.Unarmed.Deflect.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.UNARMED_IRON_GRIP) < 1) {
+        if (getMaxChance(SecondaryAbility.IRON_GRIP) < 1) {
             reason.add("Skills.Unarmed.IronGrip.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.UNARMED_IRON_GRIP) < 1) {
+        if (getMaxBonusLevel(SecondaryAbility.IRON_GRIP) < 1) {
             reason.add("Skills.Unarmed.IronGrip.MaxBonusLevel should be at least 1!");
         }
 
         if (getIronArmMinBonus() < 0) {
-            reason.add("Skills.Unarmed.IronArmStyle.BonusMin should be at least 0!");
+            reason.add("Skills.Unarmed.IronArm.BonusMin should be at least 0!");
         }
 
         if (getIronArmMaxBonus() < 0) {
-            reason.add("Skills.Unarmed.IronArmStyle.BonusMax should be at least 0!");
+            reason.add("Skills.Unarmed.IronArm.BonusMax should be at least 0!");
         }
 
         if (getIronArmMaxBonus() < getIronArmMinBonus()) {
-            reason.add("Skills.Unarmed.IronArmStyle.BonusMax should be greater than or equal to Skills.Unarmed.IronArm.BonusMin!");
+            reason.add("Skills.Unarmed.IronArm.BonusMax should be greater than or equal to Skills.Unarmed.IronArm.BonusMin!");
         }
 
         if (getIronArmIncreaseLevel() < 1) {
-            reason.add("Skills.Unarmed.IronArmStyle.IncreaseLevel should be at least 1!");
+            reason.add("Skills.Unarmed.IronArm.IncreaseLevel should be at least 1!");
         }
 
         /* WOODCUTTING */
-
         if (getLeafBlowUnlockLevel() < 0) {
             reason.add("Skills.Woodcutting.LeafBlower.UnlockLevel should be at least 0!");
         }
 
-        if (getMaxChance(SubSkill.WOODCUTTING_HARVEST_LUMBER) < 1) {
-            reason.add("Skills.Woodcutting.HarvestLumber.ChanceMax should be at least 1!");
+        if (getMaxChance(SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) < 1) {
+            reason.add("Skills.Woodcutting.DoubleDrops.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.WOODCUTTING_HARVEST_LUMBER) < 1) {
-            reason.add("Skills.Woodcutting.HarvestLumber.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SecondaryAbility.WOODCUTTING_DOUBLE_DROPS) < 1) {
+            reason.add("Skills.Woodcutting.DoubleDrops.MaxBonusLevel should be at least 1!");
         }
 
         /* KRAKEN */
@@ -684,43 +689,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getAbilityLength() { return config.getInt("Skills.General.Ability.IncreaseLevel", 50); }
     public int getEnchantBuff() { return config.getInt("Skills.General.Ability.EnchantBuff", 5); }
 
-    public int getMaxBonusLevel(SubSkill subSkill) { return config.getInt(subSkill.getAdvConfigAddress() + ".MaxBonusLevel"); }
-    public double getMaxChance(SubSkill subSkill) { return config.getDouble(subSkill.getAdvConfigAddress() + ".ChanceMax", 100.0D);}
-
-
-    /**
-     * Gets the level required to unlock a subskill at a given rank
-     * @param subSkill The subskill
-     * @param rank The rank of the skill
-     * @return The level required to use this rank of the subskill
-     * @deprecated Right now mcMMO is an overhaul process, this will only work for skills I have overhauled. I will be removing the deprecated tag when that is true.
-     */
-    @Deprecated
-    public int getSubSkillUnlockLevel(SubSkill subSkill, int rank)
-    {
-        /*
-         * This is a bit messy but
-         *
-         * Some skills have per-rank settings as child nodes for Rank_x nodes
-         * If they do, we have to grab the child node named LevelReq from Rank_x for that skill
-         *
-         * Other skills which do not have complex per-rank settings will instead find their Level Requirement returned at Rank_x
-         */
-        if(config.get(subSkill.getAdvConfigAddress() + ".Rank_Levels.Rank_"+rank+".LevelReq") != null)
-            return config.getInt(subSkill.getAdvConfigAddress() + ".Rank_Levels.Rank_"+rank+".LevelReq");
-        else
-            return config.getInt(subSkill.getAdvConfigAddress() + ".Rank_Levels.Rank_"+rank);
-    }
-
-    /**
-     * Some SubSkills have the ability to retain classic functionality
-     * @param subSkill SubSkill with classic functionality
-     * @return true if the subskill is in classic mode
-     */
-    public boolean isSubSkillClassic(SubSkill subSkill)
-    {
-        return config.getBoolean(subSkill.getAdvConfigAddress()+".Classic");
-    }
+    public int getMaxBonusLevel(SecondaryAbility skillAbility) { return config.getInt("Skills." + StringUtils.getCapitalized(SkillType.bySecondaryAbility(skillAbility).toString()) + "." + StringUtils.getPrettySecondaryAbilityString(skillAbility).replace(" ", "") + ".MaxBonusLevel"); }
+    public double getMaxChance(SecondaryAbility skillAbility) { return config.getDouble("Skills." + StringUtils.getCapitalized(SkillType.bySecondaryAbility(skillAbility).toString()) + "." + StringUtils.getPrettySecondaryAbilityString(skillAbility).replace(" ", "") + ".ChanceMax", 100.0D); }
 
     /* ACROBATICS */
     public double getDodgeDamageModifier() { return config.getDouble("Skills.Acrobatics.Dodge.DamageModifier", 2.0D); }
@@ -740,7 +710,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
 
     /* ARCHERY */
     public int getSkillShotIncreaseLevel() { return config.getInt("Skills.Archery.SkillShot.IncreaseLevel", 50); }
-    public double getSkillShotRankDamageMultiplier() { return config.getDouble("Skills.Archery.SkillShot.RankDamageMultiplier", 10.0D); }
+    public double getSkillShotIncreasePercentage() { return config.getDouble("Skills.Archery.SkillShot.IncreasePercentage", 0.1D); }
+    public double getSkillShotBonusMax() { return config.getDouble("Skills.Archery.SkillShot.MaxBonus", 2.0D); }
     public double getSkillShotDamageMax() { return config.getDouble("Skills.Archery.SkillShot.MaxDamage", 9.0D); }
 
     public double getDazeBonusDamage() { return config.getDouble("Skills.Archery.Daze.BonusDamage", 4.0D); }
@@ -748,10 +719,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getForceMultiplier() { return config.getDouble("Skills.Archery.ForceMultiplier", 2.0D); }
 
     /* AXES */
-    public double getAxeMasteryRankDamageMultiplier() { return config.getDouble("Skills.Axes.AxeMastery.RankDamageMultiplier", 1.0D); }
+    public double getAxeMasteryBonusMax() { return config.getDouble("Skills.Axes.AxeMastery.MaxBonus", 4.0D); }
+    public int getAxeMasteryMaxBonusLevel() { return config.getInt("Skills.Axes.AxeMastery.MaxBonusLevel", 200); }
 
-    public double getCriticalStrikesPVPModifier() { return config.getDouble("Skills.Axes.CriticalStrikes.PVP_Modifier", 1.5D); }
-    public double getCriticalStrikesPVEModifier() { return config.getDouble("Skills.Axes.CriticalStrikes.PVE_Modifier", 2.0D); }
+    public double getCriticalHitPVPModifier() { return config.getDouble("Skills.Axes.CriticalHit.PVP_Modifier", 1.5D); }
+    public double getCriticalHitPVEModifier() { return config.getDouble("Skills.Axes.CriticalHit.PVE_Modifier", 2.0D); }
 
     public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact.Chance", 25.0D); }
     public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact.KnockbackModifier", 1.5D); }
@@ -761,7 +733,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getImpactChance() { return config.getDouble("Skills.Axes.ArmorImpact.Chance", 25.0D); }
     public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact.MaxPercentageDurabilityDamage", 20.0D); }
 
-    public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter.DamageModifier", 2.0D); }
+    public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter.DamagerModifier", 2.0D); }
 
     /* EXCAVATION */
     //Nothing to configure, everything is already configurable in config.yml
@@ -830,14 +802,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getSmeltingVanillaXPBoostMultiplier(Smelting.Tier tier) { return config.getInt("Skills.Smelting.VanillaXPMultiplier.Rank_" + tier.toNumerical()); }
 
     /* SWORDS */
-    public double getBleedDamagePlayer() { return config.getDouble("Skills.Swords.Bleed.DamagePlayer", 1.0); }
-    public double getBleedDamageMobs() { return config.getDouble("Skills.Swords.Bleed.DamageMobs", 2.0); }
-
     public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed.MaxTicks", 3); }
     public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed.BaseTicks", 2); }
 
-    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.CounterAttack.RequiresBlock"); }
-    public double getCounterModifier() { return config.getDouble("Skills.Swords.CounterAttack.DamageModifier", 2.0D); }
+    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.Counter.RequiresBlock"); }
+    public double getCounterModifier() { return config.getDouble("Skills.Swords.Counter.DamageModifier", 2.0D); }
 
     public double getSerratedStrikesModifier() { return config.getDouble("Skills.Swords.SerratedStrikes.DamageModifier", 4.0D); }
     public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes.BleedTicks", 5); }
@@ -866,9 +835,9 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getMaxHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength", 2.0D); }
 
     /* UNARMED */
-    public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArmStyle.BonusMin", 3.0D); }
-    public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArmStyle.BonusMax", 8.0D); }
-    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArmStyle.IncreaseLevel", 50); }
+    public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArm.BonusMin", 3.0D); }
+    public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArm.BonusMax", 8.0D); }
+    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm.IncreaseLevel", 50); }
     public boolean getDisarmProtected() { return config.getBoolean("Skills.Unarmed.Disarm.AntiTheft", false); }
 
     /* WOODCUTTING */
@@ -887,39 +856,4 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", ""); }
     public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", ""); }
     public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", ""); }
-
-    /**
-     * Checks for valid keys in the advanced.yml file for subskill ranks
-     */
-    private void checkKeys(List<String> reasons)
-    {
-        //For now we will only check ranks of stuff I've overhauled
-        for(SubSkill subSkill : SubSkill.values())
-        {
-            if(subSkill.getParentSkill() == PrimarySkill.WOODCUTTING)
-            {
-                //Keeping track of the rank requirements and making sure there are no logical errors
-                int curRank = 0;
-                int prevRank = 0;
-
-                for(int x = 0; x < subSkill.getNumRanks(); x++)
-                {
-                    if(curRank > 0)
-                        prevRank = curRank;
-
-                    curRank = getSubSkillUnlockLevel(subSkill, x);
-
-                    //Do we really care if its below 0? Probably not
-                    if(curRank < 0)
-                        reasons.add(subSkill.getAdvConfigAddress() + ".Rank_Levels.Rank_"+curRank+".LevelReq should be above or equal to 0!");
-
-                    if(prevRank > curRank)
-                    {
-                        //We're going to allow this but we're going to warn them
-                        plugin.getLogger().info("You have the ranks for the subskill "+subSkill.toString()+" set up poorly, sequential ranks should have ascending requirements");
-                    }
-                }
-            }
-        }
-    }
 }

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

@@ -6,13 +6,14 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.InputStreamReader;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+import com.gmail.nossr50.metrics.MetricsManager;
+
 public abstract class AutoUpdateConfigLoader extends ConfigLoader {
     public AutoUpdateConfigLoader(String relativePath, String fileName) {
         super(relativePath, fileName);
@@ -25,7 +26,7 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
     @Override
     protected void loadFile() {
         super.loadFile();
-        FileConfiguration internalConfig = YamlConfiguration.loadConfiguration(plugin.getResourceAsReader(fileName));
+        FileConfiguration internalConfig = YamlConfiguration.loadConfiguration(plugin.getResource(fileName));
 
         Set<String> configKeys = config.getKeys(true);
         Set<String> internalConfigKeys = internalConfig.getKeys(true);
@@ -45,8 +46,8 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
         }
 
         for (String key : oldKeys) {
-            plugin.debug("Detected potentially unused key: " + key);
-            //config.set(key, null);
+            plugin.debug("Removing unused key: " + key);
+            config.set(key, null);
         }
 
         for (String key : newKeys) {
@@ -70,7 +71,7 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
             try {
                 // Read internal
                 BufferedReader reader = new BufferedReader(new InputStreamReader(plugin.getResource(fileName)));
-                LinkedHashMap<String, String> comments = new LinkedHashMap<String, String>();
+                HashMap<String, String> comments = new HashMap<String, String>();
                 String temp = "";
 
                 String line;
@@ -81,15 +82,6 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
                     else if (line.contains(":")) {
                         line = line.substring(0, line.indexOf(":") + 1);
                         if (!temp.isEmpty()) {
-                            if(comments.containsKey(line)) {
-                                int index = 0;
-                                while(comments.containsKey(line + index)) {
-                                    index++;
-                                }
-                                
-                                line = line + index;
-                            }
-
                             comments.put(line, temp);
                             temp = "";
                         }
@@ -97,20 +89,9 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
                 }
 
                 // Dump to the new one
-                HashMap<String, Integer> indexed = new HashMap<String, Integer>();
                 for (String key : comments.keySet()) {
-                    String actualkey = key.substring(0, key.indexOf(":") + 1);
-
-                    int index = 0;
-                    if(indexed.containsKey(actualkey)) {
-                        index = indexed.get(actualkey);
-                    }
-                    boolean isAtTop = !output.contains("\n" + actualkey);
-                    index = output.indexOf((isAtTop ? "" : "\n") + actualkey, index);
-
-                    if (index >= 0) {
-                        output = output.substring(0, index) + "\n" + comments.get(key) + output.substring(isAtTop ? index : index + 1);
-                        indexed.put(actualkey, index + comments.get(key).length() + actualkey.length() + 1);
+                    if (output.contains(key)) {
+                        output = output.substring(0, output.indexOf(key)) + comments.get(key) + output.substring(output.indexOf(key));
                     }
                 }
             }
@@ -135,5 +116,13 @@ public abstract class AutoUpdateConfigLoader extends ConfigLoader {
                 e.printStackTrace();
             }
         }
+        else {
+            for (String key : configKeys) {
+                if (!config.isConfigurationSection(key) && !config.get(key).equals(internalConfig.get(key))) {
+                    MetricsManager.customConfig();
+                    break;
+                }
+            }
+        }
     }
 }

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

@@ -1,20 +1,20 @@
 package com.gmail.nossr50.config;
 
-import com.gmail.nossr50.database.SQLDatabaseManager.PoolIdentifier;
-import com.gmail.nossr50.datatypes.MobHealthbarType;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.skills.SuperAbility;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
-import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.EntityType;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.Material;
+import org.bukkit.TreeSpecies;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.EntityType;
+
+import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.StringUtils;
+
 public class Config extends AutoUpdateConfigLoader {
     private static Config instance;
 
@@ -41,16 +41,6 @@ public class Config extends AutoUpdateConfigLoader {
             reason.add("General.Save_Interval should be greater than 0!");
         }
 
-        /* MySQL Settings */
-        for (PoolIdentifier identifier : PoolIdentifier.values()) {
-            if (getMySQLMaxConnections(identifier) <= 0) {
-                reason.add("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()) + " should be greater than 0!");
-            }
-            if (getMySQLMaxPoolSize(identifier) <= 0) {
-                reason.add("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()) + " should be greater than 0!");
-            }
-        }
-
         /* Mob Healthbar */
         if (getMobHealthbarTime() == 0) {
             reason.add("Mob_Healthbar.Display_Time cannot be 0! Set to -1 to disable or set a valid value.");
@@ -177,10 +167,6 @@ public class Config extends AutoUpdateConfigLoader {
             reason.add("Abilities.Limits.Tree_Feller_Threshold should be greater than 0!");
         }
 
-        if (getFishingLureModifier() < 0) {
-            reason.add("Abilities.Fishing.Lure_Modifier should be at least 0!");
-        }
-
         if (getDetonatorItem() == null) {
             reason.add("Skills.Mining.Detonator_Item is invalid!");
         }
@@ -244,16 +230,6 @@ public class Config extends AutoUpdateConfigLoader {
      */
 
     /* General Settings */
-
-    //Classic mode will default the value to true if the config file doesn't contain the entry (server is from a previous mcMMO install)
-    public boolean getClassicMode() { return config.getBoolean("General.Classic_Mode", true); }
-
-    //XP needed to level is multiplied by this when using classic mode
-    public int getClassicModeXPFormulaFactor() { return config.getInt("General.Skill_Scaling.Classic_XP_Formula_Factor", 1); }
-
-    //Level requirements for subskills is multiplied by this when using classic mode
-    public int getClassicModeLevelReqFactor() { return config.getInt("General.Skill_Scaling.Classic_LevelReq_Factor", 10); }
-
     public String getLocale() { return config.getString("General.Locale", "en_us"); }
     public boolean getMOTDEnabled() { return config.getBoolean("General.MOTD_Enabled", true); }
     public boolean getShowProfileLoadedMessage() { return config.getBoolean("General.Show_Profile_Loaded", true); }
@@ -276,9 +252,6 @@ public class Config extends AutoUpdateConfigLoader {
     public long getDatabasePlayerCooldown() { return config.getLong("Commands.Database.Player_Cooldown", 1750); }
 
     public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); }
-    public boolean getRefreshChunksEnabled() { return config.getBoolean("General.Refresh_Chunks", false); }
-
-    public boolean getMobHealthbarEnabled() { return config.getBoolean("Mob_Healthbar.Enabled", true); }
 
     /* Mob Healthbar */
     public MobHealthbarType getMobHealthbarDefault() {
@@ -295,10 +268,8 @@ public class Config extends AutoUpdateConfigLoader {
     /* Scoreboards */
     public boolean getPowerLevelTagsEnabled() { return config.getBoolean("Scoreboard.Power_Level_Tags", false); }
     public boolean getAllowKeepBoard() { return config.getBoolean("Scoreboard.Allow_Keep", true); }
-    public int getTipsAmount() { return config.getInt("Scoreboard.Tips_Amount", 5); }
     public boolean getShowStatsAfterLogin() { return config.getBoolean("Scoreboard.Show_Stats_After_Login", false); }
     public boolean getScoreboardRainbows() { return config.getBoolean("Scoreboard.Rainbows", false); }
-    public boolean getShowAbilityNames() { return config.getBoolean("Scoreboard.Ability_Names", true); }
 
     public boolean getRankUseChat() { return config.getBoolean("Scoreboard.Types.Rank.Print", false); }
     public boolean getRankUseBoard() { return config.getBoolean("Scoreboard.Types.Rank.Board", true); }
@@ -343,8 +314,8 @@ public class Config extends AutoUpdateConfigLoader {
     public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
     public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
     public String getMySQLUserPassword() { return getStringIncludingInts("MySQL.Database.User_Password"); }
-    public int getMySQLMaxConnections(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()), 30); }
-    public int getMySQLMaxPoolSize(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()), 10); }
+    public int getMySQLMaxConnections() { return config.getInt("MySQL.Database.MaxConnections"); }
+    public int getMySQLMaxPoolSize() { return config.getInt("MySQL.Database.MaxPoolSize"); }
 
     private String getStringIncludingInts(String key) {
         String str = config.getString(key);
@@ -360,16 +331,16 @@ public class Config extends AutoUpdateConfigLoader {
     }
 
     /* Hardcore Mode */
-    public boolean getHardcoreStatLossEnabled(PrimarySkill primarySkill) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), false); }
-    public void setHardcoreStatLossEnabled(PrimarySkill primarySkill, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), enabled); }
+    public boolean getHardcoreStatLossEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
+    public void setHardcoreStatLossEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Death_Stat_Loss.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
 
     public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss.Penalty_Percentage", 75.0D); }
     public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss.Penalty_Percentage", value); }
 
     public int getHardcoreDeathStatPenaltyLevelThreshold() { return config.getInt("Hardcore.Death_Stat_Loss.Level_Threshold", 0); }
 
-    public boolean getHardcoreVampirismEnabled(PrimarySkill primarySkill) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), false); }
-    public void setHardcoreVampirismEnabled(PrimarySkill primarySkill, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(primarySkill.toString()), enabled); }
+    public boolean getHardcoreVampirismEnabled(SkillType skillType) { return config.getBoolean("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), false); }
+    public void setHardcoreVampirismEnabled(SkillType skillType, boolean enabled) { config.set("Hardcore.Vampirism.Enabled." + StringUtils.getCapitalized(skillType.toString()), enabled); }
 
     public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism.Leech_Percentage", 5.0D); }
     public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism.Leech_Percentage", value); }
@@ -388,23 +359,17 @@ public class Config extends AutoUpdateConfigLoader {
     public Material getChimaeraItem() { return Material.matchMaterial(config.getString("Items.Chimaera_Wing.Item_Name", "Feather")); }
     public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
     public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); }
-    public boolean getChimaeraUseBedSpawn() { return config.getBoolean("Items.Chimaera_Wing.Use_Bed_Spawn", true); }
     public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
     public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); }
     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 */
     public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
     public boolean getAbilityDeactivationEffectEnabled() { return config.getBoolean("Particles.Ability_Deactivation", true); }
-    public boolean getBleedEffectEnabled() { return config.getBoolean("Particles.Bleed", true); }
     public boolean getDodgeEffectEnabled() { return config.getBoolean("Particles.Dodge", true); }
-    public boolean getFluxEffectEnabled() { return config.getBoolean("Particles.Flux", true); }
+    public boolean getBleedEffectEnabled() { return config.getBoolean("Particles.Bleed", true); }
     public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
-    public boolean getCallOfTheWildEffectEnabled() { return config.getBoolean("Particles.Call_of_the_Wild", true); }
     public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); }
     public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); }
     public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); }
@@ -448,10 +413,9 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getAbilityMessagesEnabled() { return config.getBoolean("Abilities.Messages", true); }
     public boolean getAbilitiesEnabled() { return config.getBoolean("Abilities.Enabled", true); }
     public boolean getAbilitiesOnlyActivateWhenSneaking() { return config.getBoolean("Abilities.Activation.Only_Activate_When_Sneaking", false); }
-    public boolean getAbilitiesGateEnabled() { return config.getBoolean("Abilities.Activation.Level_Gate_Abilities"); }
 
-    public int getCooldown(SuperAbility ability) { return config.getInt("Abilities.Cooldowns." + ability.toString()); }
-    public int getMaxLength(SuperAbility ability) { return config.getInt("Abilities.Max_Seconds." + ability.toString()); }
+    public int getCooldown(AbilityType ability) { return config.getInt("Abilities.Cooldowns." + ability.toString()); }
+    public int getMaxLength(AbilityType ability) { return config.getInt("Abilities.Max_Seconds." + ability.toString()); }
 
     /* Durability Settings */
     public int getAbilityToolDamage() { return config.getInt("Abilities.Tools.Durability_Loss", 1); }
@@ -462,13 +426,11 @@ public class Config extends AutoUpdateConfigLoader {
     /*
      * SKILL SETTINGS
      */
-    public boolean getDoubleDropsEnabled(PrimarySkill skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
+    public boolean getDoubleDropsEnabled(SkillType skill, Material material) { return config.getBoolean("Double_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
 
-    public boolean getDoubleDropsDisabled(PrimarySkill skill) {
+    public boolean getDoubleDropsDisabled(SkillType skill) {
         String skillName = StringUtils.getCapitalized(skill.toString());
         ConfigurationSection section = config.getConfigurationSection("Double_Drops." + skillName);
-        if (section == null)
-            return false;
         Set<String> keys = section.getKeys(false);
         boolean disabled = true;
 
@@ -482,9 +444,6 @@ public class Config extends AutoUpdateConfigLoader {
         return disabled;
     }
 
-    /* Axes */
-    public int getAxesGate() { return config.getInt("Skills.Axes.Ability_Activation_Level_Gate", 10); }
-
     /* Acrobatics */
     public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
     public int getXPAfterTeleportCooldown() { return config.getInt("Skills.Acrobatics.XP_After_Teleport_Cooldown", 5); }
@@ -498,14 +457,9 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getFishingDropsEnabled() { return config.getBoolean("Skills.Fishing.Drops_Enabled", true); }
     public boolean getFishingOverrideTreasures() { return config.getBoolean("Skills.Fishing.Override_Vanilla_Treasures", true); }
     public boolean getFishingExtraFish() { return config.getBoolean("Skills.Fishing.Extra_Fish", true); }
-    public double getFishingLureModifier() { return config.getDouble("Skills.Fishing.Lure_Modifier", 4.0D); }
 
     /* Mining */
     public Material getDetonatorItem() { return Material.matchMaterial(config.getString("Skills.Mining.Detonator_Name", "FLINT_AND_STEEL")); }
-    public int getMiningGate() { return config.getInt("Skills.Mining.Ability_Activation_Level_Gate", 10); }
-
-    /* Excavation */
-    public int getExcavationGate() { return config.getInt("Skills.Excavation.Ability_Activation_Level_Gate", 10); }
 
     /* Repair */
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
@@ -524,24 +478,16 @@ public class Config extends AutoUpdateConfigLoader {
     /* Unarmed */
     public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }
     public boolean getUnarmedItemPickupDisabled() { return config.getBoolean("Skills.Unarmed.Item_Pickup_Disabled_Full_Inventory", true); }
-    public boolean getUnarmedItemsAsUnarmed() { return config.getBoolean("Skills.Unarmed.Items_As_Unarmed", false); }
-    public int getUnarmedGate() { return config.getInt("Skills.Unarmed.Ability_Activation_Level_Gate", 10); }
-
-    /* Swords */
-    public int getSwordsGate() { return config.getInt("Skills.Swords.Ability_Activation_Level_Gate", 10); }
 
     /* Taming */
     public Material getTamingCOTWMaterial(EntityType type) { return Material.matchMaterial(config.getString("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Material")); }
     public int getTamingCOTWCost(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Amount"); }
     public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Summon_Amount"); }
-    public int getTamingCOTWLength(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ ".Summon_Length"); }
-    public int getTamingCOTWMaxAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ ".Summon_Max_Amount"); }
     public double getTamingCOTWRange() { return config.getDouble("Skills.Taming.Call_Of_The_Wild.Range", 40.0D); }
 
     /* Woodcutting */
-    public boolean getWoodcuttingDoubleDropsEnabled(BlockData material) { return config.getBoolean("Double_Drops.Woodcutting." + StringUtils.getFriendlyConfigBlockDataString(material)); }
+    public boolean getWoodcuttingDoubleDropsEnabled(TreeSpecies species) { return config.getBoolean("Double_Drops.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_")); }
     public boolean getTreeFellerSoundsEnabled() { return config.getBoolean("Skills.Woodcutting.Tree_Feller_Sounds", true); }
-    public int getWoodcuttingGate() { return config.getInt("Skills.Woodcutting.Ability_Activation_Level_Gate", 10); }
 
     /* AFK Leveling */
     public boolean getAcrobaticsPreventAFK() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); }
@@ -554,20 +500,12 @@ public class Config extends AutoUpdateConfigLoader {
         return (cap <= 0) ? Integer.MAX_VALUE : cap;
     }
 
-    public int getLevelCap(PrimarySkill skill) {
+    public int getLevelCap(SkillType skill) {
         int cap = config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Level_Cap");
         return (cap <= 0) ? Integer.MAX_VALUE : cap;
     }
 
-    public int getSkillAbilityGate(PrimarySkill skill) {
-        return config.getInt("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Ability_Activation_Level_Gate");
-    }
-
-    public boolean getTruncateSkills() { return config.getBoolean("General.TruncateSkills", false); }
-
     /* PVP & PVE Settings */
-    public boolean getPVPEnabled(PrimarySkill skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
-    public boolean getPVEEnabled(PrimarySkill skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
-    
-    public float getMasterVolume() { return (float) config.getDouble("Sounds.MasterVolume", 1.0); }
+    public boolean getPVPEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVP", true); }
+    public boolean getPVEEnabled(SkillType skill) { return config.getBoolean("Skills." + StringUtils.getCapitalized(skill.toString()) + ".Enabled_For_PVE", true); }
 }

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

@@ -1,24 +1,21 @@
 package com.gmail.nossr50.config;
 
-import java.io.InputStreamReader;
-
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import com.gmail.nossr50.mcMMO;
 
 public class HiddenConfig {
     private static HiddenConfig instance;
-    private String fileName;
-    private YamlConfiguration config;
-    private boolean chunkletsEnabled;
-    private int conversionRate;
-    private boolean useEnchantmentBuffs;
-    private int uuidConvertAmount;
-    private int mojangRateLimit;
-    private long mojangLimitPeriod;
+    private static String fileName;
+    private static YamlConfiguration config;
+    private static boolean chunkletsEnabled;
+    private static int conversionRate;
+    private static boolean useEnchantmentBuffs;
+    private static boolean resendChunksAfterBlockAbility;
+    private static int uuidConvertAmount;
 
     public HiddenConfig(String fileName) {
-        this.fileName = fileName;
+        HiddenConfig.fileName = fileName;
         load();
     }
 
@@ -31,15 +28,13 @@ public class HiddenConfig {
     }
 
     public void load() {
-        InputStreamReader reader = mcMMO.p.getResourceAsReader(fileName);
-        if (reader != null) {
-            config = YamlConfiguration.loadConfiguration(reader);
+        if (mcMMO.p.getResource(fileName) != null) {
+            config = YamlConfiguration.loadConfiguration(mcMMO.p.getResource(fileName));
             chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
             conversionRate = config.getInt("Options.ConversionRate", 1);
             useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
+            resendChunksAfterBlockAbility = config.getBoolean("Options.RefreshChunks", false);
             uuidConvertAmount = config.getInt("Options.UUIDConvertAmount", 5);
-            mojangRateLimit = config.getInt("Options.MojangRateLimit", 50000);
-            mojangLimitPeriod = config.getLong("Options.MojangLimitPeriod", 600000);
         }
     }
 
@@ -55,15 +50,11 @@ public class HiddenConfig {
         return useEnchantmentBuffs;
     }
 
+    public boolean resendChunksAfterBlockAbility() {
+        return resendChunksAfterBlockAbility;
+    }
+
     public int getUUIDConvertAmount() {
         return uuidConvertAmount;
     }
-
-    public int getMojangRateLimit() {
-        return mojangRateLimit;
-    }
-
-    public long getMojangLimitPeriod() {
-        return mojangLimitPeriod;
-    }
 }

src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java

@@ -1,17 +1,21 @@
 package com.gmail.nossr50.config.experience;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.GrassSpecies;
+import org.bukkit.Material;
+import org.bukkit.TreeSpecies;
+import org.bukkit.entity.EntityType;
+import org.bukkit.material.LongGrass;
+import org.bukkit.material.MaterialData;
+
 import com.gmail.nossr50.config.AutoUpdateConfigLoader;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.datatypes.skills.MaterialType;
-import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
 import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.EntityType;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class ExperienceConfig extends AutoUpdateConfigLoader {
     private static ExperienceConfig instance;
@@ -68,11 +72,6 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
             reason.add("Experience_Formula.Mobspawners.Multiplier should be at least 0!");
         }
 
-        /* Bred Mob modifier */
-        if (getBredMobXpMultiplier() < 0) {
-            reason.add("Experience_Formula.Breeding.Multiplier should be at least 0!");
-        }
-
         /* Conversion */
         if (getExpModifier() <= 0) {
             reason.add("Conversion.Exp_Modifier should be greater than 0!");
@@ -89,16 +88,15 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
             }
         }
 
-        /* Archery */
-        if (getArcheryDistanceMultiplier() < 0) {
-            reason.add("Experience.Archery.Distance_Multiplier should be at least 0!");
-        }
-
         /* Combat XP Multipliers */
         if (getAnimalsXP() < 0) {
             reason.add("Experience.Combat.Multiplier.Animals should be at least 0!");
         }
 
+        if (getWitherSkeletonXP() < 0) {
+            reason.add("Experience.Combat.Multiplier.Wither_Skeleton should be at least 0!");
+        }
+
         if (getDodgeXPModifier() < 0) {
             reason.add("Skills.Acrobatics.Dodge_XP_Modifier should be at least 0!");
         }
@@ -124,14 +122,31 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
         }
 
         /* Taming */
-        if (getTamingXP(EntityType.WOLF) <= 0) {
+        if (getTamingXPWolf() <= 0) {
             reason.add("Experience.Taming.Animal_Taming.Wolf should be greater than 0!");
         }
 
-        if (getTamingXP(EntityType.OCELOT) <= 0) {
+        if (getTamingXPOcelot() <= 0) {
             reason.add("Experience.Taming.Animal_Taming.Ocelot should be greater than 0!");
         }
 
+        /* Woodcutting */
+        for (TreeSpecies species : TreeSpecies.values()) {
+            String key = "Experience.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_");
+
+            if (config.getInt(key) <= 0) {
+                reason.add(key + " should be greater than 0!");
+            }
+        }
+
+        if (getWoodcuttingXPHugeBrownMushroom() <= 0) {
+            reason.add("Experience.Woodcutting.Huge_Mushroom_Brown should be greater than 0!");
+        }
+
+        if (getWoodcuttingXPHugeRedMushroom() <= 0) {
+            reason.add("Experience.Woodcutting.Huge_Mushroom_Red should be greater than 0!");
+        }
+
         return noErrorsInConfig(reason);
     }
 
@@ -157,19 +172,13 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
 
     /* Spawned Mob modifier */
     public double getSpawnedMobXpMultiplier() { return config.getDouble("Experience_Formula.Mobspawners.Multiplier", 0.0); }
-    public double getBredMobXpMultiplier() { return config.getDouble("Experience_Formula.Breeding.Multiplier", 1.0); }
 
     /* Skill modifiers */
-    public double getFormulaSkillModifier(PrimarySkill skill) { return config.getDouble("Experience_Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
+    public double getFormulaSkillModifier(SkillType skill) { return config.getDouble("Experience_Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
 
     /* Custom XP perk */
     public double getCustomXpPerkBoost() { return config.getDouble("Experience_Formula.Custom_XP_Perk.Boost", 1.25); }
 
-    /* Diminished Returns */
-    public boolean getDiminishedReturnsEnabled() { return config.getBoolean("Diminished_Returns.Enabled", false); }
-    public int getDiminishedReturnsThreshold(PrimarySkill skill) { return config.getInt("Diminished_Returns.Threshold." + StringUtils.getCapitalized(skill.toString()), 20000); }
-    public int getDiminishedReturnsTimeInterval() { return config.getInt("Diminished_Returns.Time_Interval", 10); }
-
     /* Conversion */
     public double getExpModifier() { return config.getDouble("Conversion.Exp_Modifier", 1); }
 
@@ -182,67 +191,11 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
 
     /* Combat XP Multipliers */
     public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
-    public double getAnimalsXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_"), getAnimalsXP()); }
     public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
-    public boolean hasCombatXP(EntityType entity) {return config.contains("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
+    public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
 
     /* Materials  */
-    public int getXp(PrimarySkill skill, Material data)
-    {
-        String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + ".";
-        String explicitString = baseString + StringUtils.getExplicitConfigMaterialString(data);
-        if (config.contains(explicitString))
-            return config.getInt(explicitString);
-        String friendlyString = baseString + StringUtils.getFriendlyConfigMaterialString(data);
-        if (config.contains(friendlyString))
-            return config.getInt(friendlyString);
-        String wildcardString = baseString + StringUtils.getWildcardConfigMaterialString(data);
-        if (config.contains(wildcardString))
-            return config.getInt(wildcardString);
-        return 0;
-    }
-
-    /* Materials  */
-    public int getXp(PrimarySkill skill, BlockData data)
-    {
-        String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + ".";
-        String explicitString = baseString + StringUtils.getExplicitConfigBlockDataString(data);
-        if (config.contains(explicitString))
-            return config.getInt(explicitString);
-        String friendlyString = baseString + StringUtils.getFriendlyConfigBlockDataString(data);
-        if (config.contains(friendlyString))
-            return config.getInt(friendlyString);
-        String wildcardString = baseString + StringUtils.getWildcardConfigBlockDataString(data);
-        if (config.contains(wildcardString))
-            return config.getInt(wildcardString);
-        return 0;
-    }
-
-    public boolean isSkillBlock(PrimarySkill skill, Material data)
-    {
-        String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + ".";
-        String explicitString = baseString + StringUtils.getExplicitConfigMaterialString(data);
-        if (config.contains(explicitString))
-            return true;
-        String friendlyString = baseString + StringUtils.getFriendlyConfigMaterialString(data);
-        if (config.contains(friendlyString))
-            return true;
-        String wildcardString = baseString + StringUtils.getWildcardConfigMaterialString(data);
-        return config.contains(wildcardString);
-    }
-
-    public boolean isSkillBlock(PrimarySkill skill, BlockData data)
-    {
-        String baseString = "Experience." + StringUtils.getCapitalized(skill.toString()) + ".";
-        String explicitString = baseString + StringUtils.getExplicitConfigBlockDataString(data);
-        if (config.contains(explicitString))
-            return true;
-        String friendlyString = baseString + StringUtils.getFriendlyConfigBlockDataString(data);
-        if (config.contains(friendlyString))
-            return true;
-        String wildcardString = baseString + StringUtils.getWildcardConfigBlockDataString(data);
-        return config.contains(wildcardString);
-    }
+    public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
 
     /* Acrobatics */
     public int getDodgeXPModifier() { return config.getInt("Experience.Acrobatics.Dodge", 120); }
@@ -254,18 +207,125 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
     /* Alchemy */
     public double getPotionXP(PotionStage stage) { return config.getDouble("Experience.Alchemy.Potion_Stage_" + stage.toNumerical(), 10D); }
 
-    /* Archery */
-    public double getArcheryDistanceMultiplier() { return config.getDouble("Experience.Archery.Distance_Multiplier", 0.025); }
+    /* Fishing */
+    public int getFishXp(MaterialData data) {
+        switch (data.getData()) {
+            case 0x0:
+                return config.getInt("Experience.Fishing.Raw_Fish", 800);
+
+            case 0x1:
+                return config.getInt("Experience.Fishing.Raw_Salmon", 800);
+
+            case 0x2:
+                return config.getInt("Experience.Fishing.Clownfish", 800);
+
+            case 0x3:
+                return config.getInt("Experience.Fishing.Pufferfish", 800);
+
+            default:
+                return 0;
+        }
+    }
 
     public int getFishingShakeXP() { return config.getInt("Experience.Fishing.Shake", 50); }
 
+    /* Herbalism */
+    public int getFlowerAndGrassXp(MaterialData data) {
+        Material type = data.getItemType();
+
+        if (type == Material.RED_ROSE) {
+            switch (data.getData()) {
+                case 0x0:
+                    return config.getInt("Experience.Herbalism.Poppy", 100);
+
+                case 0x1:
+                    return config.getInt("Experience.Herbalism.Blue_Orchid", 150);
+
+                case 0x2:
+                    return config.getInt("Experience.Herbalism.Allium", 300);
+
+                case 0x3:
+                    return config.getInt("Experience.Herbalism.Azure_Bluet", 150);
+
+                case 0x4:
+                    return config.getInt("Experience.Herbalism.Red_Tulip", 150);
+
+                case 0x5:
+                    return config.getInt("Experience.Herbalism.Orange_Tulip", 150);
+
+                case 0x6:
+                    return config.getInt("Experience.Herbalism.White_Tulip", 150);
+
+                case 0x7:
+                    return config.getInt("Experience.Herbalism.Pink_Tulip", 150);
+
+                case 0x8:
+                    return config.getInt("Experience.Herbalism.Oxeye_Daisy", 150);
+
+                default:
+                    return 0;
+            }
+
+        }
+        else if (type == Material.LONG_GRASS) {
+            GrassSpecies species = ((LongGrass) data).getSpecies();
+            if (species == null) {
+                return 0;
+            }
+
+            switch (species) {
+                case DEAD:
+                    return config.getInt("Experience.Herbalism.Dead_Bush", 30);
+
+                case FERN_LIKE:
+                    return config.getInt("Experience.Herbalism.Small_Fern", 10);
+
+                case NORMAL:
+                    return config.getInt("Experience.Herbalism.Small_Grass", 10);
+
+                default:
+                    return 0;
+            }
+        }
+        else if (type == Material.DOUBLE_PLANT) {
+            switch (data.getData()) {
+                case 0x0:
+                    return config.getInt("Experience.Herbalism.Sunflower", 50);
+
+                case 0x1:
+                    return config.getInt("Experience.Herbalism.Lilac", 50);
+
+                case 0x2:
+                    return config.getInt("Experience.Herbalism.Tall_Grass", 50);
+
+                case 0x3:
+                    return config.getInt("Experience.Herbalism.Tall_Fern", 50);
+
+                case 0x4:
+                    return config.getInt("Experience.Herbalism.Rose_Bush", 50);
+
+                case 0x5:
+                    return config.getInt("Experience.Herbalism.Peony", 50);
+
+                default:
+                    return 0;
+            }
+        }
+
+        return 0;
+    }
+
     /* Repair */
     public double getRepairXPBase() { return config.getDouble("Experience.Repair.Base", 1000.0); }
     public double getRepairXP(MaterialType repairMaterialType) { return config.getDouble("Experience.Repair." + StringUtils.getCapitalized(repairMaterialType.toString())); }
 
     /* Taming */
-    public int getTamingXP(EntityType type)
-    {
-        return config.getInt("Experience.Taming.Animal_Taming." + StringUtils.getPrettyEntityTypeString(type));
-    }
+    public int getTamingXPHorse() { return config.getInt("Experience.Taming.Animal_Taming.Horse", 1000); }
+    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
+    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
+
+    /* Woodcutting */
+    public int getWoodcuttingTreeXP(TreeSpecies species) { return config.getInt("Experience.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_")); }
+    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
+    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
 }

src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java

@@ -72,7 +72,7 @@ public class CustomArmorConfig extends ConfigLoader {
             boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
             Material repairMaterial = Material.matchMaterial(config.getString(armorType + "." + armorName + ".Repair_Material", ""));
 
-            if (repairable && (repairMaterial == null)) {
+            if (repairMaterial == null) {
                 plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + armorName);
                 repairable = false;
             }
@@ -82,7 +82,7 @@ public class CustomArmorConfig extends ConfigLoader {
                 int repairQuantity = SkillUtils.getRepairAndSalvageQuantities(new ItemStack(armorMaterial), repairMaterial, repairData);
 
                 if (repairQuantity == 0) {
-                    repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Quantity", 2);
+                    repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Quantity", 2);
                 }
 
                 String repairItemName = config.getString(armorType + "." + armorName + ".Repair_Material_Pretty_Name");

src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java

@@ -1,27 +1,29 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.material.MaterialData;
+
+import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.datatypes.mods.CustomBlock;
+
 public class CustomBlockConfig extends ConfigLoader {
     private boolean needsUpdate = false;
 
-    public List<Material> customExcavationBlocks  = new ArrayList<>();
-    public List<Material> customHerbalismBlocks   = new ArrayList<>();
-    public List<Material> customMiningBlocks      = new ArrayList<>();
-    public List<Material> customOres              = new ArrayList<>();
-    public List<Material> customLogs              = new ArrayList<>();
-    public List<Material> customLeaves            = new ArrayList<>();
-    public List<Material> customAbilityBlocks     = new ArrayList<>();
+    public List<MaterialData> customExcavationBlocks  = new ArrayList<MaterialData>();
+    public List<MaterialData> customHerbalismBlocks   = new ArrayList<MaterialData>();
+    public List<MaterialData> customMiningBlocks      = new ArrayList<MaterialData>();
+    public List<MaterialData> customOres              = new ArrayList<MaterialData>();
+    public List<MaterialData> customLogs              = new ArrayList<MaterialData>();
+    public List<MaterialData> customLeaves            = new ArrayList<MaterialData>();
+    public List<MaterialData> customAbilityBlocks     = new ArrayList<MaterialData>();
 
-    public HashMap<Material, CustomBlock> customBlockMap = new HashMap<>();
+    public HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
 
     protected CustomBlockConfig(String fileName) {
         super("mods", fileName);
@@ -42,7 +44,7 @@ public class CustomBlockConfig extends ConfigLoader {
         }
     }
 
-    private void loadBlocks(String skillType, List<Material> blockList) {
+    private void loadBlocks(String skillType, List<MaterialData> blockList) {
         if (needsUpdate) {
             return;
         }
@@ -56,7 +58,7 @@ public class CustomBlockConfig extends ConfigLoader {
         Set<String> skillConfigSet = skillSection.getKeys(false);
 
         for (String blockName : skillConfigSet) {
-            if (config.contains(skillType + "." + blockName + ".Drop_Item")) {
+            if (config.contains(skillType + "." + blockName + "." + ".Drop_Item")) {
                 needsUpdate = true;
                 return;
             }
@@ -70,8 +72,11 @@ public class CustomBlockConfig extends ConfigLoader {
                 continue;
             }
 
+            byte blockData = (blockInfo.length == 2) ? Byte.valueOf(blockInfo[1]) : 0;
+            MaterialData blockMaterialData = new MaterialData(blockMaterial, blockData);
+
             if (blockList != null) {
-                blockList.add(blockMaterial);
+                blockList.add(blockMaterialData);
             }
 
             if (skillType.equals("Ability_Blocks")) {
@@ -82,20 +87,20 @@ public class CustomBlockConfig extends ConfigLoader {
             int smeltingXp = 0;
 
             if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
-                customOres.add(blockMaterial);
+                customOres.add(blockMaterialData);
                 smeltingXp = config.getInt(skillType + "." + blockName + ".Smelting_XP_Gain", xp / 10);
             }
             else if (skillType.equals("Woodcutting")) {
                 if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
-                    customLogs.add(blockMaterial);
+                    customLogs.add(blockMaterialData);
                 }
                 else {
-                    customLeaves.add(blockMaterial);
+                    customLeaves.add(blockMaterialData);
                     xp = 0; // Leaves don't grant XP
                 }
             }
 
-            customBlockMap.put(blockMaterial, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
+            customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
         }
     }
 }

src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java

@@ -3,7 +3,7 @@ package com.gmail.nossr50.config.mods;
 import java.util.HashMap;
 
 import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomEntity;
@@ -54,7 +54,7 @@ public class CustomEntityConfig extends ConfigLoader {
                 canBeSummoned = false;
             }
 
-            CustomEntity entity = new CustomEntity(xpMultiplier, canBeTamed, tamingXp, canBeSummoned, (canBeSummoned ? new ItemStack(callOfTheWildMaterial) : null), callOfTheWildAmount);
+            CustomEntity entity = new CustomEntity(xpMultiplier, canBeTamed, tamingXp, canBeSummoned, (canBeSummoned ? new MaterialData(callOfTheWildMaterial, callOfTheWildData).toItemStack(1) : null), callOfTheWildAmount);
 
             customEntityTypeMap.put(entityTypeName, entity);
             customEntityClassMap.put(clazz == null ? null : clazz.getName(), entity);

src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java

@@ -80,7 +80,7 @@ public class CustomToolConfig extends ConfigLoader {
             boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
             Material repairMaterial = Material.matchMaterial(config.getString(toolType + "." + toolName + ".Repair_Material", ""));
 
-            if (repairable && (repairMaterial == null)) {
+            if (repairMaterial == null) {
                 plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + toolName);
                 repairable = false;
             }
@@ -90,7 +90,7 @@ public class CustomToolConfig extends ConfigLoader {
                 int repairQuantity = SkillUtils.getRepairAndSalvageQuantities(new ItemStack(toolMaterial), repairMaterial, repairData);
 
                 if (repairQuantity == 0) {
-                    repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Quantity", 2);
+                    repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Quantity", 2);
                 }
 
                 String repairItemName = config.getString(toolType + "." + toolName + ".Repair_Material_Pretty_Name");

src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java

@@ -5,16 +5,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.bukkit.ChatColor;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.Potion;
-import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.bukkit.potion.PotionType;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.ConfigLoader;
@@ -32,7 +27,7 @@ public class PotionConfig extends ConfigLoader {
     private List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
     private List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
 
-    private Map<String, AlchemyPotion> potionMap = new HashMap<String, AlchemyPotion>();
+    private Map<Short, AlchemyPotion> potionMap = new HashMap<Short, AlchemyPotion>();
 
     private PotionConfig() {
         super("potions.yml");
@@ -94,11 +89,11 @@ public class PotionConfig extends ConfigLoader {
         int pass = 0;
         int fail = 0;
 
-        for (String potionName : potionSection.getKeys(false)) {
-            AlchemyPotion potion = loadPotion(potionSection.getConfigurationSection(potionName));
+        for (String dataValue : potionSection.getKeys(false)) {
+            AlchemyPotion potion = loadPotion(potionSection.getConfigurationSection(dataValue));
 
             if (potion != null) {
-                potionMap.put(potionName, potion);
+                potionMap.put(potion.getDataValue(), potion);
                 pass++;
             }
             else {
@@ -119,33 +114,14 @@ public class PotionConfig extends ConfigLoader {
      */
     private AlchemyPotion loadPotion(ConfigurationSection potion_section) {
         try {
-            
+            short dataValue = Short.parseShort(potion_section.getName());
 
             String name = potion_section.getString("Name");
-            if (name != null) {
-                name = ChatColor.translateAlternateColorCodes('&', name);
-            }
-            
-            PotionData data;
-            if (!potion_section.contains("PotionData")) { // Backwards config compatability
-                short dataValue = Short.parseShort(potion_section.getName());
-                Potion potion = Potion.fromDamage(dataValue);
-                data = new PotionData(potion.getType(), potion.hasExtendedDuration(), potion.getLevel() == 2);
-            } else {
-                ConfigurationSection potionData = potion_section.getConfigurationSection("PotionData");
-                data = new PotionData(PotionType.valueOf(potionData.getString("PotionType", "WATER")), potionData.getBoolean("Extended", false), potionData.getBoolean("Upgraded", false));
-            }
-            
-            Material material = Material.POTION;
-            String mat = potion_section.getString("Material", null);
-            if (mat != null) {
-                material = Material.valueOf(mat);
-            }
 
             List<String> lore = new ArrayList<String>();
             if (potion_section.contains("Lore")) {
                 for (String line : potion_section.getStringList("Lore")) {
-                    lore.add(ChatColor.translateAlternateColorCodes('&', line));
+                    lore.add(line);
                 }
             }
 
@@ -166,21 +142,13 @@ public class PotionConfig extends ConfigLoader {
                     }
                 }
             }
-            
-            Color color = null;
-            if (potion_section.contains("Color")) {
-                color = Color.fromRGB(potion_section.getInt("Color"));
-            }
-            else {
-                color = this.generateColor(effects);
-            }
 
-            Map<ItemStack, String> children = new HashMap<ItemStack, String>();
+            Map<ItemStack, Short> children = new HashMap<ItemStack, Short>();
             if (potion_section.contains("Children")) {
                 for (String child : potion_section.getConfigurationSection("Children").getKeys(false)) {
                     ItemStack ingredient = loadIngredient(child);
                     if (ingredient != null) {
-                        children.put(ingredient, potion_section.getConfigurationSection("Children").getString(child));
+                        children.put(ingredient, Short.parseShort(potion_section.getConfigurationSection("Children").getString(child)));
                     }
                     else {
                         mcMMO.p.getLogger().warning("Failed to parse child for potion " + name + ": " + child);
@@ -188,7 +156,7 @@ public class PotionConfig extends ConfigLoader {
                 }
             }
 
-            return new AlchemyPotion(material, data, name, lore, effects, color, children);
+            return new AlchemyPotion(dataValue, name, lore, effects, children);
         }
         catch (Exception e) {
             mcMMO.p.getLogger().warning("Failed to load Alchemy potion: " + potion_section.getName());
@@ -210,10 +178,13 @@ public class PotionConfig extends ConfigLoader {
             return null;
         }
 
-        Material material = Material.getMaterial(ingredient);
+        String[] parts = ingredient.split(":");
+
+        Material material = parts.length > 0 ? Material.getMaterial(parts[0]) : null;
+        short data = parts.length > 1 ? Short.parseShort(parts[1]) : 0;
 
         if (material != null) {
-            return new ItemStack(material, 1);
+            return new ItemStack(material, 1, data);
         }
 
         return null;
@@ -242,51 +213,10 @@ public class PotionConfig extends ConfigLoader {
     }
 
     public boolean isValidPotion(ItemStack item) {
-        return getPotion(item) != null;
+        return potionMap.containsKey(item.getDurability());
     }
 
-    public AlchemyPotion getPotion(String name) {
-        return potionMap.get(name);
+    public AlchemyPotion getPotion(short durability) {
+        return potionMap.get(durability);
     }
-    
-    public AlchemyPotion getPotion(ItemStack item) {
-        for (AlchemyPotion potion : potionMap.values()) {
-            if (potion.isSimilar(item)) {
-                return potion;
-            }
-        }
-        return null;
-    }
-    
-    public Color generateColor(List<PotionEffect> effects) {
-        if (effects != null && !effects.isEmpty()) {
-            List<Color> colors = new ArrayList<Color>();
-            for (PotionEffect effect : effects) {
-                if (effect.getType().getColor() != null) {
-                    colors.add(effect.getType().getColor());
-                }
-            }
-            if (!colors.isEmpty()) {
-                if (colors.size() > 1) {
-                    return calculateAverageColor(colors);
-                }
-                return colors.get(0);
-            }
-        }
-        return null;
-    }
-    
-    public Color calculateAverageColor(List<Color> colors) {
-        int red = 0;
-        int green = 0;
-        int blue = 0;
-        for (Color color : colors) {
-            red += color.getRed();
-            green += color.getGreen();
-            blue += color.getBlue();
-        }
-        Color color = Color.fromRGB(red/colors.size(), green/colors.size(), blue/colors.size());
-        return color;
-    }
-    
 }

src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java

@@ -1,36 +1,70 @@
 package com.gmail.nossr50.config.treasure;
 
-import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.treasure.*;
-import com.gmail.nossr50.util.EnchantmentUtils;
-import com.gmail.nossr50.util.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.Tag;
-import org.bukkit.TreeSpecies;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.EntityType;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.potion.PotionData;
-import org.bukkit.potion.PotionType;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-public class TreasureConfig extends ConfigLoader {
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.material.Dye;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionType;
 
+import com.gmail.nossr50.config.ConfigLoader;
+import com.gmail.nossr50.datatypes.treasure.EnchantmentTreasure;
+import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
+import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
+import com.gmail.nossr50.datatypes.treasure.HylianTreasure;
+import com.gmail.nossr50.datatypes.treasure.Rarity;
+import com.gmail.nossr50.datatypes.treasure.ShakeTreasure;
+import com.gmail.nossr50.util.EnchantmentUtils;
+
+public class TreasureConfig extends ConfigLoader {
     private static TreasureConfig instance;
 
-    public HashMap<String, List<ExcavationTreasure>> excavationMap = new HashMap<String, List<ExcavationTreasure>>();
+    public List<ExcavationTreasure> excavationFromDirt      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGrass     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSand      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromGravel    = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromClay      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromMycel     = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSoulSand  = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromSnow      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromRedSand   = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromPodzol    = new ArrayList<ExcavationTreasure>();
 
-    public HashMap<EntityType, List<ShakeTreasure>> shakeMap  = new HashMap<EntityType, List<ShakeTreasure>>();
-    public HashMap<String, List<HylianTreasure>>    hylianMap = new HashMap<String, List<HylianTreasure>>();
+    public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
+    public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
+    public List<HylianTreasure> hylianFromPots    = new ArrayList<HylianTreasure>();
 
-    public HashMap<Rarity, List<FishingTreasure>>     fishingRewards      = new HashMap<Rarity, List<FishingTreasure>>();
+    public List<ShakeTreasure> shakeFromBlaze       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromCaveSpider  = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromSpider      = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromChicken     = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromCow         = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromCreeper     = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromEnderman    = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromGhast       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromHorse       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromIronGolem   = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromMagmaCube   = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromMushroomCow = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromPig         = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromPigZombie   = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromSheep       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromSkeleton    = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromSlime       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromSnowman     = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromSquid       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromWitch       = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromZombie      = new ArrayList<ShakeTreasure>();
+
+    public HashMap<Rarity, List<FishingTreasure>> fishingRewards = new HashMap<Rarity, List<FishingTreasure>>();
     public HashMap<Rarity, List<EnchantmentTreasure>> fishingEnchantments = new HashMap<Rarity, List<EnchantmentTreasure>>();
 
     private TreasureConfig() {
@@ -51,6 +85,7 @@ public class TreasureConfig extends ConfigLoader {
     protected boolean validateKeys() {
         // Validate all the settings!
         List<String> reason = new ArrayList<String>();
+
         for (String tier : config.getConfigurationSection("Enchantment_Drop_Rates").getKeys(false)) {
             double totalEnchantDropRate = 0;
             double totalItemDropRate = 0;
@@ -90,19 +125,19 @@ public class TreasureConfig extends ConfigLoader {
             return;
         }
 
-        loadTreasures("Fishing");
-        loadTreasures("Excavation");
-        loadTreasures("Hylian_Luck");
+        loadTreaures("Fishing");
+        loadTreaures("Excavation");
+        loadTreaures("Hylian_Luck");
         loadEnchantments();
 
         for (EntityType entity : EntityType.values()) {
             if (entity.isAlive()) {
-                loadTreasures("Shake." + entity.toString());
+                loadTreaures("Shake." + entity.toString());
             }
         }
     }
 
-    private void loadTreasures(String type) {
+    private void loadTreaures(String type) {
         boolean isFishing = type.equals("Fishing");
         boolean isShake = type.contains("Shake");
         boolean isExcavation = type.equals("Excavation");
@@ -133,18 +168,18 @@ public class TreasureConfig extends ConfigLoader {
              */
             Material material;
 
-            if (materialName.contains("INVENTORY")) {
-                // Use magic material BEDROCK to know that we're grabbing something from the inventory and not a normal treasure
-                if (!shakeMap.containsKey(EntityType.PLAYER))
-                    shakeMap.put(EntityType.PLAYER, new ArrayList<ShakeTreasure>());
-                shakeMap.get(EntityType.PLAYER).add(new ShakeTreasure(new ItemStack(Material.BEDROCK, 1, (byte) 0), 1, getInventoryStealDropChance(), getInventoryStealDropLevel()));
-                continue;
-            } else {
+            if (materialName.contains("POTION")) {
+                material = Material.POTION;
+            }
+            else if (materialName.contains("INK_SACK")) {
+                material = Material.INK_SACK;
+            }
+            else {
                 material = Material.matchMaterial(materialName);
             }
 
             int amount = config.getInt(type + "." + treasureName + ".Amount");
-            short data = (treasureInfo.length == 2) ? Short.parseShort(treasureInfo[1]) : (short) config.getInt(type + "." + treasureName + ".Data");
+            short data = (treasureInfo.length == 2) ? Byte.valueOf(treasureInfo[1]) : (short) config.getInt(type + "." + treasureName + ".Data");
 
             if (material == null) {
                 reason.add("Invalid material: " + materialName);
@@ -197,52 +232,40 @@ public class TreasureConfig extends ConfigLoader {
             ItemStack item = null;
 
             if (materialName.contains("POTION")) {
-                Material mat = Material.matchMaterial(materialName);
-                if (mat == null) {
-                    reason.add("Potion format for Treasures.yml has changed");
-                } else {
-                    item = new ItemStack(mat, amount, data);
-                    PotionMeta itemMeta = (PotionMeta) item.getItemMeta();
+                String potionType = materialName.substring(7);
 
-                    PotionType potionType = null;
-                    try {
-                        potionType = PotionType.valueOf(config.getString(type + "." + treasureName + ".PotionData.PotionType", "WATER"));
-                    } catch (IllegalArgumentException ex) {
-                        reason.add("Invalid Potion_Type: " + config.getString(type + "." + treasureName + ".PotionData.PotionType", "WATER"));
-                    }
-                    boolean extended = config.getBoolean(type + "." + treasureName + ".PotionData.Extended", false);
-                    boolean upgraded = config.getBoolean(type + "." + treasureName + ".PotionData.Upgraded", false);
-                    itemMeta.setBasePotionData(new PotionData(potionType, extended, upgraded));
-
-                    if (config.contains(type + "." + treasureName + ".Custom_Name")) {
-                        itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString(type + "." + treasureName + ".Custom_Name")));
-                    }
-
-                    if (config.contains(type + "." + treasureName + ".Lore")) {
-                        List<String> lore = new ArrayList<String>();
-                        for (String s : config.getStringList(type + "." + treasureName + ".Lore")) {
-                            lore.add(ChatColor.translateAlternateColorCodes('&', s));
-                        }
-                        itemMeta.setLore(lore);
-                    }
-                    item.setItemMeta(itemMeta);
+                try {
+                    item = new Potion(PotionType.valueOf(potionType.toUpperCase().trim())).toItemStack(amount);
                 }
-            } else if (material != null) {
+                catch (IllegalArgumentException ex) {
+                    reason.add("Invalid Potion_Type: " + potionType);
+                }
+            }
+            else if (materialName.contains("INK_SACK")) {
+                String color = materialName.substring(9);
+
+                try {
+                    Dye dye = new Dye();
+                    dye.setColor(DyeColor.valueOf(color.toUpperCase().trim()));
+
+                    item = dye.toItemStack(amount);
+                }
+                catch (IllegalArgumentException ex) {
+                    reason.add("Invalid Dye_Color: " + color);
+                }
+            }
+            else if (material != null) {
                 item = new ItemStack(material, amount, data);
 
                 if (config.contains(type + "." + treasureName + ".Custom_Name")) {
                     ItemMeta itemMeta = item.getItemMeta();
-                    itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString(type + "." + treasureName + ".Custom_Name")));
+                    itemMeta.setDisplayName(config.getString(type + "." + treasureName + ".Custom_Name"));
                     item.setItemMeta(itemMeta);
                 }
 
                 if (config.contains(type + "." + treasureName + ".Lore")) {
                     ItemMeta itemMeta = item.getItemMeta();
-                    List<String> lore = new ArrayList<String>();
-                    for (String s : config.getStringList(type + "." + treasureName + ".Lore")) {
-                        lore.add(ChatColor.translateAlternateColorCodes('&', s));
-                    }
-                    itemMeta.setLore(lore);
+                    itemMeta.setLore(config.getStringList(type + "." + treasureName + ".Lore"));
                     item.setItemMeta(itemMeta);
                 }
             }
@@ -250,66 +273,138 @@ public class TreasureConfig extends ConfigLoader {
             if (noErrorsInConfig(reason)) {
                 if (isFishing) {
                     fishingRewards.get(rarity).add(new FishingTreasure(item, xp));
-                } else if (isShake) {
+                }
+                else if (isShake) {
                     ShakeTreasure shakeTreasure = new ShakeTreasure(item, xp, dropChance, dropLevel);
 
-                    EntityType entityType = EntityType.valueOf(type.substring(6));
-                    if (!shakeMap.containsKey(entityType))
-                        shakeMap.put(entityType, new ArrayList<ShakeTreasure>());
-                    shakeMap.get(entityType).add(shakeTreasure);
-                } else if (isExcavation) {
+                    if (type.equals("Shake.BLAZE")) {
+                        shakeFromBlaze.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.CAVE_SPIDER")) {
+                        shakeFromCaveSpider.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.CHICKEN")) {
+                        shakeFromChicken.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.COW")) {
+                        shakeFromCow.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.CREEPER")) {
+                        shakeFromCreeper.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.ENDERMAN")) {
+                        shakeFromEnderman.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.GHAST")) {
+                        shakeFromGhast.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.HORSE")) {
+                        shakeFromHorse.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.IRON_GOLEM")) {
+                        shakeFromIronGolem.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.MAGMA_CUBE")) {
+                        shakeFromMagmaCube.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.MUSHROOM_COW")) {
+                        shakeFromMushroomCow.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.PIG")) {
+                        shakeFromPig.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.PIG_ZOMBIE")) {
+                        shakeFromPigZombie.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SHEEP")) {
+                        shakeFromSheep.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SKELETON")) {
+                        shakeFromSkeleton.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SLIME")) {
+                        shakeFromSlime.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SPIDER")) {
+                        shakeFromSpider.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SNOWMAN")) {
+                        shakeFromSnowman.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.SQUID")) {
+                        shakeFromSquid.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.WITCH")) {
+                        shakeFromWitch.add(shakeTreasure);
+                    }
+                    else if (type.equals("Shake.ZOMBIE")) {
+                        shakeFromZombie.add(shakeTreasure);
+                    }
+                }
+                else if (isExcavation) {
                     ExcavationTreasure excavationTreasure = new ExcavationTreasure(item, xp, dropChance, dropLevel);
                     List<String> dropList = config.getStringList(type + "." + treasureName + ".Drops_From");
 
-                    for (String blockType : dropList) {
-                        if (!excavationMap.containsKey(blockType))
-                            excavationMap.put(blockType, new ArrayList<ExcavationTreasure>());
-                        excavationMap.get(blockType).add(excavationTreasure);
+                    if (dropList.contains("Dirt")) {
+                        excavationFromDirt.add(excavationTreasure);
                     }
-                } else if (isHylian) {
+
+                    if (dropList.contains("Grass")) {
+                        excavationFromGrass.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Sand")) {
+                        excavationFromSand.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Gravel")) {
+                        excavationFromGravel.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Clay")) {
+                        excavationFromClay.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Mycelium")) {
+                        excavationFromMycel.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Soul_Sand")) {
+                        excavationFromSoulSand.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Snow")) {
+                        excavationFromSnow.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Red_Sand")) {
+                        excavationFromRedSand.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Podzol")) {
+                        excavationFromPodzol.add(excavationTreasure);
+                    }
+                }
+                else if (isHylian) {
                     HylianTreasure hylianTreasure = new HylianTreasure(item, xp, dropChance, dropLevel);
                     List<String> dropList = config.getStringList(type + "." + treasureName + ".Drops_From");
 
-                    for (String dropper : dropList) {
-                        if (dropper.equals("Bushes")) {
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.FERN), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.TALL_GRASS), hylianTreasure);
-                            for (Material species : Tag.SAPLINGS.getValues())
-                                AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(species), hylianTreasure);
+                    if (dropList.contains("Bushes")) {
+                        hylianFromBushes.add(hylianTreasure);
+                    }
 
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.DEAD_BUSH), hylianTreasure);
-                            continue;
-                        }
-                        if (dropper.equals("Flowers")) {
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POPPY), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.DANDELION), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.BLUE_ORCHID), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.ALLIUM), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.AZURE_BLUET), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.ORANGE_TULIP), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.PINK_TULIP), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.RED_TULIP), hylianTreasure);
-                            AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.WHITE_TULIP), hylianTreasure);
-                            continue;
-                        }
-                        if (dropper.equals("Pots")) {
-                            for (Material species : Tag.FLOWER_POTS.getValues())
-                                AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(species), hylianTreasure);
-                            continue;
-                        }
-                        AddHylianTreasure(dropper, hylianTreasure);
+                    if (dropList.contains("Flowers")) {
+                        hylianFromFlowers.add(hylianTreasure);
+                    }
+
+                    if (dropList.contains("Pots")) {
+                        hylianFromPots.add(hylianTreasure);
                     }
                 }
             }
         }
     }
 
-    private void AddHylianTreasure(String dropper, HylianTreasure treasure) {
-        if (!hylianMap.containsKey(dropper))
-            hylianMap.put(dropper, new ArrayList<HylianTreasure>());
-        hylianMap.get(dropper).add(treasure);
-    }
-
     private void loadEnchantments() {
         for (Rarity rarity : Rarity.values()) {
             if (rarity == Rarity.TRAP || rarity == Rarity.RECORD) {
@@ -340,27 +435,6 @@ public class TreasureConfig extends ConfigLoader {
         }
     }
 
-    public boolean getInventoryStealEnabled() {
-        return config.contains("Shake.PLAYER.INVENTORY");
-    }
-
-    public boolean getInventoryStealStacks() {
-        return config.getBoolean("Shake.PLAYER.INVENTORY.Whole_Stacks");
-    }
-
-    public double getInventoryStealDropChance() {
-        return config.getDouble("Shake.PLAYER.INVENTORY.Drop_Chance");
-    }
-
-    public int getInventoryStealDropLevel() {
-        return config.getInt("Shake.PLAYER.INVENTORY.Drop_Level");
-    }
-
-    public double getItemDropRate(int tier, Rarity rarity) {
-        return config.getDouble("Item_Drop_Rates.Tier_" + tier + "." + rarity.toString());
-    }
-
-    public double getEnchantmentDropRate(int tier, Rarity rarity) {
-        return config.getDouble("Enchantment_Drop_Rates.Tier_" + tier + "." + rarity.toString());
-    }
+    public double getItemDropRate(int tier, Rarity rarity) { return config.getDouble("Item_Drop_Rates.Tier_" + tier + "." + rarity.toString()); }
+    public double getEnchantmentDropRate(int tier, Rarity rarity) { return config.getDouble("Enchantment_Drop_Rates.Tier_" + tier + "." + rarity.toString()); }
 }