Merge branch 'master' of github.com:mcMMO-Dev/mcmmo into configurable

protection

.gitattributes

@@ -2,3 +2,4 @@
 
 *.png binary
 *.wav binary
+p

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [nossr50] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: nossr50 # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: https://paypal.me/nossr50 # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -1,42 +1,291 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
 
-# netbeans
-/nbproject
+### NetBeans template
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
 
-# we use maven!
-/build.xml
+### Bash Scripts
+*.sh
+!mcmmo-core/src/main/resources/com/gmail/nossr50/locale/doTranslation.sh
 
-# maven
-/target
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# vim
-.*.sw[a-p]
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# various other potential build files
-/build
-/bin
-/dist
-/manifest.mf
+# Generated files
+.idea/**/contentModel.xml
 
-/world
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
 
-# Mac filesystem dust
-*.DS_Store
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
 
-# intellij
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+.idea
 *.iml
 *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
 *.iws
-.idea/
 
-# Project Stuff
-/src/main/resources/mcMMO
+# IntelliJ
+out/
 
-# Other Libraries
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar
+
+### Kotlin template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
 *.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Eclipse template
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+### Windows template
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Gradle template
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
 
-# Atlassian Stuff
-/atlassian-ide-plugin.xml

Changelog_2.1.0.md

@@ -0,0 +1,234 @@
+# **Version 2.1.0+**
+
+### Please use Spigot or Paper!
+
+* **mcMMO is now built against Spigot-API instead of Bukkit**
+
+### New Level Scaling
+
+* mcMMO now features an optional 1-100 scaling mode!
+* This is on by default for new installs, if you are upgrading mcMMO you will be put into Retro Mode instead (1-1000) scaling.
+* The two scaling modes are the same, the changes are completely cosmetic!
+* Skill Requirements in the config file will be multiplied by 10 if you are using Retro mode unless the setting has Retro in its name, keep this in mind if you need to edit anything!
+
+### WorldGuard Support
+
+* Added support for WorldGuard regions!
+* `mcmmo` region flag turns on or off a players ability to use anything related to mcMMO other than commands
+* `mcmmo-xp` region flag turns on or off a player's ability to gain XP
+* These flags default to on unless you specify otherwise
+
+### World Blacklist
+
+* You can now disable mcMMO completely for specific worlds via `world_blacklist.txt` in /plugins/mcMMO/
+* This file appears once mcMMO has been run at least once
+* Every line of this file should be the name of a world where you don't want mcMMO to be enabled!
+
+### Rank System
+
+* Skills that are not yet unlocked will show up as `???` until learned
+* Many skills now make use of a rank system!
+* Rank level requirements are modified in `skillranks.yml`
+* Woodcutting's Double Drop subskill is now named Harvest Lumber
+* Archery's Skill Shot now uses a rank system
+* Swords' Bleed now uses a rank system
+* Swords' Counter Attack now uses a rank system
+* Axe's Axe Mastery now uses a rank system
+* Axe's Impact now uses a rank system
+* Herbalism's Farmer's Diet now uses a rank system
+* Herbalism's Green Thumb now uses a rank system
+* Shake now uses a rank system
+* Flux Mining now uses a rank system
+* Removed traps from fishing
+* Dodge now uses a rank system
+* Arrow Retrieval now uses a rank system
+* Axes' Critical Strikes now uses a rank system
+* Axes' Greater Impact now uses a rank system
+* Taming's Beast Lore now uses a rank system
+* Taming's Gore now uses a rank system
+* Taming's Call of the Wild now uses a rank system
+* Taming's Pummel now uses a rank system
+* Green Thumb now uses a rank system
+* Farmer's Diet & Fisherman's Diet now use a rank system
+
+### mcMMO Chat Alerts
+
+* mcMMO no longer spams your chat!
+* Most messages are sent to your action bar instead!
+* Completely configurable! You can have mcMMO spam your chat again if you want!
+* You can configure it so that messages will be sent to your action bar AND your chat system!
+* Improved some of the messages sent to the player regarding the Chimaera Wing
+
+### Localization File
+
+* The descriptions of a few skills have changed
+* Locale files now support & codes for colors and formatting!
+* Added locale strings for new Woodcutting abilities
+* Added locale strings for mcchatspy command
+* Added locale strings for JSON integration
+* Added locale strings for Taming's Pummel SubSkill
+* Added locale strings for Unarmed's Block Cracker SubSkill
+* Removed localizations with the following codes for being almost empty: `id`, `HR_hr`, `et_EE`, `lv`, `lt`, `no`, `pl_PL`, `pt_PT`, `tr_TR`
+* Removed redundant information from some skill names and descriptions `en_US` (other locales will need to be updated)
+* SubSkill locale keys are now located at `{ParentSkill}.SubSkill.SubSkillName`
+* Super Abilities no longer have `(ABILITY)` in their `Skill.Effect` strings
+
+### UI
+
+* Certain elements of mcMMO's UI have been restyled
+* Skills can now be clicked on and hovered over for more information!
+* Added links to mcMMO related websites to various commands
+* Customizeable and optional XP Bars
+* Added the tagline "Overhaul Era" to various locations until 3.0.0 comes out
+* Added option to disable the new URL links to `config.yml`
+
+### Sounds
+
+* Volume and Pitch of sounds can now be configured in the new `sounds.yml` file
+
+### Super Ability Changes
+
+* Skill Super Abilities now use a rank system, the default rank to unlock is level 5
+* Activating Super abilities plays a sound (other plays can hear this)
+* Ability Lengths now have a default skill cap at which they stop increasing in length
+* Setting the cap to 0 removes it!
+* Configurable in `advanced.yml` (endurance perks extend this limit)
+
+### Skills
+
+* mcMMO now notifies you when you progress in a skill!
+* Excavation Treasure Hunter is renamed to Archaeology
+* Readying a tool for a super ability now plays a sound
+* Skill Unlock Notifications have sounds
+* Stripping wood and right clicking on stripped wood will no longer ready your Axe
+* Added new skill 'Understanding The Art' which adds nothing new but tracks previously hidden benefits of raising a skill
+* Tool alerts now are sent to the Action Bar
+* Super Ability activation alerts are now sent to the Action Bar
+* Almost all Skill-related messages are now sent to the Action Bar
+* Added some missing information to skill stats
+* Swords no longer require blocking with a shield to trigger counter attacks
+* Sword's Bleed has been renamed to Rupture
+* Sword's Rupture no longer has an internal hard coded limit
+* Sword's Serrated Strikes now uses your Rupture rank to determine the damage/ticks for its bleed effect.
+* Sword's Rupture now ticks four times as fast
+* Sword's Rupture now refreshes bleed duration instead of adding duration when applying bleed to the same target
+* Sword's Rupture will now deal lethal damage
+* Sword's Rupture now reaches its max proc chance at level 20 (200 in Retro)
+* Sword's Rupture now has a max chance to proc of 33% instead of 70%
+* Sword's Rupture now deals 50% more damage at above Rank 3 and can last much longer!
+ * The base damage for Bleed has been increased as well (update your `advanced.yml` admins)
+* Sword's Rupture no longer triggers invincibility frames when damaging your opponent
+* Sword's Rupture now plays a sound
+* Taming's Gore now uses Rupture Rank 1 for its DoT calculations
+* Furnaces now give XP to the last person to modify their inventory instead of the first person to open them
+* Rolling now plays a sound (Graceful Roll has a different sound :) )
+* Acrobatics' Roll exploit detection was tweaked to still allow for Roll to trigger even if it rewards no XP
+* Acrobatics' Roll & Gracefull Roll are now considered the same skill (both mechanics are still there)
+* Some skill level rank requirements have changed
+
+### Experience
+
+* Skills now start at level 1 (configurable in advanced.yml)
+* Starting an XP event will now use the title API (toggle this in `advanced.yml`)
+* The XP values of fish are now based on their rarity and have been drastically changed
+* Coral (blocks) now give Mining XP
+* Coral (plants) now give Herbalism XP
+* Blue Ice now gives Mining XP
+* Dolphins now give combat XP
+* Drowned mobs now count towards combat XP
+* Added missing mushroom blocks for XP
+* You can now set guaranteed minimum values for XP gained if diminishing returns are enabled, this value defaults to 5% (`experience.yml`)
+
+### Bug Fixes
+
+* Fixed the bug where mob names would be replaced by hearts
+* Fixed a bug where Rupture would apply an incorrect amount of bleed ticks
+* Fixed bug where XP rate could be a negative number
+* Fixed a bug where you could set a players levels into the negative and bad things would happen
+* Fixed an edge case bug where Blast Mining wouldn't inform the player that it was on cooldown
+
+### Plugin Compatibility
+
+* mcMMO now fires new custom events relating to changes it makes to player scoreboards, plugin authors can listen to these events to improve compatibility
+
+### Exploit Fixes
+
+* Prevented exploits involving blocks made from entities (snowmen, etc..)
+* Chimaera Wing now tracks cooldowns between sessions for players (no more disconnect abuse)
+* Tridents will no longer be considered unarmed
+* Prevented exploits involving 2 high herbs and chorus flowers
+* Vastly Improved the Acrobatics exploit detection checks
+
+### Parties
+
+* Parties can now have size limits (configurable in `config.yml`), party size is unlimited by default
+* You can now turn on Friendly Fire for parties in `config.yml`
+* Party member list will only include members of the party that you can see (aren't vanished)
+
+### Scoreboards
+
+* Scoreboards are now disabled by default since most of their functionality is handled better by XP bars.
+* Added toggle to disable all scoreboards (previously you had to disable them one by one)
+* You can turn them back on in `config.yml`
+* You can have XP bars and scoreboards on at the same time
+
+### MySQL
+
+* Added support for SSL for MySQL/MariaDB in config.yml (On by default)
+* mcMMO no longer spams your console if you are not using SSL for your MySQL server
+* You can now inspect offline players
+* When converting from MySQL to flatfile mcMMO will now properly include all users in the conversion process
+
+### Admins
+
+* Added ability for admins to spy on party chat (off unless toggled on) /mcchatspy
+* The Debug stick can now tell you about properties of a block related to Excavation
+
+### API
+
+* Detailed guide to API changes is available at http://api.mcmmo.org
+* Added many missing `SubSkills` to `SubSkillType` class
+* Moved a lot of methods from `SkillCommand` to `SkillUtils`
+* `SkillType` is now `PrimarySkillType`
+* `SecondarySkill` is now `SubSkillType`
+* `AbilityType` is now `SuperAbilityType`
+* `SecondaryAbilityEvent` is now `SubSkillEvent`
+* `SubSkillType` has had many helpful methods added to it
+* `GREEN_THUMB_PLANT` & `GREEN_THUMB_BLOCK` are replaced by `GREEN_THUMB`
+
+### Permissions
+
+* Removed all mob health bar permissions, this is no longer a per-player setting.
+* Added permission node `mcmmo.commands.mcchatspy` & `mcmmo.commands.mcchatspy.others`
+* Added `mcmmo.commands.mmoinfo` for the new `mmoinfo`/`mcinfo` command
+* Added permission nodes for Harvest Lumber, Splinter, Nature's Bounty, and Bark Surgeon
+* Call of the wild now uses `mcmmo.ability.taming.callofthewild` instead of `mcmmo.ability.taming.callofthewild.all`
+* Replaced the old Double Drop permission node for woodcutting with a new Harvest Lumber permission node
+* Fast Food Service permission node renamed to `mcmmo.ability.taming.fastfoodservice`
+* Counter Attack permission node renamed to `mcmmo.ability.swords.counterattack`
+* Arrow Deflect permission node renamed to `mcmmo.ability.unarmed.arrowdeflect`
+* Iron Arm Style permission node renamed to `mcmmo.ability.unarmed.ironarmstyle`
+
+### Commands
+
+* Added new info command `/mmoinfo` or `/mcinfo`
+* Added toggle command `/mcchatspy`
+* `/mcMMO help` no longer displays the other/special commands category to players lacking permissions
+* Removed the `mobhealthbar` command, this is no longer a per-player setting.
+
+### Misc Config Changes
+
+* Removed `SkillShot`'s `IncreaseLevel` & `IncreasePercentage` (replaced by `RankDamageMultiplier`)
+* Removed `AxeMastery`'s `MaxBonus` & `MaxBonusLevel` (replaced by `RankDamageMultiplier`)
+* `Unarmed.IronArm` in `advanced.yml` is now `Unarmed.IronArmStyle`
+* `Unarmed.Deflect` in `advanced.yml` is now `Unarmed.ArrowDeflect`
+* `Swords.Counter` in `advanced.yml` is now `Swords.CounterAttack`
+* `Archery.Retrieve` in `advanced.yml` is now `Archery.ArrowRetrieval`
+* `Axes.CriticalHit` in `advanced.yml` is now `Axes.CriticalStrikes`
+* Archery's Skill Shot now uses `RankDamageMultiplier` for its damage bonus calculations
+* Axe's Axe mastery now uses `RankDamageMultiplier` for its damage bonus calculations
+
+### Misc Changes
+
+* Removed everything involving the kraken
+* Code cleanup in a lot of places... unfortunately there is still much left to do!

LICENSE

@@ -1,346 +1,674 @@
-TERMS AND CONDITIONS
-0. Definitions.
-“This License” refers to version 3 of the GNU General Public License.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”.
-“Licensees” and “recipients” may be individuals or organizations.
+                            Preamble
 
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission,
-other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work
-“based on” the earlier work.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-A “covered work” means either the unmodified Program or a work based on the Program.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
-To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily
-liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy.
-Propagation includes copying, distribution (with or without modification), making available to the public, and in some
-countries other activities as well.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction
-with a user through a computer network, with no transfer of a copy, is not conveying.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and
-prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no
-warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this
-License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
 
-1. Source Code.
-The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any
-non-source form of a work.
+  1. Source Code.
 
-A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or,
-in the case of interfaces specified for a particular programming language, one that is widely used among developers
-working in that language.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in
-the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to
-enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is
-available to the public in source code form. A “Major Component”, in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a
-compiler used to produce the work, or an object code interpreter used to run it.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and
-(for an executable work) run the object code and to modify the work, including scripts to control those activities.
-However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs
-which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding
-Source includes interface definition files associated with source files for the work, and the source code for shared
-libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data
-communication or control flow between those subprograms and other parts of the work.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the
-Corresponding Source.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-The Corresponding Source for a work in source code form is that same work.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-2. Basic Permissions.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided
-the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program.
-The output from running a covered work is covered by this License only if the output, given its content, constitutes a
-covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license
-otherwise remains in force. You may convey covered works to others for the sole purpose of having them make
-modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do not control copyright. Those thus making or running
-the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that
-prohibit them from making any copies of your copyrighted material outside their relationship with you.
+  2. Basic Permissions.
 
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not
-allowed; section 10 makes it unnecessary.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling
-obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or
-restricting circumvention of such measures.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the
-extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you
-disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users,
-your or third parties' legal rights to forbid circumvention of technological measures.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
 
-4. Conveying Verbatim Copies.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating
-that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices
-of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for
-a fee.
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
 
-5. Conveying Modified Source Versions.
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source
-code under the terms of section 4, provided that you also meet all of these conditions:
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
 
-a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-b) The work must carry prominent notices stating that it is released under this License and any conditions added under
-section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
-c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This
-License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all
-its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way,
-but it does not invalidate such permission if you have separately received it.
-d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has
-interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of
-the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or
-distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the
-access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other parts of the aggregate.
+  4. Conveying Verbatim Copies.
 
-6. Conveying Non-Source Forms.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License, in one of these ways:
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
 
-a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied
-by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied
-by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for
-that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all
-the software in the product that is covered by this License, on a durable physical medium customarily used for software
-interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2)
-access to copy the Corresponding Source from a network server at no charge.
-c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source.
-This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an
-offer, in accord with subsection 6b.
-d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent
-access to the Corresponding Source in the same way through the same place at no further charge. You need not require
-recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a
-network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports
-equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the
-Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it
-is available for as long as needed to satisfy these requirements.
-e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and
-Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library,
-need not be included in conveying the object code work.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
 
-A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used
-for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In
-determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a
-particular product received by a particular user, “normally used” refers to a typical or common use of that class of
-product, regardless of the status of the particular user or of the way in which the particular user actually uses, or
-expects or is expected to use, the product. A product is a consumer product regardless of whether the product has
-substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of
-the product.
+  5. Conveying Modified Source Versions.
 
-“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information
-required to install and execute modified versions of a covered work in that User Product from a modified version of its
-Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code
-is in no case prevented or interfered with solely because modification has been made.
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
 
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the
-conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to
-the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding
-Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not
-apply if neither you nor any third party retains the ability to install modified object code on the User Product (for
-example, the work has been installed in ROM).
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
 
-The requirement to provide Installation Information does not include a requirement to continue to provide support
-service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product
-in which it has been modified or installed. Access to a network may be denied when the modification itself materially
-and adversely affects the operation of the network or violates the rules and protocols for communication across the
-network.
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
 
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format
-that is publicly documented (and with an implementation available to the public in source code form), and must require
-no special password or key for unpacking, reading or copying.
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
 
-7. Additional Terms.
-“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its
-conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were
-included in this License, to the extent that they are valid under applicable law. If additional permissions apply only
-to part of the Program, that part may be used separately under those permissions, but the entire Program remains
-governed by this License without regard to the additional permissions.
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
 
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or
-from any part of it. (Additional permissions may be written to require their own removal in certain cases when you
-modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have
-or can give appropriate copyright permission.
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by
-the copyright holders of that material) supplement the terms of this License with terms:
+  6. Conveying Non-Source Forms.
 
-a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the
-Appropriate Legal Notices displayed by works containing it; or
-c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be
-marked in reasonable ways as different from the original version; or
-d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified
-versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual
-assumptions directly impose on those licensors and authors.
-All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the
-Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with
-a term that is a further restriction, you may remove that term. If a license document contains a further restriction but
-permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of
-that license document, provided that the further restriction does not survive such relicensing or conveying.
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
 
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a
-statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
 
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as
-exceptions; the above requirements apply either way.
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
 
