Update pom.xml and changelog.txt for 1.5.00 release

Because when treasures are found in vanilla Minecraft, there isn’t a
message either

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto
+
+*.png binary
+*.wav binary

.gitignore

@@ -1,42 +1,42 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
-
-# netbeans
-/nbproject
-
-# we use maven!
-/build.xml
-
-# maven
-/target
-
-# vim
-.*.sw[a-p]
-
-# various other potential build files
-/build
-/bin
-/dist
-/manifest.mf
-
-/world
-
-# Mac filesystem dust
-*.DS_Store
-
-# intellij
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Project Stuff
-/src/main/resources/mcMMO
-
-# Other Libraries
-*.jar
-
-# Atlassian Stuff
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
+
+# netbeans
+/nbproject
+
+# we use maven!
+/build.xml
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
+
+# various other potential build files
+/build
+/bin
+/dist
+/manifest.mf
+
+/world
+
+# Mac filesystem dust
+*.DS_Store
+
+# intellij
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Project Stuff
+/src/main/resources/mcMMO
+
+# Other Libraries
+*.jar
+
+# Atlassian Stuff
 /atlassian-ide-plugin.xml

README.creole

@@ -1,28 +0,0 @@
-== mcMMO
-**The RPG lovers mod**
-
-=== Dev builds
-http://ci.mcmmo.info Download the latest dev build of mcMMO here.
-
-=== 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.
-
-=== About the Developer
-I've always wanted to make games and in the last year I decided to take a swing at developing Minecraft mods as a platform to teach myself programming, the biggest project I have made to date is mcMMO. I went from knowing nothing about Java to what I know now purely from modding Minecraft, and I plan to move onto game development in the not so distant future.
-
-I take design very seriously, I am not the kind of person who can be satisfied giving a project anything less than my all. As you will see reflected in the quality of the mods I make, I take great care in my work.
-
-Hearing that people enjoy mcMMO and seeing the daily youtube videos about my mod has become a joy, I really can't believe how popular my mod has gotten!
-
-=== Compiling
-
-Required Libraries:
-* Spout API
-* JUnit
-
-Required to Run:
-* Bukkit
-
-http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

README.md