-8. Termination.
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to
-propagate or modify it is void, and will automatically terminate your rights under this License (including any patent
-licenses granted under the third paragraph of section 11).
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated
-(a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and
-(b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days
-after the cessation.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
 
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you
-of the violation by some reasonable means, this is the first time you have received notice of violation of this License
-(for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
 
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or
-rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not
-qualify to receive new licenses for the same material under section 10.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
 
-9. Acceptance Not Required for Having Copies.
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a
-covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not
-require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered
-work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
 
-10. Automatic Licensing of Downstream Recipients.
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run,
-modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third
-parties with this License.
+  10. Automatic Licensing of Downstream Recipients.
 
-An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or
-subdividing an organization, or merging organizations. If propagation of a covered work results from an entity
-transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work
-the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with
-reasonable efforts.
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
 
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For
-example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License,
-and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent
-claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
 
-11. Patents.
-A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program
-is based. The work thus licensed is called the contributor's “contributor version”.
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
 
-A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already
-acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or
-selling its contributor version, but do not include claims that would be infringed only as a consequence of further
-modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent
-sublicenses in a manner consistent with the requirements of this License.
+  11. Patents.
 
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential
-patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its
-contributor version.
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
 
-In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to
-enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To
-“grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against
-the party.
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
 
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not
-available for anyone to copy, free of charge and under the terms of this License, through a publicly available network
-server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available,
-or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a
-manner consistent with the requirements of this License, to extend the patent license to downstream recipients.
-“Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in
-a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in
-that country that you have reason to believe are valid.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
 
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring
-conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing
-them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is
-automatically extended to all recipients of the covered work and works based on it.
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
 
-A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of,
-or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You
-may not convey a covered work if you are a party to an arrangement with a third party that is in the business of
-distributing software, under which you make payment to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a
-discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from
-those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered
-work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
 
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to
-infringement that may otherwise be available to you under applicable patent law.
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
 
-12. No Surrender of Others' Freedom.
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this
-License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to
-satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence
-you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further
-conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License
-would be to refrain entirely from conveying the Program.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
 
-13. Use with the GNU Affero General Public License.
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work
-licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the
-resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special
-requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply
-to the combination as such.
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
 
-14. Revised Versions of this License.
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to
-time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new
-problems or concerns.
+  12. No Surrender of Others' Freedom.
 
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the
-GNU General Public License “or any later version” applies to it, you have the option of following the terms and
-conditions either of that numbered version or of any later version published by the Free Software Foundation. If the
-Program does not specify a version number of the GNU General Public License, you may choose any version ever published
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used,
-that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the
-Program.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed
-on any author or copyright holder as a result of your choosing to follow a later version.
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-15. Disclaimer of Warranty.
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING
-THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU
-ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-16. Limitation of Liability.
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
-MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO
-LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-17. Interpretation of Sections 15 and 16.
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to
-their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil
-liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program
-in return for a fee.
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,47 +1,62 @@
 # mcMMO
-## The RPG lovers mod
+## The #1 RPG Mod for Minecraft
 
-### Dev builds
-Our latest development builds are available [here](http://ci.mcmmo.info).
+## Website
+I'm working on a brand new website for mcMMO
+
+You can check it out here http://www.mcmmo.org
+
+Spigot Resource: https://spigot.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: http://spigot.mcmmo.org
 
 ### Brief Description
-mcMMO takes core Minecraft game mechanics and expands them to add an extensive RPG experience, the goal of the project has always been a quality RPG experience. Everything in mcMMO is carefully thought out and is constantly improving. mcMMO adds eleven skills to train in and level in, while also offering a high level of customization for server admins. There are countless features, including custom sounds, graphical elements, and more added when running mcMMO in conjunction with Spout. I carefully read feedback and evaluate the mechanics of mcMMO in every update to provide an ever-evolving experience.
-
-If you want an original RPG experience like no other mod out there, mcMMO is for you.
+The goal of mcMMO is to take core Minecraft game mechanics and expand them into 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
+In December 2018, the original author and creator of mcMMO (nossr50) returned and took over the role of project lead once again, to develop and improve mcMMO.
+#### Project Lead & Founder
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
 
-mcMMO is currently developed by a team of individuals from all over the world.
-### Glorious Leader
-[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
-(https://github.com/gmcferrin)
+#### mcMMO Devs
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
+[![kashike](https://secure.gravatar.com/avatar/b5e86d6d443b957fd5cdee55501f3799.png)](https://github.com/kashike)
+[![electronicboy](https://secure.gravatar.com/avatar/44759c38d311ce09596de6a2d5b88036.png)](https://github.com/electronicboy)
 
-### 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)
-[![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)
+#### Classic Maintainer
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)](https://github.com/t00thpick1)
+
+## Former Team Members
+
+### Former Lead & Awesome guy
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
+
+### Former team members
+[![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)
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)](https://github.com/riking)
+[![TheYeti](https://i.imgur.com/tzFrxdo.png)](https://github.com/TheYeti)
 
 ## Compiling
 
-mcMMO uses Maven 3 to manage dependancies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
+mcMMO uses Maven 3 to manage dependencies, packaging, and shading of necessary classes; Maven 3 is required to compile mcMMO.
 
-The typical command used to build mcMMO is: mvn clean package install
+The typical command used to build mcMMO is: `mvn clean package install`
 
 Required Libraries:
-* Spout API
+* Spigot
 * JUnit
-* Metrics
-* Bukkit
+* WorldGuard 7
+* bStats Bukkit
 
-http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
+https://spigot.mcmmo.org for more up to date information.
+
+Resource Page
+
+https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/ 

build.gradle.kts

@@ -0,0 +1,30 @@
+subprojects {
+    apply(plugin = "java-library")
+    // Java is not explicitly needed, but keeps IJ happy with the tasks block
+    apply(plugin = "java")
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven("https://oss.sonatype.org/content/groups/public/")
+        maven("https://repo.spongepowered.org/maven")
+        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots")
+        maven("https://repo.codemc.org/repository/maven-public")
+        maven("https://maven.sk89q.com/repo")
+        maven("https://mvnrepository.com/artifact/org.jetbrains/annotations")
+        maven("https://repo.aikar.co/content/groups/aikar/")
+        maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+    }
+
+    tasks {
+        withType(JavaCompile::class.java) {
+            options.encoding = "UTF-8"
+        }
+    }
+
+    configure<JavaPluginConvention> {
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
+}

extras/repair.chain.yml

@@ -1,73 +0,0 @@
-#
-# Any file named repair.*.yml in the mcmmmo folder will be loaded as a repair config
-# All repair configs have a main section titled "Repairables"
-# Afterwards, all sub-items are considered a Repairable to be loaded
-# The bare minimum of a Repairable is that it have an ItemId, a RepairMaterialId, and a MaximumDurability
-#
-# ItemId: This is the id of the item to be repairable.
-## This is required to be set.
-#
-# ItemType: This is the type of item to be repaired, this is only important to permissions.
-## Valid values are ARMOR, TOOL, and OTHER.
-## This defaults to OTHER.
-#
-# MaterialType: This is the type of the material of the item to be repaired, this is only important for permissions.
-## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
-## This defaults to OTHER.
-#
-# RepairMaterialId: This is the id of the item used to repair this repairable.
-## This is required to be set.
-#
-# RepairMaterialMetadata: This is the metadata of the item used to repair this repairable.
-## A value of -1 means to ignore all metadata when repairing.
-## This defaults to -1
-#
-# MaximumDurability: This is the maximum durability of the item.
-## This is required to be set.
-#
-# MinimumLevel: This is the minimum repair level needed to repair this item.
-## Valid values are > 0
-## This defaults to 0
-#
-# MinimumQuantity: This is the minimum number of items needed to repair this item ignoring all other repair bonuses.
-## This is typically the number of the repair material needed to create a new item, for example for a sword it is 2, for an axe it is 3
-## This defaults to 2
-#
-# XpMultiplier: This is the amount to multiply the xp bonus by.
-## This defaults to 1
-#
-#
-# The following is an example of a repair.*.yml config which adds the ability to repair Chainmail armor using fire.
-#
-#
-###
-Repairables:
-    ChainHelmet:
-        ItemId: 302
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 165
-        MinimumQuantity: 5
-        XpMultiplier: 2
-    ChainChest:
-        ItemId: 303
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 240
-        MinimumQuantity: 8
-        XpMultiplier: 2
-    ChainLegs:
-        ItemId: 304
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 225
-        MinimumQuantity: 7
-        XpMultiplier: 2
-    ChainBoots:
-        ItemId: 305
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        RepairMaterialMetadata: -1
-        MaximumDurability: 195
-        MinimumQuantity: 4
-        XpMultiplier: 2

gradle.properties

@@ -0,0 +1,5 @@
+version=2.2.0-SNAPSHOT
+group=com.gmail.nossr50.mcMMO
+artifactId=mcMMO
+name=mcMMO
+url=https://github.com/mcMMO-Dev/mcMMO

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Sep 30 20:08:33 BST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

mcmmo-core/build.gradle.kts

@@ -0,0 +1,78 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    `java-library`
+    id("com.github.johnrengelman.shadow") version "5.1.0"
+}
+
+tasks {
+
+    shadowJar {
+        dependencies {
+            include(dependency("org.spongepowered:configurate-yaml"))
+            include(dependency("org.spongepowered:configurate-hocon"))
+            include(dependency("org.spongepowered:configurate-core"))
+            include(dependency("org.bstats:bstats-bukkit"))
+            include(dependency("org.apache.tomcat:tomcat-jdbc"))
+            include(dependency("org.apache.tomcat:tomcat-juli"))
+            include(dependency("com.typesafe:config"))
+            include(dependency("co.aikar:acf-core"))
+            include(dependency("co.aikar:acf-bukkit"))
+            include(dependency("net.kyori:text-api"))
+            include(dependency("net.kyori:text-adapter-bukkit"))
+            include(dependency("net.kyori:text-serializer-gson"))
+            exclude(dependency("org.spigotmc:spigot"))
+        }
+        relocate("org.apache.commons.logging", "com.gmail.nossr50.commons.logging")
+        relocate("org.apache.juli", "com.gmail.nossr50.database.tomcat.juli")
+        relocate("org.apache.tomcat", "com.gmail.nossr50.database.tomcat")
+        relocate("org.bstats", "com.gmail.nossr50.metrics.bstat")
+        relocate("co.aikar.commands", "com.gmail.nossr50.aikar.commands")
+        relocate("co.aikar.locales", "com.gmail.nossr50.aikar.locales")
+        relocate("co.aikar.table", "com.gmail.nossr50.aikar.table")
+        relocate("net.jodah.expiringmap", "com.gmail.nossr50.expiringmap")
+        relocate("net.kyori.text", "com.gmail.nossr50.kyoripowered.text")
+
+        mergeServiceFiles()
+    }
+
+    processResources {
+        filter<ReplaceTokens>("tokens" to mapOf("project.version" to project.version))
+        filesMatching("**/locales/*") {
+
+        }
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+tasks.named<ShadowJar>("shadowJar") {
+    dependencies{
+        include { true }
+    }
+}
+
+
+dependencies {
+    api("org.apache.tomcat:tomcat-jdbc:7.0.52")
+    api("com.typesafe:config:1.3.2")
+    api("org.spongepowered:configurate-core:3.7-SNAPSHOT")
+    api("org.spongepowered:configurate-yaml:3.7-SNAPSHOT")
+    api("org.spongepowered:configurate-hocon:3.7-SNAPSHOT")
+    api("co.aikar:acf-core:0.5.0-SNAPSHOT") //Don't change without updating the artifacts for its dependencies (see the other comments)
+    api("co.aikar:acf-paper:0.5.0-SNAPSHOT") //Don't change without updating the artifacts for its dependencies (see the other comments)
+    api("net.kyori:text-api:3.0.2")
+    api("net.kyori:text-serializer-gson:3.0.2")
+    api("net.kyori:text-adapter-bukkit:3.0.4-SNAPSHOT")
+    implementation("org.jetbrains:annotations:17.0.0")
+    implementation("org.apache.maven.scm:maven-scm-provider-gitexe:1.8.1")
+    implementation("org.bstats:bstats-bukkit:1.4")
+    implementation("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
+    implementation("com.sk89q.worldguard:worldguard-legacy:7.0.0-SNAPSHOT")
+    testImplementation("junit:junit:4.10")
+}
+
+

mcmmo-core/src/main/assembly/package.xml

@@ -0,0 +1,16 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <files>
+        <file>
+            <source>${project.build.directory}/${artifactId}.jar</source>
+            <outputDirectory>/</outputDirectory>
+            <destName>mcMMO.jar</destName>
+        </file>
+    </files>
+</assembly>

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

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

mcmmo-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java

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

mcmmo-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java

@@ -0,0 +1,154 @@
+//package com.gmail.nossr50.api;
+//
+//import com.gmail.nossr50.chat.ChatManager;
+//import com.gmail.nossr50.chat.ChatManagerFactory;
+//import com.gmail.nossr50.chat.PartyChatManager;
+//import com.gmail.nossr50.datatypes.chat.ChatMode;
+//import com.gmail.nossr50.party.PartyManager;
+//import com.gmail.nossr50.util.player.UserManager;
+//import org.bukkit.entity.Player;
+//import org.bukkit.plugin.Plugin;
+//
+//public final class ChatAPI {
+//    private ChatAPI() {
+//    }
+//
+//    /**
+//     * Send a message to all members of a party
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param plugin      The plugin sending the message
+//     * @param sender      The name of the sender
+//     * @param displayName The display name of the sender
+//     * @param party       The name of the party to send to
+//     * @param message     The message to send
+//     */
+//    public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
+//        getPartyChatManager(plugin, party).handleChat(sender, displayName, message);
+//    }
+//
+//    /**
+//     * Send a message to all members of a party
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param plugin  The plugin sending the message
+//     * @param sender  The name of the sender to display in the chat
+//     * @param party   The name of the party to send to
+//     * @param message The message to send
+//     */
+//    public static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
+//        getPartyChatManager(plugin, party).handleChat(sender, message);
+//    }
+//
+//    /**
+//     * Send a message to administrators
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param plugin      The plugin sending the message
+//     * @param sender      The name of the sender
+//     * @param displayName The display name of the sender
+//     * @param message     The message to send
+//     */
+//    public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
+//        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, displayName, message);
+//    }
+//
+//    /**
+//     * Send a message to administrators
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param plugin  The plugin sending the message
+//     * @param sender  The name of the sender to display in the chat
+//     * @param message The message to send
+//     */
+//    public static void sendAdminChat(Plugin plugin, String sender, String message) {
+//        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, message);
+//    }
+//
+//    /**
+//     * Check if a player is currently talking in party chat.
+//     *
+//     * @param player The player to check
+//     * @return true if the player is using party chat, false otherwise
+//     */
+//    public static boolean isUsingPartyChat(Player player) {
+//        return pluginRef.getUserManager().getPlayer(player).isChatEnabled(ChatMode.PARTY);
+//    }
+//
+//    /**
+//     * Check if a player is currently talking in party chat.
+//     *
+//     * @param playerName The name of the player to check
+//     * @return true if the player is using party chat, false otherwise
+//     */
+//    public static boolean isUsingPartyChat(String playerName) {
+//        return pluginRef.getUserManager().getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
+//    }
+//
+//    /**
+//     * Check if a player is currently talking in admin chat.
+//     *
+//     * @param player The player to check
+//     * @return true if the player is using admin chat, false otherwise
+//     */
+//    public static boolean isUsingAdminChat(Player player) {
+//        return pluginRef.getUserManager().getPlayer(player).isChatEnabled(ChatMode.ADMIN);
+//    }
+//
+//    /**
+//     * Check if a player is currently talking in admin chat.
+//     *
+//     * @param playerName The name of the player to check
+//     * @return true if the player is using admin chat, false otherwise
+//     */
+//    public static boolean isUsingAdminChat(String playerName) {
+//        return pluginRef.getUserManager().getPlayer(playerName).isChatEnabled(ChatMode.ADMIN);
+//    }
+//
+//    /**
+//     * Toggle the party chat mode of a player.
+//     *
+//     * @param player The player to toggle party chat on.
+//     */
+//    public static void togglePartyChat(Player player) {
+//        pluginRef.getUserManager().getPlayer(player).toggleChat(ChatMode.PARTY);
+//    }
+//
+//    /**
+//     * Toggle the party chat mode of a player.
+//     *
+//     * @param playerName The name of the player to toggle party chat on.
+//     */
+//    public static void togglePartyChat(String playerName) {
+//        pluginRef.getUserManager().getPlayer(playerName).toggleChat(ChatMode.PARTY);
+//    }
+//
+//    /**
+//     * Toggle the admin chat mode of a player.
+//     *
+//     * @param player The player to toggle admin chat on.
+//     */
+//    public static void toggleAdminChat(Player player) {
+//        pluginRef.getUserManager().getPlayer(player).toggleChat(ChatMode.ADMIN);
+//    }
+//
+//    /**
+//     * Toggle the admin chat mode of a player.
+//     *
+//     * @param playerName The name of the player to toggle party chat on.
+//     */
+//    public static void toggleAdminChat(String playerName) {
+//        pluginRef.getUserManager().getPlayer(playerName).toggleChat(ChatMode.ADMIN);
+//    }
+//
+//    private static ChatManager getPartyChatManager(Plugin plugin, String party) {
+//        ChatManager chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.PARTY);
+//        ((PartyChatManager) chatManager).setParty(pluginRef.getPartyManager().getParty(party));
+//
+//        return chatManager;
+//    }
+//}

mcmmo-core/src/main/java/com/gmail/nossr50/api/DatabaseAPI.java

@@ -0,0 +1,30 @@
+//package com.gmail.nossr50.api;
+//
+//import com.gmail.nossr50.datatypes.player.PlayerProfile;
+//import com.gmail.nossr50.mcMMO;
+//
+//import java.util.UUID;
+//
+//public class DatabaseAPI {
+//
+//    /**
+//     * Checks if a player exists in the mcMMO Database
+//     * @param uuid player UUID
+//     * @return true if the player exists in the DB, false if they do not
+//     */
+//    public boolean doesPlayerExistInDB(String uuid) {
+//        return doesPlayerExistInDB(UUID.fromString(uuid));
+//    }
+//
+//    /**
+//     * Checks if a player exists in the mcMMO Database
+//     * @param uuid player UUID
+//     * @return true if the player exists in the DB, false if they do not
+//     */
+//    public boolean doesPlayerExistInDB(UUID uuid) {
+//        PlayerProfile playerProfile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
+//
+//        return playerProfile.isLoaded();
+//    }
+//
+//}

mcmmo-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java

@@ -0,0 +1,265 @@
+//package com.gmail.nossr50.api;
+//
+//import com.gmail.nossr50.datatypes.interactions.NotificationType;
+//import com.gmail.nossr50.datatypes.party.Party;
+//import com.gmail.nossr50.datatypes.party.PartyLeader;
+//import com.gmail.nossr50.mcMMO;
+//import com.gmail.nossr50.party.PartyManager;
+//import com.gmail.nossr50.util.player.UserManager;
+//import org.bukkit.OfflinePlayer;
+//import org.bukkit.entity.Player;
+//
+//import java.util.*;
+//
+//public final class PartyAPI {
+//    private PartyAPI() {
+//    }
+//
+//    /**
+//     * Get the name of the party a player is in.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player The player to check the party name of
+//     * @return the name of the player's party, or null if not in a party
+//     */
+//    public static String getPartyName(Player player) {
+//        if (!inParty(player)) {
+//            return null;
+//        }
+//
+//        return pluginRef.getUserManager().getPlayer(player).getParty().getName();
+//    }
+//
+//    /**
+//     * Checks if a player is in a party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player The player to check
+//     * @return true if the player is in a party, false otherwise
+//     */
+//    public static boolean inParty(Player player) {
+//        if (pluginRef.getUserManager().getPlayer(player) == null)
+//            return false;
+//
+//        return pluginRef.getUserManager().getPlayer(player).inParty();
+//    }
+//
+//    /**
+//     * Check if two players are in the same party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param playera The first player to check
+//     * @param playerb The second player to check
+//     * @return true if the two players are in the same party, false otherwise
+//     */
+//    public static boolean inSameParty(Player playera, Player playerb) {
+//        return pluginRef.getPartyManager().inSameParty(playera, playerb);
+//    }
+//
+//    /**
+//     * Get a list of all current parties.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return the list of parties.
+//     */
+//    public static List<Party> getParties() {
+//        return pluginRef.getPartyManager().getParties();
+//    }
+//
+//    /**
+//     * Add a player to a party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player    The player to add to the party
+//     * @param partyName The party to add the player to
+//     * @deprecated parties can have limits, use the other method
+//     */
+//    @Deprecated
+//    public static void addToParty(Player player, String partyName) {
+//        //Check if player profile is loaded
+//        if (pluginRef.getUserManager().getPlayer(player) == null)
+//            return;
+//
+//        Party party = pluginRef.getPartyManager().getParty(partyName);
+//
+//        if (party == null) {
+//            party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName);
+//        } else if (mcMMO.getConfigManager().getConfigParty().getPartyGeneral().isPartySizeCapped()) {
+//            if (pluginRef.getPartyManager().isPartyFull(player, party)) {
+//                mcMMO.getNotificationManager().sendPlayerInformation(player, NotificationType.PARTY_MESSAGE, "Commands.Party.PartyFull", party.toString());
+//                return;
+//            }
+//        }
+//
+//        pluginRef.getPartyManager().addToParty(pluginRef.getUserManager().getPlayer(player), party);
+//    }
+//
+//    /**
+//     * The max party size of the server
+//     * Limits are only enforced if the enforcement setting is on
+//     *
+//     * @return the max party size on this server
+//     */
+//    public static int getMaxPartySize() {
+//        return mcMMO.getConfigManager().getConfigParty().getPartySizeLimit();
+//    }
+//
+//    /**
+//     * Checks if parties are currently size capped which is determined by the user config
+//     *
+//     * @return true if parties are size capped
+//     */
+//    public static boolean isPartySizeCapped() {
+//        return mcMMO.getConfigManager().getConfigParty().isPartySizeCapped();
+//    }
+//
+//    /**
+//     * Add a player to a party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player      The player to add to the party
+//     * @param partyName   The party to add the player to
+//     * @param bypassLimit if true bypasses party size limits
+//     */
+//    //TODO: bypasslimit not used?
+//    public static void addToParty(Player player, String partyName, boolean bypassLimit) {
+//        //Check if player profile is loaded
+//        if (pluginRef.getUserManager().getPlayer(player) == null)
+//            return;
+//
+//        Party party = pluginRef.getPartyManager().getParty(partyName);
+//
+//        if (party == null) {
+//            party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName);
+//        }
+//
+//        pluginRef.getPartyManager().addToParty(pluginRef.getUserManager().getPlayer(player), party);
+//    }
+//
+//    /**
+//     * Remove a player from a party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player The player to remove
+//     */
+//    public static void removeFromParty(Player player) {
+//        //Check if player profile is loaded
+//        if (pluginRef.getUserManager().getPlayer(player) == null)
+//            return;
+//
+//        pluginRef.getPartyManager().removeFromParty(pluginRef.getUserManager().getPlayer(player));
+//    }
+//
+//    /**
+//     * Get the leader of a party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param partyName The party name
+//     * @return the leader of the party
+//     */
+//    public static String getPartyLeader(String partyName) {
+//        return pluginRef.getPartyManager().getPartyLeaderName(partyName);
+//    }
+//
+//    /**
+//     * Set the leader of a party.
+//     * </br>
+//     * 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
+//     */
+//    @Deprecated
+//    public static void setPartyLeader(String partyName, String playerName) {
+//        pluginRef.getPartyManager().setPartyLeader(mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId(), pluginRef.getPartyManager().getParty(partyName));
+//    }
+//
+//    /**
+//     * Get a list of all players in this player's party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player The player to check
+//     * @return all the players in the player's party
+//     */
+//    @Deprecated
+//    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
+//        List<OfflinePlayer> members = new ArrayList<>();
+//
+//        for (UUID memberUniqueId : pluginRef.getPartyManager().getAllMembers(player).keySet()) {
+//            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberUniqueId);
+//            members.add(member);
+//        }
+//        return members;
+//    }
+//
+//    /**
+//     * Get a list of all player names in this player's party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @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>) pluginRef.getPartyManager().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 pluginRef.getPartyManager().getAllMembers(player);
+//    }
+//
+//    /**
+//     * Get a list of all online players in this party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param partyName The party to check
+//     * @return all online players in this party
+//     */
+//    public static List<Player> getOnlineMembers(String partyName) {
+//        return pluginRef.getPartyManager().getOnlineMembers(partyName);
+//    }
+//
+//    /**
+//     * Get a list of all online players in this player's party.
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @param player The player to check
+//     * @return all online players in the player's party
+//     */
+//    public static List<Player> getOnlineMembers(Player player) {
+//        return pluginRef.getPartyManager().getOnlineMembers(player);
+//    }
+//
+//    public static boolean hasAlly(String partyName) {
+//        return getAllyName(partyName) != null;
+//    }
+//
+//    public static String getAllyName(String partyName) {
+//        Party ally = pluginRef.getPartyManager().getParty(partyName).getAlly();
+//        if (ally != null) {
+//            return ally.getName();
+//        }
+//
+//        return null;
+//    }
+//}

mcmmo-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java

@@ -0,0 +1,94 @@
+//package com.gmail.nossr50.api;
+//
+//import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+//
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//
+//public final class SkillAPI {
+//    private SkillAPI() {
+//    }
+//
+//    /**
+//     * Returns a list of strings with mcMMO's skills
+//     * This includes parent and child skills
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return a list of strings with valid skill names
+//     */
+//    public static List<String> getSkills() {
+//        return getListFromEnum(Arrays.asList(PrimarySkillType.values()));
+//    }
+//
+//    /**
+//     * Returns a list of strings with mcMMO's skills
+//     * This only includes parent skills
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return a list of strings with valid skill names
+//     */
+//    public static List<String> getNonChildSkills() {
+//        return getListFromEnum(pluginRef.getSkillTools().NON_CHILD_SKILLS);
+//    }
+//
+//    /**
+//     * Returns a list of strings with mcMMO's skills
+//     * This only includes child skills
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return a list of strings with valid skill names
+//     */
+//    public static List<String> getChildSkills() {
+//        return getListFromEnum(PrimarySkillType.CHILD_SKILLS);
+//    }
+//
+//    /**
+//     * Returns a list of strings with mcMMO's skills
+//     * This only includes combat skills
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return a list of strings with valid skill names
+//     */
+//    public static List<String> getCombatSkills() {
+//        return getListFromEnum(PrimarySkillType.COMBAT_SKILLS);
+//    }
+//
+//    /**
+//     * Returns a list of strings with mcMMO's skills
+//     * This only includes gathering skills
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return a list of strings with valid skill names
+//     */
+//    public static List<String> getGatheringSkills() {
+//        return getListFromEnum(PrimarySkillType.GATHERING_SKILLS);
+//    }
+//
+//    /**
+//     * Returns a list of strings with mcMMO's skills
+//     * This only includes misc skills
+//     * </br>
+//     * This function is designed for API usage.
+//     *
+//     * @return a list of strings with valid skill names
+//     */
+//    public static List<String> getMiscSkills() {
+//        return getListFromEnum(PrimarySkillType.MISC_SKILLS);
+//    }
+//
+//    private static List<String> getListFromEnum(List<PrimarySkillType> skillsTypes) {
+//        List<String> skills = new ArrayList<>();
+//
+//        for (PrimarySkillType primarySkillType : skillsTypes) {
+//            skills.add(primarySkillType.name());
+//        }
+//
+//        return skills;
+//    }
+//}

mcmmo-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java

@@ -0,0 +1,9 @@
+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.");
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java

@@ -3,7 +3,7 @@ package com.gmail.nossr50.api.exceptions;
 public class InvalidSkillException extends RuntimeException {
     private static final long serialVersionUID = 942705284195791157L;
 
-    public InvalidSkillException() {
-        super("That is not a valid skill.");
+    public InvalidSkillException(String s) {
+        super(s + " does not match a valid skill.");
     }
 }

mcmmo-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java

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

mcmmo-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java

@@ -0,0 +1,11 @@
+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 [NOTE: This can mean the profile is not loaded yet!] : " + player.getName() + " " + player.getUniqueId());
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/api/exceptions/MissingSkillPropertyDefinition.java

@@ -0,0 +1,7 @@
+package com.gmail.nossr50.api.exceptions;
+
+public class MissingSkillPropertyDefinition extends RuntimeException {
+    public MissingSkillPropertyDefinition(String details) {
+        super("A skill property is undefined! Details: " + details);
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/api/exceptions/UndefinedSkillBehaviour.java

@@ -0,0 +1,9 @@
+package com.gmail.nossr50.api.exceptions;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+
+public class UndefinedSkillBehaviour extends RuntimeException {
+    public UndefinedSkillBehaviour(PrimarySkillType primarySkillType) {
+        super("Undefined behaviour for skill! - " + primarySkillType.toString());
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/bukkit/BukkitFactory.java

@@ -0,0 +1,26 @@
+//package com.gmail.nossr50.bukkit;
+//
+//import com.gmail.nossr50.datatypes.items.BukkitMMOItem;
+//import com.gmail.nossr50.datatypes.items.MMOItem;
+//import com.gmail.nossr50.util.nbt.NBTManager;
+//import com.gmail.nossr50.util.nbt.RawNBT;
+//import org.bukkit.inventory.ItemStack;
+//
+///**
+// * Used to convert or construct platform independent types into Bukkit types
+// */
+//public class BukkitFactory {
+//
+//    /**
+//     * Creates a BukkitMMOItem which contains Bukkit implementations for the type MMOItem
+//     * @return a new BukkitMMOItem
+//     */
+//    public static MMOItem<?> createItem(String namespaceKey, int amount, RawNBT rawNBT) {
+//        return new BukkitMMOItem(namespaceKey, amount, rawNBT);
+//    }
+//
+//    public static MMOItem<?> createItem(ItemStack itemStack) {
+//        return createItem(itemStack.getType().getKey().toString(), itemStack.getAmount(), new RawNBT(NBTManager.getNBT(itemStack).toString()));
+//    }
+//
+//}

mcmmo-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java

@@ -0,0 +1,105 @@
+package com.gmail.nossr50.chat;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ChatManager {
+    private final String ADMIN_CHAT_PERMISSION = "mcmmo.chat.adminchat";
+    private final mcMMO pluginRef;
+
+    public ChatManager(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    public void processAdminChat(Player player, String message) {
+        sendAdminChatMessage(new McMMOAdminChatEvent(pluginRef, player.getName(), player.getDisplayName(), message));
+    }
+
+    public void processAdminChat(String senderName, String displayName, String message) {
+        sendAdminChatMessage(new McMMOAdminChatEvent(pluginRef, senderName, displayName, message));
+    }
+
+    public void processPartyChat(Party party, Player sender, String message) {
+        sendPartyChatMessage(new McMMOPartyChatEvent(pluginRef, sender.getName(), sender.getDisplayName(), party, message));
+    }
+
+    public void processPartyChat(Party party, String senderName, String message) {
+        sendPartyChatMessage(new McMMOPartyChatEvent(pluginRef, senderName, senderName, party, message));
+    }
+
+    private void sendAdminChatMessage(McMMOAdminChatEvent event) {
+        pluginRef.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        String chatPrefix = pluginRef.getConfigManager().getConfigCommands().getAdminChatPrefix();
+        String senderName = event.getSender();
+        String displayName = pluginRef.getConfigManager().getConfigCommands().isUseDisplayNames() ? event.getDisplayName() : senderName;
+        String message = pluginRef.getLocaleManager().formatString(chatPrefix, displayName) + " " + event.getMessage();
+
+        pluginRef.getServer().broadcast(message, ADMIN_CHAT_PERMISSION);
+    }
+
+    private void sendPartyChatMessage(McMMOPartyChatEvent event) {
+        pluginRef.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        Party party = event.getParty();
+        String chatPrefix = pluginRef.getConfigManager().getConfigParty().getPartyChatPrefixFormat();
+        String senderName = event.getSender();
+        String displayName = pluginRef.getConfigManager().getConfigCommands().isUseDisplayNames() ? event.getDisplayName() : senderName;
+        String message = pluginRef.getLocaleManager().formatString(chatPrefix, displayName) + " " + event.getMessage();
+
+        if (pluginRef.getConfigManager().getConfigParty().isPartyLeaderColoredGold()
+                && senderName.equalsIgnoreCase(party.getLeader().getPlayerName())) {
+            message = message.replaceFirst(Pattern.quote(displayName), ChatColor.GOLD + Matcher.quoteReplacement(displayName) + ChatColor.RESET);
+        }
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(message);
+        }
+
+        if (party.getAlly() != null) {
+            for (Player member : party.getAlly().getOnlineMembers()) {
+                String allyPrefix = pluginRef.getLocaleManager().formatString(pluginRef.getConfigManager().getConfigParty().getPartyChatPrefixAlly());
+                member.sendMessage(allyPrefix + message);
+            }
+        }
+
+        pluginRef.getServer().getConsoleSender().sendMessage(ChatColor.stripColor("[mcMMO] [P]<" + party.getName() + ">" + message));
+
+        /*
+         * Party Chat Spying
+         */
+        for (McMMOPlayer mcMMOPlayer : pluginRef.getUserManager().getPlayers()) {
+            Player player = mcMMOPlayer.getPlayer();
+
+            //Check for toggled players
+            if (mcMMOPlayer.isPartyChatSpying()) {
+                Party adminParty = mcMMOPlayer.getParty();
+
+                //Only message admins not part of this party
+                if (adminParty != null) {
+                    //TODO: Incorporate JSON
+                    if (adminParty != event.getParty())
+                        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.AdminChatSpy.Chat", event.getParty(), message));
+                } else {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.AdminChatSpy.Chat", event.getParty(), message));
+                }
+            }
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/AbilityToggleCommand.java

@@ -0,0 +1,33 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+
+public class AbilityToggleCommand extends ToggleCommand {
+
+    public AbilityToggleCommand(mcMMO pluginRef) {
+        super(pluginRef);
+    }
+
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return pluginRef.getPermissionTools().mcabilityOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return pluginRef.getPermissionTools().mcability(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.getPlayer().sendMessage(pluginRef.getLocaleManager().getString("Commands.Ability." + (mcMMOPlayer.getAllowAbilityUse() ? "Off" : "On")));
+        mcMMOPlayer.toggleAbilityUse();
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Ability.Toggle", playerName));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/ChatNotificationToggleCommand.java

@@ -1,26 +1,38 @@
 package com.gmail.nossr50.commands;
 
-import java.util.List;
-
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+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 com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import java.util.List;
 
-import com.google.common.collect.ImmutableList;
+public class ChatNotificationToggleCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ChatNotificationToggleCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
 
-public class McnotifyCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
         switch (args.length) {
             case 0:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer((Player) sender);
 
-                sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
+                //Not Loaded yet
+                if (mcMMOPlayer == null)
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
                 mcMMOPlayer.toggleChatNotifications();
                 return true;
 

mcmmo-core/src/main/java/com/gmail/nossr50/commands/CommandConstants.java

@@ -0,0 +1,12 @@
+package com.gmail.nossr50.commands;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
+public class CommandConstants {
+    public static final List<String> TELEPORT_SUBCOMMANDS = ImmutableList.of("toggle", "accept", "acceptany", "acceptall");
+    public static final List<String> ALLIANCE_SUBCOMMANDS = ImmutableList.of("invite", "accept", "disband");
+    public static final List<String> TRUE_FALSE_OPTIONS = ImmutableList.of("on", "off", "true", "false", "enabled", "disabled");
+    public static final List<String> RESET_OPTIONS = ImmutableList.of("clear", "reset");
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/ConvertCommand.java

@@ -0,0 +1,96 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
+import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ConvertCommand implements TabExecutor {
+    private List<String> FORMULA_TYPES;
+    private List<String> DATABASE_TYPES;
+    private final List<String> CONVERSION_SUBCOMMANDS = ImmutableList.of("database", "experience");
+    private CommandExecutor databaseConvertCommand;
+    private CommandExecutor experienceConvertCommand;
+
+    private final mcMMO pluginRef;
+
+    public ConvertCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+        databaseConvertCommand = new ConvertDatabaseCommand(pluginRef);
+        experienceConvertCommand = new ConvertExperienceCommand(pluginRef);
+        initTypes();
+    }
+
+    private void initTypes() {
+        ArrayList<String> formulaTypes = new ArrayList<>();
+        ArrayList<String> databaseTypes = new ArrayList<>();
+
+        for (FormulaType type : FormulaType.values()) {
+            formulaTypes.add(type.toString());
+        }
+
+        for (DatabaseType type : DatabaseType.values()) {
+            databaseTypes.add(type.toString());
+        }
+
+        // Custom stuff
+        databaseTypes.remove(DatabaseType.CUSTOM.toString());
+
+        if (pluginRef.getDatabaseManager().getDatabaseType() == DatabaseType.CUSTOM) {
+            databaseTypes.add(pluginRef.getDatabaseManagerFactory().getCustomDatabaseManagerClass().getName());
+        }
+
+        Collections.sort(formulaTypes);
+        Collections.sort(databaseTypes);
+
+        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
+        DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
+                    return databaseConvertCommand.onCommand(sender, command, label, args);
+                } else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
+                    return experienceConvertCommand.onCommand(sender, command, label, args);
+                }
+
+                return false;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], CONVERSION_SUBCOMMANDS, new ArrayList<>(CONVERSION_SUBCOMMANDS.size()));
+            case 2:
+                if (args[1].equalsIgnoreCase("database") || args[1].equalsIgnoreCase("db")) {
+                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<>(DATABASE_TYPES.size()));
+                }
+
+                if (args[1].equalsIgnoreCase("experience") || args[1].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
+                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<>(FORMULA_TYPES.size()));
+                }
+
+                return ImmutableList.of();
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/ExperienceRateCommand.java

@@ -0,0 +1,124 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.datatypes.notifications.SensitiveCommandType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.StringUtils;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExperienceRateCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ExperienceRateCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (!args[0].equalsIgnoreCase("reset") && !args[0].equalsIgnoreCase("clear")) {
+                    return false;
+                }
+
+                if (!pluginRef.getPermissionTools().xprateReset(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (pluginRef.isXPEventEnabled()) {
+
+                    if (pluginRef.getConfigManager().getConfigEvent().isSendTitleMessages()) {
+                        pluginRef.getNotificationManager().broadcastTitle(pluginRef.getServer(),
+                                pluginRef.getLocaleManager().getString("Commands.Event.Stop"),
+                                pluginRef.getLocaleManager().getString("Commands.Event.Stop.Subtitle"),
+                                10, 10 * 20, 20);
+                    }
+
+                    if (pluginRef.getConfigManager().getConfigEvent().isBroadcastXPRateEventMessages()) {
+                        pluginRef.getServer().broadcastMessage(pluginRef.getLocaleManager().getString("Commands.Event.Stop"));
+                        pluginRef.getServer().broadcastMessage(pluginRef.getLocaleManager().getString("Commands.Event.Stop.Subtitle"));
+                    }
+
+                    //Admin notification
+                    pluginRef.getNotificationManager().processSensitiveCommandNotification(sender, SensitiveCommandType.XPRATE_END);
+
+                    pluginRef.toggleXpEventEnabled();
+                }
+
+                pluginRef.getDynamicSettingsManager().getExperienceManager().resetGlobalXpMult();
+                return true;
+
+            case 2:
+                if (pluginRef.getCommandTools().isInvalidInteger(sender, args[0])) {
+                    return true;
+                }
+
+                if (!pluginRef.getPermissionTools().xprateSet(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (pluginRef.getCommandTools().shouldDisableToggle(args[1])) {
+                    pluginRef.setXPEventEnabled(false);
+                } else if (pluginRef.getCommandTools().shouldEnableToggle(args[1])) {
+                    pluginRef.setXPEventEnabled(true);
+                } else {
+                    return false;
+                }
+
+                int newXpRate = Integer.parseInt(args[0]);
+
+                if (newXpRate < 0) {
+                    sender.sendMessage(ChatColor.RED + pluginRef.getLocaleManager().getString("Commands.NegativeNumberWarn"));
+                    return true;
+                }
+
+                pluginRef.getDynamicSettingsManager().getExperienceManager().setGlobalXpMult(newXpRate);
+
+                if (pluginRef.getConfigManager().getConfigEvent().isSendTitleMessages()) {
+                    pluginRef.getNotificationManager().broadcastTitle(pluginRef.getServer(),
+                            pluginRef.getLocaleManager().getString("Commands.Event.Start"),
+                            pluginRef.getLocaleManager().getString("Commands.Event.XP", newXpRate),
+                            10, 10 * 20, 20);
+                }
+
+                if (pluginRef.getConfigManager().getConfigEvent().isBroadcastXPRateEventMessages()) {
+                    pluginRef.getServer().broadcastMessage(pluginRef.getLocaleManager().getString("Commands.Event.Start"));
+                    pluginRef.getServer().broadcastMessage(pluginRef.getLocaleManager().getString("Commands.Event.XP", newXpRate));
+                }
+
+                //Admin notification
+                pluginRef.getNotificationManager().processSensitiveCommandNotification(sender, SensitiveCommandType.XPRATE_MODIFY, String.valueOf(newXpRate));
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (StringUtils.isInt(args[0])) {
+                    return ImmutableList.of();
+                }
+
+                return StringUtil.copyPartialMatches(args[0], CommandConstants.RESET_OPTIONS, new ArrayList<>(CommandConstants.RESET_OPTIONS.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], CommandConstants.TRUE_FALSE_OPTIONS, new ArrayList<>(CommandConstants.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/GodModeCommand.java

@@ -0,0 +1,33 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+
+public class GodModeCommand extends ToggleCommand {
+
+    public GodModeCommand(mcMMO pluginRef) {
+        super(pluginRef);
+    }
+
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return pluginRef.getPermissionTools().mcgodOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return pluginRef.getPermissionTools().mcgod(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.getPlayer().sendMessage(pluginRef.getLocaleManager().getString("Commands.GodMode." + (mcMMOPlayer.getGodMode() ? "Disabled" : "Enabled")));
+        mcMMOPlayer.toggleGodMode();
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.GodMode.Toggle", playerName));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/McMMOCommand.java

@@ -0,0 +1,118 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.commands.party.PartySubcommandType;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+public class McMMOCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public McMMOCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!pluginRef.getPermissionTools().mcmmoDescription(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String description = pluginRef.getLocaleManager().getString("mcMMO.Description");
+                String[] mcSplit = description.split(",");
+                sender.sendMessage(mcSplit);
+                sender.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.Description.FormerDevs"));
+
+                if (pluginRef.getConfigManager().getConfigAds().isShowDonationInfo()) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("MOTD.Donate"));
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
+                }
+
+                sender.sendMessage(pluginRef.getLocaleManager().getString("MOTD.Version", pluginRef.getDescription().getVersion()));
+
+//                mcMMO.getHolidayManager().anniversaryCheck(sender);
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("commands")) {
+                    if (!pluginRef.getPermissionTools().mcmmoHelp(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcc.Header"));
+                    displayGeneralCommands(sender);
+                    displayOtherCommands(sender);
+                    displayPartyCommands(sender);
+                }
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void displayGeneralCommands(CommandSender sender) {
+        sender.sendMessage(ChatColor.DARK_AQUA + " /mcstats " + pluginRef.getLocaleManager().getString("Commands.Stats"));
+        sender.sendMessage(ChatColor.DARK_AQUA + " /<skill>" + pluginRef.getLocaleManager().getString("Commands.SkillInfo"));
+        sender.sendMessage(ChatColor.DARK_AQUA + " /mctop " + pluginRef.getLocaleManager().getString("Commands.Leaderboards"));
+
+        if (pluginRef.getPermissionTools().inspect(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /inspect " + pluginRef.getLocaleManager().getString("Commands.Inspect"));
+        }
+
+        if (pluginRef.getPermissionTools().mcability(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /mcability " + pluginRef.getLocaleManager().getString("Commands.ToggleAbility"));
+        }
+    }
+
+    private void displayOtherCommands(CommandSender sender) {
+        //Don't show them this category if they have none of the permissions
+        if (!pluginRef.getPermissionTools().skillreset(sender) && !pluginRef.getPermissionTools().mmoedit(sender) && !pluginRef.getPermissionTools().adminChat(sender) && !pluginRef.getPermissionTools().mcgod(sender))
+            return;
+
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Other"));
+
+        if (pluginRef.getPermissionTools().skillreset(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /skillreset <skill|all> " + pluginRef.getLocaleManager().getString("Commands.Reset"));
+        }
+
+        if (pluginRef.getPermissionTools().mmoedit(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /mmoedit " + pluginRef.getLocaleManager().getString("Commands.mmoedit"));
+        }
+
+        if (pluginRef.getPermissionTools().adminChat(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /adminchat " + pluginRef.getLocaleManager().getString("Commands.AdminToggle"));
+        }
+
+        if (pluginRef.getPermissionTools().mcgod(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /mcgod " + pluginRef.getLocaleManager().getString("Commands.mcgod"));
+        }
+    }
+
+    private void displayPartyCommands(CommandSender sender) {
+        if (pluginRef.getPermissionTools().party(sender)) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Commands"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party create <" + pluginRef.getLocaleManager().getString("Commands.Usage.PartyName") + "> " + pluginRef.getLocaleManager().getString("Commands.Party1"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party join <" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + "> " + pluginRef.getLocaleManager().getString("Commands.Party2"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party quit " + pluginRef.getLocaleManager().getString("Commands.Party.Quit"));
+
+            if (pluginRef.getPermissionTools().partyChat(sender)) {
+                sender.sendMessage(ChatColor.DARK_AQUA + " /party chat " + pluginRef.getLocaleManager().getString("Commands.Party.Toggle"));
+            }
+
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party invite <" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + "> " + pluginRef.getLocaleManager().getString("Commands.Party.Invite"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party accept " + pluginRef.getLocaleManager().getString("Commands.Party.Accept"));
+
+            if (pluginRef.getPermissionTools().partySubcommand(sender, PartySubcommandType.TELEPORT)) {
+                sender.sendMessage(ChatColor.DARK_AQUA + " /party teleport <" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + "> " + pluginRef.getLocaleManager().getString("Commands.Party.Teleport"));
+            }
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/RefreshCooldownsCommand.java

@@ -0,0 +1,37 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+
+public class RefreshCooldownsCommand extends ToggleCommand {
+
+    public RefreshCooldownsCommand(mcMMO pluginRef) {
+        super(pluginRef);
+    }
+
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return pluginRef.getPermissionTools().mcrefreshOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return pluginRef.getPermissionTools().mcrefresh(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.setRecentlyHurt(0);
+        mcMMOPlayer.resetCooldowns();
+        mcMMOPlayer.resetToolPrepMode();
+        mcMMOPlayer.resetSuperAbilityMode();
+
+        mcMMOPlayer.getPlayer().sendMessage(pluginRef.getLocaleManager().getString("Ability.Generic.Refresh"));
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcrefresh.Success", playerName));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/ResetUserHealthBarSettingsCommand.java

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.database.FlatFileDatabaseManager;
+import com.gmail.nossr50.database.SQLDatabaseManager;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import java.util.List;
+
+public class ResetUserHealthBarSettingsCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ResetUserHealthBarSettingsCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getDatabaseManager() instanceof SQLDatabaseManager) {
+            SQLDatabaseManager sqlDatabaseManager = (SQLDatabaseManager) pluginRef.getDatabaseManager();
+            sqlDatabaseManager.resetMobHealthSettings();
+            for (McMMOPlayer player : pluginRef.getUserManager().getPlayers()) {
+                player.getProfile().setMobHealthbarType(pluginRef.getConfigManager().getConfigMobs().getCombat().getHealthBars().getDisplayBarType());
+            }
+            sender.sendMessage("Mob health reset");
+            return true;
+        }
+        if (pluginRef.getDatabaseManager() instanceof FlatFileDatabaseManager) {
+            FlatFileDatabaseManager flatFileDatabaseManager = (FlatFileDatabaseManager) pluginRef.getDatabaseManager();
+            flatFileDatabaseManager.resetMobHealthSettings();
+            for (McMMOPlayer player : pluginRef.getUserManager().getPlayers()) {
+                player.getProfile().setMobHealthbarType(pluginRef.getConfigManager().getConfigMobs().getCombat().getHealthBars().getDisplayBarType());
+            }
+            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();
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/ScoreboardCommand.java

@@ -0,0 +1,92 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ScoreboardCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ScoreboardCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    private static final List<String> FIRST_ARGS = ImmutableList.of("keep", "time", "clear");
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("clear") || args[0].equalsIgnoreCase("reset")) {
+                    pluginRef.getScoreboardManager().clearBoard(sender.getName());
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Clear"));
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("keep")) {
+                    if (!pluginRef.getScoreboardSettings().getScoreboardsEnabled()) {
+                        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Disabled"));
+                        return true;
+                    }
+
+                    if (!pluginRef.getScoreboardManager().isBoardShown(sender.getName())) {
+                        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.NoBoard"));
+                        return true;
+                    }
+
+                    pluginRef.getScoreboardManager().keepBoard(sender.getName());
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Keep"));
+                    return true;
+                }
+
+                return help(sender);
+
+            case 2:
+                if (args[0].equalsIgnoreCase("time") || args[0].equalsIgnoreCase("timer")) {
+                    if (pluginRef.getCommandTools().isInvalidInteger(sender, args[1])) {
+                        return true;
+                    }
+
+                    int time = Math.abs(Integer.parseInt(args[1]));
+
+                    pluginRef.getScoreboardManager().setRevertTimer(sender.getName(), time);
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Timer", time));
+                    return true;
+                }
+
+                return help(sender);
+
+            default:
+                return help(sender);
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], FIRST_ARGS, new ArrayList<>(FIRST_ARGS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private boolean help(CommandSender sender) {
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Help.0"));
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Help.1"));
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Help.2"));
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Scoreboard.Help.3"));
+        return true;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java

@@ -1,30 +1,29 @@
 package com.gmail.nossr50.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+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.util.StringUtil;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-
-import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class ToggleCommand implements TabExecutor {
-    protected McMMOPlayer mcMMOPlayer;
-    protected Player player;
+
+    protected mcMMO pluginRef;
+
+    public ToggleCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
-                if (CommandUtils.noConsoleUsage(sender)) {
+                if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
                     return true;
                 }
 
@@ -33,10 +32,11 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                player = (Player) sender;
-                mcMMOPlayer = UserManager.getPlayer(player);
+                if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                    return true;
+                }
 
-                applyCommandAction();
+                applyCommandAction(pluginRef.getUserManager().getPlayer(sender.getName()));
                 return true;
 
             case 1:
@@ -45,20 +45,20 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
-                mcMMOPlayer = UserManager.getPlayer(args[0]);
+                String playerName = pluginRef.getCommandTools().getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(playerName);
 
-                if (!CommandUtils.checkPlayerExistence(sender, args[0], mcMMOPlayer)) {
+                if (!pluginRef.getCommandTools().checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
                     return true;
                 }
 
-                player = mcMMOPlayer.getPlayer();
-
-                if (CommandUtils.isOffline(sender, player)) {
+                //TODO: Does it matter if they are offline?
+                /*if (pluginRef.getCommandTools().isOffline(sender, mcMMOPlayer.getPlayer())) {
                     return true;
-                }
+                }*/
 
-                applyCommandAction();
-                sendSuccessMessage(sender);
+                applyCommandAction(mcMMOPlayer);
+                sendSuccessMessage(sender, playerName);
                 return true;
 
             default:
@@ -70,15 +70,18 @@ public abstract class ToggleCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayers().keySet();
-                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+                List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
             default:
                 return ImmutableList.of();
         }
     }
 
     protected abstract boolean hasOtherPermission(CommandSender sender);
+
     protected abstract boolean hasSelfPermission(CommandSender sender);
-    protected abstract void applyCommandAction();
-    protected abstract void sendSuccessMessage(CommandSender sender);
+
+    protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
+
+    protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
 }

mcmmo-core/src/main/java/com/gmail/nossr50/commands/admin/NBTToolsCommand.java

@@ -0,0 +1,66 @@
+package com.gmail.nossr50.commands.admin;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.*;
+import com.gmail.nossr50.mcMMO;
+import net.kyori.text.TextComponent;
+import net.kyori.text.adapter.bukkit.TextAdapter;
+import net.kyori.text.format.TextColor;
+import net.kyori.text.serializer.gson.GsonComponentSerializer;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+@CommandAlias("nbttools")
+@Description("Read or Modify values of NBT on an item in-hand")
+public class NBTToolsCommand extends BaseCommand {
+
+    public static final String STYLE_TEXT_1 = "//////////";
+    @Dependency
+    private mcMMO plugin;
+
+    @Default
+    @CommandPermission("mcmmo.commands.nbttools")
+    public void onCommand(Player player) {
+        //TODO: Add some help messages
+        player.sendMessage("hi");
+    }
+
+    /**
+     * Show the NBT tags of an item in hand
+     */
+    @Subcommand("tags show")
+    public void onShowTags(Player player) {
+        final TextComponent textComponent = TextComponent.builder()
+                .content(plugin.getLocaleManager().getString("mcMMO.Template.Prefix"))
+                .append("NBT Tools")
+                .color(TextColor.GOLD)
+                .append(" - ")
+                .append("Showing NBT Tags (")
+                .append(player.getInventory().getItemInMainHand().getType().getKey().toString())
+                .color(TextColor.GREEN)
+                .append(")")
+                .color(TextColor.GOLD)
+                .append(TextComponent.newline())
+                .build();
+
+        String json = GsonComponentSerializer.INSTANCE.serialize(textComponent);
+        TextAdapter.sendMessage(player, textComponent);
+
+        //Show NBT tags to player
+        player.sendMessage(STYLE_TEXT_1 + " NBT TOOLS " + STYLE_TEXT_1);
+        player.sendMessage("NBT Analysis: " + player.getInventory().getItemInMainHand().getType().getKey().toString());
+        player.sendMessage(STYLE_TEXT_1 + STYLE_TEXT_1);
+        plugin.getNbtManager().printNBT(player.getInventory().getItemInMainHand(), player);
+        player.sendMessage(ChatColor.GRAY + "NBT Analysis completed!");
+    }
+
+    @Subcommand("tags add")
+    public void onAddTags(Player player) {
+
+    }
+
+    @Subcommand("tags remove")
+    public void onRemoveTags(Player player) {
+
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/admin/PlayerDebugCommand.java

@@ -0,0 +1,33 @@
+package com.gmail.nossr50.commands.admin;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.Default;
+import co.aikar.commands.annotation.Dependency;
+import co.aikar.commands.annotation.Description;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+@CommandAlias("mmodebug")
+@Description("Puts the player into debug mode, which helps problem solve bugs in mcMMO.")
+public class PlayerDebugCommand extends BaseCommand {
+
+    @Dependency
+    private mcMMO plugin;
+
+    @Default
+    public void onCommand(CommandSender sender) {
+        if(sender instanceof Player) {
+            McMMOPlayer mcMMOPlayer = plugin.getUserManager().getPlayer((Player) sender);
+            mcMMOPlayer.toggleDebugMode(); //Toggle debug mode
+            plugin.getNotificationManager().sendPlayerInformationChatOnlyPrefixed(mcMMOPlayer.getPlayer(), "Commands.Mmodebug.Toggle", String.valueOf(mcMMOPlayer.isDebugMode()));
+        } else {
+            //TODO: Localize
+            sender.sendMessage("Players only");
+        }
+    }
+
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/admin/ReloadLocaleCommand.java

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.commands.admin;
+
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+/**
+ * @author Mark Vainomaa
+ */
+public final class ReloadLocaleCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ReloadLocaleCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0) {
+            if (!pluginRef.getPermissionTools().reloadlocale(sender)) {
+                if(command.getPermissionMessage() != null)
+                    sender.sendMessage(command.getPermissionMessage());
+
+                return true;
+            }
+
+            pluginRef.getLocaleManager().reloadLocale();
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Locale.Reloaded"));
+
+            return true;
+        }
+        return false;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java

@@ -0,0 +1,16 @@
+package com.gmail.nossr50.commands.chat;
+
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+
+public class AdminChatCommand extends ChatCommand {
+    public AdminChatCommand(mcMMO pluginRef) {
+        super(ChatMode.ADMIN, pluginRef);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        pluginRef.getChatManager().processAdminChat(sender.getName(), getDisplayName(sender), buildChatMessage(args, 0));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -0,0 +1,159 @@
+package com.gmail.nossr50.commands.chat;
+
+import com.gmail.nossr50.commands.CommandConstants;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+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.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class ChatCommand implements TabExecutor {
+    private ChatMode chatMode;
+    protected mcMMO pluginRef;
+
+    ChatCommand(ChatMode chatMode, mcMMO pluginRef) {
+        this.chatMode = chatMode;
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
+                mcMMOPlayer = pluginRef.getUserManager().getPlayer(sender.getName());
+
+                if (mcMMOPlayer.isChatEnabled(chatMode)) {
+                    disableChatMode(mcMMOPlayer, sender);
+                } else {
+                    enableChatMode(mcMMOPlayer, sender);
+                }
+
+                return true;
+
+            case 1:
+                if (pluginRef.getCommandTools().shouldEnableToggle(args[0])) {
+                    if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+                        return true;
+                    }
+                    if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                        return true;
+                    }
+
+                    enableChatMode(pluginRef.getUserManager().getPlayer(sender.getName()), sender);
+                    return true;
+                }
+
+                if (pluginRef.getCommandTools().shouldDisableToggle(args[0])) {
+                    if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+                        return true;
+                    }
+                    if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                        return true;
+                    }
+
+                    disableChatMode(pluginRef.getUserManager().getPlayer(sender.getName()), sender);
+                    return true;
+                }
+
+                // Fallthrough
+
+            default:
+                handleChatSending(sender, args);
+                return true;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], CommandConstants.TRUE_FALSE_OPTIONS, new ArrayList<>(CommandConstants.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected String buildChatMessage(String[] args, int index) {
+        StringBuilder builder = new StringBuilder();
+        builder.append(args[index]);
+
+        for (int i = index + 1; i < args.length; i++) {
+            builder.append(" ");
+            builder.append(args[i]);
+        }
+
+        return builder.toString();
+    }
+
+    protected String getDisplayName(CommandSender sender) {
+        return (sender instanceof Player) ? ((Player) sender).getDisplayName() : pluginRef.getLocaleManager().getString("Commands.Chat.Console");
+    }
+
+    protected abstract void handleChatSending(CommandSender sender, String[] args);
+
+    private void enableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.None"));
+            return;
+        }
+
+        if (chatMode == ChatMode.PARTY && (mcMMOPlayer.getParty().getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.CHAT))) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.1"));
+            return;
+        }
+
+        mcMMOPlayer.enableChat(chatMode);
+        sender.sendMessage(getChatModeEnabledMessage(chatMode, true));
+    }
+
+    private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.None"));
+            return;
+        }
+
+        mcMMOPlayer.disableChat(chatMode);
+        sender.sendMessage(getChatModeEnabledMessage(chatMode, false));
+    }
+
+    private String getChatModeEnabledMessage(ChatMode chatMode, boolean enabled) {
+        switch(chatMode) {
+            case ADMIN:
+                return getAdminMessage(enabled);
+            default:
+                return getPartyMessage(enabled);
+        }
+    }
+
+    private String getAdminMessage(boolean enabled) {
+        if(enabled)
+            return pluginRef.getLocaleManager().getString("Commands.AdminChat.On");
+        else
+            return pluginRef.getLocaleManager().getString("Commands.AdminChat.Off");
+    }
+
+    private String getPartyMessage(boolean enabled) {
+        if(enabled)
+            return pluginRef.getLocaleManager().getString("Commands.Party.Chat.On");
+        else
+            return pluginRef.getLocaleManager().getString("Commands.Party.Chat.Off");
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/chat/ChatSpyCommand.java

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

mcmmo-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -0,0 +1,56 @@
+package com.gmail.nossr50.commands.chat;
+
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyChatCommand extends ChatCommand {
+    public PartyChatCommand(mcMMO pluginRef) {
+        super(ChatMode.PARTY, pluginRef);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        Party party;
+        String message;
+
+        if (sender instanceof Player) {
+            //Check if player profile is loaded
+            if (pluginRef.getUserManager().getPlayer((Player) sender) == null)
+                return;
+
+            party = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+
+            if (party == null) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.None"));
+                return;
+            }
+
+            if (party.getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.1"));
+                return;
+            }
+
+            message = buildChatMessage(args, 0);
+        } else {
+            if (args.length < 2) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Specify"));
+                return;
+            }
+
+            party = pluginRef.getPartyManager().getParty(args[0]);
+
+            if (party == null) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.InvalidName"));
+                return;
+            }
+
+            message = buildChatMessage(args, 1);
+        }
+
+        pluginRef.getChatManager().processPartyChat(party, getDisplayName(sender), message);
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java

@@ -0,0 +1,93 @@
+package com.gmail.nossr50.commands.database;
+
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
+import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class ConvertDatabaseCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ConvertDatabaseCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                DatabaseType previousType = getDatabaseType(args[1]);
+                DatabaseType newType = pluginRef.getDatabaseManager().getDatabaseType();
+
+                if (previousType == newType || (newType == DatabaseType.CUSTOM && pluginRef.getDatabaseManagerFactory().getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1]))) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcconvert.Database.Same", newType.toString()));
+                    return true;
+                }
+
+                DatabaseManager oldDatabase = pluginRef.getDatabaseManagerFactory().createDatabaseManager(previousType);
+
+                if (previousType == DatabaseType.CUSTOM) {
+                    Class<?> clazz;
+
+                    try {
+                        clazz = Class.forName(args[1]);
+
+                        if (!DatabaseManager.class.isAssignableFrom(clazz)) {
+                            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                            return true;
+                        }
+
+                        oldDatabase = pluginRef.getDatabaseManagerFactory().createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                        return true;
+                    }
+                }
+
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcconvert.Database.Start", previousType.toString(), newType.toString()));
+
+                pluginRef.getUserManager().saveAll();
+                pluginRef.getUserManager().clearAll();
+
+                for (Player player : pluginRef.getServer().getOnlinePlayers()) {
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getUniqueId());
+
+                    if (profile.isLoaded()) {
+                        pluginRef.getDatabaseManager().saveUser(profile);
+                    }
+
+                    new PlayerProfileLoadingTask(pluginRef, player).runTaskLaterAsynchronously(pluginRef, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                }
+
+                new DatabaseConversionTask(pluginRef, oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(pluginRef);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    public DatabaseType getDatabaseType(String typeName) {
+        for (DatabaseType type : DatabaseType.values()) {
+            if (type.name().equalsIgnoreCase(typeName)) {
+                return type;
+            }
+        }
+
+        if (typeName.equalsIgnoreCase("file")) {
+            return DatabaseType.FLATFILE;
+        } else if (typeName.equalsIgnoreCase("mysql")) {
+            return DatabaseType.SQL;
+        }
+
+        return DatabaseType.CUSTOM;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java

@@ -0,0 +1,59 @@
+package com.gmail.nossr50.commands.database;
+
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class McremoveCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public McremoveCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 1) {
+            String playerName = pluginRef.getCommandTools().getMatchedPlayerName(args[0]);
+
+            if (pluginRef.getUserManager().getOfflinePlayer(playerName) == null && pluginRef.getCommandTools().unloadedProfile(sender, pluginRef.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                return true;
+            }
+
+            UUID uuid = null;
+
+            if (Bukkit.getPlayer(playerName) != null) {
+                uuid = Bukkit.getPlayer(playerName).getUniqueId();
+            }
+
+            if (pluginRef.getDatabaseManager().removeUser(playerName, uuid)) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcremove.Success", playerName));
+            } else {
+                sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/database/PurgeCommand.java

@@ -1,29 +1,32 @@
 package com.gmail.nossr50.commands.database;
 
-import java.util.List;
-
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
 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.locale.LocaleLoader;
+import java.util.List;
 
-import com.google.common.collect.ImmutableList;
+public class PurgeCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PurgeCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
 
-public class McpurgeCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 0:
-                mcMMO.getDatabaseManager().purgePowerlessUsers();
+                pluginRef.getDatabaseManager().purgePowerlessUsers();
 
-                if (Config.getInstance().getOldUsersCutoff() != -1) {
-                    mcMMO.getDatabaseManager().purgeOldUsers();
+                if (pluginRef.getDatabaseCleaningSettings().getOldUserCutoffMonths() != -1) {
+                    pluginRef.getDatabaseManager().purgeOldUsers();
                 }
 
-                sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcpurge.Success"));
                 return true;
 
             default:

mcmmo-core/src/main/java/com/gmail/nossr50/commands/database/ShowDatabaseCommand.java

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.commands.database;
+
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import java.util.List;
+
+public class ShowDatabaseCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ShowDatabaseCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 0) {
+            Class<?> clazz = pluginRef.getDatabaseManagerFactory().getCustomDatabaseManagerClass();
+
+            if (clazz != null) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mmoshowdb", clazz.getName()));
+                return true;
+            }
+
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mmoshowdb", (pluginRef.getMySQLConfigSettings().isMySQLEnabled() ? "sql" : "flatfile")));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/experience/AddLevelsCommand.java

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.commands.experience;
+
+import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class AddLevelsCommand extends ExperienceCommand {
+
+    public AddLevelsCommand(mcMMO pluginRef) {
+        super(pluginRef);
+    }
+
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return pluginRef.getPermissionTools().addlevels(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return pluginRef.getPermissionTools().addlevelsOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+        double xpRemoved = profile.getSkillXpLevelRaw(skill);
+        profile.addLevels(skill, value);
+
+        if (player == null) {
+            profile.scheduleAsyncSave();
+            return;
+        }
+
+        pluginRef.getEventManager().tryLevelChangeEvent(player, skill, value, xpRemoved, true, XPGainReason.COMMAND);
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.addlevels.AwardAll.1", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.addlevels.AwardSkill.1", value, pluginRef.getSkillTools().getLocalizedSkillName(skill)));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/experience/AddXPCommand.java

@@ -0,0 +1,50 @@
+package com.gmail.nossr50.commands.experience;
+
+import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.datatypes.experience.XPGainSource;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class AddXPCommand extends ExperienceCommand {
+
+    public AddXPCommand(mcMMO pluginRef) {
+        super(pluginRef);
+    }
+
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return pluginRef.getPermissionTools().addxp(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return pluginRef.getPermissionTools().addxpOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+        if (player != null) {
+            //Check if player profile is loaded
+            if (pluginRef.getUserManager().getPlayer(player) == null)
+                return;
+
+            pluginRef.getUserManager().getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND, XPGainSource.COMMAND);
+        } else {
+            profile.addXp(skill, value);
+            profile.scheduleAsyncSave();
+        }
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.addxp.AwardAll", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.addxp.AwardSkill", value, pluginRef.getSkillTools().getLocalizedSkillName(skill)));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java

@@ -0,0 +1,51 @@
+package com.gmail.nossr50.commands.experience;
+
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.runnables.database.FormulaConversionTask;
+import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class ConvertExperienceCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ConvertExperienceCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+
+                for(FormulaType formulaType : FormulaType.values()) {
+                    if(formulaType.toString().equalsIgnoreCase(args[1])) {
+                        FormulaType previousType = formulaType;
+
+                        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcconvert.Experience.Start", previousType.toString(), pluginRef.getConfigManager().getConfigLeveling().getFormulaType().toString()));
+
+                        pluginRef.getUserManager().saveAll();
+                        pluginRef.getUserManager().clearAll();
+
+                        new FormulaConversionTask(pluginRef, sender, previousType).runTaskLater(pluginRef, 1);
+
+                        for (Player player : pluginRef.getServer().getOnlinePlayers()) {
+                            new PlayerProfileLoadingTask(pluginRef, player).runTaskLaterAsynchronously(pluginRef, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                        }
+
+                        return true;
+                    }
+                }
+
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.mcconvert.Experience.Invalid"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -0,0 +1,171 @@
+package com.gmail.nossr50.commands.experience;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.OfflinePlayer;
+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 java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public abstract class ExperienceCommand implements TabExecutor {
+
+    protected mcMMO pluginRef;
+
+    public ExperienceCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    protected void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.addlevels.AwardAll.2", playerName));
+        } else {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.addlevels.AwardSkill.2", pluginRef.getSkillTools().getLocalizedSkillName(skill), playerName));
+        }
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PrimarySkillType skill;
+
+        switch (args.length) {
+            case 2:
+                if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!permissionsCheckSelf(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[0], args[1])) {
+                    return true;
+                }
+
+                skill = pluginRef.getSkillTools().matchSkill(args[0]);
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    skill = null;
+                }
+
+                if (skill != null && pluginRef.getSkillTools().isChildSkill(skill)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Skill.ChildSkill"));
+                    return true;
+                }
+
+                //Profile not loaded
+                if (pluginRef.getUserManager().getPlayer(sender.getName()) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+
+                editValues((Player) sender, pluginRef.getUserManager().getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
+                return true;
+
+            case 3:
+                if (!permissionsCheckOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[1], args[2])) {
+                    return true;
+                }
+
+                skill = pluginRef.getSkillTools().matchSkill(args[1]);
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    skill = null;
+                }
+
+                if (skill != null && pluginRef.getSkillTools().isChildSkill(skill)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Skill.ChildSkill"));
+                    return true;
+                }
+
+                int value = Integer.parseInt(args[2]);
+
+                String playerName = pluginRef.getCommandTools().getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getOfflinePlayer(playerName);
+
+                // 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 = pluginRef.getServer().getOfflinePlayer(playerName);
+                    if (player != null) {
+                        uuid = player.getUniqueId();
+                    }
+                    PlayerProfile profile = pluginRef.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
+
+                    if (pluginRef.getCommandTools().unloadedProfile(sender, profile)) {
+                        return true;
+                    }
+
+                    editValues(null, profile, skill, value);
+                } else {
+                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value);
+                }
+
+                handleSenderMessage(sender, playerName, skill);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], pluginRef.getSkillTools().LOCALIZED_SKILL_NAMES, new ArrayList<>(pluginRef.getSkillTools().LOCALIZED_SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected abstract boolean permissionsCheckSelf(CommandSender sender);
+
+    protected abstract boolean permissionsCheckOthers(CommandSender sender);
+
+    protected abstract void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value);
+
+    protected abstract void handlePlayerMessageAll(Player player, int value);
+
+    protected abstract void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill);
+
+    private boolean validateArguments(CommandSender sender, String skillName, String value) {
+        return !(pluginRef.getCommandTools().isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && pluginRef.getCommandTools().isInvalidSkill(sender, skillName)));
+    }
+
+    protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+        if (skill == null) {
+            for (PrimarySkillType primarySkillType : pluginRef.getSkillTools().NON_CHILD_SKILLS) {
+                handleCommand(player, profile, primarySkillType, value);
+            }
+
+            if (player != null) {
+                handlePlayerMessageAll(player, value);
+            }
+        } else {
+            handleCommand(player, profile, skill, value);
+
+            if (player != null) {
+                handlePlayerMessageSkill(player, value, skill);
+            }
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/experience/SkillEditCommand.java

@@ -0,0 +1,53 @@
+package com.gmail.nossr50.commands.experience;
+
+import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class SkillEditCommand extends ExperienceCommand {
+    public SkillEditCommand(mcMMO pluginRef) {
+        super(pluginRef);
+    }
+
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return pluginRef.getPermissionTools().mmoedit(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return pluginRef.getPermissionTools().mmoeditOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+        int skillLevel = profile.getSkillLevel(skill);
+        double xpRemoved = profile.getSkillXpLevelRaw(skill);
+
+        profile.modifySkill(skill, value);
+
+        if (player == null) {
+            profile.scheduleAsyncSave();
+            return;
+        }
+
+        if (value == skillLevel) {
+            return;
+        }
+
+        pluginRef.getEventManager().tryLevelEditEvent(player, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND, skillLevel);
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.mmoedit.AllSkills.1", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.mmoedit.Modified.1", pluginRef.getSkillTools().getLocalizedSkillName(skill), value));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/experience/SkillResetCommand.java

@@ -0,0 +1,176 @@
+package com.gmail.nossr50.commands.experience;
+
+import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.OfflinePlayer;
+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 java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * This class mirrors the structure of ExperienceCommand, except the
+ * value/quantity argument is removed.
+ */
+public class SkillResetCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public SkillResetCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    protected void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.addlevels.AwardAll.2", playerName));
+        } else {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.addlevels.AwardSkill.2", pluginRef.getSkillTools().getLocalizedSkillName(skill), playerName));
+        }
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PrimarySkillType skill;
+        switch (args.length) {
+            case 1:
+                if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!permissionsCheckSelf(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[0])) {
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("all")) {
+                    skill = null;
+                } else {
+                    skill = pluginRef.getSkillTools().matchSkill(args[1]);
+                }
+
+                editValues((Player) sender, pluginRef.getUserManager().getPlayer(sender.getName()).getProfile(), skill);
+                return true;
+
+            case 2:
+                if (!permissionsCheckOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[1])) {
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    skill = null;
+                } else {
+                    skill = pluginRef.getSkillTools().matchSkill(args[1]);
+                }
+
+                String playerName = pluginRef.getCommandTools().getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getOfflinePlayer(playerName);
+
+                // 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 = pluginRef.getServer().getOfflinePlayer(playerName);
+                    if (player != null) {
+                        uuid = player.getUniqueId();
+                    }
+                    PlayerProfile profile = pluginRef.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
+
+                    if (pluginRef.getCommandTools().unloadedProfile(sender, profile)) {
+                        return true;
+                    }
+
+                    editValues(null, profile, skill);
+                } else {
+                    editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill);
+                }
+
+                handleSenderMessage(sender, playerName, skill);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], pluginRef.getSkillTools().LOCALIZED_SKILL_NAMES, new ArrayList<>(pluginRef.getSkillTools().LOCALIZED_SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill) {
+        int levelsRemoved = profile.getSkillLevel(skill);
+        double xpRemoved = profile.getSkillXpLevelRaw(skill);
+
+        profile.modifySkill(skill, 0);
+
+        if (player == null) {
+            profile.scheduleAsyncSave();
+            return;
+        }
+
+        pluginRef.getEventManager().tryLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false, XPGainReason.COMMAND);
+    }
+
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return pluginRef.getPermissionTools().skillreset(sender);
+    }
+
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return pluginRef.getPermissionTools().skillresetOthers(sender);
+    }
+
+    protected void handlePlayerMessageAll(Player player) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Reset.All"));
+    }
+
+    protected void handlePlayerMessageSkill(Player player, PrimarySkillType skill) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Reset.Single", pluginRef.getSkillTools().getLocalizedSkillName(skill)));
+    }
+
+    private boolean validateArguments(CommandSender sender, String skillName) {
+        return skillName.equalsIgnoreCase("all") || !pluginRef.getCommandTools().isInvalidSkill(sender, skillName);
+    }
+
+    protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill) {
+        if (skill == null) {
+            for (PrimarySkillType primarySkillType : pluginRef.getSkillTools().NON_CHILD_SKILLS) {
+                handleCommand(player, profile, primarySkillType);
+            }
+
+            if (player != null) {
+                handlePlayerMessageAll(player);
+            }
+        } else {
+            handleCommand(player, profile, skill);
+
+            if (player != null) {
+                handlePlayerMessageSkill(player, skill);
+            }
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyAcceptCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyAcceptCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length == 1) {
+            Player player = (Player) sender;
+
+            //Check if player profile is loaded
+            if (pluginRef.getUserManager().getPlayer(player) == null) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                return true;
+            }
+
+            McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+
+            if (!mcMMOPlayer.hasPartyInvite()) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.NoInvites"));
+                return true;
+            }
+
+            // Changing parties
+            if (!pluginRef.getPartyManager().changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
+                return true;
+            }
+
+            pluginRef.getPartyManager().joinInvitedParty(mcMMOPlayer);
+            return true;
+        }
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.1", "party", "accept"));
+        return true;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java

@@ -0,0 +1,46 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyChangeOwnerCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyChangeOwnerCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                //Check if player profile is loaded
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                Party playerParty = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+                String targetName = pluginRef.getCommandTools().getMatchedPlayerName(args[1]);
+                OfflinePlayer target = pluginRef.getServer().getOfflinePlayer(targetName);
+
+                if (!playerParty.hasMember(target.getUniqueId())) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.NotInYourParty", targetName));
+                    return true;
+                }
+
+                pluginRef.getPartyManager().setPartyLeader(target.getUniqueId(), playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "owner", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java

@@ -0,0 +1,59 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyChangePasswordCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyChangePasswordCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        Party party = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+            case 1:
+                unprotectParty(party, sender);
+                return true;
+
+            case 2:
+                if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
+                    unprotectParty(party, sender);
+                    return true;
+                }
+
+                protectParty(party, sender, args[1]);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "password", "[clear|reset]"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "password", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.Password") + ">"));
+                return true;
+        }
+    }
+
+    private void unprotectParty(Party party, CommandSender sender) {
+        party.setLocked(true);
+        party.setPassword(null);
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Password.Removed"));
+    }
+
+    private void protectParty(Party party, CommandSender sender, String password) {
+        party.setLocked(true);
+        party.setPassword(password);
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Password.Set", password));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -0,0 +1,279 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.commands.CommandConstants;
+import com.gmail.nossr50.commands.chat.PartyChatCommand;
+import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
+import com.gmail.nossr50.commands.party.teleport.PtpCommand;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+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 org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+//TODO: This class horrifies me, rewrite it at some point
+public class PartyCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+    private CommandExecutor partyJoinCommand;
+    private CommandExecutor partyAcceptCommand;
+    private CommandExecutor partyCreateCommand;
+    private CommandExecutor partyQuitCommand;
+    private CommandExecutor partyXpShareCommand;
+    private CommandExecutor partyItemShareCommand;
+    private CommandExecutor partyInviteCommand;
+    private CommandExecutor partyKickCommand;
+    private CommandExecutor partyDisbandCommand;
+    private CommandExecutor partyChangeOwnerCommand;
+    private CommandExecutor partyLockCommand;
+    private CommandExecutor partyChangePasswordCommand;
+    private CommandExecutor partyRenameCommand;
+    private CommandExecutor partyInfoCommand;
+    private CommandExecutor partyHelpCommand;
+    private CommandExecutor partyTeleportCommand;
+    private CommandExecutor partyChatCommand;
+    private CommandExecutor partyAllianceCommand;
+
+    public PartyCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+        initSubCommandList();
+
+        partyJoinCommand = new PartyJoinCommand(pluginRef);
+        partyAcceptCommand = new PartyAcceptCommand(pluginRef);
+        partyCreateCommand = new PartyCreateCommand(pluginRef);
+        partyQuitCommand = new PartyQuitCommand(pluginRef);
+        partyXpShareCommand = new PartyXpShareCommand(pluginRef);
+        partyItemShareCommand = new PartyItemShareCommand(pluginRef);
+        partyInviteCommand = new PartyInviteCommand(pluginRef);
+        partyKickCommand = new PartyKickCommand(pluginRef);
+        partyDisbandCommand = new PartyDisbandCommand(pluginRef);
+        partyChangeOwnerCommand = new PartyChangeOwnerCommand(pluginRef);
+        partyLockCommand = new PartyLockCommand(pluginRef);
+        partyChangePasswordCommand = new PartyChangePasswordCommand(pluginRef);
+        partyRenameCommand = new PartyRenameCommand(pluginRef);
+        partyInfoCommand = new PartyInfoCommand(pluginRef);
+        partyHelpCommand = new PartyHelpCommand(pluginRef);
+        partyTeleportCommand = new PtpCommand(pluginRef);
+        partyChatCommand = new PartyChatCommand(pluginRef);
+        partyAllianceCommand = new PartyAllianceCommand(pluginRef);
+    }
+
+    private List<String> PARTY_SUBCOMMANDS;
+    private final List<String> XPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
+    private final List<String> ITEMSHARE_COMPLETIONS = ImmutableList.of("none", "equal", "random", "loot", "mining", "herbalism", "woodcutting", "misc");
+
+    private void initSubCommandList() {
+        ArrayList<String> subcommands = new ArrayList<>();
+
+        for (PartySubcommandType subcommand : PartySubcommandType.values()) {
+            subcommands.add(subcommand.toString());
+        }
+
+        Collections.sort(subcommands);
+        PARTY_SUBCOMMANDS = ImmutableList.copyOf(subcommands);
+    }
+
+
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        //If the party system is disabled, don't fire this command
+        if (!pluginRef.getConfigManager().getConfigParty().isPartySystemEnabled())
+            return true;
+
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!pluginRef.getPermissionTools().party(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        Player player = (Player) sender;
+
+        if (!pluginRef.getUserManager().hasPlayerDataKey(player)) {
+            return true;
+        }
+
+        if (pluginRef.getUserManager().getPlayer(player) == null) {
+            player.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+        if (args.length < 1) {
+            if (!mcMMOPlayer.inParty()) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.None"));
+                return printUsage(player);
+            }
+
+            return partyInfoCommand.onCommand(sender, command, label, args);
+        }
+
+        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
+
+        if (subcommand == null) {
+            return printUsage(player);
+        }
+
+        // Can't use this for lock/unlock since they're handled by the same command
+        if (subcommand != PartySubcommandType.LOCK && subcommand != PartySubcommandType.UNLOCK && !pluginRef.getPermissionTools().partySubcommand(sender, subcommand)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (subcommand) {
+            case JOIN:
+                return partyJoinCommand.onCommand(sender, command, label, args);
+            case ACCEPT:
+                return partyAcceptCommand.onCommand(sender, command, label, args);
+            case CREATE:
+                return partyCreateCommand.onCommand(sender, command, label, args);
+            case HELP:
+                return partyHelpCommand.onCommand(sender, command, label, args);
+            default:
+                break;
+        }
+
+        // Party member commands
+        if (!mcMMOPlayer.inParty()) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.None"));
+            return printUsage(player);
+        }
+
+        switch (subcommand) {
+            case INFO:
+                return partyInfoCommand.onCommand(sender, command, label, args);
+            case QUIT:
+                return partyQuitCommand.onCommand(sender, command, label, args);
+            case INVITE:
+                return partyInviteCommand.onCommand(sender, command, label, args);
+            case TELEPORT:
+                return partyTeleportCommand.onCommand(sender, command, label, extractArgs(args));
+            case CHAT:
+                return partyChatCommand.onCommand(sender, command, label, extractArgs(args));
+            default:
+                break;
+        }
+
+        // Party leader commands
+        if (!mcMMOPlayer.getParty().getLeader().getUniqueId().equals(player.getUniqueId())) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Party.NotOwner"));
+            return true;
+        }
+
+        switch (subcommand) {
+            case XPSHARE:
+                return partyXpShareCommand.onCommand(sender, command, label, args);
+            case ITEMSHARE:
+                return partyItemShareCommand.onCommand(sender, command, label, args);
+            case KICK:
+                return partyKickCommand.onCommand(sender, command, label, args);
+            case DISBAND:
+                return partyDisbandCommand.onCommand(sender, command, label, args);
+            case OWNER:
+                return partyChangeOwnerCommand.onCommand(sender, command, label, args);
+            case LOCK:
+            case UNLOCK:
+                return partyLockCommand.onCommand(sender, command, label, args);
+            case PASSWORD:
+                return partyChangePasswordCommand.onCommand(sender, command, label, args);
+            case RENAME:
+                return partyRenameCommand.onCommand(sender, command, label, args);
+            case ALLIANCE:
+                return partyAllianceCommand.onCommand(sender, command, label, args);
+            default:
+                break;
+        }
+
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], PARTY_SUBCOMMANDS, new ArrayList<>(PARTY_SUBCOMMANDS.size()));
+            case 2:
+                PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
+
+                if (subcommand == null) {
+                    return ImmutableList.of();
+                }
+
+                switch (subcommand) {
+                    case JOIN:
+                    case INVITE:
+                    case KICK:
+                    case OWNER:
+                        List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                        return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<>(playerNames.size()));
+                    case XPSHARE:
+                        return StringUtil.copyPartialMatches(args[1], XPSHARE_COMPLETIONS, new ArrayList<>(XPSHARE_COMPLETIONS.size()));
+                    case ITEMSHARE:
+                        return StringUtil.copyPartialMatches(args[1], ITEMSHARE_COMPLETIONS, new ArrayList<>(ITEMSHARE_COMPLETIONS.size()));
+                    case LOCK:
+                    case CHAT:
+                        return StringUtil.copyPartialMatches(args[1], CommandConstants.TRUE_FALSE_OPTIONS, new ArrayList<>(CommandConstants.TRUE_FALSE_OPTIONS.size()));
+                    case PASSWORD:
+                        return StringUtil.copyPartialMatches(args[1], CommandConstants.RESET_OPTIONS, new ArrayList<>(CommandConstants.RESET_OPTIONS.size()));
+                    case TELEPORT:
+                        List<String> matches = StringUtil.copyPartialMatches(args[1], CommandConstants.TELEPORT_SUBCOMMANDS, new ArrayList<>(CommandConstants.TELEPORT_SUBCOMMANDS.size()));
+
+                        if (matches.size() == 0) {
+                            Player player = (Player) sender;
+
+                            //Not Loaded
+                            if (pluginRef.getUserManager().getPlayer(player) == null) {
+                                sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                                return ImmutableList.of();
+                            }
+
+                            Party party = pluginRef.getUserManager().getPlayer(player).getParty();
+
+                            playerNames = party.getOnlinePlayerNames(player);
+                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<>(playerNames.size()));
+                        }
+
+                        return matches;
+                    default:
+                        return ImmutableList.of();
+                }
+            case 3:
+                if (PartySubcommandType.getSubcommand(args[0]) == PartySubcommandType.ITEMSHARE && isItemShareCategory(args[1])) {
+                    return StringUtil.copyPartialMatches(args[2], CommandConstants.TRUE_FALSE_OPTIONS, new ArrayList<>(CommandConstants.TRUE_FALSE_OPTIONS.size()));
+                }
+
+                return ImmutableList.of();
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private boolean printUsage(Player player) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.0", "/party join"));
+        player.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.1", "/party create"));
+        player.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.2", "/party ?"));
+        return true;
+    }
+
+    private String[] extractArgs(String[] args) {
+        return Arrays.copyOfRange(args, 1, args.length);
+    }
+
+    private boolean isItemShareCategory(String category) {
+        return category.equalsIgnoreCase("loot") || category.equalsIgnoreCase("mining") || category.equalsIgnoreCase("herbalism") || category.equalsIgnoreCase("woodcutting") || category.equalsIgnoreCase("misc");
+    }
+}
+

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java

@@ -1,42 +1,48 @@
 package com.gmail.nossr50.commands.party;
 
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
-
 public class PartyCreateCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyCreateCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
             case 3:
-                Party newParty = PartyManager.getParty(args[1]);
-
                 Player player = (Player) sender;
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+                if (pluginRef.getUserManager().getPlayer(player) == null) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
 
                 // Check to see if the party exists, and if it does cancel creating a new party
-                if (PartyManager.checkPartyExistence(player, newParty, args[1])) {
+                if (pluginRef.getPartyManager().checkPartyExistence(player, args[1])) {
                     return true;
                 }
 
                 // Changing parties
-                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
+                if (!pluginRef.getPartyManager().changeOrJoinParty(mcMMOPlayer, args[1])) {
                     return true;
                 }
 
-                PartyManager.createParty(player, mcMMOPlayer, args[1], getPassword(args));
+                pluginRef.getPartyManager().createParty(mcMMOPlayer, args[1], getPassword(args));
                 return true;
 
             default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "create", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.3", "party", "create", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.PartyName") + ">", "[" + pluginRef.getLocaleManager().getString("Commands.Usage.Password") + "]"));
                 return true;
         }
     }

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java

@@ -0,0 +1,47 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyDisbandCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyDisbandCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                Party playerParty = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+                String partyName = playerParty.getName();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!pluginRef.getPartyManager().handlePartyChangeEvent(member, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    member.sendMessage(pluginRef.getLocaleManager().getString("Party.Disband"));
+                }
+
+                pluginRef.getPartyManager().disbandParty(playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.1", "party", "disband"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+public class PartyHelpCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyHelpCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.3", "/party join", "/party quit"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.1", "/party create"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.4", "/party <lock|unlock>"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.5", "/party password"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.6", "/party kick"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.7", "/party leader"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.8", "/party disband"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.9", "/party itemshare"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Help.10", "/party xpshare"));
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.1", "party", "help"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java

@@ -0,0 +1,148 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PartyInfoCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyInfoCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+            case 1:
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+                Party party = mcMMOPlayer.getParty();
+
+                displayPartyHeader(player, party);
+                displayShareModeInfo(player, party);
+                displayPartyFeatures(player, party);
+                displayMemberInfo(player, mcMMOPlayer, party);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.1", "party", "info"));
+                return true;
+        }
+    }
+
+    private void displayPartyHeader(Player player, Party party) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Header"));
+
+        /*if (!party.hasReachedLevelCap()) {
+            status.append(" (").append(party.getXpToLevelPercentage()).append(")");
+        }*/
+
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Status", party.getName(), pluginRef.getLocaleManager().getString("Party.Status." + (party.isLocked() ? "Locked" : "Unlocked")), party.getLevel())
+ /*if (!party.hasReachedLevelCap()) {
+     status.append(" (").append(party.getXpToLevelPercentage()).append(")");
+ }*/);
+    }
+
+    private void displayPartyFeatures(Player player, Party party) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Features.Header"));
+
+        List<String> unlockedPartyFeatures = new ArrayList<>();
+        List<String> lockedPartyFeatures = new ArrayList<>();
+
+        for (PartyFeature partyFeature : PartyFeature.values()) {
+            if (!partyFeature.hasPermission(pluginRef, player)) {
+                continue;
+            }
+
+            if (isUnlockedFeature(party, partyFeature)) {
+                unlockedPartyFeatures.add(getPartyFeatureLocaleString(partyFeature));
+            } else {
+                lockedPartyFeatures.add(getFeatureLockedLocaleString(partyFeature));
+            }
+        }
+
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.UnlockedFeatures", unlockedPartyFeatures.isEmpty() ? "None" : unlockedPartyFeatures));
+
+        for (String message : lockedPartyFeatures) {
+            player.sendMessage(message);
+        }
+    }
+
+    public String getPartyFeatureLocaleString(PartyFeature partyFeature) {
+        return pluginRef.getLocaleManager().getString("Party.Feature." + StringUtils.getPrettyPartyFeatureString(partyFeature).replace(" ", ""));
+    }
+
+    public String getFeatureLockedLocaleString(PartyFeature partyFeature) {
+        return pluginRef.getLocaleManager().getString("Ability.Generic.Template.Lock",
+                pluginRef.getLocaleManager().getString("Party.Feature.Locked."
+                                + StringUtils.getPrettyPartyFeatureString(partyFeature).replace(" ", ""),
+                        pluginRef.getPartyManager().getPartyFeatureUnlockLevel(partyFeature)));
+    }
+
+    private boolean isUnlockedFeature(Party party, PartyFeature partyFeature) {
+        return party.getLevel() >= pluginRef.getPartyManager().getPartyFeatureUnlockLevel(partyFeature);
+    }
+
+    private void displayShareModeInfo(Player player, Party party) {
+        boolean xpShareEnabled = isUnlockedFeature(party, PartyFeature.XP_SHARE);
+        boolean itemShareEnabled = isUnlockedFeature(party, PartyFeature.ITEM_SHARE);
+        boolean itemSharingActive = (party.getItemShareMode() != ShareMode.NONE);
+
+        if (!xpShareEnabled && !itemShareEnabled) {
+            return;
+        }
+
+        String expShareInfo = "";
+        String itemShareInfo = "";
+        String separator = "";
+
+        if (xpShareEnabled) {
+            expShareInfo = pluginRef.getLocaleManager().getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
+        }
+
+        if (itemShareEnabled) {
+            itemShareInfo = pluginRef.getLocaleManager().getString("Commands.Party.ItemShare", party.getItemShareMode().toString());
+        }
+
+        if (xpShareEnabled && itemShareEnabled) {
+            separator = ChatColor.DARK_GRAY + " || ";
+        }
+
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
+
+        if (itemSharingActive) {
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.ItemShareCategories", party.getItemShareCategories()));
+        }
+    }
+
+    private void displayMemberInfo(Player player, McMMOPlayer mcMMOPlayer, Party party) {
+        /*
+         * Only show members of the party that this member can see
+         */
+
+        List<Player> nearMembers = pluginRef.getPartyManager().getNearVisibleMembers(mcMMOPlayer);
+        int membersOnline = party.getVisibleMembers(player).size();
+
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Members.Header"));
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.MembersNear", nearMembers.size() + 1, membersOnline));
+        player.sendMessage(party.createMembersList(player));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java

@@ -0,0 +1,78 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyInviteCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyInviteCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                String targetName = pluginRef.getCommandTools().getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getOfflinePlayer(targetName);
+
+                if (!pluginRef.getCommandTools().checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return false;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+                String playerName = player.getName();
+
+                if (player.equals(target)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Invite.Self"));
+                    return true;
+                }
+
+                if (pluginRef.getPartyManager().inSameParty(player, target)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Player.InSameParty", targetName));
+                    return true;
+                }
+
+                if (!pluginRef.getPartyManager().canInvite(mcMMOPlayer)) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Party.Locked"));
+                    return true;
+                }
+
+                Party playerParty = mcMMOPlayer.getParty();
+
+                if (pluginRef.getConfigManager().getConfigParty().getPartyGeneral().isPartySizeCapped())
+                    if (pluginRef.getPartyManager().isPartyFull(target, playerParty)) {
+                        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.PartyFull.Invite",
+                                target.getName(), playerParty.toString(),
+                                pluginRef.getConfigManager().getConfigParty().getPartySizeLimit()));
+                        return true;
+                    }
+
+                mcMMOTarget.setPartyInvite(playerParty);
+
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Invite.Success"));
+                target.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Invite.0", playerParty.getName(), playerName));
+                target.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Invite.1"));
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "invite", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java

@@ -0,0 +1,96 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.ItemShareType;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.StringUtils;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Locale;
+
+public class PartyItemShareCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyItemShareCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        Party party = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+
+        if (party.getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.ITEM_SHARE)) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.4"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase(Locale.ENGLISH));
+
+                if (mode == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                    return true;
+                }
+
+                handleChangingShareMode(party, mode);
+                return true;
+
+            case 3:
+                boolean toggle;
+
+                if (pluginRef.getCommandTools().shouldEnableToggle(args[2])) {
+                    toggle = true;
+                } else if (pluginRef.getCommandTools().shouldDisableToggle(args[2])) {
+                    toggle = false;
+                } else {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                    return true;
+                }
+
+                try {
+                    handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase(Locale.ENGLISH)), toggle);
+                } catch (IllegalArgumentException ex) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(Party party, ShareMode mode) {
+        party.setItemShareMode(mode);
+
+        String changeModeMessage = pluginRef.getLocaleManager().getString("Commands.Party.SetSharing", pluginRef.getLocaleManager().getString("Party.ShareType.Item"), pluginRef.getLocaleManager().getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(changeModeMessage);
+        }
+    }
+
+    private void handleToggleItemShareCategory(Party party, ItemShareType type, boolean toggle) {
+        party.setSharingDrops(type, toggle);
+
+        String toggleMessage = pluginRef.getLocaleManager().getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(toggleMessage);
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java

@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyJoinCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyJoinCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+            case 3:
+                String targetName = pluginRef.getCommandTools().getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getPlayer(targetName);
+
+                if (!pluginRef.getCommandTools().checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return true;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+
+                if (!mcMMOTarget.inParty()) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.PlayerNotInParty", targetName));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+                Party targetParty = mcMMOTarget.getParty();
+
+                if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Join.Self"));
+                    return true;
+                }
+
+                String password = getPassword(args);
+
+                // Make sure party passwords match
+                if (!pluginRef.getPartyManager().checkPartyPassword(player, targetParty, password)) {
+                    return true;
+                }
+
+                String partyName = targetParty.getName();
+
+                // Changing parties
+                if (!pluginRef.getPartyManager().changeOrJoinParty(mcMMOPlayer, partyName)) {
+                    return true;
+                }
+
+                if (pluginRef.getConfigManager().getConfigParty().getPartyGeneral().isPartySizeCapped())
+                    if (pluginRef.getPartyManager().isPartyFull(player, targetParty)) {
+                        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.PartyFull", targetParty.toString()));
+                        return true;
+                    }
+
+                player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Join", partyName));
+                pluginRef.getPartyManager().addToParty(mcMMOPlayer, targetParty);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.3", "party", "join", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + ">", "[" + pluginRef.getLocaleManager().getString("Commands.Usage.Password") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java

@@ -0,0 +1,59 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyKickCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyKickCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                Party playerParty = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+                String targetName = pluginRef.getCommandTools().getMatchedPlayerName(args[1]);
+
+                if (!playerParty.hasMember(targetName)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.NotInYourParty", targetName));
+                    return true;
+                }
+
+                OfflinePlayer target = pluginRef.getServer().getOfflinePlayer(targetName);
+
+                if (target.isOnline()) {
+                    Player onlineTarget = target.getPlayer();
+                    String partyName = playerParty.getName();
+
+                    if (!pluginRef.getPartyManager().handlePartyChangeEvent(onlineTarget, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    pluginRef.getPartyManager().processPartyLeaving(pluginRef.getUserManager().getPlayer(onlineTarget));
+                    onlineTarget.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Kick", partyName));
+                }
+
+                pluginRef.getPartyManager().removeFromParty(target, playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "kick", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java

@@ -0,0 +1,78 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyLockCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyLockCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("lock")) {
+                    togglePartyLock(sender, true);
+                } else if (args[0].equalsIgnoreCase("unlock")) {
+                    togglePartyLock(sender, false);
+                }
+
+                return true;
+
+            case 2:
+                if (!args[0].equalsIgnoreCase("lock")) {
+                    sendUsageStrings(sender);
+                    return true;
+                }
+
+                if (pluginRef.getCommandTools().shouldEnableToggle(args[1])) {
+                    togglePartyLock(sender, true);
+                } else if (pluginRef.getCommandTools().shouldDisableToggle(args[1])) {
+                    togglePartyLock(sender, false);
+                } else {
+                    sendUsageStrings(sender);
+                }
+
+                return true;
+
+            default:
+                sendUsageStrings(sender);
+                return true;
+        }
+    }
+
+    private void sendUsageStrings(CommandSender sender) {
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "lock", "[on|off]"));
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.1", "party", "unlock"));
+    }
+
+    private void togglePartyLock(CommandSender sender, boolean lock) {
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return;
+        }
+
+        Party party = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+
+        if (!pluginRef.getPermissionTools().partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.NoPermission"));
+            return;
+        }
+
+        if (lock ? party.isLocked() : !party.isLocked()) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Party." + (lock ? "IsLocked" : "IsntLocked")));
+            return;
+        }
+
+        party.setLocked(lock);
+        sender.sendMessage(pluginRef.getLocaleManager().getString("Party." + (lock ? "Locked" : "Unlocked")));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java