@@ -0,0 +1,51 @@
+# mcMMO
+## The RPG lovers mod
+
+### Dev builds
+Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).
+
+### Brief Description
+The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
+
+## About the Team
+
+mcMMO is currently developed by a team of individuals from all over the world.
+### Glorious Leader
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
+(https://github.com/gmcferrin)
+
+### Developers
+[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
+(https://github.com/bm01)
+[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
+(https://github.com/Glitchfinder)
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)]
+(https://github.com/nossr50)
+[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)]
+(https://github.com/NuclearW)
+[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)]
+(https://github.com/shatteredbeam)
+[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
+(https://github.com/TfT-02)
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
+(https://github.com/t00thpick1)
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
+(https://github.com/riking)
+
+### Special thanks
+[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)]
+(https://github.com/EasyMFnE)
+Added the Alchemy skill
+
+## Compiling
+
+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`
+
+Required Libraries:
+* JUnit
+* EMetrics
+* Bukkit
+
+http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

extras/mods/LOTR.armor.yml

@@ -0,0 +1,439 @@
+# Lord of the Rings mod config by Dragyn
+# Built against version [1.6.4] The Lord of the Rings Mod Public Beta 11.1
+#
+#
+#  Settings for Boots
+###
+Boots:
+    # Bronze
+    X12015:
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Orc
+    X12035:
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Gondorian
+    X12060:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Mithril
+    X12064:
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Elven
+    X12088:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Warg
+    X12098:
+        Repairable: true
+        Repair_Material: X12094
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dwarven
+    X12129:
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Galven
+    X12134:
+        Repairable: true
+        Repair_Material: X12130
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Uruk
+    X12161:
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Wood Elf
+    X12176:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Ancient
+    X12180:
+        Repairable: true
+        Repair_Material: X12179
+        Repair_Material_Data_Value: 3
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rohirric
+    X12187:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rangers
+    X12206:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dunlending
+    X12210:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Morgul
+    X12222:
+        Repairable: true
+        Repair_Material: X12217
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Chestplates
+###
+Chestplates:
+    # Bronze
+    X12013:
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Orc
+    X12033:
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Gondorian
+    X12058:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Mithril
+    X12062:
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Elven
+    X12086:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Warg
+    X12096:
+        Repairable: true
+        Repair_Material: X12094
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dwarven
+    X12127:
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Galven
+    X12132:
+        Repairable: true
+        Repair_Material: X12130
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Uruk
+    X12159:
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Wood Elf
+    X12174:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Ancient
+    X12178:
+        Repairable: true
+        Repair_Material: X12179
+        Repair_Material_Data_Value: 3
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rohirric
+    X12185:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rangers
+    X12204:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dunlending
+    X12208:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Morgul
+    X12220:
+        Repairable: true
+        Repair_Material: X12217
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Helmets
+###
+Helmets:
+    # Bronze
+    X12012:
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Orc
+    X12032:
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Gondorian
+    X12057:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Mithril
+    X12061:
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Elven
+    X12085:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Warg
+    X12095:
+        Repairable: true
+        Repair_Material: X12094
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dwarven
+    X12126:
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Galven
+    X12131:
+        Repairable: true
+        Repair_Material: X12130
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Uruk
+    X12158:
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Wood Elf
+    X12173:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Ancient
+    X12177:
+        Repairable: true
+        Repair_Material: X12179
+        Repair_Material_Data_Value: 3
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rohirric
+    X12184:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rangers
+    X12203:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dunlending
+    X12207:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Morgul
+    X12219:
+        Repairable: true
+        Repair_Material: X12217
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Leggings
+###
+Leggings:
+    # Bronze
+    X12014:
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Orc
+    X12034:
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Gondorian
+    X12059:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Mithril
+    X12063:
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Elven
+    X12087:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Warg
+    X12097:
+        Repairable: true
+        Repair_Material: X12094
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dwarven
+    X12128:
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Galven
+    X12133:
+        Repairable: true
+        Repair_Material: X12130
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Uruk
+    X12160:
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Wood Elf
+    X12175:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Ancient
+    X12179:
+        Repairable: true
+        Repair_Material: X12179
+        Repair_Material_Data_Value: 3
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rohirric
+    X12186:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Rangers
+    X12205:
+        Repairable: true
+        Repair_Material: LEATHER
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Dunlending
+    X12209:
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Morgul
+    X12221:
+        Repairable: true
+        Repair_Material: X12217
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500

extras/mods/LOTR.blocks.yml

@@ -0,0 +1,211 @@
+# Lord of the Rings mod config by Skuli (Updated by Dragyn)
+# Built against version [1.6.4] The Lord of the Rings Mod Public Beta 11.1
+#
+#  Settings for Custom Excavation Blocks
+###
+Excavation:
+    Block_1|0:
+        XP_Gain: 99
+        Double_Drops_Enabled: true
+    Block_2|0:
+        XP_Gain: 99
+        Double_Drops_Enabled: true
+
+#
+#  Settings for Custom Herbalism Blocks
+###
+Herbalism:
+
+# Shireheather
+    X1813:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Simbelmyne
+    X1805:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Asphodel
+    X1895:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Bluebell
+    X1867:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Clover
+    X1873:
+        XP_Gain: 10
+        Double_Drops_Enabled: false
+
+# Dead Marsh Plant
+    X1886:
+        XP_Gain: 10
+        Double_Drops_Enabled: false
+
+# DwarfWort
+    X1902:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Elanor
+    X1833:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Lettuce Crop
+    X1830:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Morgul Shroom
+    X1870:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Niphredil
+    X1834:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Pipeweed Crop
+    X1823:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+# Pipeweed Plant
+    X1822:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+
+# Mithril
+    X1803:
+        XP_Gain: 2000
+        Double_Drops_Enabled: false
+        Is_Ore: true
+# Naurite
+    X1818:
+        XP_Gain: 150
+        Double_Drops_Enabled: false
+        Is_Ore: false
+#Glowstone Ore
+    X1859:
+        XP_Gain: 30
+        Double_Drops_Enabled: false
+        Is_Ore: false
+# Remains
+    X1885:
+        XP_Gain: 1800
+        Double_Drops_Enabled: false
+        Is_Ore: false
+# Gulduril
+    X1887:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Ore: false
+
+# Quendite
+    X1846:
+        XP_Gain: 150
+        Double_Drops_Enabled: false
+        Is_Ore: false
+
+# MorgulIron
+    X1819:
+        XP_Gain: 25
+        Double_Drops_Enabled: true
+        Is_Ore: false
+
+# Rohan Rock
+    X180|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: false
+        Is_Ore: false
+
+
+#Gondor Stone
+    X180|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: false
+        Is_Ore: false
+
+# Mordor Stone
+    X180|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: false
+        Is_Ore: false
+
+#
+#  Settings for Custom Woodcutting Blocks
+###
+Woodcutting:
+# Shire Pine
+    X1806|0:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Mallorn
+    X1806|1:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Apple
+    X1860|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+#  Pear
+    X1860|1:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Cherry
+    X1860|2:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Mirkwood
+    X1806|2:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Charred
+    X1806|3:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Lebethron
+    X1896|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+# Beech
+    X1896|1:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+
+
+#
+#  Settings for Custom Ability Blocks
+#  (These blocks don't trigger abilities)
+###
+Ability_Blocks:
+    Block_1|0:
+    Block_2|0:

extras/mods/LOTR.tools.yml

@@ -0,0 +1,700 @@
+# Lord of the Rings mod config by Skuli (Updated by Dragyn)
+# Built against version [1.6.4] The Lord of the Rings Mod Public Beta 11.1
+
+Axes:
+    #DwarvenThrowingAxe
+    X12146:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 451
+    #UrukWarhammer
+    X12156:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 391
+    #Gondorian Warhammer
+    X12140:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 281
+    #UrukBattleaxe
+    X12155:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 391
+    #MithrilBattleaxe
+    X12138:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 2479
+    #MithrilWarhamer
+    X12139:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 2479
+    #OrcWarhammer
+    X12125:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 261
+    #Dwarven Warhammer
+    X12120:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 451
+    #DwarvenZbattleaxe
+    X12119:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 451
+    #BronzeAxe
+    X12009:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 197
+    #MithrilAxe
+    X12050:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 2479
+    #MallornAxe
+    X12075:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X1801
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 121
+    #Elven Axe
+    X12080:
+        XP_Modifer: 2
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 313
+    #DwarvenAxe
+    X12115:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 450
+    #OrcAxe
+    X12123:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 261
+    #UrukAxe
+    X12150:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 391
+Bows:    
+    #ElvenBow
+    X12093:
+        XP_Modifer: 2
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 9
+        Durability: 485
+    #mallornbow
+    X12084:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X1801
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 417
+    #orcBow
+    X12099:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 441
+    #UrukCrossbow
+    X12163:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 471
+    #MithrilCrossbow
+    X12171:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 1761
+    #IronCrossbow
+    X12170:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 9
+        Durability: 357
+    #BowofMirkwood
+    X12177:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X1806
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 3
+        Durability: 417
+Hoes:    
+    #BronzeHoe
+    X12011:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 197
+    #MithrilHoe
+    X12052:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 2479
+    #MallornHoe
+    X12077:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X1801
+        Repair_Material_Data_Value: 1
+        Repair_Material_Quantity: 2
+        Durability: 121
+    #CopperHoe
+    X26511:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X26507
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 180
+    #ElvenHoe
+    X12082:
+        XP_Modifer: 2
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12082
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 313
+    #DwarvenHoe
+    X12117:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X26507
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 180
+Pickaxes:    
+    #MEBronzePickaxe
+    X12008:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 197
+    #MithrilPixkaxe
+    X12049:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 2479
+    #MallornPickaxe
+    X12074:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X1801
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 121
+    #ElvenPickaxe
+    X12079:
+        XP_Modifer: 2
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 313
+    #DwarvenPickaxe
+    X12114:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 451
+    #UrukPickaxe
+    X12149:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 391
+    #OrcPickaxe
+    X12122:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 3
+        Durability: 261
+Shovels:    
+    #BronzeShovel
+    X12007:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 197
+    #MithrilShovel
+    X12048:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 2479
+    #MallornShovel
+    X12073:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X1801
+        Repair_Material_Data_Value: 1
+        Repair_Material_Quantity: 1
+        Durability: 121
+    #ElvenShovel
+    X12078:
+        XP_Modifer: 2
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12082
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 313
+    #DwarvenShovel
+    X12113:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 451
+    #UrukShovel
+    X12148:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 391
+    #OrcShovel
+    X12121:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 261
+
+Swords:    
+    #Uruk Dagger
+    X12153:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 313
+    #Poisoned urukd agger
+    X12154:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 313
+    #Uruk Spear
+    X12157:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 391
+    #Rohirric Sword
+    X12181:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 251
+    #Rohirric Dagger
+    X12182:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 201
+    #Rohirric Spear
+    X12183:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 251
+    #Dunlending Spear
+    X12212:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 251
+    #Uruk Scimitar
+    X12151:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12147
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 391
+    #Mithril Dagger
+    X12137:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 1983
+    #Iron Dagger
+    X12136:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 201
+    #Dwarven Dagger
+    X12118:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 361
+    #Dwarven Sword
+    X12116:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12112
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 451
+    #Elven Sword
+    X12081:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 313
+    #Elven Spear
+    X12083:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 313
+    #Anduril
+    X12070:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 4
+        Repairable: false
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 313
+    #Mallorn Sword
+    X12076:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X1801
+        Repair_Material_Data_Value: 1
+        Repair_Material_Quantity: 2
+        Durability: 121
+    #Mithril Spear
+    X12069:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 4
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 2479
+    #Iron Spear
+    X12068:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: IRON_INGOT
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 251
+    #Orc Spear
+    X12066:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 261
+    #Bronze Spear
+    X12067:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 197
+    #Gondor Spear
+    X12065:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 281
+    #Gondor Sword
+    X12056:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: false
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 281
+    #Orc Scimitar
+    X12031:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12036
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 261
+    #Steel Sword
+    X26862:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X26857
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 751
+    #Bronze Sword
+    X12010:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X12004
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 1
+        Durability: 197
+    #Mithril Sword
+    X12051:
+        XP_Modifer: 1
+        Ability_Enabled: true
+        Tier: 4
+        Repairable: true
+        Repair_Material: X12006
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 2479    

extras/mods/extrabiomesxl.blocks.yml

@@ -0,0 +1,182 @@
+# Config created by Dragyn
+# Created For ExtrabiomesXL-universal-1.6.4-3.14.5
+
+#
+#  Settings for Custom Excavation Blocks
+###
+Excavation:
+    # Quicksand
+    X2214|0:
+        XP_Gain: 40
+        Double_Drops_Enabled: true
+
+
+#
+#  Settings for Custom Herbalism Blocks
+###
+Herbalism:
+    # Cattails
+    X2201|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+    # Hydrangea
+    X2202|1:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+    # Buttercups
+    X2202|2:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+    # Lavender
+    X2202|3:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+    # Tiny Cactus
+    X2202|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+    # Toadstool
+    X2202|6:
+        XP_Gain: 150
+        Double_Drops_Enabled: true        
+    # Calla Lillies
+    X2202|7:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    X254|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+
+    X254|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+
+#
+#  Settings for Custom Woodcutting Blocks
+###
+Woodcutting:
+    # Fir 
+    X2208|0:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Acacia 
+    X2208|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Cypress 
+    X2208|2:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Japanese Maple
+    X2208|3:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Redwood Quarter
+    X2209|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2211|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2212|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2213|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Fir Quarters
+    X2209|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2211|1:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2212|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2213|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true        
+    # Oak Quarters
+    X2209|2:
+        XP_Gain: 70
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2211|2:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2212|2:
+        XP_Gain: 70
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X2213|2:
+        XP_Gain: 70
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Acacia 
+    X2209|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Cypress 
+    X2209|2:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Bald Cypress Quarter
+    X2225|0:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true    
+    # Bald Cypress Elbow
+    X2227|0:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true     
+    # Bald Cypress Log
+    X2231|2:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Rainbow Eucalyptus
+    X2228|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true           
+    X2229|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true  
+    X2231|0:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true     
+    # Autumn Log
+    X2231|1:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Sakura Log
+    X2238|0:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true         

extras/mods/galacticraft.armor.yml

@@ -0,0 +1,71 @@
+# Config created by Dragyn
+# Created For Galacticraft-1.6.4-2.0.7.904 and Galacticraft-Planets-1.6.4-2.0.7.904
+#
+#  Settings for Boots
+###
+Boots:
+    # Heavy Duty
+    X10149:
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    X10171:
+        Repairable: true
+        Repair_Material: X10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 999
+#
+#  Settings for Chestplates
+###
+Chestplates:
+    # Heavy Duty
+    X10147:
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    X10169:
+        Repairable: true
+        Repair_Material: X10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 999
+#
+#  Settings for Helmets
+###
+Helmets:
+    # Heavy Duty
+        X10146:
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    X10168:
+        Repairable: true
+        Repair_Material: X10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 999
+#
+#  Settings for Leggings
+###
+Leggings:
+    # Heavy Duty
+    X10148:
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    X10170:
+        Repairable: true
+        Repair_Material: X10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 999
+        

extras/mods/galacticraft.blocks.yml

@@ -0,0 +1,98 @@
+# Config created by Dragyn
+# Created For Galacticraft-1.6.4-2.0.7.904 and Galacticraft-Planets-1.6.4-2.0.7.904
+#
+#  Settings for Custom Excavation Blocks
+###
+Excavation:
+    # Dirt
+    X3347|3:
+        XP_Gain: 40
+        Double_Drops_Enabled: true
+    Block_2|0:
+        XP_Gain: 99
+        Double_Drops_Enabled: true
+
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    # Copper Ore
+    X3347|0:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    X3372|5:
+        XP_Gain: 450
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    X3390|0:
+        XP_Gain: 550
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Tin Ore
+    X3347|1:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    X3372|6:
+        XP_Gain: 450
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    X3390|1:
+        XP_Gain: 550
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Aluminum Ore
+    X3372|7:
+        XP_Gain: 450
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Silicon Ore
+    X3372|8:
+        XP_Gain: 450
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Cheese Ore
+    X3347|2:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true   
+    # Iron Ore
+    X3390|3:
+        XP_Gain: 550
+        Double_Drops_Enabled: true
+        Is_Ore: true        
+    # Desh Ore
+    X3390|2:
+        XP_Gain: 600
+        Double_Drops_Enabled: true
+        Is_Ore: true                    
+    # Moon Stone
+    X3347|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false    
+    # Moon Turf
+    X3347|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false    
+    # Mars Cobblestone
+    X3390|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false     
+    # Mars Rock/Stone
+    X3390|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false 
+    X3390|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false 
+    X3390|9:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false 
+

extras/mods/galacticraft.tools.yml

@@ -0,0 +1,123 @@
+# Config created by Dragyn
+# Created For Galacticraft-1.6.4-2.0.7.904 and Galacticraft-Planets-1.6.4-2.0.7.904
+#
+#  Settings for Axes
+###
+Axes:
+    # Heavy Duty
+    X10145:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Desh
+    X10167:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: 10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 1000
+
+#
+#  Settings for Hoes
+###
+Hoes:
+    # Heavy Duty
+    X10144:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Desh
+    X10166:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: 10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 1000
+#
+#  Settings for Pickaxes
+###
+Pickaxes:
+    # Heavy Duty
+    X10142:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Desh
+    X10164:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: 10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 1000
+#
+#  Settings for Shovels
+###
+Shovels:
+    # Heavy Duty
+    X10143:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Desh
+    X10165:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: 10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 1000
+#
+#  Settings for Swords
+###
+Swords:
+    # Heavy Duty
+    X10141:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 4
+        Repairable: true
+        Repair_Material: X10150
+        Repair_Material_Data_Value: 9
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Desh
+    X10163:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: 10161
+        Repair_Material_Data_Value: 2
+        Repair_Material_Quantity: 2
+        Durability: 1000

extras/mods/metallurgy3.blocks.yml

@@ -0,0 +1,185 @@
+# Config created by Dragyn
+# Created For Metallurgy-1.6.4-3.3.1 
+#
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    # Copper
+    X900|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Tin
+    X900|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Zinc
+    X902|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Silver
+    X902|1:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Platinum
+    X902|3:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+
+    # NETHER ORES
+    # Ignatius
+    X903|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Shadow Iron
+    X903|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Lemurite
+    X903|2:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true                
+    # Midasium
+    X903|3:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Vyroxeres
+    X903|4:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Ceruclase
+    X903|5:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Alduorite
+    X903|6:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Kalendrite
+    X903|7:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Vulcanite
+    X903|8:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Sanguinite
+    X903|9:
+        XP_Gain: 450
+        Double_Drops_Enabled: true
+        Is_Ore: true
+
+    # Manganese
+    X900|2:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Eximite
+    X900|5:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Meutoite
+    X900|6:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Sulfur
+    X905|7:
+        XP_Gain: 150
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Phosphorite
+    X905|8:
+        XP_Gain: 150
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Saltpeter
+    X905|9:
+        XP_Gain: 150
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Magnesium
+    X905|10:
+        XP_Gain: 150
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Bitumen
+    X905|11:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Potash
+    X905|12:
+        XP_Gain: 150
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Prometheum
+    X906|0:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true        
+    # Deep Iron
+    X906|1:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true 
+    # Infuscolium
+    X906|2:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true 
+    # Oureclase
+    X906|4:
+        XP_Gain: 650
+        Double_Drops_Enabled: true
+        Is_Ore: true 
+    # Astral Silver
+    X906|5:
+        XP_Gain: 650
+        Double_Drops_Enabled: true
+        Is_Ore: true 
+    # Carmot
+    X906|6:
+        XP_Gain: 350
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Mithril
+    X906|7:
+        XP_Gain: 750
+        Double_Drops_Enabled: true
+        Is_Ore: true
+    # Rubracium
+    X906|8:
+        XP_Gain: 800
+        Double_Drops_Enabled: true
+        Is_Ore: true         
+    # Orichalcum
+    X906|11:
+        XP_Gain: 900
+        Double_Drops_Enabled: true
+        Is_Ore: true         
+    # Adamantine
+    X906|13:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Ore: true         
+    # Atlarus
+    X906|14:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Ore: true   

extras/mods/railcraft.armor.yml

@@ -0,0 +1,44 @@
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Boots
+###
+Boots:
+    X7758:
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500       
+#
+#  Settings for Chestplates
+###
+Chestplates:
+    X7761:
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500        
+#
+#  Settings for Helmets
+###
+Helmets:
+    X7759:
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500       
+#
+#  Settings for Leggings
+###
+Leggings:
+    X7760:
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+        

extras/mods/railcraft.blocks.yml

@@ -0,0 +1,103 @@
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    # Abyssal Stone
+    X457|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Quarried Stone
+    X457|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Sulfur
+    X458|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Saltpeter
+    X458|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Dark Diamond
+    X458|2:
+        XP_Gain: 750
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Dark Emerald
+    X458|3:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Dark Lapis
+    X458|4:
+        XP_Gain: 400
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Firestone
+    X458|5:
+        XP_Gain: 450
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Infernal Stone
+    X467|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X467|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Blood Stained Stone
+    X468|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X468|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Sandy Stone
+    X469|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X469|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Quarried Stone
+    X471|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X471|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Frost Bound Stone
+    X472|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X472|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    # Nether Stone
+    X475|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X475|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+              
+              

extras/mods/railcraft.tools.yml

@@ -0,0 +1,76 @@
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Axes
+###
+Axes:
+    # Steel
+    X7819:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+
+#
+#  Settings for Hoes
+###
+Hoes:
+    # Steel
+    X7820:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+#
+#  Settings for Pickaxes
+###
+Pickaxes:
+    # Steel
+    X7821:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Shovels
+###
+Shovels:
+    # Steel
+    X7823:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Swords
+###
+Swords:
+    # Steel
+    X7824:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X7796
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500

extras/mods/simcraft.blocks.yml

@@ -0,0 +1,543 @@
+# Config created by Dragyn
+# Created For SimCraft 1.6.4 
+#
+#
+#  Settings for Custom Herbalism Blocks
+###
+Herbalism:
+    X705|0:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|1:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|2:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|3:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|4:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|5:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|6:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|7:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|8:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|9:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|10:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|11:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|12:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|13:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|14:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X705|15:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|0:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|1:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|2:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|3:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|4:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|5:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|6:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|7:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|8:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|9:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|10:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|11:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|12:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|13:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|14:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X706|15:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|0:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|1:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|2:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|3:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|4:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|5:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|6:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|7:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|8:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|9:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|10:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|11:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|12:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|13:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|14:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+    X707|15:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    X700|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|3:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|8:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|9:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|10:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|11:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|12:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|13:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|14:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X700|15:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|0:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|1:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|2:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|3:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|4:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|5:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|6:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|7:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|8:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|9:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|10:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|11:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|12:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|13:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|14:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X701|15:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|2:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|3:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|4:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|5:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|6:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|7:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|8:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|9:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|10:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|11:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|12:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|13:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|14:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X702|15:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|2:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|3:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|4:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|5:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|6:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|7:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|8:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|9:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|10:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|11:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|12:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|13:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|14:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X703|15:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|2:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|3:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|4:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|5:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|6:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|7:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|8:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|9:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|10:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|11:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|12:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|13:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|14:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X704|15:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+#
+#  Settings for Custom Woodcutting Blocks
+###
+Woodcutting:
+    X708|0:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|2:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|3:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|4:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|5:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|6:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|7:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|8:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|9:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|10:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X708|11:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X1095|0:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X1095|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X1095|2:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    X1095|3:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true

extras/mods/simcraft.tools.yml

@@ -0,0 +1,61 @@
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Axes
+###
+Axes:
+    # Steel
+    X15787:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X15260
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+
+#
+#  Settings for Pickaxes
+###
+Pickaxes:
+    # Steel
+    X15788:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X15260
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Shovels
+###
+Shovels:
+    # Steel
+    X15789:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X15260
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Swords
+###
+Swords:
+    # Steel
+    X15786:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X15260
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500

extras/mods/twilightforest.armor.yml

@@ -0,0 +1,134 @@
+# Config created by Dragyn
+# Created For twilightforest-1.20.3 
+#
+#
+#  Settings for Boots
+###
+Boots:  
+    # Ironwood
+    X27978:
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Fiery
+    X27995:
+        Repairable: true
+        Repair_Material: X27991
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Stealeaf
+    X28002:
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28037:
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+        
+#
+#  Settings for Chestplates
+###
+Chestplates:
+    # Ironwood
+    X27976:
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Fiery
+    X27993:
+        Repairable: true
+        Repair_Material: X27991
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Stealeaf
+    X28000:
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28035:
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+#
+#  Settings for Helmets
+###
+Helmets:
+    # Ironwood
+    X27975:
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Fiery
+    X27992:
+        Repairable: true
+        Repair_Material: X27991
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Stealeaf
+    X27999:
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28034:
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+#
+#  Settings for Leggings
+###
+Leggings:
+    # Ironwood
+    X27977:
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Fiery
+    X27994:
+        Repairable: true
+        Repair_Material: X27991
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Stealeaf
+    X28001:
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28036:
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500

extras/mods/twilightforest.blocks.yml

@@ -0,0 +1,117 @@
+# Config created by Dragyn
+# Created For twilightforest-1.20.3 
+#
+#
+#  Settings for Custom Herbalism Blocks
+###
+Herbalism:
+    # Mushgloom
+    X2169|9:
+        XP_Gain: 150
+        Double_Drops_Enabled: true
+    # Torchberry Plant
+    X2169|13:
+        XP_Gain: 20
+        Double_Drops_Enabled: true
+    # Mayapple
+    X2169|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+    # Fiddlehead
+    X2169|8:
+        XP_Gain: 35
+        Double_Drops_Enabled: true
+
+
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    # Mazestone
+    X2165|0:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|1:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|2:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|3:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|4:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|5:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|6:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2165|7:
+        XP_Gain: 250
+        Double_Drops_Enabled: true
+        Is_Ore: false
+        
+#
+#  Settings for Custom Woodcutting Blocks
+###
+Woodcutting:
+    # Twilight Oak
+    X2163|0:
+        XP_Gain: 70
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Canopy
+    X2163|1:
+        XP_Gain: 80
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Mangrove
+    X2163|2:
+        XP_Gain: 90
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Darkwood
+    X2163|3:
+        XP_Gain: 100
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Roots
+    X2170|0:
+        XP_Gain: 10
+        Double_Drops_Enabled: true
+        Is_Log: false
+    X2170|1:
+        XP_Gain: 10
+        Double_Drops_Enabled: true
+        Is_Log: false
+    # Timewood
+    X2176|0:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Transwood
+    X2176|1:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Minewood
+    X2176|2:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Log: true
+    # Sortingwood
+    X2176|3:
+        XP_Gain: 1000
+        Double_Drops_Enabled: true
+        Is_Log: true
+                 

extras/mods/twilightforest.tools.yml

@@ -0,0 +1,186 @@
+# Config created by Dragyn
+# Created For twilightforest-1.20.3 
+#
+#
+#  Settings for Axes
+###
+Axes:
+    # Ironwood
+    X27982:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Steeleaf
+    X31989:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28040:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Minotaur
+    X31984:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X264
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+
+#
+#  Settings for Hoes
+###
+Hoes:
+    # Ironwood
+    X27983:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Steeleaf
+    X31988:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+
+#
+#  Settings for Pickaxes
+###
+Pickaxes:
+    # Ironwood
+    X27981:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Fiery
+    X27997:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27991
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Steeleaf
+    X28005:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28039:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Shovels
+###
+Shovels:
+    # Ironwood
+    X27980:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Steeleaf
+    X28004:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+#
+#  Settings for Swords
+###
+Swords:
+    # Ironwood
+    X27979:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27974
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Fiery
+    X27996:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27991
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Steeleaf
+    X28003:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X27998
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500
+    # Knightmetal
+    X28038:
+        XP_Modifer: 1.0
+        Ability_Enabled: true
+        Tier: 1
+        Repairable: true
+        Repair_Material: X28032
+        Repair_Material_Data_Value: 0
+        Repair_Material_Quantity: 2
+        Durability: 500

extras/mods/underground_biomes.blocks.yml

@@ -0,0 +1,171 @@
+# Config created by Dragyn
+# Created For UndergroundBiomes 1.6.x - 0.4.2c 
+#
+#
+#  Settings for Custom Mining Blocks
+###
+Mining:
+    X2000|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|3:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2000|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+#        
+    X2001|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|3:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2001|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false        
+#        
+    X2009|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|3:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2009|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false   
+#
+    X2010|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|3:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|4:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2010|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false   
+#    
+    X2011|0:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|1:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|2:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|3:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|4:
+        XP_Gain: 50
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|5:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|6:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false
+    X2011|7:
+        XP_Gain: 30
+        Double_Drops_Enabled: true
+        Is_Ore: false                   

extras/repair.chain.yml

@@ -1,11 +1,11 @@
 #
+#  Repair configuration
+#  Last updated on ${project.version}-b${BUILD_NUMBER}
+#
 # 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.
+# Afterwards, all sub-items are considered a Repairable to be loaded. The names of each subitem should be the exact material name.
+# The bare minimum of a Repairable is that it have a RepairMaterial and a MaximumDurability
 #
 # ItemType: This is the type of item to be repaired, this is only important to permissions.
 ## Valid values are ARMOR, TOOL, and OTHER.
@@ -15,7 +15,7 @@
 ## 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.
+# RepairMaterial: This is the material name 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.
@@ -26,7 +26,7 @@
 ## This is required to be set.
 #
 # MinimumLevel: This is the minimum repair level needed to repair this item.
-## Valid values are > 0
+## 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.
@@ -42,32 +42,19 @@
 #
 ###
 Repairables:
-    ChainHelmet:
-        ItemId: 302
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 165
-        MinimumQuantity: 5
+    #
+    # Chainmail repairables
+    ###
+    # Armor
+    CHAINMAIL_HELMET:
+        RepairMaterial: FIRE
         XpMultiplier: 2
-    ChainChest:
-        ItemId: 303
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 240
-        MinimumQuantity: 8
+    CHAINMAIL_CHESTPLATE:
+        RepairMaterial: FIRE
         XpMultiplier: 2
-    ChainLegs:
-        ItemId: 304
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        MaximumDurability: 225
-        MinimumQuantity: 7
+    CHAINMAIL_LEGGINGS:
+        RepairMaterial: FIRE
         XpMultiplier: 2
-    ChainBoots:
-        ItemId: 305
-        ItemType: ARMOR
-        RepairMaterialId: 51
-        RepairMaterialMetadata: -1
-        MaximumDurability: 195
-        MinimumQuantity: 4
+    CHAINMAIL_BOOTS:
+        RepairMaterial: FIRE
         XpMultiplier: 2

pom.xml

@@ -1,197 +1,157 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.gmail.nossr50.mcMMO</groupId>
-    <artifactId>mcMMO</artifactId>
-    <version>1.4.00-beta4</version>
-    <name>mcMMO</name>
-    <url>https://github.com/mcMMO-Dev/mcMMO</url>
-    <issueManagement>
-        <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
-        <system>GitHub</system>
-    </issueManagement>
-    <build>
-        <finalName>mcMMO</finalName>
-        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/</directory>
-                <includes>
-                    <include>*.yml</include>
-                    <include>.jenkins</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/xpbar/</directory>
-                <includes>
-                    <include>xpbar*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/healthbar/</directory>
-                <includes>
-                    <include>health*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/skillicon/</directory>
-                <includes>
-                    <include>*.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>resources</targetPath>
-                <filtering>false</filtering>
-                <directory>${basedir}/src/main/resources/sound/</directory>
-                <includes>
-                    <include>*.wav</include>
-                </includes>
-            </resource>
-            <resource>
-                <targetPath>com/gmail/nossr50/locale</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/locale/</directory>
-                <includes>
-                    <include>locale*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <excludes>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/package.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
-                <configuration>
-                    <artifactSet>
-                        <includes>
-                            <include>com.turt2live.metrics:MetricsExtension</include>
-                        </includes>
-                    </artifactSet>
-                    <relocations>
-                        <relocation>
-                            <pattern>com.turt2live.metrics</pattern>
-                            <shadedPattern>com.gmail.nossr50.util.mcstats</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-file</artifactId>
-                <version>2.2</version>
-            </extension>
-        </extensions>
-    </build>
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-            <id>spout-repo</id>
-            <url>http://nexus.spout.org/content/groups/public/</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-            <id>Plugin MetricsExtension</id>
-            <url>http://repo.turt2live.com</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>LATEST</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.getspout</groupId>
-            <artifactId>spoutplugin</artifactId>
-            <version>LATEST</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.turt2live.metrics</groupId>
-            <artifactId>MetricsExtension</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <distributionManagement>
-        <repository>
-            <id>mcmmo-repo</id>
-            <url>file:///var/lib/jenkins/repo</url>
-        </repository>
-    </distributionManagement>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.gmail.nossr50.mcMMO</groupId>
+    <artifactId>mcMMO</artifactId>
+    <version>1.5.00</version>
+    <name>mcMMO</name>
+    <url>https://github.com/mcMMO-Dev/mcMMO</url>
+    <issueManagement>
+        <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
+        <system>GitHub</system>
+    </issueManagement>
+    <build>
+        <finalName>mcMMO</finalName>
+        <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/</directory>
+                <includes>
+                    <include>*.yml</include>
+                    <include>.jenkins</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>com/gmail/nossr50/locale</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/locale/</directory>
+                <includes>
+                    <include>locale*.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>mods</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources/mods</directory>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <excludes>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/package.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.5</version>
+                <configuration>
+                    <artifactSet>
+                        <includes>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.turt2live.metrics</pattern>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-file</artifactId>
+                <version>2.2</version>
+            </extension>
+        </extensions>
+    </build>
+    <repositories>
+        <repository>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>Plugin MetricsExtension</id>
+            <url>http://repo.turt2live.com</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>LATEST</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit-dep</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.turt2live.metrics</groupId>
+            <artifactId>MetricsExtension</artifactId>
+            <version>0.0.5-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>md_5-snapshots</id>
+            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
+    </ciManagement>
+</project>

src/main/assembly/package.xml

@@ -1,14 +1,14 @@
-<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 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>

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

@@ -1,51 +1,83 @@
-package com.gmail.nossr50.api;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.skills.utilities.AbilityType;
-import com.gmail.nossr50.util.Users;
-
-public final class AbilityAPI {
-    private AbilityAPI() {}
-
-    public static boolean berserkEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.BERSERK);
-    }
-
-    public static boolean gigaDrillBreakerEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
-    }
-
-    public static boolean greenTerraEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.GREEN_TERRA);
-    }
-
-    public static boolean serratedStrikesEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SERRATED_STRIKES);
-    }
-
-    public static boolean skullSplitterEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SKULL_SPLITTER);
-    }
-
-    public static boolean superBreakerEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.SUPER_BREAKER);
-    }
-
-    public static boolean treeFellerEnabled(Player player) {
-        return Users.getPlayer(player).getProfile().getAbilityMode(AbilityType.TREE_FELLER);
-    }
-
-    public static boolean isAnyAbilityEnabled(Player player) {
-        PlayerProfile profile = Users.getPlayer(player).getProfile();
-
-        for (AbilityType ability : AbilityType.values()) {
-            if (profile.getAbilityMode(ability)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
+package com.gmail.nossr50.api;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.util.player.UserManager;
+
+public final class AbilityAPI {
+    private AbilityAPI() {}
+
+    public static boolean berserkEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.BERSERK);
+    }
+
+    public static boolean gigaDrillBreakerEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GIGA_DRILL_BREAKER);
+    }
+
+    public static boolean greenTerraEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.GREEN_TERRA);
+    }
+
+    public static boolean serratedStrikesEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SERRATED_STRIKES);
+    }
+
+    public static boolean skullSplitterEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SKULL_SPLITTER);
+    }
+
+    public static boolean superBreakerEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.SUPER_BREAKER);
+    }
+
+    public static boolean treeFellerEnabled(Player player) {
+        return UserManager.getPlayer(player).getAbilityMode(AbilityType.TREE_FELLER);
+    }
+
+    public static boolean isAnyAbilityEnabled(Player player) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+        for (AbilityType ability : AbilityType.values()) {
+            if (mcMMOPlayer.getAbilityMode(ability)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static void resetCooldowns(Player player) {
+        UserManager.getPlayer(player).resetCooldowns();
+    }
+
+    public static void setBerserkCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.BERSERK, cooldown);
+    }
+
+    public static void setGigaDrillBreakerCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GIGA_DRILL_BREAKER, cooldown);
+    }
+
+    public static void setGreenTerraCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.GREEN_TERRA, cooldown);
+    }
+
+    public static void setSerratedStrikesCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SERRATED_STRIKES, cooldown);
+    }
+
+    public static void setSkullSplitterCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SKULL_SPLITTER, cooldown);
+    }
+
+    public static void setSuperBreakerCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.SUPER_BREAKER, cooldown);
+    }
+
+    public static void setTreeFellerCooldown(Player player, long cooldown) {
+        UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
+    }
+}

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

@@ -4,8 +4,11 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 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.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public final class ChatAPI {
     private ChatAPI() {}
@@ -22,7 +25,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
-        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, displayName, message);
+        getPartyChatManager(plugin, party).handleChat(sender, displayName, message);
     }
 
     /**
@@ -36,23 +39,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
-        ChatManager.handlePartyChat(plugin, PartyManager.getParty(party), sender, sender, message);
-    }
-
-    /**
-     * Send a message to all members of a party
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @deprecated Replaced by sendPartyChat(Plugin, String, String, String)
-     *
-     * @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
-     */
-    @Deprecated
-    public static void sendPartyChat(String sender, String party, String message) {
-        sendPartyChat(null, party, sender, sender, message);
+        getPartyChatManager(plugin, party).handleChat(sender, message);
     }
 
     /**
@@ -66,7 +53,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
-        ChatManager.handleAdminChat(plugin, sender, displayName, message);
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, displayName, message);
     }
 
     /**
@@ -79,22 +66,7 @@ public final class ChatAPI {
      * @param message The message to send
      */
     public static void sendAdminChat(Plugin plugin, String sender, String message) {
-        ChatManager.handleAdminChat(plugin, sender, sender, message);
-    }
-
-    /**
-     * Send a message to administrators
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @deprecated Replaced by sendAdminChat(Plugin, String, String)
-     *
-     * @param sender The name of the sender to display in the chat
-     * @param message The message to send
-     */
-    @Deprecated
-    public static void sendAdminChat(String sender, String message) {
-        sendAdminChat(null, sender, sender, message);
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, message);
     }
 
     /**
@@ -104,7 +76,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(Player player) {
-        return Users.getPlayer(player).getPartyChatMode();
+        return UserManager.getPlayer(player).isChatEnabled(ChatMode.PARTY);
     }
 
     /**
@@ -114,7 +86,7 @@ public final class ChatAPI {
      * @return true if the player is using party chat, false otherwise
      */
     public static boolean isUsingPartyChat(String playerName) {
-        return Users.getPlayer(playerName).getPartyChatMode();
+        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
     }
 
     /**
@@ -124,7 +96,7 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(Player player) {
-        return Users.getPlayer(player).getAdminChatMode();
+        return UserManager.getPlayer(player).isChatEnabled(ChatMode.ADMIN);
     }
 
     /**
@@ -134,6 +106,49 @@ public final class ChatAPI {
      * @return true if the player is using admin chat, false otherwise
      */
     public static boolean isUsingAdminChat(String playerName) {
-        return Users.getPlayer(playerName).getAdminChatMode();
+        return UserManager.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) {
+        UserManager.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) {
+        UserManager.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) {
+        UserManager.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) {
+        UserManager.getPlayer(playerName).toggleChat(ChatMode.ADMIN);
+    }
+
+    private static ChatManager getPartyChatManager(Plugin plugin, String party) {
+        ChatManager chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.PARTY);
+        ((PartyChatManager) chatManager).setParty(PartyManager.getParty(party));
+
+        return chatManager;
     }
 }

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

@@ -1,335 +1,616 @@
-package com.gmail.nossr50.api;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Users;
-
-public final class ExperienceAPI {
-    private ExperienceAPI() {}
-
-    /**
-     * Check the XP of a player. This should be called after giving XP to process level-ups.
-     *
-     * @param player The player to check
-     * @param skillType The skill to check
-     * @deprecated Calling this function is no longer needed and should be avoided
-     */
-    @Deprecated
-    private static void checkXP(Player player, SkillType skillType) {
-        SkillTools.xpCheckSkill(skillType, player, Users.getProfile(player));
-    }
-
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @deprecated Use {@link #addRawXP(Player, String, int)} instead
-     */
-   @Deprecated
-    public static void addRawXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(skillType, XP);
-    }
-
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     */
-    public static void addRawXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), XP);
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate only.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @deprecated Use {@link #addMultipliedXP(Player, String, int)} instead
-     */
-    @Deprecated
-    public static void addMultipliedXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(skillType, (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate only.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     */
-    public static void addMultipliedXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).applyXpGain(SkillType.getSkill(skillType), (int) (XP * Config.getInstance().getExperienceGainsGlobalMultiplier()));
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @deprecated Use {@link #addXP(Player, String, int)} instead
-     */
-    @Deprecated
-    public static void addXP(Player player, SkillType skillType, int XP) {
-        Users.getPlayer(player).beginXpGain(skillType, XP);
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate, skill modifiers and perks. May be shared with the party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     */
-    public static void addXP(Player player, String skillType, int XP) {
-        Users.getPlayer(player).beginXpGain(SkillType.getSkill(skillType), XP);
-    }
-
-    /**
-     * Get the amount of XP a player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
-     * @deprecated Use {@link #getXP(Player, String)} instead
-     */
-    @Deprecated
-    public static int getXP(Player player, SkillType skillType) {
-        return Users.getPlayer(player).getProfile().getSkillXpLevel(skillType);
-    }
-
-    /**
-     * Get the amount of XP a player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get XP for
-     * @param skillType The skill to get XP for
-     * @return the amount of XP in a given skill
-     */
-    public static int getXP(Player player, String skillType) {
-        return Users.getPlayer(player).getProfile().getSkillXpLevel(SkillType.getSkill(skillType));
-    }
-
-    /**
-     * Get the amount of XP left before leveling up.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get the XP amount for
-     * @param skillType The skill to get the XP amount for
-     * @return the amount of XP left before leveling up a specifc skill
-     * @deprecated Use {@link #getXPToNextLevel(Player, String)} instead
-     */
-    @Deprecated
-    public static int getXPToNextLevel(Player player, SkillType skillType) {
-        return Users.getPlayer(player).getProfile().getXpToLevel(skillType);
-    }
-
-    /**
-     * Get the amount of XP left before leveling up.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get the XP amount for
-     * @param skillType The skill to get the XP amount for
-     * @return the amount of XP left before leveling up a specifc skill
-     */
-    public static int getXPToNextLevel(Player player, String skillType) {
-        return Users.getPlayer(player).getProfile().getXpToLevel(SkillType.getSkill(skillType));
-    }
-
-    /**
-     * Add levels to a skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add levels to
-     * @param skillType Type of skill to add levels to
-     * @param levels Number of levels to add
-     * @param notify Unused argument
-     * @deprecated Use addLevel(Player, SKillType, int) instead
-     */
-    public static void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
-        Users.getProfile(player).addLevels(skillType, levels);
-
-        if (notify) {
-            checkXP(player, skillType);
-        }
-    }
-
-    /**
-     * Add levels to a skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add levels to
-     * @param skillType Type of skill to add levels to
-     * @param levels Number of levels to add
-     * @deprecated Use {@link #addLevel(Player, String, int)} instead
-     */
-    @Deprecated
-    public static void addLevel(Player player, SkillType skillType, int levels) {
-        Users.getPlayer(player).getProfile().addLevels(skillType, levels);
-    }
-
-    /**
-     * Add levels to a skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add levels to
-     * @param skillType Type of skill to add levels to
-     * @param levels Number of levels to add
-     */
-    public static void addLevel(Player player, String skillType, int levels) {
-        Users.getPlayer(player).getProfile().addLevels(SkillType.getSkill(skillType), levels);
-    }
-
-    /**
-     * Get the level a player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get the level for
-     * @param skillType The skill to get the level for
-     * @return the level of a given skill
-     * @deprecated Use {@link #getLevel(Player, String)} instead
-     */
-    @Deprecated
-    public static int getLevel(Player player, SkillType skillType) {
-        return Users.getPlayer(player).getProfile().getSkillLevel(skillType);
-    }
-
-    /**
-     * Get the level a player has in a specific skill.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get the level for
-     * @param skillType The skill to get the level for
-     * @return the level of a given skill
-     */
-    public static int getLevel(Player player, String skillType) {
-        return Users.getPlayer(player).getProfile().getSkillLevel(SkillType.getSkill(skillType));
-    }
-
-    /**
-     * Gets the power level of a player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to get the power level for
-     * @return the power level of the player
-     */
-    public static int getPowerLevel(Player player) {
-        return Users.getPlayer(player).getPowerLevel();
-    }
-
-    /**
-     * Sets the level of a player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to set the level of
-     * @param skillType The skill to set the level for
-     * @param skillLevel The value to set the level to
-     * @deprecated Use {@link #setLevel(Player, String, int)} instead
-     */
-    @Deprecated
-    public static void setLevel(Player player, SkillType skillType, int skillLevel) {
-        Users.getPlayer(player).getProfile().modifySkill(skillType, skillLevel);
-    }
-
-    /**
-     * Sets the level of a player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to set the level of
-     * @param skillType The skill to set the level for
-     * @param skillLevel The value to set the level to
-     */
-    public static void setLevel(Player player, String skillType, int skillLevel) {
-        Users.getPlayer(player).getProfile().modifySkill(SkillType.getSkill(skillType), skillLevel);
-    }
-
-    /**
-     * Sets the XP of a player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to set the XP of
-     * @param skillType The skill to set the XP for
-     * @param newValue The value to set the XP to
-     * @deprecated Use {@link #setXP(Player, String, int)} instead
-     */
-    @Deprecated
-    public static void setXP(Player player, SkillType skillType, int newValue) {
-        Users.getPlayer(player).getProfile().setSkillXpLevel(skillType, newValue);
-    }
-
-    /**
-     * Sets the XP of a player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to set the XP of
-     * @param skillType The skill to set the XP for
-     * @param newValue The value to set the XP to
-     */
-    public static void setXP(Player player, String skillType, int newValue) {
-        Users.getPlayer(player).getProfile().setSkillXpLevel(SkillType.getSkill(skillType), newValue);
-    }
-
-    /**
-     * Removes XP from a player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to change the XP of
-     * @param skillType The skill to change the XP for
-     * @param xp The amount of XP to remove
-     * @deprecated Use {@link #removeXP(Player, String, int)} instead
-     */
-    @Deprecated
-    public static void removeXP(Player player, SkillType skillType, int xp) {
-        Users.getPlayer(player).getProfile().removeXp(skillType, xp);
-    }
-
-    /**
-     * Removes XP from a player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to change the XP of
-     * @param skillType The skill to change the XP for
-     * @param xp The amount of XP to remove
-     */
-    public static void removeXP(Player player, String skillType, int xp) {
-        Users.getPlayer(player).getProfile().removeXp(SkillType.getSkill(skillType), xp);
-    }
-}
+package com.gmail.nossr50.api;
+
+import java.util.Set;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
+import com.gmail.nossr50.api.exceptions.InvalidSkillException;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.skills.child.FamilyTree;
+import com.gmail.nossr50.util.player.UserManager;
+
+public final class ExperienceAPI {
+    private ExperienceAPI() {}
+
+    /**
+     * Returns whether given string is a valid type of skill suitable for the
+     * other API calls in this class.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType A string that may or may not be a skill
+     * @return true if this is a valid mcMMO skill
+     */
+    public static boolean isValidSkillType(String skillType) {
+        return SkillType.getSkill(skillType) != null;
+    }
+
+    /**
+     * Returns whether the given skill type string is both valid and not a
+     * child skill. (Child skills have no XP of their own, and their level is
+     * derived from the parent(s).)
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType the skill to check
+     * @return true if this is a valid, non-child mcMMO skill
+     */
+    public static boolean isNonChildSkill(String skillType) {
+        SkillType skill = SkillType.getSkill(skillType);
+
+        return skill != null && !skill.isChildSkill();
+    }
+
+    @Deprecated
+    public static void addRawXP(Player player, String skillType, int XP) {
+        addRawXP(player, skillType, (float) XP);
+    }
+
+    /**
+     * Adds raw XP to the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addRawXP(Player player, String skillType, float XP) {
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
+    }
+
+    @Deprecated
+    public static void addRawXPOffline(String playerName, String skillType, int XP) {
+        addRawXPOffline(playerName, skillType, (float) XP);
+    }
+
+    /**
+     * Adds raw XP to an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void addRawXPOffline(String playerName, String skillType, float XP) {
+        addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addMultipliedXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to an offline player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
+        addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate and skill modifier.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addModifiedXP(Player player, String skillType, int XP) {
+        SkillType skill = getSkillType(skillType);
+
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to an offline player, calculates for XP Rate and skill modifier.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
+        SkillType skill = getSkillType(skillType);
+
+        addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
+     * and party sharing.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addXP(Player player, String skillType, int XP) {
+        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
+    }
+
+    /**
+     * Get the amount of XP a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXP(Player player, String skillType) {
+        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the amount of XP an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXP(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getSkillXpLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the raw amount of XP a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static float getXPRaw(Player player, String skillType) {
+        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the raw amount of XP an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP in a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static float getOfflineXPRaw(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the total amount of XP needed to reach the next level.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the total amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXPToNextLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the total amount of XP an offline player needs to reach the next level.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the total amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXPToNextLevel(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getXpToLevel(getNonChildSkillType(skillType));
+    }
+
+    /**
+     * Get the amount of XP remaining until the next level.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the XP amount for
+     * @param skillType The skill to get the XP amount for
+     * @return the amount of XP remaining until the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getXPRemaining(Player player, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
+
+        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
+
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
+    }
+
+    /**
+     * Get the amount of XP an offline player has left before leveling up.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get XP for
+     * @param skillType The skill to get XP for
+     * @return the amount of XP needed to reach the next level
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static int getOfflineXPRemaining(String playerName, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
+
+        PlayerProfile profile = getOfflineProfile(playerName);
+
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
+    }
+
+    /**
+     * Add levels to a skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void addLevel(Player player, String skillType, int levels) {
+        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
+    }
+
+    /**
+     * Add levels to a skill for an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to add levels to
+     * @param skillType Type of skill to add levels to
+     * @param levels Number of levels to add
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void addLevelOffline(String playerName, String skillType, int levels) {
+        PlayerProfile profile = getOfflineProfile(playerName);
+        SkillType skill = getSkillType(skillType);
+
+        if (skill.isChildSkill()) {
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
+
+            for (SkillType parentSkill : parentSkills) {
+                profile.addLevels(parentSkill, (levels / parentSkills.size()));
+            }
+
+            profile.save();
+            return;
+        }
+
+        profile.addLevels(skill, levels);
+        profile.save();
+    }
+
+    /**
+     * Get the level a player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the level for
+     * @param skillType The skill to get the level for
+     * @return the level of a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static int getLevel(Player player, String skillType) {
+        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
+    }
+
+    /**
+     * Get the level an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get the level for
+     * @param skillType The skill to get the level for
+     * @return the level of a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static int getLevelOffline(String playerName, String skillType) {
+        return getOfflineProfile(playerName).getSkillLevel(getSkillType(skillType));
+    }
+
+    /**
+     * Gets the power level of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to get the power level for
+     * @return the power level of the player
+     */
+    public static int getPowerLevel(Player player) {
+        return UserManager.getPlayer(player).getPowerLevel();
+    }
+
+    /**
+     * Gets the power level of an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to get the power level for
+     * @return the power level of the player
+     *
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static int getPowerLevelOffline(String playerName) {
+        int powerLevel = 0;
+        PlayerProfile profile = getOfflineProfile(playerName);
+
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
+            powerLevel += profile.getSkillLevel(type);
+        }
+
+        return powerLevel;
+    }
+
+    /**
+     * Get the level cap of a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param skillType The skill to get the level cap for
+     * @return the level cap of a given skill
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static int getLevelCap(String skillType) {
+        return Config.getInstance().getLevelCap(getSkillType(skillType));
+    }
+
+    /**
+     * Get the power level cap.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @return the overall power level cap
+     */
+    public static int getPowerLevelCap() {
+        return Config.getInstance().getPowerLevelCap();
+    }
+
+    /**
+     * Get the position on the leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     * @param skillType The skill to check
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     *
+     * @return the position on the leaderboard
+     */
+    public static int getPlayerRankSkill(String playerName, String skillType) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType));
+    }
+
+
+    /**
+     * Get the position on the power level leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The name of the player to check
+     *
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     *
+     * @return the position on the power level leaderboard
+     */
+    public static int getPlayerRankOverall(String playerName) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
+    }
+
+    /**
+     * Sets the level of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the level of
+     * @param skillType The skill to set the level for
+     * @param skillLevel The value to set the level to
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     */
+    public static void setLevel(Player player, String skillType, int skillLevel) {
+        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
+    }
+
+    /**
+     * Sets the level of an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to set the level of
+     * @param skillType The skill to set the level for
+     * @param skillLevel The value to set the level to
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     */
+    public static void setLevelOffline(String playerName, String skillType, int skillLevel) {
+        getOfflineProfile(playerName).modifySkill(getSkillType(skillType), skillLevel);
+    }
+
+    /**
+     * Sets the XP of a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to set the XP of
+     * @param skillType The skill to set the XP for
+     * @param newValue The value to set the XP to
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void setXP(Player player, String skillType, int newValue) {
+        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+    }
+
+    /**
+     * Sets the XP of an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to set the XP of
+     * @param skillType The skill to set the XP for
+     * @param newValue The value to set the XP to
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void setXPOffline(String playerName, String skillType, int newValue) {
+        getOfflineProfile(playerName).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+    }
+
+    /**
+     * Removes XP from a player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to change the XP of
+     * @param skillType The skill to change the XP for
+     * @param xp The amount of XP to remove
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void removeXP(Player player, String skillType, int xp) {
+        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+    }
+
+    /**
+     * Removes XP from an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param playerName The player to change the XP of
+     * @param skillType The skill to change the XP for
+     * @param xp The amount of XP to remove
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidPlayerException if the given player does not exist in the database
+     * @throws UnsupportedOperationException if the given skill is a child skill
+     */
+    public static void removeXPOffline(String playerName, String skillType, int xp) {
+        getOfflineProfile(playerName).removeXp(getNonChildSkillType(skillType), xp);
+    }
+
+    // Utility methods follow.
+
+    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
+        PlayerProfile profile = getOfflineProfile(playerName);
+
+        profile.addXp(skill, XP);
+        profile.save();
+    }
+
+    private static PlayerProfile getOfflineProfile(String playerName) {
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+
+        if (!profile.isLoaded()) {
+            throw new InvalidPlayerException();
+        }
+
+        return profile;
+    }
+
+    private static SkillType getSkillType(String skillType) throws InvalidSkillException {
+        SkillType skill = SkillType.getSkill(skillType);
+
+        if (skill == null) {
+            throw new InvalidSkillException();
+        }
+
+        return skill;
+    }
+
+    private static SkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
+        SkillType skill = getSkillType(skillType);
+
+        if (skill.isChildSkill()) {
+            throw new UnsupportedOperationException("Child skills do not have XP");
+        }
+
+        return skill;
+    }
+}

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

@@ -1,174 +1,190 @@
-package com.gmail.nossr50.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
-
-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
-     */
-    public static String getPartyName(Player player) {
-        return Users.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) {
-        return Users.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 PartyManager.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 PartyManager.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
-     */
-    public static void addToParty(Player player, String partyName) {
-        Party party = PartyManager.getParty(partyName);
-
-        if (party == null) {
-            party = new Party();
-            party.setName(partyName);
-            party.setLeader(player.getName());
-        }
-
-        PartyManager.addToParty(player, Users.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) {
-        PartyManager.removeFromParty(player, Users.getPlayer(player).getParty());
-    }
-
-    /**
-     * 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 PartyManager.getPartyLeader(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 player The player to set as leader
-     */
-    public static void setPartyLeader(String partyName, String player) {
-        PartyManager.setPartyLeader(player, PartyManager.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
-     */
-    @Deprecated
-    public static List<String> getAllMembers(Player player) {
-        List<String> memberNames = new ArrayList<String>();
-
-        for (OfflinePlayer member : PartyManager.getAllMembers(player)) {
-            memberNames.add(member.getName());
-        }
-
-        return memberNames;
-    }
-
-    /**
-     * 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
-     */
-    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
-        return PartyManager.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 PartyManager.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 PartyManager.getOnlineMembers(player);
-    }
-}
+package com.gmail.nossr50.api;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+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 UserManager.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) {
+        return UserManager.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 PartyManager.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 PartyManager.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
+     */
+    public static void addToParty(Player player, String partyName) {
+        Party party = PartyManager.getParty(partyName);
+
+        if (party == null) {
+            party = new Party(player.getName(), partyName);
+        }
+
+        PartyManager.addToParty(UserManager.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) {
+        PartyManager.removeFromParty(UserManager.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 PartyManager.getPartyLeader(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 player The player to set as leader
+     */
+    public static void setPartyLeader(String partyName, String player) {
+        PartyManager.setPartyLeader(player, PartyManager.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<OfflinePlayer>();
+
+        for (String memberName : PartyManager.getAllMembers(player)) {
+            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
+            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
+     */
+    public static LinkedHashSet<String> getMembers(Player player) {
+        return PartyManager.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 PartyManager.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 PartyManager.getOnlineMembers(player);
+    }
+
+    public static boolean hasAlly(String partyName) {
+        return PartyManager.getParty(partyName).getAlly() != null;
+    }
+
+    public static String getAllyName(String partyName) {
+        Party ally = PartyManager.getParty(partyName).getAlly();
+        if (ally != null) {
+            return ally.getName();
+        }
+
+        return null;
+    }
+}

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

@@ -1,53 +0,0 @@
-package com.gmail.nossr50.api;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.skills.utilities.ToolType;
-
-public final class SpoutToolsAPI {
-    public static final List<ItemStack> spoutSwords = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutAxes = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutPickaxes = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutHoes = new ArrayList<ItemStack>();
-    public static final List<ItemStack> spoutShovels = new ArrayList<ItemStack>();
-
-    private SpoutToolsAPI() {}
-
-    /**
-     * Add a custom Spout tool to mcMMO for XP gain & ability use.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param spoutTool The tool to add
-     * @param type The type of tool to add
-     */
-    public static void addCustomTool(ItemStack spoutTool, ToolType type) {
-        switch (type) {
-        case AXE:
-            spoutAxes.add(spoutTool);
-            break;
-
-        case HOE:
-            spoutHoes.add(spoutTool);
-            break;
-
-        case PICKAXE:
-            spoutPickaxes.add(spoutTool);
-            break;
-
-        case SHOVEL:
-            spoutShovels.add(spoutTool);
-            break;
-
-        case SWORD:
-            spoutSwords.add(spoutTool);
-            break;
-
-        default:
-            break;
-        }
-    }
-}

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

@@ -0,0 +1,9 @@
+package com.gmail.nossr50.api.exceptions;
+
+public class InvalidPlayerException extends RuntimeException {
+    private static final long serialVersionUID = 907213002618581385L;
+
+    public InvalidPlayerException() {
+        super("That player does not exist in the database.");
+    }
+}

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

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

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

@@ -0,0 +1,22 @@
+package com.gmail.nossr50.chat;
+
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
+
+public class AdminChatManager extends ChatManager {
+    protected AdminChatManager(Plugin plugin) {
+        super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix());
+    }
+
+    @Override
+    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
+        handleChat(new McMMOAdminChatEvent(plugin, senderName, displayName, message, isAsync));
+    }
+
+    @Override
+    protected void sendMessage() {
+        plugin.getServer().broadcast(message, "mcmmo.chat.adminchat");
+    }
+}

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

@@ -1,66 +1,53 @@
-package com.gmail.nossr50.chat;
-
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-
-public final class ChatManager {
-    public ChatManager () {}
-
-    public static void handleAdminChat(Plugin plugin, String playerName, String displayName, String message) {
-        McMMOAdminChatEvent chatEvent = new McMMOAdminChatEvent(plugin, playerName, displayName, message);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
-
-        if (chatEvent.isCancelled()) {
-            return;
-        }
-
-        if(Config.getInstance().getAdminDisplayNames())
-            displayName = chatEvent.getDisplayName();
-        else
-            displayName = chatEvent.getSender();
-
-        String adminMessage = chatEvent.getMessage();
-
-        mcMMO.p.getServer().broadcast(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage, "mcmmo.chat.adminchat");
-    }
-
-    public static void handleAdminChat(Plugin plugin, String senderName, String message) {
-        handleAdminChat(plugin, senderName, senderName, message);
-    }
-
-    public static void handlePartyChat(Plugin plugin, Party party, String playerName, String displayName, String message) {
-        String partyName = party.getName();
-
-        McMMOPartyChatEvent chatEvent = new McMMOPartyChatEvent(plugin, playerName, displayName, partyName, message);
-        mcMMO.p.getServer().getPluginManager().callEvent(chatEvent);
-
-        if (chatEvent.isCancelled()) {
-            return;
-        }
-
-        if(Config.getInstance().getPartyDisplayNames())
-            displayName = chatEvent.getDisplayName();
-        else
-            displayName = chatEvent.getSender();
-
-        String partyMessage = chatEvent.getMessage();
-
-        for (Player member : party.getOnlineMembers()) {
-            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
-        }
-
-        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + ChatColor.stripColor(displayName) + "> " + partyMessage);
-    }
-
-    public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
-        handlePartyChat(plugin, party, senderName, senderName, message);
-    }
+package com.gmail.nossr50.chat;
+
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.events.chat.McMMOChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public abstract class ChatManager {
+    protected Plugin plugin;
+    protected boolean useDisplayNames;
+    protected String chatPrefix;
+
+    protected String senderName;
+    protected String displayName;
+    protected String message;
+
+    protected ChatManager(Plugin plugin, boolean useDisplayNames, String chatPrefix) {
+        this.plugin = plugin;
+        this.useDisplayNames = useDisplayNames;
+        this.chatPrefix = chatPrefix;
+    }
+
+    protected void handleChat(McMMOChatEvent event) {
+        plugin.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        senderName = event.getSender();
+        displayName = useDisplayNames ? event.getDisplayName() : senderName;
+        message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
+
+        sendMessage();
+    }
+
+    public void handleChat(String senderName, String message) {
+        handleChat(senderName, senderName, message, false);
+    }
+
+    public void handleChat(Player player, String message, boolean isAsync) {
+        handleChat(player.getName(), player.getDisplayName(), message, isAsync);
+    }
+
+    public void handleChat(String senderName, String displayName, String message) {
+        handleChat(senderName, displayName, message, false);
+    }
+
+    public abstract void handleChat(String senderName, String displayName, String message, boolean isAsync);
+
+    protected abstract void sendMessage();
 }

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

@@ -0,0 +1,31 @@
+package com.gmail.nossr50.chat;
+
+import java.util.HashMap;
+
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+
+public class ChatManagerFactory {
+    private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();
+    private static final HashMap<Plugin, PartyChatManager> partyChatManagers = new HashMap<Plugin, PartyChatManager>();
+
+    public static ChatManager getChatManager(Plugin plugin, ChatMode mode) {
+        switch (mode) {
+            case ADMIN:
+                if (!adminChatManagers.containsKey(plugin)) {
+                    adminChatManagers.put(plugin, new AdminChatManager(plugin));
+                }
+
+                return adminChatManagers.get(plugin);
+            case PARTY:
+                if (!partyChatManagers.containsKey(plugin)) {
+                    partyChatManagers.put(plugin, new PartyChatManager(plugin));
+                }
+
+                return partyChatManagers.get(plugin);
+            default:
+                return null;
+        }
+    }
+}

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

@@ -1,70 +0,0 @@
-package com.gmail.nossr50.chat;
-
-import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-public enum ChatMode {
-    ADMIN(LocaleLoader.getString("Commands.AdminChat.On"), LocaleLoader.getString("Commands.AdminChat.Off")),
-    PARTY(LocaleLoader.getString("Commands.Party.Chat.On"), LocaleLoader.getString("Commands.Party.Chat.Off"));
-
-    private String enabledMessage;
-    private String disabledMessage;
-
-    private ChatMode (String enabledMessage, String disabledMessage) {
-        this.enabledMessage = enabledMessage;
-        this.disabledMessage = disabledMessage;
-    }
-
-    public boolean isEnabled(McMMOPlayer mcMMOPlayer) {
-        switch (this) {
-        case ADMIN:
-            return mcMMOPlayer.getAdminChatMode();
-
-        case PARTY:
-            return mcMMOPlayer.getPartyChatMode();
-
-        default:
-            return false;
-        }
-    }
-
-    public void disable(McMMOPlayer mcMMOPlayer) {
-        switch (this) {
-        case ADMIN:
-            mcMMOPlayer.setAdminChat(false);
-            return;
-
-        case PARTY:
-            mcMMOPlayer.setPartyChat(false);
-            return;
-
-        default:
-            return;
-        }
-    }
-
-    public void enable(McMMOPlayer mcMMOPlayer) {
-        switch (this) {
-        case ADMIN:
-            mcMMOPlayer.setAdminChat(true);
-            mcMMOPlayer.setPartyChat(false);
-            return;
-
-        case PARTY:
-            mcMMOPlayer.setPartyChat(true);
-            mcMMOPlayer.setAdminChat(false);
-            return;
-
-        default:
-            return;
-        }
-    }
-
-    public String getEnabledMessage() {
-        return enabledMessage;
-    }
-
-    public String getDisabledMessage() {
-        return disabledMessage;
-    }
-}

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

@@ -0,0 +1,50 @@
+package com.gmail.nossr50.chat;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class PartyChatManager extends ChatManager {
+    private Party party;
+
+    protected PartyChatManager(Plugin plugin) {
+        super(plugin, Config.getInstance().getPartyDisplayNames(), Config.getInstance().getPartyChatPrefix());
+    }
+
+    public void setParty(Party party) {
+        this.party = party;
+    }
+
+    @Override
+    public void handleChat(String senderName, String displayName, String message, boolean isAsync) {
+        handleChat(new McMMOPartyChatEvent(plugin, senderName, displayName, party.getName(), message, isAsync));
+    }
+
+    @Override
+    protected void sendMessage() {
+        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
+            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 = LocaleLoader.formatString(Config.getInstance().getPartyChatPrefixAlly());
+                member.sendMessage(allyPrefix + message);
+            }
+        }
+
+        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
+    }
+}

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

@@ -1,28 +0,0 @@
-package com.gmail.nossr50.chat.commands;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatMode;
-import com.gmail.nossr50.locale.LocaleLoader;
-
-public class AdminChatCommand extends ChatCommand {
-    public AdminChatCommand() {
-        super(ChatMode.ADMIN);
-    }
-
-    @Override
-    protected void handleChatSending(CommandSender sender, String[] args) {
-        String message = buildChatMessage(args, 0);
-
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-            ChatManager.handleAdminChat(mcMMO.p, player.getName(), player.getDisplayName(), message);
-        }
-        else {
-            ChatManager.handleAdminChat(mcMMO.p, LocaleLoader.getString("Commands.Chat.Console"), message);
-        }
-    }
-}

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

@@ -1,88 +0,0 @@
-package com.gmail.nossr50.chat.commands;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.chat.ChatMode;
-import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.util.Users;
-
-public abstract class ChatCommand implements CommandExecutor {
-    protected McMMOPlayer mcMMOPlayer;
-    protected ChatMode chatMode;
-
-    public ChatCommand (ChatMode chatMode) {
-        this.chatMode = chatMode;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 0:
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            mcMMOPlayer = Users.getPlayer((Player) sender);
-
-            if (chatMode.isEnabled(mcMMOPlayer)) {
-                disableChatMode(sender);
-            }
-            else {
-                enableChatMode(sender);
-            }
-
-            return true;
-
-        default:
-            if (args.length == 1) {
-                if (args[0].equalsIgnoreCase("on")) {
-                    if (!(sender instanceof Player)) {
-                        return false;
-                    }
-
-                    enableChatMode(sender);
-                    return true;
-                }
-
-                if (args[0].equalsIgnoreCase("off")) {
-                    if (!(sender instanceof Player)) {
-                        return false;
-                    }
-
-                    disableChatMode(sender);
-                    return true;
-                }
-            }
-
-            handleChatSending(sender, args);
-            return true;
-        }
-    }
-
-    private void enableChatMode(CommandSender sender) {
-        chatMode.enable(mcMMOPlayer);
-        sender.sendMessage(chatMode.getEnabledMessage());
-    }
-
-    private void disableChatMode(CommandSender sender) {
-        chatMode.disable(mcMMOPlayer);
-        sender.sendMessage(chatMode.getDisabledMessage());
-    }
-
-    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 abstract void handleChatSending(CommandSender sender, String[] args);
-}

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

@@ -1,48 +0,0 @@
-package com.gmail.nossr50.chat.commands;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatMode;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Users;
-
-public class PartyChatCommand extends ChatCommand {
-    public PartyChatCommand() {
-        super(ChatMode.PARTY);
-    }
-
-    @Override
-    protected void handleChatSending(CommandSender sender, String[] args) {
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-            Party party = Users.getPlayer(player).getParty();
-
-            if (party == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return;
-            }
-
-            ChatManager.handlePartyChat(mcMMO.p, party, player.getName(), player.getDisplayName(), buildChatMessage(args, 0));
-        }
-        else {
-            if (args.length < 2) {
-                sender.sendMessage(LocaleLoader.getString("Party.Specify"));
-                return;
-            }
-
-            Party party = PartyManager.getParty(args[0]);
-
-            if (party == null) {
-                sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
-                return;
-            }
-
-            ChatManager.handlePartyChat(mcMMO.p, party, LocaleLoader.getString("Commands.Chat.Console"), buildChatMessage(args, 1));
-        }
-    }
-}

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

@@ -1,122 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Permissions;
-
-public final class CommandHelper {
-    private CommandHelper() {}
-
-    public static boolean noConsoleUsage(CommandSender sender) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Print out details on Gathering skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param profile The player's profile
-     * @param display The sender to display stats to
-     */
-    public static void printGatheringSkills(Player inspect, PlayerProfile profile, CommandSender display) {
-        if (SkillTools.hasGatheringSkills(inspect)) {
-            display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));
-
-            if (Permissions.skillEnabled(inspect, SkillType.EXCAVATION)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.FISHING)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.HERBALISM)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.MINING)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.WOODCUTTING)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING)));
-            }
-        }
-    }
-
-    public static void printGatheringSkills(Player player, PlayerProfile profile) {
-        printGatheringSkills(player, profile, player);
-    }
-
-    /**
-     * Print out details on Combat skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param profile The player's profile
-     * @param display The sender to display stats to
-     */
-    public static void printCombatSkills(Player inspect, PlayerProfile profile, CommandSender display) {
-        if (SkillTools.hasCombatSkills(inspect)) {
-            display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));
-
-            if (Permissions.skillEnabled(inspect, SkillType.AXES)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.ARCHERY)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.SWORDS)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.TAMING)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.UNARMED)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED)));
-            }
-        }
-    }
-
-    public static void printCombatSkills(Player player, PlayerProfile profile) {
-        printCombatSkills(player, profile, player);
-    }
-
-    /**
-     * Print out details on Misc skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param profile The player's profile
-     * @param display The sender to display stats to
-     */
-    public static void printMiscSkills(Player inspect, PlayerProfile profile, CommandSender display) {
-        if (SkillTools.hasMiscSkills(inspect)) {
-            display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));
-
-            if (Permissions.skillEnabled(inspect, SkillType.ACROBATICS)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
-            }
-
-            if (Permissions.skillEnabled(inspect, SkillType.REPAIR)) {
-                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
-            }
-        }
-    }
-
-    public static void printMiscSkills(Player player, PlayerProfile profile) {
-        printMiscSkills(player, profile, player);
-    }
-}

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

@@ -0,0 +1,66 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class KrakenCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!Permissions.kraken(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
+                return true;
+
+            case 1:
+                if (!Permissions.krakenOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                    return true;
+                }
+
+                mcMMOPlayer.getFishingManager().unleashTheKraken();
+                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 = CommandUtils.getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McabilityCommand extends ToggleCommand {
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return Permissions.mcabilityOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return Permissions.mcability(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Ability." + (mcMMOPlayer.getAbilityUse() ? "Off" : "On")));
+        mcMMOPlayer.toggleAbilityUse();
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Ability.Toggle", playerName));
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+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 com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
+import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+
+import com.google.common.collect.ImmutableList;
+
+public class McconvertCommand implements TabExecutor {
+    private static final List<String> FORMULA_TYPES;
+    private static final List<String> DATABASE_TYPES;
+    private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
+
+    private CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
+    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
+
+    static {
+        ArrayList<String> formulaTypes = new ArrayList<String>();
+        ArrayList<String> databaseTypes = new ArrayList<String>();
+
+        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 (mcMMO.getDatabaseManager().getDatabaseType() == DatabaseType.CUSTOM) {
+            databaseTypes.add(DatabaseManagerFactory.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], SUBCOMMANDS, new ArrayList<String>(SUBCOMMANDS.size()));
+            case 2:
+                if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
+                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<String>(DATABASE_TYPES.size()));
+                }
+
+                if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[0].equalsIgnoreCase("exp")) {
+                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<String>(FORMULA_TYPES.size()));
+                }
+
+                return ImmutableList.of();
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,112 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.party.PartySubcommandType;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McmmoCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!Permissions.mcmmoDescription(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String description = LocaleLoader.getString("mcMMO.Description");
+                String[] mcSplit = description.split(",");
+                sender.sendMessage(mcSplit);
+
+                if (Config.getInstance().getDonateMessageEnabled()) {
+                    sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
+                }
+
+                if (Permissions.showversion(sender)) {
+                    sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                }
+
+                mcMMO.getHolidayManager().anniversaryCheck(sender);
+                return true;
+
+            case 1:
+                if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("commands")) {
+                    if (!Permissions.mcmmoHelp(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    sender.sendMessage(LocaleLoader.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 " + LocaleLoader.getString("Commands.Stats"));
+        sender.sendMessage(ChatColor.DARK_AQUA + " /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
+        sender.sendMessage(ChatColor.DARK_AQUA + " /mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+
+        if (Permissions.inspect(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
+
+        if (Permissions.mcability(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        }
+    }
+
+    private void displayOtherCommands(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Other"));
+
+        if (Permissions.skillreset(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+        }
+
+        if (Permissions.mmoedit(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        }
+
+        if (Permissions.adminChat(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
+
+        if (Permissions.mcgod(sender)) {
+            sender.sendMessage(ChatColor.DARK_AQUA + " /mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        }
+    }
+
+    private void displayPartyCommands(CommandSender sender) {
+        if (Permissions.party(sender)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party quit " + LocaleLoader.getString("Commands.Party.Quit"));
+
+            if (Permissions.partyChat(sender)) {
+                sender.sendMessage(ChatColor.DARK_AQUA + " /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
+            }
+
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
+            sender.sendMessage(ChatColor.DARK_AQUA + " /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
+
+            if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
+                sender.sendMessage(ChatColor.DARK_AQUA + " /party teleport <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Teleport"));
+            }
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.commands;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import 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 com.google.common.collect.ImmutableList;
+
+public class McnotifyCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
+                mcMMOPlayer.toggleChatNotifications();
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.gmail.nossr50.commands;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class McrefreshCommand extends ToggleCommand {
+    @Override
+    protected boolean hasOtherPermission(CommandSender sender) {
+        return Permissions.mcrefreshOthers(sender);
+    }
+
+    @Override
+    protected boolean hasSelfPermission(CommandSender sender) {
+        return Permissions.mcrefresh(sender);
+    }
+
+    @Override
+    protected void applyCommandAction(McMMOPlayer mcMMOPlayer) {
+        mcMMOPlayer.setRecentlyHurt(0);
+        mcMMOPlayer.resetCooldowns();
+        mcMMOPlayer.resetToolPrepMode();
+        mcMMOPlayer.resetAbilityMode();
+
+        mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
+    }
+
+    @Override
+    protected void sendSuccessMessage(CommandSender sender, String playerName) {
+        sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", playerName));
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McscoreboardCommand implements TabExecutor {
+    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 (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                if (args[0].equalsIgnoreCase("clear") || args[0].equalsIgnoreCase("reset")) {
+                    ScoreboardManager.clearBoard(sender.getName());
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Clear"));
+                    return true;
+                }
+
+                if (args[0].equalsIgnoreCase("keep")) {
+                    if (!Config.getInstance().getAllowKeepBoard()) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
+                        return true;
+                    }
+
+                    if (!ScoreboardManager.isBoardShown(sender.getName())) {
+                        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.NoBoard"));
+                        return true;
+                    }
+
+                    ScoreboardManager.keepBoard(sender.getName());
+                    sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Keep"));
+                    return true;
+                }
+
+                return help(sender);
+
+            case 2:
+                if (args[0].equalsIgnoreCase("time") || args[0].equalsIgnoreCase("timer")) {
+                    if (CommandUtils.isInvalidInteger(sender, args[1])) {
+                        return true;
+                    }
+
+                    int time = Math.abs(Integer.parseInt(args[1]));
+
+                    ScoreboardManager.setRevertTimer(sender.getName(), time);
+                    sender.sendMessage(LocaleLoader.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<String>(FIRST_ARGS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private boolean help(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.0"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.1"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.2"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Scoreboard.Help.3"));
+        return true;
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class MobhealthCommand implements TabExecutor {
+    private static final List<String> MOB_HEALTHBAR_TYPES;
+
+    static {
+        ArrayList<String> types = new ArrayList<String>();
+
+        for (MobHealthbarType type : MobHealthbarType.values()) {
+            types.add(type.toString());
+        }
+
+        Collections.sort(types);
+        MOB_HEALTHBAR_TYPES = ImmutableList.copyOf(types);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        switch (args.length) {
+            case 1:
+                try {
+                    MobHealthbarType type = MobHealthbarType.valueOf(args[0].toUpperCase().trim());
+                    UserManager.getPlayer((Player) sender).getProfile().setMobHealthbarType(type);
+                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Changed." + type.name()));
+                    return true;
+                }
+                catch (IllegalArgumentException ex) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Healthbars.Invalid"));
+                    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], MOB_HEALTHBAR_TYPES, new ArrayList<String>(MOB_HEALTHBAR_TYPES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.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;
+
+public abstract class ToggleCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!hasSelfPermission(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                applyCommandAction(UserManager.getPlayer(sender.getName()));
+                return true;
+
+            case 1:
+                if (!hasOtherPermission(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, playerName, mcMMOPlayer)) {
+                    return true;
+                }
+
+                if (CommandUtils.isOffline(sender, mcMMOPlayer.getPlayer())) {
+                    return true;
+                }
+
+                applyCommandAction(mcMMOPlayer);
+                sendSuccessMessage(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 = CommandUtils.getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected abstract boolean hasOtherPermission(CommandSender sender);
+    protected abstract boolean hasSelfPermission(CommandSender sender);
+    protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
+    protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
+}

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

@@ -0,0 +1,97 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public class XprateCommand implements TabExecutor {
+    private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (!args[0].equalsIgnoreCase("reset")) {
+                    return false;
+                }
+
+                if (!Permissions.xprateReset(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (mcMMO.p.isXPEventEnabled()) {
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.over"));
+                    mcMMO.p.toggleXpEventEnabled();
+                }
+
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(ORIGINAL_XP_RATE);
+                return true;
+
+            case 2:
+                if (CommandUtils.isInvalidInteger(sender, args[0])) {
+                    return true;
+                }
+
+                if (!Permissions.xprateSet(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[1])) {
+                    mcMMO.p.setXPEventEnabled(false);
+                }
+                else if (CommandUtils.shouldEnableToggle(args[1])) {
+                    mcMMO.p.setXPEventEnabled(true);
+                }
+                else {
+                    return false;
+                }
+
+                int newXpRate = Integer.parseInt(args[0]);
+                ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
+
+                if (mcMMO.p.isXPEventEnabled()) {
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", 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], CommandUtils.RESET_OPTIONS, new ArrayList<String>(CommandUtils.RESET_OPTIONS.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -1,154 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.Users;
-
-public class AddlevelsCommand implements CommandExecutor{
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        int levels;
-        boolean allSkills = false;
-        SkillType skill = null;
-
-        switch (args.length) {
-        case 2:
-            if (!Permissions.addlevels(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!StringUtils.isInt(args[1])) {
-                return false;
-            }
-
-            levels = Integer.parseInt(args[1]);
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    profile.addLevels(skillType, levels);
-                }
-            }
-            else {
-                skill = SkillType.getSkill(args[0]);
-                profile.addLevels(skill, levels);
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillTools.getSkillName(skill)));
-            }
-
-            return true;
-
-        case 3:
-            if (!Permissions.addlevelsOthers(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!StringUtils.isInt(args[2])) {
-                return false;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-            levels = Integer.parseInt(args[2]);
-
-            // 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) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.addLevels(skillType, levels);
-                    }
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                    profile.addLevels(skill, levels);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                profile = mcMMOPlayer.getProfile();
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.addLevels(skillType, levels);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                    profile.addLevels(skill, levels);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillTools.getSkillName(skill)));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillTools.getSkillName(skill), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,151 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.Users;
-
-public class AddxpCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        int xp;
-        McMMOPlayer mcMMOPlayer;
-        PlayerProfile profile;
-        boolean allSkills = false;
-        SkillType skill = null;
-
-        switch (args.length) {
-        case 2:
-            if (!Permissions.addxp(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!StringUtils.isInt(args[1])) {
-                return false;
-            }
-
-            xp = Integer.parseInt(args[1]);
-            mcMMOPlayer = Users.getPlayer((Player) sender);
-            profile = mcMMOPlayer.getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    mcMMOPlayer.applyXpGain(skillType, xp);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
-            }
-            else {
-                skill = SkillType.getSkill(args[0]);
-
-                mcMMOPlayer.applyXpGain(skill, xp);
-                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillTools.getSkillName(skill)));
-            }
-
-            return true;
-
-        case 3:
-            if (!Permissions.addxpOthers(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!StringUtils.isInt(args[2])) {
-                return false;
-            }
-
-            mcMMOPlayer = Users.getPlayer(args[0]);
-            xp = Integer.parseInt(args[2]);
-
-            // 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) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                // TODO: Currently the offline player doesn't level up automatically
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.setSkillXpLevel(skillType, xp);
-                    }
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                    profile.setSkillXpLevel(skill, xp);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        mcMMOPlayer.applyXpGain(skillType, xp);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                    mcMMOPlayer.applyXpGain(skill, xp);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillTools.getSkillName(skill)));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillTools.getSkillName(skill), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,86 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-
-public class HardcoreCommand implements CommandExecutor{
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 0:
-            if (!Permissions.hardcoreToggle(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (Config.getInstance().getHardcoreEnabled()) {
-                disableHardcore();
-            }
-            else {
-                enableHardcore();
-            }
-
-            return true;
-
-        case 1:
-            if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
-                if (!Permissions.hardcoreToggle(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                enableHardcore();
-                return true;
-            }
-
-            if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
-                if (!Permissions.hardcoreToggle(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                disableHardcore();
-                return true;
-            }
-
-            if (!StringUtils.isDouble(args[0])) {
-                return false;
-            }
-
-            if (!Permissions.hardcoreModify(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            DecimalFormat percent = new DecimalFormat("##0.00%");
-            double newPercent = Double.parseDouble(args[0]);
-
-            Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
-            sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    private void disableHardcore() {
-        Config.getInstance().setHardcoreEnabled(false);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
-    }
-
-    private void enableHardcore() {
-        Config.getInstance().setHardcoreEnabled(true);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
-    }
-}

src/main/java/com/gmail/nossr50/commands/admin/McgodCommand.java

@@ -1,89 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class McgodCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-
-        switch (args.length) {
-        case 0:
-            if (!Permissions.mcgod(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (profile == null) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return true;
-            }
-
-            if (profile.getGodMode()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
-            }
-
-            profile.toggleGodMode();
-            return true;
-
-        case 1:
-            if (!Permissions.mcgodOthers(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            if (mcMMOPlayer == null) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            profile = mcMMOPlayer.getProfile();
-            Player player = mcMMOPlayer.getPlayer();
-
-            if (!player.isOnline()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            if (profile.getGodMode()) {
-                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Disabled"));
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Commands.GodMode.Enabled"));
-            }
-
-            profile.toggleGodMode();
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

src/main/java/com/gmail/nossr50/commands/admin/McrefreshCommand.java

@@ -1,80 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class McrefreshCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-
-        switch (args.length) {
-        case 0:
-            if (!Permissions.mcrefresh(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            profile = Users.getPlayer(sender.getName()).getProfile();
-
-            profile.setRecentlyHurt(0);
-            profile.resetCooldowns();
-            profile.resetToolPrepMode();
-            profile.resetAbilityMode();
-
-            sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-            return true;
-
-        case 1:
-            if (!Permissions.mcrefreshOthers(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            if (mcMMOPlayer == null) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-            profile = mcMMOPlayer.getProfile();
-            Player player = mcMMOPlayer.getPlayer();
-
-            if (!player.isOnline()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return true;
-            }
-
-            profile.setRecentlyHurt(0);
-            profile.resetCooldowns();
-            profile.resetToolPrepMode();
-            profile.resetAbilityMode();
-
-            player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,150 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.Users;
-
-public class MmoeditCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        int newValue;
-        boolean allSkills = false;
-        SkillType skill = null;
-
-        switch (args.length) {
-        case 2:
-            if (!Permissions.mmoedit(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!StringUtils.isInt(args[1])) {
-                return false;
-            }
-
-            newValue = Integer.parseInt(args[1]);
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    profile.modifySkill(skillType, newValue);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
-            }
-            else {
-                skill = SkillType.getSkill(args[0]);
-                profile.modifySkill(skill, newValue);
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillTools.getSkillName(skill), newValue));
-            }
-
-            return true;
-
-        case 3:
-            if (!Permissions.mmoeditOthers(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!StringUtils.isInt(args[2])) {
-                return false;
-            }
-
-            newValue = Integer.parseInt(args[2]);
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            // 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) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, newValue);
-                    }
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                    profile.modifySkill(skill, newValue);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                profile = mcMMOPlayer.getProfile();
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, newValue);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
-                }
-                else {
-                    skill = SkillType.getSkill(args[1]);
-                    profile.modifySkill(skill, newValue);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1",  SkillTools.getSkillName(skill), newValue));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", SkillTools.getSkillName(skill), args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,169 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-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.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.Users;
-
-public class SkillresetCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PlayerProfile profile;
-        boolean allSkills = false;
-        SkillType skill = null;
-        String skillName = "";
-
-        switch (args.length) {
-        case 1:
-            if (!Permissions.skillreset(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!(sender instanceof Player)) {
-                return false;
-            }
-
-            if (args[0].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[0])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
-                    if (!Permissions.skillreset(sender, skillType)) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        continue;
-                    }
-
-                    profile.modifySkill(skillType, 0);
-                }
-
-                sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-            }
-            else {
-                skill = SkillType.getSkill(args[0]);
-                skillName = SkillTools.getSkillName(skill);
-
-                if (!Permissions.skillreset(sender, skill)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                profile.modifySkill(skill, 0);
-                sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
-            }
-
-            return true;
-
-        case 2:
-            if (!Permissions.skillresetOthers(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (args[1].equalsIgnoreCase("all")) {
-                allSkills = true;
-            }
-            else if (!SkillTools.isSkill(args[1])) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
-                return true;
-            }
-
-            if (!allSkills) {
-                skill = SkillType.getSkill(args[1]);
-                skillName = SkillTools.getSkillName(skill);
-
-                if (!Permissions.skillresetOthers(sender, skill)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-            }
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-
-            // 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) {
-                profile = new PlayerProfile(args[0], false);
-
-                if (!profile.isLoaded()) {
-                    sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                    return true;
-                }
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        if (!Permissions.skillresetOthers(sender, skill)) {
-                            sender.sendMessage(command.getPermissionMessage());
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, 0);
-                    }
-                }
-                else {
-                    profile.modifySkill(skill, 0);
-                }
-
-                profile.save(); // Since this is a temporary profile, we save it here.
-            }
-            else {
-                profile = mcMMOPlayer.getProfile();
-
-                if (allSkills) {
-                    for (SkillType skillType : SkillType.values()) {
-                        if (skillType.isChildSkill()) {
-                            continue;
-                        }
-
-                        if (!Permissions.skillresetOthers(sender, skill)) {
-                            sender.sendMessage(command.getPermissionMessage());
-                            continue;
-                        }
-
-                        profile.modifySkill(skillType, 0);
-                    }
-
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.All"));
-                }
-                else {
-                    profile.modifySkill(skill, 0);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
-                }
-            }
-
-            if (allSkills) {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", skillName, args[0]));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

@@ -1,91 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-import java.text.DecimalFormat;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-
-public class VampirismCommand implements CommandExecutor {
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Config.getInstance().getHardcoreEnabled()) {
-            sender.sendMessage(LocaleLoader.getString("Hardcore.Disabled"));
-            return true;
-        }
-
-        switch (args.length) {
-        case 0:
-            if (!Permissions.vampirismToggle(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (Config.getInstance().getHardcoreVampirismEnabled()) {
-                disableVampirism();
-            }
-            else {
-                enableVampirism();
-            }
-
-            return true;
-
-        case 1:
-            if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
-                if (!Permissions.vampirismToggle(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                enableVampirism();
-                return true;
-            }
-
-            if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
-                if (!Permissions.vampirismToggle(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-
-                disableVampirism();
-                return true;
-            }
-
-            if (!StringUtils.isDouble(args[0])) {
-                return false;
-            }
-
-            if (!Permissions.vampirismModify(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            DecimalFormat percent = new DecimalFormat("##0.00%");
-            double newPercent = Double.parseDouble(args[0]);
-
-            Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
-            sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    private void disableVampirism() {
-        Config.getInstance().setHardcoreVampirismEnabled(false);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
-    }
-
-    private void enableVampirism() {
-        Config.getInstance().setHardcoreVampirismEnabled(true);
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
-    }
-}

src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java

@@ -1,69 +0,0 @@
-package com.gmail.nossr50.commands.admin;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-
-public class XprateCommand implements CommandExecutor {
-    private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        switch (args.length) {
-        case 1:
-            if (!args[0].equalsIgnoreCase("reset")) {
-                return false;
-            }
-
-            if (!Permissions.xprateReset(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (mcMMO.p.isXPEventEnabled()) {
-                mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.over"));
-                mcMMO.p.toggleXpEventEnabled();
-            }
-
-            Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
-            return true;
-
-        case 2:
-            if (!StringUtils.isInt(args[0])) {
-                return false;
-            }
-
-            if (!Permissions.xprateSet(sender)) {
-                sender.sendMessage(command.getPermissionMessage());
-                return true;
-            }
-
-            if (!args[1].equalsIgnoreCase("true") && !args[1].equalsIgnoreCase("false")) {
-                return false;
-            }
-
-            mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
-            int newXpRate = Integer.parseInt(args[0]);
-            Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
-
-            if (mcMMO.p.isXPEventEnabled()) {
-                mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
-                mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
-            }
-            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
-            }
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

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

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

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

@@ -0,0 +1,134 @@
+package com.gmail.nossr50.commands.chat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class ChatCommand implements TabExecutor {
+    private ChatMode chatMode;
+    protected ChatManager chatManager;
+
+    public ChatCommand(ChatMode chatMode) {
+        this.chatMode = chatMode;
+        this.chatManager = ChatManagerFactory.getChatManager(mcMMO.p, chatMode);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        McMMOPlayer mcMMOPlayer;
+
+        switch (args.length) {
+            case 0:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                mcMMOPlayer = UserManager.getPlayer(sender.getName());
+
+                if (mcMMOPlayer.isChatEnabled(chatMode)) {
+                    disableChatMode(mcMMOPlayer, sender);
+                }
+                else {
+                    enableChatMode(mcMMOPlayer, sender);
+                }
+
+                return true;
+
+            case 1:
+                if (CommandUtils.shouldEnableToggle(args[0])) {
+                    if (CommandUtils.noConsoleUsage(sender)) {
+                        return true;
+                    }
+
+                    enableChatMode(UserManager.getPlayer(sender.getName()), sender);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[0])) {
+                    if (CommandUtils.noConsoleUsage(sender)) {
+                        return true;
+                    }
+
+                    disableChatMode(UserManager.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], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.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() : LocaleLoader.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(LocaleLoader.getString("Commands.Party.None"));
+            return;
+        }
+
+        if (chatMode == ChatMode.PARTY && (mcMMOPlayer.getParty().getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT))) {
+            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
+            return;
+        }
+
+        mcMMOPlayer.enableChat(chatMode);
+        sender.sendMessage(chatMode.getEnabledMessage());
+    }
+
+    private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
+        if (chatMode == ChatMode.PARTY && mcMMOPlayer.getParty() == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return;
+        }
+
+        mcMMOPlayer.disableChat(chatMode);
+        sender.sendMessage(chatMode.getDisabledMessage());
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.gmail.nossr50.commands.chat;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChatCommand extends ChatCommand {
+    public PartyChatCommand() {
+        super(ChatMode.PARTY);
+    }
+
+    @Override
+    protected void handleChatSending(CommandSender sender, String[] args) {
+        Party party;
+        String message;
+
+        if (sender instanceof Player) {
+            party = UserManager.getPlayer((Player) sender).getParty();
+
+            if (party == null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+                return;
+            }
+
+            if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
+                sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
+                return;
+            }
+
+            message = buildChatMessage(args, 0);
+        }
+        else {
+            if (args.length < 2) {
+                sender.sendMessage(LocaleLoader.getString("Party.Specify"));
+                return;
+            }
+
+            party = PartyManager.getParty(args[0]);
+
+            if (party == null) {
+                sender.sendMessage(LocaleLoader.getString("Party.InvalidName"));
+                return;
+            }
+
+            message = buildChatMessage(args, 1);
+        }
+
+        ((PartyChatManager) chatManager).setParty(party);
+        chatManager.handleChat(sender.getName(), getDisplayName(sender), message);
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.gmail.nossr50.commands.database;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class ConvertDatabaseCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                DatabaseType previousType = DatabaseType.getDatabaseType(args[1]);
+                DatabaseType newType = mcMMO.getDatabaseManager().getDatabaseType();
+
+                if (previousType == newType || (newType == DatabaseType.CUSTOM && DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName().equalsIgnoreCase(args[1]))) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Same", newType.toString()));
+                    return true;
+                }
+
+                DatabaseManager oldDatabase = DatabaseManagerFactory.createDatabaseManager(previousType);
+
+                if (previousType == DatabaseType.CUSTOM) {
+                    Class<?> clazz;
+
+                    try {
+                        clazz = Class.forName(args[1]);
+
+                        if (!DatabaseManager.class.isAssignableFrom(clazz)) {
+                            sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                            return true;
+                        }
+
+                        oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
+                    }
+                    catch (Throwable e) {
+                        e.printStackTrace();
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
+                        return true;
+                    }
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.Start", previousType.toString(), newType.toString()));
+
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
+
+                    if (profile.isLoaded()) {
+                        mcMMO.getDatabaseManager().saveUser(profile);
+                    }
+
+                    UserManager.addUser(player);
+                }
+
+                new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
+
+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();
+
+                if (Config.getInstance().getOldUsersCutoff() != -1) {
+                    mcMMO.getDatabaseManager().purgeOldUsers();
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcpurge.Success"));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class McremoveCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
+
+                if (UserManager.getOfflinePlayer(playerName) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                    return true;
+                }
+
+                if (mcMMO.getDatabaseManager().removeUser(playerName)) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", playerName));
+                }
+                else {
+                    sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
+                }
+
+                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 = CommandUtils.getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
+
+public class MmoshowdbCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
+
+                if (clazz != null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Permissions;
+
+public class AddlevelsCommand extends ExperienceCommand {
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return Permissions.addlevels(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return Permissions.addlevelsOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+        profile.addLevels(skill, value);
+
+        if (player == null) {
+            profile.save();
+            return;
+        }
+
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true);
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+        player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class AddxpCommand extends ExperienceCommand {
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return Permissions.addxp(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return Permissions.addxpOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        if (player != null) {
+            UserManager.getPlayer(player).applyXpGain(skill, value);
+        }
+        else {
+            profile.addXp(skill, value);
+            profile.save();
+        }
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+        player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName()));
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.FormulaConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class ConvertExperienceCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                FormulaType previousType = mcMMO.getFormulaManager().getPreviousFormulaType();
+                FormulaType newType = FormulaType.getFormulaType(args[1].toUpperCase());
+
+                if (newType == FormulaType.UNKNOWN) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Invalid"));
+                    return true;
+                }
+
+                if (previousType == newType) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Same", newType.toString()));
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Experience.Start", previousType.toString(), newType.toString()));
+
+                UserManager.saveAll();
+                UserManager.clearAll();
+
+                new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
+
+                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+                    UserManager.addUser(player);
+                }
+
+                return true;
+
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.gmail.nossr50.commands.experience;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class ExperienceCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        SkillType skill;
+
+        switch (args.length) {
+            case 2:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!permissionsCheckSelf(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[0], args[1])) {
+                    return true;
+                }
+
+                skill = SkillType.getSkill(args[0]);
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    skill = null;
+                }
+
+                editValues((Player) sender, UserManager.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 = SkillType.getSkill(args[1]);
+
+                if (args[1].equalsIgnoreCase("all")) {
+                    skill = null;
+                }
+
+                int value = Integer.parseInt(args[2]);
+
+                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.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 = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+
+                    if (CommandUtils.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 = CommandUtils.getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.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, SkillType skill, int value);
+    protected abstract void handlePlayerMessageAll(Player player, int value);
+    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
+
+    private boolean validateArguments(CommandSender sender, String skillName, String value) {
+        return !(CommandUtils.isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && CommandUtils.isInvalidSkill(sender, skillName)));
+    }
+
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
+        }
+    }
+
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                handleCommand(player, profile, skillType, value);
+            }
+
+            if (player != null) {
+                handlePlayerMessageAll(player, value);
+            }
+        }
+        else {
+            handleCommand(player, profile, skill, value);
+
+            if (player != null) {
+                handlePlayerMessageSkill(player, value, skill);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.gmail.nossr50.commands.experience;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Permissions;
+
+public class MmoeditCommand extends ExperienceCommand {
+    @Override
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return Permissions.mmoedit(sender);
+    }
+
+    @Override
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return Permissions.mmoeditOthers(sender);
+    }
+
+    @Override
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
+        int skillLevel = profile.getSkillLevel(skill);
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+
+        profile.modifySkill(skill, value);
+
+        if (player == null) {
+            profile.save();
+            return;
+        }
+
+        if (value == skillLevel) {
+            return;
+        }
+
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel);
+    }
+
+    @Override
+    protected void handlePlayerMessageAll(Player player, int value) {
+        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", value));
+    }
+
+    @Override
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
+        player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
+    }
+}

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

@@ -0,0 +1,166 @@
+package com.gmail.nossr50.commands.experience;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * This class mirrors the structure of ExperienceCommand, except the
+ * value/quantity argument is removed.
+ */
+public class SkillresetCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                if (CommandUtils.noConsoleUsage(sender)) {
+                    return true;
+                }
+
+                if (!permissionsCheckSelf(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[0])) {
+                    return true;
+                }
+
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]));
+                return true;
+
+            case 2:
+                if (!permissionsCheckOthers(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (!validateArguments(sender, args[1])) {
+                    return true;
+                }
+
+                SkillType skill;
+                if (args[1].equalsIgnoreCase("all")) {
+                    skill = null;
+                }
+                else {
+                    skill = SkillType.getSkill(args[1]);
+                }
+
+                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
+                McMMOPlayer mcMMOPlayer = UserManager.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 = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+
+                    if (CommandUtils.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 = CommandUtils.getOnlinePlayerNames(sender);
+                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+            case 2:
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill) {
+        int levelsRemoved = profile.getSkillLevel(skill);
+        float xpRemoved = profile.getSkillXpLevelRaw(skill);
+
+        profile.modifySkill(skill, 0);
+
+        if (player == null) {
+            profile.save();
+            return;
+        }
+
+        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false);
+    }
+
+    protected boolean permissionsCheckSelf(CommandSender sender) {
+        return Permissions.skillreset(sender);
+    }
+
+    protected boolean permissionsCheckOthers(CommandSender sender) {
+        return Permissions.skillresetOthers(sender);
+    }
+
+    protected void handlePlayerMessageAll(Player player) {
+        player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
+    }
+
+    protected void handlePlayerMessageSkill(Player player, SkillType skill) {
+        player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
+    }
+
+    private boolean validateArguments(CommandSender sender, String skillName) {
+        return !(CommandUtils.isInvalidSkill(sender, skillName) && !skillName.equalsIgnoreCase("all"));
+    }
+
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
+        }
+        else {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
+        }
+    }
+
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                handleCommand(player, profile, skillType);
+            }
+
+            if (player != null) {
+                handlePlayerMessageAll(player);
+            }
+        }
+        else {
+            handleCommand(player, profile, skill);
+
+            if (player != null) {
+                handlePlayerMessageSkill(player, skill);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class HardcoreCommand extends HardcoreModeCommand {
+    @Override
+    protected boolean checkTogglePermissions(CommandSender sender) {
+        return Permissions.hardcoreToggle(sender);
+    }
+
+    @Override
+    protected boolean checkModifyPermissions(CommandSender sender) {
+        return Permissions.hardcoreModify(sender);
+    }
+
+    @Override
+    protected boolean checkEnabled(SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreStatLossEnabled()) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return skill.getHardcoreStatLossEnabled();
+    }
+
+    @Override
+    protected void enable(SkillType skill) {
+        toggle(true, skill);
+    }
+
+    @Override
+    protected void disable(SkillType skill) {
+        toggle(false, skill);
+    }
+
+    @Override
+    protected void modify(CommandSender sender, double newPercentage) {
+        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercentage);
+        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
+    }
+
+    private void toggle(boolean enable, SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreStatLossEnabled(enable);
+            }
+        }
+        else {
+            skill.setHardcoreStatLossEnabled(enable);
+        }
+
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), (skill == null ? "all skills" : skill.getName())));
+    }
+}

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

@@ -0,0 +1,132 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.util.StringUtil;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public abstract class HardcoreModeCommand implements TabExecutor {
+    protected final DecimalFormat percent = new DecimalFormat("##0.00%");
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+                if (!checkTogglePermissions(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                if (checkEnabled(null)) {
+                    disable(null);
+                }
+                else {
+                    enable(null);
+                }
+
+                return true;
+
+            case 1:
+                if (CommandUtils.shouldEnableToggle(args[0])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(null);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[0])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    disable(null);
+                    return true;
+                }
+
+                if (CommandUtils.isInvalidDouble(sender, args[0])) {
+                    return true;
+                }
+
+                if (!Permissions.hardcoreModify(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                modify(sender, Double.parseDouble(args[0]));
+                return true;
+
+
+            case 2:
+                if (CommandUtils.isInvalidSkill(sender, args[0])) {
+                    return true;
+                }
+
+                SkillType skill = SkillType.getSkill(args[0]);
+
+                if (!CommandUtils.isChildSkill(sender, skill)) {
+                    return true;
+                }
+
+                if (CommandUtils.shouldEnableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
+                if (CommandUtils.shouldDisableToggle(args[1])) {
+                    if (!Permissions.hardcoreToggle(sender)) {
+                        sender.sendMessage(command.getPermissionMessage());
+                        return true;
+                    }
+
+                    enable(skill);
+                    return true;
+                }
+
+                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.isDouble(args[0])) {
+                    return ImmutableList.of();
+                }
+
+                return StringUtil.copyPartialMatches(args[0], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    protected abstract boolean checkTogglePermissions(CommandSender sender);
+    protected abstract boolean checkModifyPermissions(CommandSender sender);
+    protected abstract boolean checkEnabled(SkillType skill);
+    protected abstract void enable(SkillType skill);
+    protected abstract void disable(SkillType skill);
+    protected abstract void modify(CommandSender sender, double newPercentage);
+}

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

@@ -0,0 +1,65 @@
+package com.gmail.nossr50.commands.hardcore;
+
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
+public class VampirismCommand extends HardcoreModeCommand {
+    @Override
+    protected boolean checkTogglePermissions(CommandSender sender) {
+        return Permissions.vampirismToggle(sender);
+    }
+
+    @Override
+    protected boolean checkModifyPermissions(CommandSender sender) {
+        return Permissions.vampirismModify(sender);
+    }
+
+    @Override
+    protected boolean checkEnabled(SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreVampirismEnabled()) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return skill.getHardcoreVampirismEnabled();
+    }
+
+    @Override
+    protected void enable(SkillType skill) {
+        toggle(true, skill);
+    }
+
+    @Override
+    protected void disable(SkillType skill) {
+        toggle(false, skill);
+    }
+
+    @Override
+    protected void modify(CommandSender sender, double newPercentage) {
+        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercentage);
+        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
+    }
+
+    private void toggle(boolean enable, SkillType skill) {
+        if (skill == null) {
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreVampirismEnabled(enable);
+            }
+        }
+        else {
+            skill.setHardcoreVampirismEnabled(enable);
+        }
+
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode." + (enable ? "Enabled" : "Disabled"), LocaleLoader.getString("Hardcore.Vampirism.Name"), (skill == null ? "all skills" : skill)));
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.commands.party;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyAcceptCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                if (!mcMMOPlayer.hasPartyInvite()) {
+                    sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, mcMMOPlayer.getPartyInvite().getName())) {
+                    return true;
+                }
+
+                PartyManager.joinInvitedParty(mcMMOPlayer);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "accept"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.commands.party;
+
+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.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChangeOwnerCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+
+                if (!playerParty.getMembers().contains(targetName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                    return true;
+                }
+
+                PartyManager.setPartyLeader(targetName, playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.gmail.nossr50.commands.party;
+
+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.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyChangePasswordCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party party = UserManager.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(LocaleLoader.getString("Commands.Usage.2", "party", "password", "[clear|reset]"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "<" + LocaleLoader.getString("Commands.Usage.Password") + ">"));
+                return true;
+        }
+    }
+
+    private void unprotectParty(Party party, CommandSender sender) {
+        party.setLocked(true);
+        party.setPassword(null);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
+    }
+
+    private void protectParty(Party party, CommandSender sender, String password) {
+        party.setLocked(true);
+        party.setPassword(password);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
+    }
+}

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

@@ -0,0 +1,234 @@
+package com.gmail.nossr50.commands.party;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+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 com.gmail.nossr50.mcMMO;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class PartyCommand implements TabExecutor {
+    private static final List<String> PARTY_SUBCOMMANDS;
+    private static final List<String> XPSHARE_COMPLETIONS = ImmutableList.of("none", "equal");
+    private static final List<String> ITEMSHARE_COMPLETIONS = ImmutableList.of("none", "equal", "random", "loot", "mining", "herbalism", "woodcutting", "misc");
+
+    static {
+        ArrayList<String> subcommands = new ArrayList<String>();
+
+        for (PartySubcommandType subcommand : PartySubcommandType.values()) {
+            subcommands.add(subcommand.toString());
+        }
+
+        Collections.sort(subcommands);
+        PARTY_SUBCOMMANDS = ImmutableList.copyOf(subcommands);
+    }
+
+    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
+    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
+    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
+    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
+    private CommandExecutor partyXpShareCommand        = new PartyXpShareCommand();
+    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
+    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
+    private CommandExecutor partyKickCommand           = new PartyKickCommand();
+    private CommandExecutor partyDisbandCommand        = new PartyDisbandCommand();
+    private CommandExecutor partyChangeOwnerCommand    = new PartyChangeOwnerCommand();
+    private CommandExecutor partyLockCommand           = new PartyLockCommand();
+    private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
+    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
+    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
+    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
+    private CommandExecutor partyTeleportCommand       = mcMMO.p.getCommand("ptp").getExecutor();
+    private CommandExecutor partyChatCommand           = new PartyChatCommand();
+    private CommandExecutor partyAllianceCommand       = new PartyAllianceCommand();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (!Permissions.party(sender)) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        Player player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+        if (args.length < 1) {
+            if (!mcMMOPlayer.inParty()) {
+                sender.sendMessage(LocaleLoader.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 && !Permissions.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(LocaleLoader.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().equalsIgnoreCase(player.getName())) {
+            sender.sendMessage(LocaleLoader.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<String>(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 = CommandUtils.getOnlinePlayerNames(sender);
+                        return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
+                    case XPSHARE:
+                        return StringUtil.copyPartialMatches(args[1], XPSHARE_COMPLETIONS, new ArrayList<String>(XPSHARE_COMPLETIONS.size()));
+                    case ITEMSHARE:
+                        return StringUtil.copyPartialMatches(args[1], ITEMSHARE_COMPLETIONS, new ArrayList<String>(ITEMSHARE_COMPLETIONS.size()));
+                    case LOCK:
+                    case CHAT:
+                        return StringUtil.copyPartialMatches(args[1], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+                    case PASSWORD:
+                        return StringUtil.copyPartialMatches(args[1], CommandUtils.RESET_OPTIONS, new ArrayList<String>(CommandUtils.RESET_OPTIONS.size()));
+                    case TELEPORT:
+                        List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));
+
+                        if (matches.size() == 0) {
+                            Player player = (Player) sender;
+                            Party party = UserManager.getPlayer(player).getParty();
+
+                            playerNames = party.getOnlinePlayerNames(player);
+                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(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], CommandUtils.TRUE_FALSE_OPTIONS, new ArrayList<String>(CommandUtils.TRUE_FALSE_OPTIONS.size()));
+                }
+
+                return ImmutableList.of();
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private boolean printUsage(Player player) {
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+        player.sendMessage(LocaleLoader.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");
+    }
+}
+

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

@@ -0,0 +1,48 @@
+package com.gmail.nossr50.commands.party;
+
+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.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 {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+            case 3:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                // Check to see if the party exists, and if it does cancel creating a new party
+                if (PartyManager.checkPartyExistence(player, args[1])) {
+                    return true;
+                }
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, args[1])) {
+                    return true;
+                }
+
+                PartyManager.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") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.gmail.nossr50.commands.party;
+
+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.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 PartyDisbandCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String partyName = playerParty.getName();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    member.sendMessage(LocaleLoader.getString("Party.Disband"));
+                }
+
+                PartyManager.disbandParty(playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "disband"));
+                return true;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,126 @@
+package com.gmail.nossr50.commands.party;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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 com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyInfoCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 0:
+            case 1:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party party = mcMMOPlayer.getParty();
+
+                displayPartyHeader(player, party);
+                displayShareModeInfo(player, party);
+                displayPartyFeatures(player, party);
+                displayMemberInfo(player, mcMMOPlayer, party);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "info"));
+                return true;
+        }
+    }
+
+    private void displayPartyHeader(Player player, Party party) {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
+
+        StringBuilder status = new StringBuilder();
+        status.append(LocaleLoader.getString("Commands.Party.Status", party.getName(), LocaleLoader.getString("Party.Status." + (party.isLocked() ? "Locked" : "Unlocked")), party.getLevel()));
+
+        if (!party.hasReachedLevelCap()) {
+            status.append(" (").append(party.getXpToLevelPercentage()).append(")");
+        }
+
+        player.sendMessage(status.toString());
+    }
+
+    private void displayPartyFeatures(Player player, Party party) {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Features.Header"));
+
+        List<String> unlockedPartyFeatures = new ArrayList<String>();
+        List<String> lockedPartyFeatures = new ArrayList<String>();
+
+        for (PartyFeature partyFeature : PartyFeature.values()) {
+            if (!partyFeature.hasPermission(player)) {
+                continue;
+            }
+
+            if (isUnlockedFeature(party, partyFeature)) {
+                unlockedPartyFeatures.add(partyFeature.getLocaleString());
+            }
+            else {
+                lockedPartyFeatures.add(partyFeature.getFeatureLockedLocaleString());
+            }
+        }
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.UnlockedFeatures", unlockedPartyFeatures.isEmpty() ? "None" : unlockedPartyFeatures));
+
+        for (String message : lockedPartyFeatures) {
+            player.sendMessage(message);
+        }
+    }
+
+    private boolean isUnlockedFeature(Party party, PartyFeature partyFeature) {
+        return party.getLevel() >= Config.getInstance().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 = LocaleLoader.getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
+        }
+
+        if (itemShareEnabled) {
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", party.getItemShareMode().toString());
+        }
+
+        if (xpShareEnabled && itemShareEnabled) {
+            separator = ChatColor.DARK_GRAY + " || ";
+        }
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
+
+        if (itemSharingActive) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.ItemShareCategories", party.getItemShareCategories()));
+        }
+    }
+
+    private void displayMemberInfo(Player player, McMMOPlayer mcMMOPlayer, Party party) {
+        List<Player> nearMembers = PartyManager.getNearMembers(mcMMOPlayer);
+        int membersOnline = party.getOnlineMembers().size() - 1;
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", nearMembers.size(), membersOnline));
+        player.sendMessage(party.createMembersList(player.getName(), nearMembers));
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.gmail.nossr50.commands.party;
+
+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.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyInviteCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return false;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                String playerName = player.getName();
+
+                if (player.equals(target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
+                    return true;
+                }
+
+                if (PartyManager.inSameParty(player, target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
+                    return true;
+                }
+
+                if (!PartyManager.canInvite(mcMMOPlayer)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                    return true;
+                }
+
+                Party playerParty = mcMMOPlayer.getParty();
+                mcMMOTarget.setPartyInvite(playerParty);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), playerName));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyItemShareCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ITEM_SHARE)) {
+            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.4"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                ShareMode mode = ShareMode.getShareMode(args[1].toUpperCase());
+
+                if (mode == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                    return true;
+                }
+
+                handleChangingShareMode(party, mode);
+                return true;
+
+            case 3:
+                boolean toggle;
+
+                if (CommandUtils.shouldEnableToggle(args[2])) {
+                    toggle = true;
+                }
+                else if (CommandUtils.shouldDisableToggle(args[2])) {
+                    toggle = false;
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                    return true;
+                }
+
+                try {
+                    handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase()), toggle);
+                }
+                catch (IllegalArgumentException ex) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                sender.sendMessage(LocaleLoader.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 = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.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 = LocaleLoader.getString("Commands.Party.ToggleShareCategory", StringUtils.getCapitalized(type.toString()), toggle ? "enabled" : "disabled");
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(toggleMessage);
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.gmail.nossr50.commands.party;
+
+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.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyJoinCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+            case 3:
+                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return true;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+
+                if (!mcMMOTarget.inParty()) {
+                    sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+                    return true;
+                }
+
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party targetParty = mcMMOTarget.getParty();
+
+                if (player.equals(target) || (mcMMOPlayer.inParty() && mcMMOPlayer.getParty().equals(targetParty))) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Join.Self"));
+                    return true;
+                }
+
+                String password = getPassword(args);
+
+                // Make sure party passwords match
+                if (!PartyManager.checkPartyPassword(player, targetParty, password)) {
+                    return true;
+                }
+
+                String partyName = targetParty.getName();
+
+                // Changing parties
+                if (!PartyManager.changeOrJoinParty(mcMMOPlayer, partyName)) {
+                    return true;
+                }
+
+                player.sendMessage(LocaleLoader.getString("Commands.Party.Join", partyName));
+                PartyManager.addToParty(mcMMOPlayer, targetParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "join", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
+                return true;
+        }
+    }
+
+    private String getPassword(String[] args) {
+        if (args.length == 3) {
+            return args[2];
+        }
+
+        return null;
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyKickCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
+                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+
+                if (!playerParty.getMembers().contains(targetName)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                    return true;
+                }
+
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
+
+                if (target.isOnline()) {
+                    Player onlineTarget = target.getPlayer();
+                    String partyName = playerParty.getName();
+
+                    if (!PartyManager.handlePartyChangeEvent(onlineTarget, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                        return true;
+                    }
+
+                    PartyManager.processPartyLeaving(UserManager.getPlayer(onlineTarget));
+                    onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
+                }
+
+                PartyManager.removeFromParty(target, playerParty);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.gmail.nossr50.commands.party;
+
+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.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyLockCommand implements CommandExecutor {
+    @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 (CommandUtils.shouldEnableToggle(args[1])) {
+                    togglePartyLock(sender, true);
+                }
+                else if (CommandUtils.shouldDisableToggle(args[1])) {
+                    togglePartyLock(sender, false);
+                }
+                else {
+                    sendUsageStrings(sender);
+                }
+
+                return true;
+
+            default:
+                sendUsageStrings(sender);
+                return true;
+        }
+    }
+
+    private void sendUsageStrings(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
+    }
+
+    private void togglePartyLock(CommandSender sender, boolean lock) {
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        if (!Permissions.partySubcommand(sender, lock ? PartySubcommandType.LOCK : PartySubcommandType.UNLOCK)) {
+            sender.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
+            return;
+        }
+
+        if (lock ? party.isLocked() : !party.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "IsLocked" : "IsntLocked")));
+            return;
+        }
+
+        party.setLocked(lock);
+        sender.sendMessage(LocaleLoader.getString("Party." + (lock ? "Locked" : "Unlocked")));
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.gmail.nossr50.commands.party;
+
+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 PartyQuitCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 1:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party playerParty = mcMMOPlayer.getParty();
+
+                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
+                    return true;
+                }
+
+                PartyManager.removeFromParty(mcMMOPlayer);
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "quit"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.gmail.nossr50.commands.party;
+
+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 {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+                Party playerParty = mcMMOPlayer.getParty();
+
+                String oldPartyName = playerParty.getName();
+                String newPartyName = args[1];
+
+                // 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"));
+                    return true;
+                }
+
+                Player player = mcMMOPlayer.getPlayer();
+
+                // Check to see if the party exists, and if it does cancel renaming the party
+                if (PartyManager.checkPartyExistence(player, newPartyName)) {
+                    return true;
+                }
+
+                String leaderName = playerParty.getLeader();
+
+                for (Player member : playerParty.getOnlineMembers()) {
+                    if (!PartyManager.handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {
+                        return true;
+                    }
+
+                    if (!member.getName().equalsIgnoreCase(leaderName)) {
+                        member.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leaderName, newPartyName));
+                    }
+                }
+
+                playerParty.setName(newPartyName);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
+                return true;
+        }
+    }
+}

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

@@ -1,45 +1,52 @@
-package com.gmail.nossr50.party.commands;
-
-public enum PartySubcommandType {
-    JOIN,
-    ACCEPT,
-    CREATE,
-    HELP,
-    INFO,
-    QUIT,
-    EXPSHARE,
-    ITEMSHARE,
-    INVITE,
-    KICK,
-    DISBAND,
-    OWNER,
-    LOCK,
-    UNLOCK,
-    PASSWORD,
-    RENAME,
-    TELEPORT,
-    CHAT;
-
-    public static PartySubcommandType getSubcommand(String commandName) {
-        for (PartySubcommandType command : values()) {
-            if (command.name().equalsIgnoreCase(commandName)) {
-                return command;
-            }
-        }
-
-        if (commandName.equalsIgnoreCase("?")) {
-            return HELP;
-        }
-        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
-            return QUIT;
-        }
-        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
-            return EXPSHARE;
-        }
-        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
-            return ITEMSHARE;
-        }
-
-        return null;
-    }
-}
+package com.gmail.nossr50.commands.party;
+
+public enum PartySubcommandType {
+    JOIN,
+    ACCEPT,
+    CREATE,
+    HELP,
+    INFO,
+    QUIT,
+    XPSHARE,
+    ITEMSHARE,
+    INVITE,
+    KICK,
+    DISBAND,
+    OWNER,
+    LOCK,
+    UNLOCK,
+    PASSWORD,
+    RENAME,
+    TELEPORT,
+    CHAT,
+    ALLIANCE;
+
+    public static PartySubcommandType getSubcommand(String commandName) {
+        for (PartySubcommandType command : values()) {
+            if (command.name().equalsIgnoreCase(commandName)) {
+                return command;
+            }
+        }
+
+        if (commandName.equalsIgnoreCase("?")) {
+            return HELP;
+        }
+        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
+            return QUIT;
+        }
+        else if (commandName.equalsIgnoreCase("leader")) {
+            return OWNER;
+        }
+        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;
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.gmail.nossr50.commands.party;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyXpShareCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        Party party = UserManager.getPlayer((Player) sender).getParty();
+
+        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.XP_SHARE)) {
+            sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.5"));
+            return true;
+        }
+
+        switch (args.length) {
+            case 2:
+                if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
+                    handleChangingShareMode(party, ShareMode.NONE);
+                }
+                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
+                    handleChangingShareMode(party, ShareMode.EQUAL);
+                }
+                else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
+                }
+
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
+                return true;
+        }
+    }
+
+    private void handleChangingShareMode(Party party, ShareMode mode) {
+        party.setXpShareMode(mode);
+
+        String changeModeMessage = LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Xp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString())));
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(changeModeMessage);
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+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.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyAllianceAcceptCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                if (!mcMMOPlayer.hasPartyAllianceInvite()) {
+                    sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
+                    return true;
+                }
+
+                if (mcMMOPlayer.getParty().getAlly() != null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.AlreadyAllies"));
+                    return true;
+                }
+
+                PartyManager.acceptAllianceInvite(mcMMOPlayer);
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "alliance", "accept"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,135 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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 com.gmail.nossr50.config.Config;
+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.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
+
+public class PartyAllianceCommand implements TabExecutor {
+    private Player player;
+    private Party playerParty;
+    private Party targetParty;
+
+    public static final List<String> ALLIANCE_SUBCOMMANDS = ImmutableList.of("invite", "accept", "disband");
+
+    private CommandExecutor partyAllianceInviteCommand = new PartyAllianceInviteCommand();
+    private CommandExecutor partyAllianceAcceptCommand = new PartyAllianceAcceptCommand();
+    private CommandExecutor partyAllianceDisbandCommand = new PartyAllianceDisbandCommand();
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+        playerParty = mcMMOPlayer.getParty();
+
+        switch (args.length) {
+            case 1:
+                if (playerParty.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
+                    sender.sendMessage(LocaleLoader.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() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
+                    sender.sendMessage(LocaleLoader.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 boolean printUsage() {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Help.0"));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Help.1"));
+        return true;
+    }
+
+    @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], ALLIANCE_SUBCOMMANDS, new ArrayList<String>(ALLIANCE_SUBCOMMANDS.size()));
+
+                if (matches.size() == 0) {
+                    List<String> playerNames = CommandUtils.getOnlinePlayerNames(commandSender);
+                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
+                }
+
+                return matches;
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private void displayPartyHeader() {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Header"));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Ally", playerParty.getName(), targetParty.getName()));
+    }
+
+    private void displayMemberInfo(McMMOPlayer mcMMOPlayer) {
+        List<Player> nearMembers = PartyManager.getNearMembers(mcMMOPlayer);
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Members.Header"));
+        player.sendMessage(playerParty.createMembersList(player.getName(), nearMembers));
+        player.sendMessage(ChatColor.DARK_GRAY + "----------------------------");
+        player.sendMessage(targetParty.createMembersList(player.getName(), nearMembers));
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+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 PartyAllianceDisbandCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 2:
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                Party party = mcMMOPlayer.getParty();
+
+                if (party.getAlly() == null) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.None"));
+                    return true;
+                }
+
+                PartyManager.disbandAlliance(player, party, party.getAlly());
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "alliance", "disband"));
+                return true;
+        }
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.gmail.nossr50.commands.party.alliance;
+
+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.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class PartyAllianceInviteCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+            case 3:
+                String targetName = CommandUtils.getMatchedPlayerName(args[2]);
+                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+
+                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+                    return false;
+                }
+
+                Player target = mcMMOTarget.getPlayer();
+                Player player = (Player) sender;
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+                String playerName = player.getName();
+
+                if (player.equals(target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
+                    return true;
+                }
+
+                if (!mcMMOTarget.inParty()) {
+                    player.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
+                    return true;
+                }
+
+                if (PartyManager.inSameParty(player, target)) {
+                    sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", targetName));
+                    return true;
+                }
+
+                if (!mcMMOTarget.getParty().getLeader().equalsIgnoreCase(targetName)) {
+                    player.sendMessage(LocaleLoader.getString("Party.Target.NotOwner", targetName));
+                    return true;
+                }
+
+                Party playerParty = mcMMOPlayer.getParty();
+
+                if (playerParty.getAlly() != null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.AlreadyAllies"));
+                    return true;
+                }
+
+                mcMMOTarget.setPartyAllianceInvite(playerParty);
+
+                sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Invite.0", playerParty.getName(), playerName));
+                target.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.Invite.1"));
+                return true;
+
+            default:
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.3", "party", "alliance", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+                return true;
+        }
+    }
+}