@@ -0,0 +1,47 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyQuitCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyQuitCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Player player = (Player) sender;
+
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+                Party playerParty = mcMMOPlayer.getParty();
+
+                if (!pluginRef.getPartyManager().handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
+                    return true;
+                }
+
+                pluginRef.getPartyManager().removeFromParty(mcMMOPlayer);
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Leave"));
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.1", "party", "quit"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java

@@ -1,23 +1,32 @@
 package com.gmail.nossr50.commands.party;
 
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
-
 public class PartyRenameCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyRenameCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer((Player) sender);
                 Party playerParty = mcMMOPlayer.getParty();
 
                 String oldPartyName = playerParty.getName();
@@ -25,37 +34,36 @@ public class PartyRenameCommand implements CommandExecutor {
 
                 // This is to prevent party leaders from spamming other players with the rename message
                 if (oldPartyName.equalsIgnoreCase(newPartyName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.Rename.Same"));
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Rename.Same"));
                     return true;
                 }
 
                 Player player = mcMMOPlayer.getPlayer();
-                Party newParty = PartyManager.getParty(newPartyName);
 
                 // Check to see if the party exists, and if it does cancel renaming the party
-                if (PartyManager.checkPartyExistence(player, newParty, newPartyName)) {
+                if (pluginRef.getPartyManager().checkPartyExistence(player, newPartyName)) {
                     return true;
                 }
 
-                String leaderName = playerParty.getLeader();
+                String leaderName = playerParty.getLeader().getPlayerName();
 
                 for (Player member : playerParty.getOnlineMembers()) {
-                    if (!PartyManager.handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {
+                    if (!pluginRef.getPartyManager().handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {
                         return true;
                     }
 
                     if (!member.getName().equalsIgnoreCase(leaderName)) {
-                        member.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leaderName, newPartyName));
+                        member.sendMessage(pluginRef.getLocaleManager().getString("Party.InformedOnNameChange", leaderName, newPartyName));
                     }
                 }
 
                 playerParty.setName(newPartyName);
 
-                sender.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Rename", newPartyName));
                 return true;
 
             default:
-                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "rename", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.PartyName") + ">"));
                 return true;
         }
     }

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java

@@ -7,7 +7,7 @@ public enum PartySubcommandType {
     HELP,
     INFO,
     QUIT,
-    EXPSHARE,
+    XPSHARE,
     ITEMSHARE,
     INVITE,
     KICK,
@@ -18,7 +18,8 @@ public enum PartySubcommandType {
     PASSWORD,
     RENAME,
     TELEPORT,
-    CHAT;
+    CHAT,
+    ALLIANCE;
 
     public static PartySubcommandType getSubcommand(String commandName) {
         for (PartySubcommandType command : values()) {
@@ -29,18 +30,16 @@ public enum PartySubcommandType {
 
         if (commandName.equalsIgnoreCase("?")) {
             return HELP;
-        }
-        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
+        } else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
             return QUIT;
-        }
-        else if (commandName.equalsIgnoreCase("leader")) {
+        } else if (commandName.equalsIgnoreCase("leader")) {
             return OWNER;
-        }
-        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
-            return EXPSHARE;
-        }
-        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
+        } else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
+            return XPSHARE;
+        } else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
             return ITEMSHARE;
+        } else if (commandName.equalsIgnoreCase("ally")) {
+            return ALLIANCE;
         }
 
         return null;

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java

@@ -0,0 +1,62 @@
+package com.gmail.nossr50.commands.party;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.StringUtils;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyXpShareCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyXpShareCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        Party party = pluginRef.getUserManager().getPlayer((Player) sender).getParty();
+
+        if (party.getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.XP_SHARE)) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.5"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                if (args[1].equalsIgnoreCase("none") || pluginRef.getCommandTools().shouldDisableToggle(args[1])) {
+                    handleChangingShareMode(party, ShareMode.NONE);
+                } else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || pluginRef.getCommandTools().shouldEnableToggle(args[1])) {
+                    handleChangingShareMode(party, ShareMode.EQUAL);
+                } else {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(Party party, ShareMode mode) {
+        party.setXpShareMode(mode);
+
+        String changeModeMessage = pluginRef.getLocaleManager().getString("Commands.Party.SetSharing", pluginRef.getLocaleManager().getString("Party.ShareType.Xp"), pluginRef.getLocaleManager().getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(changeModeMessage);
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java

@@ -0,0 +1,47 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyAllianceAcceptCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyAllianceAcceptCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+                if (!mcMMOPlayer.hasPartyAllianceInvite()) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.NoInvites"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getParty().getAlly() != null) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.AlreadyAllies"));
+                    return true;
+                }
+
+                pluginRef.getPartyManager().acceptAllianceInvite(mcMMOPlayer);
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "alliance", "accept"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java

@@ -0,0 +1,141 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+import com.gmail.nossr50.commands.CommandConstants;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.ChatColor;
+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 org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PartyAllianceCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+    private Player player;
+    private Party playerParty;
+    private Party targetParty;
+    private CommandExecutor partyAllianceInviteCommand;
+    private CommandExecutor partyAllianceAcceptCommand;
+    private CommandExecutor partyAllianceDisbandCommand;
+
+    public PartyAllianceCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+
+        //Init SubCommands
+        partyAllianceInviteCommand = new PartyAllianceInviteCommand(pluginRef);
+        partyAllianceAcceptCommand = new PartyAllianceAcceptCommand(pluginRef);
+        partyAllianceDisbandCommand = new PartyAllianceDisbandCommand(pluginRef);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+        playerParty = mcMMOPlayer.getParty();
+
+        switch (args.length) {
+            case 1:
+                if (playerParty.getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.3"));
+                    return true;
+                }
+
+                if (playerParty.getAlly() == null) {
+                    printUsage();
+                    return true;
+                }
+
+                targetParty = playerParty.getAlly();
+
+                displayPartyHeader();
+                displayMemberInfo(mcMMOPlayer);
+                return true;
+
+            case 2:
+            case 3:
+                if (playerParty.getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.3"));
+                    return true;
+                }
+
+                if (args[1].equalsIgnoreCase("invite")) {
+                    return partyAllianceInviteCommand.onCommand(sender, command, label, args);
+                }
+
+                if (args[1].equalsIgnoreCase("accept")) {
+                    return partyAllianceAcceptCommand.onCommand(sender, command, label, args);
+                }
+
+                if (args[1].equalsIgnoreCase("disband")) {
+                    return partyAllianceDisbandCommand.onCommand(sender, command, label, args);
+                }
+
+                if (playerParty.getAlly() == null) {
+                    printUsage();
+                    return true;
+                }
+
+                targetParty = playerParty.getAlly();
+
+                displayPartyHeader();
+                displayMemberInfo(mcMMOPlayer);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private void printUsage() {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Help.0"));
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Help.1"));
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender commandSender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> matches = StringUtil.copyPartialMatches(args[0], CommandConstants.ALLIANCE_SUBCOMMANDS, new ArrayList<>(CommandConstants.ALLIANCE_SUBCOMMANDS.size()));
+
+                if (matches.size() == 0) {
+                    List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(commandSender);
+                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+                }
+
+                return matches;
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void displayPartyHeader() {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Header"));
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Ally", playerParty.getName(), targetParty.getName()));
+    }
+
+    private void displayMemberInfo(McMMOPlayer mcMMOPlayer) {
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Members.Header"));
+        player.sendMessage(playerParty.createMembersList(player));
+        player.sendMessage(ChatColor.DARK_GRAY + "----------------------------");
+        player.sendMessage(targetParty.createMembersList(player));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java

@@ -0,0 +1,44 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyAllianceDisbandCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyAllianceDisbandCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+                Party party = mcMMOPlayer.getParty();
+
+                if (party.getAlly() == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.None"));
+                    return true;
+                }
+
+                pluginRef.getPartyManager().disbandAlliance(player, party, party.getAlly());
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.2", "party", "alliance", "disband"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PartyAllianceInviteCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PartyAllianceInviteCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 3:
+                String targetName = pluginRef.getCommandTools().getMatchedPlayerName(args[2]);
+                McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getOfflinePlayer(targetName);
+
+                if (!pluginRef.getCommandTools().checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return false;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+                String playerName = player.getName();
+
+                if (player.equals(target)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Invite.Self"));
+                    return true;
+                }
+
+                if (!mcMMOTarget.inParty()) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Party.PlayerNotInParty", targetName));
+                    return true;
+                }
+
+                if (pluginRef.getPartyManager().inSameParty(player, target)) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Player.InSameParty", targetName));
+                    return true;
+                }
+
+                if (!mcMMOTarget.getParty().getLeader().getUniqueId().equals(target.getUniqueId())) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Party.Target.NotOwner", targetName));
+                    return true;
+                }
+
+                Party playerParty = mcMMOPlayer.getParty();
+
+                if (playerParty.getAlly() != null) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.AlreadyAllies"));
+                    return true;
+                }
+
+                mcMMOTarget.setPartyAllianceInvite(playerParty);
+
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Invite.Success"));
+                target.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Invite.0", playerParty.getName(), playerName));
+                target.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.Alliance.Invite.1"));
+                return true;
+
+            default:
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Usage.3", "party", "alliance", "invite", "<" + pluginRef.getLocaleManager().getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java

@@ -0,0 +1,34 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+public class PtpAcceptAnyCommand implements CommandExecutor {
+    private final mcMMO pluginRef;
+
+    public PtpAcceptAnyCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!pluginRef.getPermissionTools().partyTeleportAcceptAll(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        PartyTeleportRecord ptpRecord = pluginRef.getUserManager().getPlayer(sender.getName()).getPartyTeleportRecord();
+
+        if (ptpRecord.isConfirmRequired()) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.AcceptAny.Disabled"));
+        } else {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.AcceptAny.Enabled"));
+        }
+
+        ptpRecord.toggleConfirmRequired();
+        return true;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java

@@ -0,0 +1,70 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class PtpAcceptCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PtpAcceptCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!pluginRef.getPermissionTools().partyTeleportAccept(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        Player player = (Player) sender;
+        PartyTeleportRecord ptpRecord = pluginRef.getUserManager().getPlayer(player).getPartyTeleportRecord();
+
+        if (!ptpRecord.hasRequest()) {
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.NoRequests"));
+            return true;
+        }
+
+        if (pluginRef.getSkillTools().cooldownExpired(ptpRecord.getTimeout(), pluginRef.getConfigManager().getConfigParty().getPTP().getPtpRequestTimeout())) {
+            ptpRecord.removeRequest();
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.RequestExpired"));
+            return true;
+        }
+
+        Player target = ptpRecord.getRequestor();
+        ptpRecord.removeRequest();
+
+        if (!pluginRef.getPartyManager().canTeleport(sender, player, target.getName())) {
+            return true;
+        }
+
+        if (pluginRef.getConfigManager().getConfigParty().getPTP().isPtpWorldBasedPermissions()) {
+            World targetWorld = target.getWorld();
+            World playerWorld = player.getWorld();
+
+            if (!pluginRef.getPermissionTools().partyTeleportAllWorlds(target)) {
+                if (!pluginRef.getPermissionTools().partyTeleportWorld(target, targetWorld)) {
+                    target.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
+                    return true;
+                } else if (targetWorld != playerWorld && !pluginRef.getPermissionTools().partyTeleportWorld(target, playerWorld)) {
+                    target.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.NoWorldPermissions", playerWorld.getName()));
+                    return true;
+                }
+            }
+        }
+
+        pluginRef.getPartyManager().handleTeleportWarmup(target, player);
+        return true;
+    }
+}

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

@@ -0,0 +1,194 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import com.gmail.nossr50.commands.CommandConstants;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.World;
+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 org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PtpCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+    private CommandExecutor ptpToggleCommand;
+    private CommandExecutor ptpAcceptAnyCommand;
+    private CommandExecutor ptpAcceptCommand;
+
+    public PtpCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+
+        //Init SubCommands
+        ptpToggleCommand = new PtpToggleCommand(pluginRef);
+        ptpAcceptAnyCommand = new PtpAcceptAnyCommand(pluginRef);
+        ptpAcceptCommand = new PtpAcceptCommand(pluginRef);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
+        Player player = (Player) sender;
+
+        /* WORLD GUARD MAIN FLAG CHECK */
+        if (pluginRef.getWorldGuardUtils().isWorldGuardLoaded()) {
+            if (!pluginRef.getWorldGuardManager().hasMainFlag(player))
+                return true;
+        }
+
+        /* WORLD BLACKLIST CHECK */
+        if (pluginRef.getDynamicSettingsManager().isWorldBlacklisted(player.getWorld().getName()))
+            return true;
+
+        if (!pluginRef.getUserManager().hasPlayerDataKey(player)) {
+            return true;
+        }
+
+        if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+            return true;
+        }
+
+        McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+        if (!mcMMOPlayer.inParty()) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Party.None"));
+            return true;
+        }
+
+        Party party = mcMMOPlayer.getParty();
+
+        if (party.getLevel() < pluginRef.getPartyManager().getPartyFeatureUnlockLevel(PartyFeature.TELEPORT)) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Party.Feature.Disabled.2"));
+            return true;
+        }
+
+        if (args.length == 1) {
+            if (args[0].equalsIgnoreCase("toggle")) {
+                return ptpToggleCommand.onCommand(sender, command, label, args);
+            }
+
+            if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+                return ptpAcceptAnyCommand.onCommand(sender, command, label, args);
+            }
+
+            long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
+            int hurtCooldown = pluginRef.getConfigManager().getConfigParty().getPTP().getPtpRecentlyHurtCooldown();
+
+            if (hurtCooldown > 0) {
+                int timeRemaining = pluginRef.getSkillTools().calculateTimeLeft(recentlyHurt * pluginRef.getMiscTools().TIME_CONVERSION_FACTOR, hurtCooldown, player);
+
+                if (timeRemaining > 0) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Item.Injured.Wait", timeRemaining));
+                    return true;
+                }
+            }
+
+            if (args[0].equalsIgnoreCase("accept")) {
+                return ptpAcceptCommand.onCommand(sender, command, label, args);
+            }
+
+            if (!pluginRef.getPermissionTools().partyTeleportSend(sender)) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            int ptpCooldown = pluginRef.getConfigManager().getConfigParty().getPTP().getPtpCooldown();
+            long ptpLastUse = mcMMOPlayer.getPartyTeleportRecord().getLastUse();
+
+            if (ptpCooldown > 0) {
+                int timeRemaining = pluginRef.getSkillTools().calculateTimeLeft(ptpLastUse * pluginRef.getMiscTools().TIME_CONVERSION_FACTOR, ptpCooldown, player);
+
+                if (timeRemaining > 0) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Item.Generic.Wait", timeRemaining));
+                    return true;
+                }
+            }
+
+            sendTeleportRequest(sender, player, pluginRef.getCommandTools().getMatchedPlayerName(args[0]));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> matches = StringUtil.copyPartialMatches(args[0], CommandConstants.TELEPORT_SUBCOMMANDS, new ArrayList<>(CommandConstants.TELEPORT_SUBCOMMANDS.size()));
+
+                if (matches.size() == 0) {
+                    if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                        sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                        return ImmutableList.of();
+                    }
+
+                    Player player = (Player) sender;
+                    McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+                    if (!mcMMOPlayer.inParty()) {
+                        return ImmutableList.of();
+                    }
+
+                    List<String> playerNames = mcMMOPlayer.getParty().getOnlinePlayerNames(player);
+                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+                }
+
+                return matches;
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void sendTeleportRequest(CommandSender sender, Player player, String targetName) {
+        if (!pluginRef.getPartyManager().canTeleport(sender, player, targetName)) {
+            return;
+        }
+
+        McMMOPlayer mcMMOTarget = pluginRef.getUserManager().getPlayer(targetName);
+        Player target = mcMMOTarget.getPlayer();
+
+        if (pluginRef.getConfigManager().getConfigParty().getPTP().isPtpWorldBasedPermissions()) {
+            World targetWorld = target.getWorld();
+            World playerWorld = player.getWorld();
+
+            if (!pluginRef.getPermissionTools().partyTeleportAllWorlds(player)) {
+                if (!pluginRef.getPermissionTools().partyTeleportWorld(target, targetWorld)) {
+                    player.sendMessage(pluginRef.getLocaleManager().formatString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
+                    return;
+                }
+                else if (targetWorld != playerWorld && !pluginRef.getPermissionTools().partyTeleportWorld(player, targetWorld)) {
+                    player.sendMessage(pluginRef.getLocaleManager().formatString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
+                    return;
+                }
+            }
+        }
+
+        PartyTeleportRecord ptpRecord = mcMMOTarget.getPartyTeleportRecord();
+
+        if (!ptpRecord.isConfirmRequired()) {
+            pluginRef.getPartyManager().handleTeleportWarmup(player, target);
+            return;
+        }
+
+        ptpRecord.setRequestor(player);
+        ptpRecord.actualizeTimeout();
+
+        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Invite.Success"));
+
+        target.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.Request1", player.getName()));
+        target.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.Request2", pluginRef.getConfigManager().getConfigParty().getPTP().getPtpRequestTimeout()));
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.commands.party.teleport;
+
+import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+public class PtpToggleCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public PtpToggleCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!pluginRef.getPermissionTools().partyTeleportToggle(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        PartyTeleportRecord ptpRecord = pluginRef.getUserManager().getPlayer(sender.getName()).getPartyTeleportRecord();
+
+        if (ptpRecord.isEnabled()) {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.Disabled"));
+        } else {
+            sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.ptp.Enabled"));
+        }
+
+        ptpRecord.toggleEnabled();
+        return true;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/player/CooldownCommand.java

@@ -0,0 +1,80 @@
+package com.gmail.nossr50.commands.player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.scoreboards.SidebarType;
+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 java.util.List;
+
+public class CooldownCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public CooldownCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                Player player = (Player) sender;
+
+                if (pluginRef.getScoreboardSettings().getScoreboardsEnabled() && pluginRef.getScoreboardSettings().isScoreboardEnabled(SidebarType.COOLDOWNS_BOARD)) {
+                    pluginRef.getScoreboardManager().enablePlayerCooldownScoreboard(player);
+
+                    if (!pluginRef.getScoreboardSettings().isScoreboardPrinting(SidebarType.COOLDOWNS_BOARD)) {
+                        return true;
+                    }
+                }
+
+                if (pluginRef.getUserManager().getPlayer(player) == null) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(player);
+
+                player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Cooldowns.Header"));
+                player.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.NoSkillNote"));
+
+                for (SuperAbilityType superAbilityType : SuperAbilityType.values()) {
+                    if (!pluginRef.getSkillTools().superAbilityPermissionCheck(superAbilityType, player)) {
+                        continue;
+                    }
+
+                    int seconds = mcMMOPlayer.calculateTimeRemaining(superAbilityType);
+
+                    if (seconds <= 0) {
+                        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Cooldowns.Row.Y", pluginRef.getSkillTools().getPrettySuperAbilityName(superAbilityType)));
+                    } else {
+                        player.sendMessage(pluginRef.getLocaleManager().getString("Commands.Cooldowns.Row.N", pluginRef.getSkillTools().getPrettySuperAbilityName(superAbilityType), seconds));
+                    }
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java

@@ -0,0 +1,110 @@
+package com.gmail.nossr50.commands.player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+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.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InspectCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public InspectCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                String playerName = pluginRef.getCommandTools().getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getOfflinePlayer(playerName);
+
+                // 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) {
+                    PlayerProfile profile = pluginRef.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
+
+                    if (!pluginRef.getCommandTools().isLoaded(sender, profile)) {
+                        return true;
+                    }
+
+
+                    if (pluginRef.getScoreboardSettings().getScoreboardsEnabled() && sender instanceof Player
+                            && pluginRef.getScoreboardSettings().getConfigSectionScoreboardTypes().getConfigSectionInspectBoard().isUseThisBoard()) {
+                        pluginRef.getScoreboardManager().enablePlayerInspectScoreboard((Player) sender, profile);
+
+                        if (!pluginRef.getScoreboardSettings().getConfigSectionScoreboardTypes().getConfigSectionInspectBoard().isPrintToChat()) {
+                            return true;
+                        }
+                    }
+
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Inspect.OfflineStats", playerName));
+
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Stats.Header.Gathering"));
+                    for (PrimarySkillType skill : pluginRef.getSkillTools().GATHERING_SKILLS) {
+                        sender.sendMessage(pluginRef.getCommandTools().displaySkill(profile, skill));
+                    }
+
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Stats.Header.Combat"));
+                    for (PrimarySkillType skill : pluginRef.getSkillTools().COMBAT_SKILLS) {
+                        sender.sendMessage(pluginRef.getCommandTools().displaySkill(profile, skill));
+                    }
+
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Stats.Header.Misc"));
+                    for (PrimarySkillType skill : pluginRef.getSkillTools().MISC_SKILLS) {
+                        sender.sendMessage(pluginRef.getCommandTools().displaySkill(profile, skill));
+                    }
+
+                } else {
+                    Player target = mcMMOPlayer.getPlayer();
+
+                    if (pluginRef.getCommandTools().hidden(sender, target, pluginRef.getPermissionTools().inspectHidden(sender))) {
+                        sender.sendMessage(pluginRef.getLocaleManager().getString("Inspect.Offline"));
+                        return true;
+                    }
+                    else if (pluginRef.getCommandTools().tooFar(sender, target, pluginRef.getPermissionTools().inspectFar(sender))) {
+                        return true;
+                    }
+
+                    if (pluginRef.getScoreboardSettings().getScoreboardsEnabled() && sender instanceof Player && pluginRef.getScoreboardSettings().getConfigSectionScoreboardTypes().getConfigSectionInspectBoard().isUseThisBoard()) {
+                        pluginRef.getScoreboardManager().enablePlayerInspectScoreboard((Player) sender, mcMMOPlayer.getProfile());
+
+                        if (!pluginRef.getScoreboardSettings().getConfigSectionScoreboardTypes().getConfigSectionInspectBoard().isPrintToChat()) {
+                            return true;
+                        }
+                    }
+
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Inspect.Stats", target.getName()));
+                    pluginRef.getCommandTools().printGatheringSkills(target, sender);
+                    pluginRef.getCommandTools().printCombatSkills(target, sender);
+                    pluginRef.getCommandTools().printMiscSkills(target, sender);
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/player/LeaderboardCommand.java

@@ -0,0 +1,139 @@
+package com.gmail.nossr50.commands.player;
+
+import com.gmail.nossr50.core.MetadataConstants;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.runnables.commands.LeaderboardsCommandAsyncTask;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.scoreboards.SidebarType;
+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;
+
+public class LeaderboardCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public LeaderboardCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        PrimarySkillType skill = null;
+
+        switch (args.length) {
+            case 0:
+                display(1, skill, sender, command);
+                return true;
+
+            case 1:
+                if (StringUtils.isInt(args[0])) {
+                    display(Math.abs(Integer.parseInt(args[0])), skill, sender, command);
+                    return true;
+                }
+
+                skill = extractSkill(sender, args[0]);
+
+                if (skill == null) {
+                    return true;
+                }
+
+                display(1, skill, sender, command);
+                return true;
+
+            case 2:
+                if (pluginRef.getCommandTools().isInvalidInteger(sender, args[1])) {
+                    return true;
+                }
+
+                skill = extractSkill(sender, args[0]);
+
+                if (skill == null) {
+                    return true;
+                }
+
+                display(Math.abs(Integer.parseInt(args[1])), skill, sender, command);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], pluginRef.getSkillTools().LOCALIZED_SKILL_NAMES, new ArrayList<>(pluginRef.getSkillTools().LOCALIZED_SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void display(int page, PrimarySkillType skill, CommandSender sender, Command command) {
+        if (skill != null && !pluginRef.getPermissionTools().mctop(sender, skill)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (sender instanceof Player) {
+            if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                return;
+            }
+
+            McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(sender.getName());
+            long cooldownMillis = 5000;
+
+            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+                double seconds = ((mcMMOPlayer.getDatabaseATS() + cooldownMillis) - System.currentTimeMillis()) / 1000;
+                if (seconds < 1) {
+                    seconds = 1;
+                }
+
+                sender.sendMessage(pluginRef.getLocaleManager().formatString(pluginRef.getLocaleManager().getString("Commands.Database.Cooldown"), seconds));
+                return;
+            }
+
+            if (((Player) sender).hasMetadata(MetadataConstants.DATABASE_PROCESSING_COMMAND_METAKEY)) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Database.Processing"));
+                return;
+            } else {
+                ((Player) sender).setMetadata(MetadataConstants.DATABASE_PROCESSING_COMMAND_METAKEY, new FixedMetadataValue(pluginRef, null));
+            }
+
+            mcMMOPlayer.actualizeDatabaseATS();
+        }
+
+        display(page, skill, sender);
+    }
+
+    private void display(int page, PrimarySkillType skill, CommandSender sender) {
+        boolean useBoard = (sender instanceof Player) && (pluginRef.getScoreboardSettings().isScoreboardEnabled(SidebarType.TOP_BOARD));
+        boolean useChat = !useBoard || pluginRef.getScoreboardSettings().isScoreboardPrinting(SidebarType.TOP_BOARD);
+
+        new LeaderboardsCommandAsyncTask(pluginRef, page, skill, sender, useBoard, useChat).runTaskAsynchronously(pluginRef);
+    }
+
+    private PrimarySkillType extractSkill(CommandSender sender, String skillName) {
+        if (pluginRef.getCommandTools().isInvalidSkill(sender, skillName)) {
+            return null;
+        }
+
+        PrimarySkillType skill = pluginRef.getSkillTools().matchSkill(skillName);
+
+        if (pluginRef.getCommandTools().isChildSkill(sender, skill)) {
+            return null;
+        }
+
+        return skill;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/player/RankCommand.java

@@ -0,0 +1,126 @@
+package com.gmail.nossr50.commands.player;
+
+import com.gmail.nossr50.core.MetadataConstants;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.runnables.commands.RankCommandAsyncTask;
+import com.gmail.nossr50.util.scoreboards.SidebarType;
+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;
+
+public class RankCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public RankCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!pluginRef.getPermissionTools().mcrank(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
+                display(sender, sender.getName());
+
+                return true;
+
+            case 1:
+                if (!pluginRef.getPermissionTools().mcrankOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
+                String playerName = pluginRef.getCommandTools().getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getOfflinePlayer(playerName);
+
+                if (mcMMOPlayer != null) {
+                    Player player = mcMMOPlayer.getPlayer();
+                    playerName = player.getName();
+
+                    if (pluginRef.getCommandTools().tooFar(sender, player, pluginRef.getPermissionTools().mcrankFar(sender))) {
+                        return true;
+                    }
+                }
+
+                display(sender, playerName);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                List<String> playerNames = pluginRef.getCommandTools().getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void display(CommandSender sender, String playerName) {
+        if (sender instanceof Player) {
+
+            McMMOPlayer mcMMOPlayer = pluginRef.getUserManager().getPlayer(sender.getName());
+
+            if (mcMMOPlayer == null) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                return;
+            }
+
+            long cooldownMillis = 5000;
+
+            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Database.CooldownMS", getCDSeconds(mcMMOPlayer, cooldownMillis)));
+                return;
+            }
+
+            if (((Player) sender).hasMetadata(MetadataConstants.DATABASE_PROCESSING_COMMAND_METAKEY)) {
+                sender.sendMessage(pluginRef.getLocaleManager().getString("Commands.Database.Processing"));
+                return;
+            } else {
+                ((Player) sender).setMetadata(MetadataConstants.DATABASE_PROCESSING_COMMAND_METAKEY, new FixedMetadataValue(pluginRef, null));
+            }
+
+            mcMMOPlayer.actualizeDatabaseATS();
+        }
+
+        boolean useBoard = pluginRef.getScoreboardSettings().getScoreboardsEnabled() && (sender instanceof Player)
+                && (pluginRef.getScoreboardSettings().isScoreboardEnabled(SidebarType.RANK_BOARD));
+        boolean useChat = !useBoard || pluginRef.getScoreboardSettings().isScoreboardPrinting(SidebarType.RANK_BOARD);
+
+        new RankCommandAsyncTask(pluginRef, playerName, sender, useBoard, useChat).runTaskAsynchronously(pluginRef);
+    }
+
+    private long getCDSeconds(McMMOPlayer mcMMOPlayer, long cooldownMillis) {
+        return ((mcMMOPlayer.getDatabaseATS() + cooldownMillis) - System.currentTimeMillis());
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/player/SkillStatsCommand.java

@@ -0,0 +1,74 @@
+package com.gmail.nossr50.commands.player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.scoreboards.SidebarType;
+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 java.util.List;
+
+public class SkillStatsCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public SkillStatsCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (pluginRef.getCommandTools().noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!pluginRef.getCommandTools().hasPlayerDataKey(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 0:
+                if (pluginRef.getUserManager().getPlayer((Player) sender) == null) {
+                    sender.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+
+                if (pluginRef.getScoreboardSettings().isScoreboardEnabled(SidebarType.STATS_BOARD) && pluginRef.getScoreboardSettings().getScoreboardsEnabled()) {
+                    pluginRef.getScoreboardManager().enablePlayerStatsScoreboard(player);
+
+                    if (!pluginRef.getScoreboardSettings().isScoreboardPrinting(SidebarType.STATS_BOARD)) {
+                        return true;
+                    }
+                }
+
+                player.sendMessage(pluginRef.getLocaleManager().getString("Stats.Own.Stats"));
+                player.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.NoSkillNote"));
+
+                pluginRef.getCommandTools().printGatheringSkills(player);
+                pluginRef.getCommandTools().printCombatSkills(player);
+                pluginRef.getCommandTools().printMiscSkills(player);
+
+                int powerLevelCap = pluginRef.getPlayerLevelingSettings().getConfigSectionLevelCaps().getPowerLevelSettings().getLevelCap();
+
+                if (pluginRef.getPlayerLevelingSettings().getConfigSectionLevelCaps().getPowerLevelSettings().isLevelCapEnabled()) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.PowerLevel.Capped", pluginRef.getUserManager().getPlayer(player).getPowerLevel(), powerLevelCap));
+                } else {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.PowerLevel", pluginRef.getUserManager().getPlayer(player).getPowerLevel()));
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/server/ReloadPluginCommand.java

@@ -0,0 +1,32 @@
+package com.gmail.nossr50.commands.server;
+
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class ReloadPluginCommand implements CommandExecutor {
+
+    private final mcMMO pluginRef;
+
+    public ReloadPluginCommand(mcMMO plugin) {
+        this.pluginRef = plugin;
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        if (sender instanceof Player) {
+            if (!pluginRef.getPermissionTools().reload(sender))
+                return false;
+        }
+
+        Bukkit.broadcastMessage(pluginRef.getLocaleManager().getString("Commands.Reload.Start"));
+        pluginRef.reload();
+        Bukkit.broadcastMessage(pluginRef.getLocaleManager().getString("Commands.Reload.Finished"));
+        return true;
+    }
+
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java

@@ -0,0 +1,95 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.listeners.InteractionManager;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.random.RandomChanceSkill;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AcrobaticsCommand extends SkillCommand {
+    private String dodgeChance;
+    private String dodgeChanceLucky;
+
+    private boolean canDodge;
+    private boolean canRoll;
+
+    public AcrobaticsCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.ACROBATICS, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+        // ACROBATICS_DODGE
+        if (canDodge) {
+            String[] dodgeStrings = getAbilityDisplayValues(player, SubSkillType.ACROBATICS_DODGE);
+            dodgeChance = dodgeStrings[0];
+            dodgeChanceLucky = dodgeStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canDodge = canUseSubSkill(player, SubSkillType.ACROBATICS_DODGE);
+        canRoll = canUseSubSkill(player, SubSkillType.ACROBATICS_ROLL);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        if (canDodge) {
+            messages.add(getStatMessage(SubSkillType.ACROBATICS_DODGE, dodgeChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", dodgeChanceLucky) : ""));
+        }
+
+        if (canRoll) {
+
+            AbstractSubSkill abstractSubSkill = InteractionManager.getAbstractByName("Roll");
+
+            if (abstractSubSkill != null) {
+                double rollChance, graceChance;
+
+                //Chance to roll at half
+                RandomChanceSkill roll_rcs = new RandomChanceSkill(pluginRef, player, SubSkillType.ACROBATICS_ROLL);
+
+                //Chance to graceful roll
+                RandomChanceSkill grace_rcs = new RandomChanceSkill(pluginRef, player, SubSkillType.ACROBATICS_ROLL);
+                grace_rcs.setSkillLevel(grace_rcs.getSkillLevel() * 2); //Double Odds
+
+                //Chance Stat Calculations
+                rollChance = pluginRef.getRandomChanceTools().getRandomChanceExecutionChance(roll_rcs);
+                graceChance = pluginRef.getRandomChanceTools().getRandomChanceExecutionChance(grace_rcs);
+                //damageThreshold  = AdvancedConfig.getInstance().getRollDamageThreshold();
+
+                String[] rollStrings = getAbilityDisplayValues(player, SubSkillType.ACROBATICS_ROLL);
+
+                //Format
+                double rollChanceLucky = rollChance * 1.333D;
+                double graceChanceLucky = graceChance * 1.333D;
+
+                messages.add(getStatMessage(SubSkillType.ACROBATICS_ROLL, rollStrings[0])
+                        + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", rollStrings[1]) : ""));
+
+                /*messages.add(getStatMessage(true, false, SubSkillType.ACROBATICS_ROLL, String.valueOf(graceChance))
+                        + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", String.valueOf(graceChanceLucky)) : ""));*/
+            }
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.ACROBATICS);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java

@@ -0,0 +1,96 @@
+//package com.gmail.nossr50.commands.skills;
+//
+//import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+//import com.gmail.nossr50.util.TextComponentFactory;
+//import net.md_5.bungee.api.chat.TextComponent;
+//import org.bukkit.entity.Player;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//public class AlchemyCommand extends SkillCommand {
+////    private String brewSpeed;
+////    private String brewSpeedLucky;
+////
+////    private int tier;
+////    private int ingredientCount;
+////    private String ingredientList;
+////
+////    private boolean canCatalysis;
+////    private boolean canConcoctions;
+//
+//    public AlchemyCommand() {
+//        super(PrimarySkillType.ALCHEMY);
+//    }
+//
+////    protected String[] calculateAbilityDisplayValues(Player player) {
+////        //TODO: Needed?
+////        if (pluginRef.getUserManager().getPlayer(player) == null) {
+////            player.sendMessage(pluginRef.getLocaleManager().getString("Profile.PendingLoad"));
+////            return new String[]{"DATA NOT LOADED", "DATA NOT LOADED"};
+////        }
+////
+////        AlchemyManager alchemyManager = pluginRef.getUserManager().getPlayer(player).getAlchemyManager();
+////        String[] displayValues = new String[2];
+////
+////        boolean isLucky = Permissions.lucky(player, PrimarySkillType.ALCHEMY);
+////
+////        displayValues[0] = decimal.format(alchemyManager.calculateBrewSpeed(false)) + "x";
+////        displayValues[1] = isLucky ? decimal.format(alchemyManager.calculateBrewSpeed(true)) + "x" : null;
+////
+////        return displayValues;
+////    }
+//
+//    @Override
+//    protected void dataCalculations(Player player, double skillValue) {
+//        // ALCHEMY_CATALYSIS
+////        if (canCatalysis) {
+////            String[] catalysisStrings = calculateAbilityDisplayValues(player);
+////            brewSpeed = catalysisStrings[0];
+////            brewSpeedLucky = catalysisStrings[1];
+////        }
+////
+////        // ALCHEMY_CONCOCTIONS
+////        if (canConcoctions) {
+////            AlchemyManager alchemyManager = pluginRef.getUserManager().getPlayer(player).getAlchemyManager();
+////            tier = alchemyManager.getTier();
+////            ingredientCount = alchemyManager.getIngredients().size();
+////            ingredientList = alchemyManager.getIngredientList();
+////        }
+//    }
+//
+//    @Override
+//    protected void permissionsCheck(Player player) {
+////        canCatalysis = canUseSubskill(player, SubSkillType.ALCHEMY_CATALYSIS);
+////        canConcoctions = canUseSubskill(player, SubSkillType.ALCHEMY_CONCOCTIONS);
+//    }
+//
+//    @Override
+//    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+//        List<String> messages = new ArrayList<>();
+//
+////        if (canCatalysis) {
+////            messages.add(getStatMessage(SubSkillType.ALCHEMY_CATALYSIS, brewSpeed)
+////                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", brewSpeedLucky) : ""));
+////        }
+////
+////        if (canConcoctions) {
+////            messages.add(getStatMessage(false, true, SubSkillType.ALCHEMY_CONCOCTIONS, String.valueOf(tier), String.valueOf(RankUtils.getHighestRank(SubSkillType.ALCHEMY_CONCOCTIONS))));
+////            messages.add(getStatMessage(true, true, SubSkillType.ALCHEMY_CONCOCTIONS, String.valueOf(ingredientCount), ingredientList));
+////
+////            //messages.add(pluginRef.getLocaleManager().getString("Alchemy.Concoctions.Rank", tier, RankUtils.getHighestRank(SubSkillType.ALCHEMY_CONCOCTIONS)));
+////            //messages.add(pluginRef.getLocaleManager().getString("Alchemy.Concoctions.Ingredients", ingredientCount, ingredientList));
+////        }
+//
+//        return messages;
+//    }
+//
+//    @Override
+//    protected List<TextComponent> getTextComponents(Player player) {
+//        List<TextComponent> textComponents = new ArrayList<>();
+//
+//        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.ALCHEMY);
+//
+//        return textComponents;
+//    }
+//}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java

@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.mcMMO;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArcheryCommand extends SkillCommand {
+    private String skillShotBonus;
+    private String dazeChance;
+    private String dazeChanceLucky;
+    private String retrieveChance;
+    private String retrieveChanceLucky;
+
+    private boolean canSkillShot;
+    private boolean canDaze;
+    private boolean canRetrieve;
+
+    public ArcheryCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.ARCHERY, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+        // ARCHERY_ARROW_RETRIEVAL
+        if (canRetrieve) {
+            String[] retrieveStrings = getAbilityDisplayValues(player, SubSkillType.ARCHERY_ARROW_RETRIEVAL);
+            retrieveChance = retrieveStrings[0];
+            retrieveChanceLucky = retrieveStrings[1];
+        }
+
+        // ARCHERY_DAZE
+        if (canDaze) {
+            String[] dazeStrings = getAbilityDisplayValues(player, SubSkillType.ARCHERY_DAZE);
+            dazeChance = dazeStrings[0];
+            dazeChanceLucky = dazeStrings[1];
+        }
+
+        // SKILL SHOT
+        if (canSkillShot) {
+            skillShotBonus = percent.format(pluginRef.getDynamicSettingsManager().getSkillBehaviourManager().getArcheryBehaviour().getSkillShotDamageBonusPercent(player));
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canSkillShot = canUseSubSkill(player, SubSkillType.ARCHERY_SKILL_SHOT);
+        canDaze = canUseSubSkill(player, SubSkillType.ARCHERY_DAZE);
+        canRetrieve = canUseSubSkill(player, SubSkillType.ARCHERY_ARROW_RETRIEVAL);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        if (canRetrieve) {
+            messages.add(getStatMessage(SubSkillType.ARCHERY_ARROW_RETRIEVAL, retrieveChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", retrieveChanceLucky) : ""));
+        }
+
+        if (canDaze) {
+            messages.add(getStatMessage(SubSkillType.ARCHERY_DAZE, dazeChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", dazeChanceLucky) : ""));
+        }
+
+        if (canSkillShot) {
+            messages.add(getStatMessage(SubSkillType.ARCHERY_SKILL_SHOT, skillShotBonus));
+        }
+
+        if (canUseSubSkill(player, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK)) {
+            messages.add(getStatMessage(SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK,
+            String.valueOf(pluginRef.getCombatTools().getLimitBreakDamageAgainstQuality(player, SubSkillType.ARCHERY_ARCHERY_LIMIT_BREAK, 1000))));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.ARCHERY);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java

@@ -0,0 +1,108 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.mcMMO;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AxesCommand extends SkillCommand {
+    private String critChance;
+    private String critChanceLucky;
+    private double axeMasteryDamage;
+    private double impactDamage;
+    private String skullSplitterLength;
+    private String skullSplitterLengthEndurance;
+
+    private boolean canSkullSplitter;
+    private boolean canCritical;
+    private boolean canAxeMastery;
+    private boolean canImpact;
+    private boolean canGreaterImpact;
+
+    public AxesCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.AXES, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+        // ARMOR IMPACT
+        if (canImpact) {
+            impactDamage = pluginRef.getUserManager().getPlayer(player).getAxesManager().getImpactDurabilityDamage();
+        }
+
+        // AXE MASTERY
+        if (canAxeMastery) {
+            axeMasteryDamage = pluginRef.getDynamicSettingsManager().getSkillBehaviourManager().getAxesBehaviour().getAxeMasteryBonusDamage(player);
+        }
+
+        // CRITICAL HIT
+        if (canCritical) {
+            String[] criticalHitStrings = getAbilityDisplayValues(player, SubSkillType.AXES_CRITICAL_STRIKES);
+            critChance = criticalHitStrings[0];
+            critChanceLucky = criticalHitStrings[1];
+        }
+
+        // SKULL SPLITTER
+        if (canSkullSplitter) {
+            String[] skullSplitterStrings = formatLengthDisplayValues(player, skillValue);
+            skullSplitterLength = skullSplitterStrings[0];
+            skullSplitterLengthEndurance = skullSplitterStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canSkullSplitter = pluginRef.getPermissionTools().skullSplitter(player) && pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.AXES_SKULL_SPLITTER);
+        canCritical = canUseSubSkill(player, SubSkillType.AXES_CRITICAL_STRIKES);
+        canAxeMastery = canUseSubSkill(player, SubSkillType.AXES_AXE_MASTERY);
+        canImpact = canUseSubSkill(player, SubSkillType.AXES_ARMOR_IMPACT);
+        canGreaterImpact = canUseSubSkill(player, SubSkillType.AXES_GREATER_IMPACT);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        if (canImpact) {
+            messages.add(pluginRef.getLocaleManager().getString("Ability.Generic.Template", pluginRef.getLocaleManager().getString("Axes.Ability.Bonus.2"), pluginRef.getLocaleManager().getString("Axes.Ability.Bonus.3", impactDamage)));
+        }
+
+        if (canAxeMastery) {
+            messages.add(pluginRef.getLocaleManager().getString("Ability.Generic.Template", pluginRef.getLocaleManager().getString("Axes.Ability.Bonus.0"), pluginRef.getLocaleManager().getString("Axes.Ability.Bonus.1", axeMasteryDamage)));
+        }
+
+        if (canCritical) {
+            messages.add(getStatMessage(SubSkillType.AXES_CRITICAL_STRIKES, critChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", critChanceLucky) : ""));
+        }
+
+        if (canGreaterImpact) {
+            messages.add(pluginRef.getLocaleManager().getString("Ability.Generic.Template", pluginRef.getLocaleManager().getString("Axes.Ability.Bonus.4"), pluginRef.getLocaleManager().getString("Axes.Ability.Bonus.5", pluginRef.getConfigManager().getConfigAxes().getGreaterImpactBonusDamage())));
+        }
+
+        if (canSkullSplitter) {
+            messages.add(getStatMessage(SubSkillType.AXES_SKULL_SPLITTER, skullSplitterLength)
+                    + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : ""));
+        }
+
+        if (canUseSubSkill(player, SubSkillType.AXES_AXES_LIMIT_BREAK)) {
+            messages.add(getStatMessage(SubSkillType.AXES_AXES_LIMIT_BREAK,
+            String.valueOf(pluginRef.getCombatTools().getLimitBreakDamageAgainstQuality(player, SubSkillType.AXES_AXES_LIMIT_BREAK, 1000))));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.AXES);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java

@@ -0,0 +1,72 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.excavation.ExcavationManager;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExcavationCommand extends SkillCommand {
+    private String gigaDrillBreakerLength;
+    private String gigaDrillBreakerLengthEndurance;
+
+    private boolean canGigaDrill;
+    private boolean canTreasureHunt;
+
+    public ExcavationCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.EXCAVATION, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+        // GIGA DRILL BREAKER
+        if (canGigaDrill) {
+            String[] gigaDrillStrings = formatLengthDisplayValues(player, skillValue);
+            gigaDrillBreakerLength = gigaDrillStrings[0];
+            gigaDrillBreakerLengthEndurance = gigaDrillStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canGigaDrill = pluginRef.getPermissionTools().gigaDrillBreaker(player) && pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER);
+        canTreasureHunt = canUseSubSkill(player, SubSkillType.EXCAVATION_ARCHAEOLOGY);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        ExcavationManager excavationManager = pluginRef.getUserManager().getPlayer(player).getExcavationManager();
+
+        if (canGigaDrill) {
+            messages.add(getStatMessage(SubSkillType.EXCAVATION_GIGA_DRILL_BREAKER, gigaDrillBreakerLength)
+                    + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+
+            //messages.add(pluginRef.getLocaleManager().getString("Excavation.Effect.Length", gigaDrillBreakerLength) + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", gigaDrillBreakerLengthEndurance) : ""));
+        }
+
+        if(canUseSubSkill(player, SubSkillType.EXCAVATION_ARCHAEOLOGY)) {
+            messages.add(getStatMessage(false, false, SubSkillType.EXCAVATION_ARCHAEOLOGY,
+                    percent.format(excavationManager.getArchaelogyExperienceOrbChance() / 100.0D)));
+            messages.add(getStatMessage(true, false, SubSkillType.EXCAVATION_ARCHAEOLOGY,
+                    String.valueOf(excavationManager.getExperienceOrbsReward())));
+
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.EXCAVATION);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

@@ -0,0 +1,177 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.fishing.FishingManager;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FishingCommand extends SkillCommand {
+    private int lootTier;
+    private String shakeChance;
+    private String shakeChanceLucky;
+    private int fishermansDietRank;
+    private String biteChance;
+    private String innerPeaceMult;
+
+    private String commonTreasure;
+    private String uncommonTreasure;
+    private String rareTreasure;
+    private String epicTreasure;
+    private String legendaryTreasure;
+    private String recordTreasure;
+
+    private String magicChance;
+
+    private boolean canTreasureHunt;
+    private boolean canMagicHunt;
+    private boolean canShake;
+    private boolean canFishermansDiet;
+    private boolean canMasterAngler;
+    private boolean canIceFish;
+    private boolean canInnerPeace;
+
+    public FishingCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.FISHING, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+        FishingManager fishingManager = pluginRef.getUserManager().getPlayer(player).getFishingManager();
+
+        // TREASURE HUNTER
+        if (canTreasureHunt) {
+            lootTier = fishingManager.getLootTier();
+
+            // Item drop rates
+//            commonTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
+//            uncommonTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
+//            rareTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
+//            epicTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.EPIC) / 100.0);
+//            legendaryTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.LEGENDARY) / 100.0);
+//            recordTreasure = percent.format(FishingTreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RECORD) / 100.0);
+//
+//            // Magic hunter drop rates
+//            double totalEnchantChance = 0;
+//
+//            for (Rarity rarity : Rarity.values()) {
+//                if (rarity != Rarity.RECORD) {
+//                    totalEnchantChance += FishingTreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
+//                }
+//            }
+
+//            if (totalEnchantChance >= 1)
+//                magicChance = percent.format(totalEnchantChance / 100.0);
+//            else
+//                magicChance = percent.format(0);
+        }
+
+        // FISHING_SHAKE
+//        if (canShake) {
+//            String[] shakeStrings = pluginRef.getRandomChanceTools().calculateAbilityDisplayValuesStatic(player, PrimarySkillType.FISHING, fishingManager.getShakeChance());
+//            shakeChance = shakeStrings[0];
+//            shakeChanceLucky = shakeStrings[1];
+//        }
+
+        // FISHERMAN'S DIET
+        if (canFishermansDiet) {
+            fishermansDietRank = pluginRef.getRankTools().getRank(player, SubSkillType.FISHING_FISHERMANS_DIET);
+        }
+
+        // MASTER ANGLER
+        if (canMasterAngler) {
+            double rawBiteChance = 1.0 / (player.getWorld().hasStorm() ? 300 : 500);
+
+            Location location = fishingManager.getHookLocation();
+
+            if (location == null) {
+                location = player.getLocation();
+            }
+
+//            if (Fishing.getInstance().getMasterAnglerBiomes().contains(location.getBlock().getBiome())) {
+//                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBiomeModifier();
+//            }
+
+//            if (player.isInsideVehicle() && player.getVehicle().getType() == EntityType.BOAT) {
+//                rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBoatModifier();
+//            }
+
+            double luckyModifier = pluginRef.getPermissionTools().lucky(player, PrimarySkillType.FISHING) ? 1.333D : 1.0D;
+
+            biteChance = percent.format((rawBiteChance * 100.0D) * luckyModifier);
+        }
+
+        if (canInnerPeace) {
+            innerPeaceMult = String.valueOf(fishingManager.getInnerPeaceMultiplier());
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canTreasureHunt = canUseSubSkill(player, SubSkillType.FISHING_TREASURE_HUNTER);
+        canMagicHunt = canUseSubSkill(player, SubSkillType.FISHING_MAGIC_HUNTER) && canUseSubSkill(player, SubSkillType.FISHING_TREASURE_HUNTER);
+        canShake = canUseSubSkill(player, SubSkillType.FISHING_SHAKE);
+        canFishermansDiet = canUseSubSkill(player, SubSkillType.FISHING_FISHERMANS_DIET);
+        canMasterAngler = canUseSubSkill(player, SubSkillType.FISHING_MASTER_ANGLER);
+        canIceFish = canUseSubSkill(player, SubSkillType.FISHING_ICE_FISHING);
+        canInnerPeace = canUseSubSkill(player, SubSkillType.FISHING_INNER_PEACE);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        if (canFishermansDiet) {
+            messages.add(getStatMessage(false, true, SubSkillType.FISHING_FISHERMANS_DIET, String.valueOf(fishermansDietRank)));
+        }
+
+//        if (canIceFish) {
+//            messages.add(getStatMessage(SubSkillType.FISHING_ICE_FISHING, SubSkillType.FISHING_ICE_FISHING.getLocaleStatDescription()));
+//        }
+
+        if (canMagicHunt) {
+            messages.add(getStatMessage(SubSkillType.FISHING_MAGIC_HUNTER, magicChance));
+        }
+
+        if (canMasterAngler) {
+            //TODO: Update this with more details
+            messages.add(getStatMessage(false, true, SubSkillType.FISHING_MASTER_ANGLER, biteChance));
+        }
+
+        if (canShake) {
+            messages.add(getStatMessage(SubSkillType.FISHING_SHAKE, shakeChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+        }
+
+        if (canTreasureHunt) {
+            messages.add(getStatMessage(false, true, SubSkillType.FISHING_TREASURE_HUNTER, String.valueOf(lootTier), String.valueOf(pluginRef.getRankTools().getHighestRank(SubSkillType.FISHING_TREASURE_HUNTER))));
+            messages.add(getStatMessage(true, true, SubSkillType.FISHING_TREASURE_HUNTER,
+                    String.valueOf(commonTreasure),
+                    String.valueOf(uncommonTreasure),
+                    String.valueOf(rareTreasure),
+                    String.valueOf(epicTreasure),
+                    String.valueOf(legendaryTreasure),
+                    String.valueOf(recordTreasure)));
+        }
+
+        if (canInnerPeace) {
+            messages.add(getStatMessage(SubSkillType.FISHING_INNER_PEACE, innerPeaceMult));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.FISHING);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java

@@ -0,0 +1,147 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.mcMMO;
+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 HerbalismCommand extends SkillCommand {
+    private String greenTerraLength;
+    private String greenTerraLengthEndurance;
+    private String greenThumbChance;
+    private String greenThumbChanceLucky;
+    private int greenThumbStage;
+    private int farmersDietRank;
+    private String doubleDropChance;
+    private String doubleDropChanceLucky;
+    private String hylianLuckChance;
+    private String hylianLuckChanceLucky;
+    private String shroomThumbChance;
+    private String shroomThumbChanceLucky;
+
+    private boolean hasHylianLuck;
+    private boolean canGreenTerra;
+    private boolean canGreenThumbPlants;
+    private boolean canGreenThumbBlocks;
+    private boolean canFarmersDiet;
+    private boolean canDoubleDrop;
+    private boolean canShroomThumb;
+
+    public HerbalismCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.HERBALISM, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+
+        // DOUBLE DROPS
+        if (canDoubleDrop) {
+            String[] doubleDropStrings = getAbilityDisplayValues(player, SubSkillType.HERBALISM_DOUBLE_DROPS);
+            doubleDropChance = doubleDropStrings[0];
+            doubleDropChanceLucky = doubleDropStrings[1];
+        }
+
+        // FARMERS DIET
+        if (canFarmersDiet) {
+            farmersDietRank = pluginRef.getRankTools().getRank(player, SubSkillType.HERBALISM_FARMERS_DIET);
+        }
+
+        // GREEN TERRA
+        if (canGreenTerra) {
+            String[] greenTerraStrings = formatLengthDisplayValues(player, skillValue);
+            greenTerraLength = greenTerraStrings[0];
+            greenTerraLengthEndurance = greenTerraStrings[1];
+        }
+
+        // GREEN THUMB
+        if (canGreenThumbBlocks || canGreenThumbPlants) {
+            greenThumbStage = pluginRef.getRankTools().getRank(player, SubSkillType.HERBALISM_GREEN_THUMB);
+
+            String[] greenThumbStrings = getAbilityDisplayValues(player, SubSkillType.HERBALISM_GREEN_THUMB);
+            greenThumbChance = greenThumbStrings[0];
+            greenThumbChanceLucky = greenThumbStrings[1];
+        }
+
+        // HYLIAN LUCK
+        if (hasHylianLuck) {
+            String[] hylianLuckStrings = getAbilityDisplayValues(player, SubSkillType.HERBALISM_HYLIAN_LUCK);
+            hylianLuckChance = hylianLuckStrings[0];
+            hylianLuckChanceLucky = hylianLuckStrings[1];
+        }
+
+        // SHROOM THUMB
+        if (canShroomThumb) {
+            String[] shroomThumbStrings = getAbilityDisplayValues(player, SubSkillType.HERBALISM_SHROOM_THUMB);
+            shroomThumbChance = shroomThumbStrings[0];
+            shroomThumbChanceLucky = shroomThumbStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        hasHylianLuck = canUseSubSkill(player, SubSkillType.HERBALISM_HYLIAN_LUCK);
+        canGreenTerra = pluginRef.getPermissionTools().greenTerra(player);
+        canGreenThumbPlants = pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.HERBALISM_GREEN_THUMB) && (pluginRef.getPermissionTools().greenThumbPlant(player, Material.WHEAT) || pluginRef.getPermissionTools().greenThumbPlant(player, Material.CARROT) || pluginRef.getPermissionTools().greenThumbPlant(player, Material.POTATO) || pluginRef.getPermissionTools().greenThumbPlant(player, Material.BEETROOT) || pluginRef.getPermissionTools().greenThumbPlant(player, Material.NETHER_WART) || pluginRef.getPermissionTools().greenThumbPlant(player, Material.COCOA));
+        canGreenThumbBlocks = pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.HERBALISM_GREEN_THUMB) && (pluginRef.getPermissionTools().greenThumbBlock(player, Material.DIRT) || pluginRef.getPermissionTools().greenThumbBlock(player, Material.COBBLESTONE) || pluginRef.getPermissionTools().greenThumbBlock(player, Material.COBBLESTONE_WALL) || pluginRef.getPermissionTools().greenThumbBlock(player, Material.STONE_BRICKS));
+        canFarmersDiet = canUseSubSkill(player, SubSkillType.HERBALISM_FARMERS_DIET);
+        canDoubleDrop = canUseSubSkill(player, SubSkillType.HERBALISM_DOUBLE_DROPS);
+        canShroomThumb = canUseSubSkill(player, SubSkillType.HERBALISM_SHROOM_THUMB);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        if (canDoubleDrop) {
+            messages.add(getStatMessage(SubSkillType.HERBALISM_DOUBLE_DROPS, doubleDropChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        }
+
+        if (canFarmersDiet) {
+            messages.add(getStatMessage(false, true, SubSkillType.HERBALISM_FARMERS_DIET, String.valueOf(farmersDietRank)));
+        }
+
+        if (canGreenTerra) {
+            messages.add(getStatMessage(SubSkillType.HERBALISM_GREEN_TERRA, greenTerraLength)
+                    + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+
+            //messages.add(pluginRef.getLocaleManager().getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+        }
+
+        if (canGreenThumbBlocks || canGreenThumbPlants) {
+            messages.add(getStatMessage(SubSkillType.HERBALISM_GREEN_THUMB, greenThumbChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+            //messages.add(pluginRef.getLocaleManager().getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+        }
+
+        if (canGreenThumbPlants) {
+            messages.add(getStatMessage(true, true, SubSkillType.HERBALISM_GREEN_THUMB, String.valueOf(greenThumbStage)));
+        }
+
+        if (hasHylianLuck) {
+            messages.add(getStatMessage(SubSkillType.HERBALISM_HYLIAN_LUCK, hylianLuckChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+        }
+
+        if (canShroomThumb) {
+            messages.add(getStatMessage(SubSkillType.HERBALISM_SHROOM_THUMB, shroomThumbChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.HERBALISM);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java

@@ -0,0 +1,116 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.mining.MiningManager;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MiningCommand extends SkillCommand {
+    private String doubleDropChance;
+    private String doubleDropChanceLucky;
+    private String superBreakerLength;
+    private String superBreakerLengthEndurance;
+
+    private int blastMiningRank;
+    private int bonusTNTDrops;
+    private double blastRadiusIncrease;
+    private String oreBonus;
+    private String debrisReduction;
+    private String blastDamageDecrease;
+
+    private boolean canSuperBreaker;
+    private boolean canDoubleDrop;
+    private boolean canBlast;
+    private boolean canBiggerBombs;
+    private boolean canDemoExpert;
+
+    public MiningCommand(mcMMO pluginRef) {
+        super(PrimarySkillType.MINING, pluginRef);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, double skillValue) {
+        // BLAST MINING
+        if (canBlast || canDemoExpert || canBiggerBombs) {
+            MiningManager miningManager = pluginRef.getUserManager().getPlayer(player).getMiningManager();
+
+            blastMiningRank = miningManager.getBlastMiningTier();
+            bonusTNTDrops = miningManager.getDropMultiplier();
+            oreBonus = percent.format(miningManager.getOreBonus() / 30.0D); // Base received in TNT is 30%
+            debrisReduction = percent.format(miningManager.getDebrisReduction() / 30.0D); // Base received in TNT is 30%
+            blastDamageDecrease = percent.format(miningManager.getBlastDamageModifier() / 100.0D);
+            blastRadiusIncrease = miningManager.getBlastRadiusModifier();
+        }
+
+        // DOUBLE DROPS
+        if (canDoubleDrop) {
+            String[] doubleDropStrings = getAbilityDisplayValues(player, SubSkillType.MINING_DOUBLE_DROPS);
+            doubleDropChance = doubleDropStrings[0];
+            doubleDropChanceLucky = doubleDropStrings[1];
+        }
+
+        // SUPER BREAKER
+        if (canSuperBreaker) {
+            String[] superBreakerStrings = formatLengthDisplayValues(player, skillValue);
+            superBreakerLength = superBreakerStrings[0];
+            superBreakerLengthEndurance = superBreakerStrings[1];
+        }
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canBiggerBombs = pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.MINING_BIGGER_BOMBS) && pluginRef.getPermissionTools().biggerBombs(player);
+        canBlast = pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.MINING_BLAST_MINING) && pluginRef.getPermissionTools().remoteDetonation(player);
+        canDemoExpert = pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.MINING_DEMOLITIONS_EXPERTISE) && pluginRef.getPermissionTools().demolitionsExpertise(player);
+        canDoubleDrop = canUseSubSkill(player, SubSkillType.MINING_DOUBLE_DROPS);
+        canSuperBreaker = pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.MINING_SUPER_BREAKER) && pluginRef.getPermissionTools().superBreaker(player);
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, double skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<>();
+
+        if (canBiggerBombs) {
+            messages.add(getStatMessage(true, true, SubSkillType.MINING_BLAST_MINING, String.valueOf(blastRadiusIncrease)));
+            //messages.add(pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Radius.Increase", blastRadiusIncrease));
+        }
+
+        if (canBlast) {
+            messages.add(getStatMessage(false, true, SubSkillType.MINING_BLAST_MINING, String.valueOf(blastMiningRank), String.valueOf(pluginRef.getRankTools().getHighestRank(SubSkillType.MINING_BLAST_MINING)), pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
+            //messages.add(pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Rank", blastMiningRank, RankUtils.getHighestRank(SubSkillType.MINING_BLAST_MINING), pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
+        }
+
+        if (canDemoExpert) {
+            messages.add(getStatMessage(SubSkillType.MINING_DEMOLITIONS_EXPERTISE, blastDamageDecrease));
+            //messages.add(pluginRef.getLocaleManager().getString("Mining.Effect.Decrease", blastDamageDecrease));
+        }
+
+        if (canDoubleDrop) {
+            messages.add(getStatMessage(SubSkillType.MINING_DOUBLE_DROPS, doubleDropChance)
+                    + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            //messages.add(pluginRef.getLocaleManager().getString("Mining.Effect.DropChance", doubleDropChance) + (isLucky ? pluginRef.getLocaleManager().getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+        }
+
+        if (canSuperBreaker) {
+            messages.add(getStatMessage(SubSkillType.MINING_SUPER_BREAKER, superBreakerLength)
+                    + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
+            //messages.add(pluginRef.getLocaleManager().getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? pluginRef.getLocaleManager().getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<TextComponent> getTextComponents(Player player) {
+        List<TextComponent> textComponents = new ArrayList<>();
+
+        pluginRef.getTextComponentFactory().getSubSkillTextComponents(player, textComponents, PrimarySkillType.MINING);
+
+        return textComponents;
+    }
+}

mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java

@@ -0,0 +1,97 @@
+package com.gmail.nossr50.commands.skills;
+
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.listeners.InteractionManager;
+import com.gmail.nossr50.mcMMO;
+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.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This is the command that retrieves data about skills from in-game sources
+ */
+public class MmoInfoCommand implements TabExecutor {
+
+    private final mcMMO pluginRef;
+
+    public MmoInfoCommand(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
+        /*
+         * Only allow players to use this command
+         */
+        if (commandSender instanceof Player) {
+            if (args.length < 1)
+                return false;
+
+            Player player = (Player) commandSender;
+            if (pluginRef.getPermissionTools().mmoinfo(player)) {
+                if (args == null || args[0] == null)
+                    return false;
+
+                if (args[0].equalsIgnoreCase("???")) {
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.Header"));
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.SubSkillHeader", "???"));
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.DetailsHeader"));
+                    player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.Mystery"));
+                    return true;
+                } else if (InteractionManager.getAbstractByName(args[0]) != null || pluginRef.getSkillTools().isSubSkillNameExact(args[0])) {
+                    displayInfo(player, args[0]);
+                    return true;
+                }
+
+                //Not a real skill
+                player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.NoMatch"));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return StringUtil.copyPartialMatches(args[0], pluginRef.getSkillTools().EXACT_SUBSKILL_NAMES, new ArrayList<>(pluginRef.getSkillTools().EXACT_SUBSKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void displayInfo(Player player, String subSkillName) {
+        //Check to see if the skill exists in the new system
+        AbstractSubSkill abstractSubSkill = InteractionManager.getAbstractByName(subSkillName);
+        if (abstractSubSkill != null) {
+            /* New System Skills are programmable */
+            abstractSubSkill.printInfo(player);
+            //pluginRef.getTextComponentFactory().sendPlayerUrlHeader(player);
+        } else {
+            /*
+             * Skill is only in the old system
+             */
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.Header"));
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.SubSkillHeader", subSkillName));
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.DetailsHeader"));
+            player.sendMessage(pluginRef.getLocaleManager().getString("Commands.MmoInfo.OldSkill"));
+        }
+
+        for (SubSkillType subSkillType : SubSkillType.values()) {
+            if (subSkillType.getNiceNameNoSpaces(subSkillType).equalsIgnoreCase(subSkillName))
+                subSkillName = subSkillType.getWikiName(subSkillType.toString());
+        }
+
+        //Send Player Wiki Link
+        pluginRef.getTextComponentFactory().sendPlayerSubSkillWikiLink(player, subSkillName);
+    }
+}