Ensure that we're not spamming sounds

Fixes #1834

.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
-/atlassian-ide-plugin.xml
+# 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,24 +0,0 @@
-== mcMMO
-**The RPG lovers mod**
-
-=== 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
-
-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

@@ -0,0 +1,60 @@
+#
+#  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 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.
+## This defaults to OTHER.
+#
+# MaterialType: This is the type of the material of the item to be repaired, this is only important for permissions.
+## Valid values are STRING, LEATHER, WOOD, STONE, IRON, GOLD, DIAMOND, and OTHER
+## This defaults to OTHER.
+#
+# 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.
+## A value of -1 means to ignore all metadata when repairing.
+## This defaults to -1
+#
+# MaximumDurability: This is the maximum durability of the item.
+## This is required to be set.
+#
+# MinimumLevel: This is the minimum repair level needed to repair this item.
+## Valid values are => 0
+## This defaults to 0
+#
+# MinimumQuantity: This is the minimum number of items needed to repair this item ignoring all other repair bonuses.
+## This is typically the number of the repair material needed to create a new item, for example for a sword it is 2, for an axe it is 3
+## This defaults to 2
+#
+# XpMultiplier: This is the amount to multiply the xp bonus by.
+## This defaults to 1
+#
+#
+# The following is an example of a repair.*.yml config which adds the ability to repair Chainmail armor using fire.
+#
+#
+###
+Repairables:
+    #
+    # Chainmail repairables
+    ###
+    # Armor
+    CHAINMAIL_HELMET:
+        RepairMaterial: FIRE
+        XpMultiplier: 2
+    CHAINMAIL_CHESTPLATE:
+        RepairMaterial: FIRE
+        XpMultiplier: 2
+    CHAINMAIL_LEGGINGS:
+        RepairMaterial: FIRE
+        XpMultiplier: 2
+    CHAINMAIL_BOOTS:
+        RepairMaterial: FIRE
+        XpMultiplier: 2

pom.xml

@@ -1,135 +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.3.05</version>
-    <name>mcMMO</name>
-    <url>https://github.com/mcMMO-Dev/mcMMO</url>
-    <issueManagement>
-        <url>http://issues.mcmmo.org</url>
-        <system>JIRA</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>
-                </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>
-        </plugins>
-    </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>
-    </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>spoutpluginapi</artifactId>
-            <version>dev-SNAPSHOT</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <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.4.08-SNAPSHOT</version>
+    <name>mcMMO</name>
+    <url>https://github.com/mcMMO-Dev/mcMMO</url>
+    <issueManagement>
+        <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
+        <system>GitHub</system>
+    </issueManagement>
+    <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>RELEASE</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/BlockChecks.java

@@ -1,119 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Material;
-
-import com.gmail.nossr50.config.LoadProperties;
-
-public class BlockChecks {
-
-    /**
-     * Checks to see if a block type awards XP.
-     *
-     * @param material The type of Block to check
-     * @return true if the block type awards XP, false otherwise
-     */
-    public static boolean shouldBeWatched(Material material) {
-        switch (material) {
-        case BROWN_MUSHROOM:
-        case CACTUS:
-        case CLAY:
-        case COAL_ORE:
-        case DIAMOND_ORE:
-        case DIRT:
-        case ENDER_STONE:
-        case GLOWING_REDSTONE_ORE:
-        case GLOWSTONE:
-        case GOLD_ORE:
-        case GRASS:
-        case GRAVEL:
-        case IRON_ORE:
-        case JACK_O_LANTERN:
-        case LAPIS_ORE:
-        case LOG:
-        case MELON_BLOCK:
-        case MOSSY_COBBLESTONE:
-        case MYCEL:
-        case NETHERRACK:
-        case OBSIDIAN:
-        case PUMPKIN:
-        case RED_MUSHROOM:
-        case RED_ROSE:
-        case REDSTONE_ORE:
-        case SAND:
-        case SANDSTONE:
-        case SOUL_SAND:
-        case STONE:
-        case SUGAR_CANE_BLOCK:
-        case VINE:
-        case WATER_LILY:
-        case YELLOW_FLOWER:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Check if a block should allow for the activation of abilities.
-     *
-     * @param material The type of Block to check
-     * @return true if the block should allow ability activation, false otherwise
-     */
-    public static boolean abilityBlockCheck(Material material) {
-        switch (material) {
-        case BED_BLOCK:
-        case BREWING_STAND:
-        case BOOKSHELF:
-        case BURNING_FURNACE:
-        case CAKE_BLOCK:
-        case CHEST:
-        case DISPENSER:
-        case ENCHANTMENT_TABLE:
-        case FENCE_GATE:
-        case FURNACE:
-        case IRON_DOOR_BLOCK:
-        case JUKEBOX:
-        case LEVER:
-        case NOTE_BLOCK:
-        case STONE_BUTTON:
-        case TRAP_DOOR:
-        case WALL_SIGN:
-        case WOODEN_DOOR:
-        case WORKBENCH:
-            return false;
-
-        default:
-            break;
-        }
-
-        if (Material.getMaterial(LoadProperties.anvilID).equals(material)) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-
-    /**
-     * Check if a block type is an ore.
-     *
-     * @param material The type of Block to check
-     * @return true if the Block is an ore, false otherwise
-     */
-    public static boolean isOre(Material material) {
-        switch (material) {
-        case COAL_ORE:
-        case DIAMOND_ORE:
-        case GLOWING_REDSTONE_ORE:
-        case GOLD_ORE:
-        case IRON_ORE:
-        case LAPIS_ORE:
-        case REDSTONE_ORE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

src/main/java/com/gmail/nossr50/Combat.java

@@ -1,482 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Wolf;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.AbilityType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
-import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.runnables.GainXp;
-import com.gmail.nossr50.runnables.mcBleedTimer;
-import com.gmail.nossr50.skills.Acrobatics;
-import com.gmail.nossr50.skills.Archery;
-import com.gmail.nossr50.skills.Axes;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.skills.Swords;
-import com.gmail.nossr50.skills.Taming;
-import com.gmail.nossr50.skills.Unarmed;
-
-public class Combat {
-
-    /**
-     * Apply combat modifiers and process and XP gain.
-     *
-     * @param event The event to run the combat checks on.
-     * @param plugin mcMMO plugin instance
-     */
-    public static void combatChecks(EntityDamageByEntityEvent event, mcMMO plugin) {
-        if (event.getDamage() == 0 || event.getEntity().isDead()) {
-            return;
-        }
-
-        Entity damager = event.getDamager();
-        LivingEntity target = (LivingEntity) event.getEntity();
-        EntityType damagerType = damager.getType();
-        EntityType targetType = target.getType();
-
-        switch (damagerType) {
-        case PLAYER:
-            Player attacker = (Player) event.getDamager();
-            ItemStack itemInHand = attacker.getItemInHand();
-            PlayerProfile PPa = Users.getProfile(attacker);
-
-            combatAbilityChecks(attacker);
-
-            if (ItemChecks.isSword(itemInHand) && mcPermissions.getInstance().swords(attacker)) {
-                if (!mcBleedTimer.contains(target) && mcPermissions.getInstance().swordsBleed(attacker)) {
-                    Swords.bleedCheck(attacker, target, plugin);
-                }
-
-                if (PPa.getAbilityMode(AbilityType.SERRATED_STRIKES) && mcPermissions.getInstance().serratedStrikes(attacker)) {
-                    applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.SWORDS);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.SWORDS, plugin);
-            }
-            else if (ItemChecks.isAxe(itemInHand) && mcPermissions.getInstance().axes(attacker)) {
-                if (mcPermissions.getInstance().axeBonus(attacker)) {
-                    Axes.axesBonus(attacker, event);
-                }
-
-                if (mcPermissions.getInstance().criticalHit(attacker)) {
-                    Axes.axeCriticalCheck(attacker, event);
-                }
-
-                if (mcPermissions.getInstance().impact(attacker)) {
-                    Axes.impact(attacker, target, event);
-                }
- 
-                if (PPa.getAbilityMode(AbilityType.SKULL_SPLIITER) && mcPermissions.getInstance().skullSplitter(attacker)) {
-                    applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.AXES);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.AXES, plugin);
-            }
-            else if (itemInHand.getType().equals(Material.AIR) && mcPermissions.getInstance().unarmed(attacker)) {
-                if (mcPermissions.getInstance().unarmedBonus(attacker)) {
-                    Unarmed.unarmedBonus(PPa, event);
-                }
-
-                if (PPa.getAbilityMode(AbilityType.BERSERK) && mcPermissions.getInstance().berserk(attacker)) {
-                    event.setDamage((int) (event.getDamage() * 1.5));
-                }
-
-                if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {
-                    Unarmed.disarmProcCheck(PPa, (Player) target);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.UNARMED, plugin);
-            }
-            else if (itemInHand.getType().equals(Material.BONE) && mcPermissions.getInstance().beastLore(attacker)) {
-                Taming.beastLore(event, target, attacker);
-            }
-            break;
-
-        case WOLF:
-            Wolf wolf = (Wolf) damager;
-
-            if (wolf.isTamed() && wolf.getOwner() instanceof Player) {
-                Player master = (Player) wolf.getOwner();
-                PlayerProfile PPo = Users.getProfile(master);
-
-                if (mcPermissions.getInstance().taming(master)) {
-                    if (mcPermissions.getInstance().fastFoodService(master)) {
-                        Taming.fastFoodService(PPo, wolf, event);
-                    }
-
-                    if (mcPermissions.getInstance().sharpenedclaws(master)) {
-                        Taming.sharpenedClaws(PPo, event);
-                    }
-
-                    if (mcPermissions.getInstance().gore(master)) {
-                        Taming.gore(PPo, event, master, plugin);
-                    }
-
-                    startGainXp(master, PPo, target, SkillType.TAMING, plugin);
-                }
-            }
-            break;
-
-        case ARROW:
-            archeryCheck((EntityDamageByEntityEvent) event, plugin);
-            break;
-
-        default:
-            break;
-        }
-
-        if (targetType.equals(EntityType.PLAYER)) {
-            Swords.counterAttackChecks(event);
-            Acrobatics.dodgeChecks(event);
-        }
-    }
-
-    /**
-     * Process combat abilities based on weapon preparation modes.
-     *
-     * @param attacker The player attacking
-     */
-    public static void combatAbilityChecks(Player attacker) {
-        PlayerProfile PPa = Users.getProfile(attacker);
-
-        if (PPa.getToolPreparationMode(ToolType.AXE)) {
-            Skills.abilityCheck(attacker, SkillType.AXES);
-        }
-        else if (PPa.getToolPreparationMode(ToolType.SWORD)) {
-            Skills.abilityCheck(attacker, SkillType.SWORDS);
-        }
-        else if (PPa.getToolPreparationMode(ToolType.FISTS)) {
-            Skills.abilityCheck(attacker, SkillType.UNARMED);
-        }
-    }
-
-    /**
-     * Process archery abilities.
-     *
-     * @param event The event to run the archery checks on.
-     * @param pluginx mcMMO plugin instance
-     */
-    public static void archeryCheck(EntityDamageByEntityEvent event, mcMMO pluginx) {
-        Arrow arrow = (Arrow) event.getDamager();
-        LivingEntity shooter = arrow.getShooter();
-        LivingEntity target = (LivingEntity) event.getEntity();
-
-        if (target instanceof Player) {
-            Player defender = (Player) target;
-
-            if (mcPermissions.getInstance().unarmed(defender) && defender.getItemInHand().getType().equals(Material.AIR)) {
-                Unarmed.deflectCheck(defender, event);
-            }
-        }
-
-        if (shooter instanceof Player) {
-            Player attacker = (Player) shooter;
-            PlayerProfile PPa = Users.getProfile(attacker);
-            int damage = event.getDamage();
-
-            if (mcPermissions.getInstance().archery(attacker) && damage > 0) {
-                
-                /*Archery needs a damage bonus to be viable in PVP*/
-                int skillLvl = Users.getProfile(attacker).getSkillLevel(SkillType.ARCHERY);
-                double dmgBonusPercent = ((skillLvl / 50) * 0.1D);
-                
-                /* Cap maximum bonus at 200% */
-                if(dmgBonusPercent > 2)
-                    dmgBonusPercent = 2;
-                
-                /* Every 100 skill levels Archery gains 20% damage bonus, set that here */
-                //TODO: Work in progress for balancing out Archery, will work on it more later...
-                //System.out.println("DEBUG 0: "+event.getDamage());
-                int archeryBonus = (int)(event.getDamage() * dmgBonusPercent);
-                event.setDamage(event.getDamage() + archeryBonus);
-                //System.out.println("DEBUG 1: "+event.getDamage());
-                
-                if (mcPermissions.getInstance().trackArrows(attacker)) {
-                    Archery.trackArrows(pluginx, target, PPa);
-                }
-
-                startGainXp(attacker, PPa, target, SkillType.ARCHERY, pluginx);
-
-                if (target instanceof Player) {
-                    Player defender = (Player) target;
-                    PlayerProfile PPd = Users.getProfile(defender);
-
-                    if (PPa.inParty() && PPd.inParty() && Party.getInstance().inSameParty(defender, attacker)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-
-                    Archery.dazeCheck(defender, attacker);
-                }
-            }
-        }
-    }
-
-    /**
-     * Attempt to damage target for value dmg with reason CUSTOM
-     *
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     */
-    public static void dealDamage(LivingEntity target, int dmg) {
-        dealDamage(target, dmg, EntityDamageEvent.DamageCause.CUSTOM);
-    }
-
-    /**
-     * Attempt to damage target for value dmg with reason cause
-     *
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param cause DamageCause to pass to damage event
-     */
-    private static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
-        if (LoadProperties.eventCallback) {
-            EntityDamageEvent ede = (EntityDamageEvent) new FakeEntityDamageEvent(target, cause, dmg);
-            Bukkit.getPluginManager().callEvent(ede);
-
-            if (ede.isCancelled()) {
-                return;
-            }
-
-            target.damage(ede.getDamage());
-        }
-        else {
-            target.damage(dmg);
-        }
-    }
-
-    /**
-     * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker
-     *
-     * @param target LivingEntity which to attempt to damage
-     * @param dmg Amount of damage to attempt to do
-     * @param attacker Player to pass to event as damager
-     */
-    private static void dealDamage(LivingEntity target, int dmg, Player attacker) {
-        if (LoadProperties.eventCallback) {
-            EntityDamageEvent ede = (EntityDamageByEntityEvent) new FakeEntityDamageByEntityEvent(attacker, target, EntityDamageEvent.DamageCause.ENTITY_ATTACK, dmg);
-            Bukkit.getPluginManager().callEvent(ede);
-
-            if (ede.isCancelled()) {
-                return;
-            }
-
-            target.damage(ede.getDamage());
-        }
-        else {
-            target.damage(dmg);
-        }
-    }
-
-    /**
-     * Apply Area-of-Effect ability actions.
-     *
-     * @param attacker The attacking player
-     * @param target The defending entity
-     * @param damage The initial damage amount
-     * @param plugin mcMMO plugin instance
-     * @param type The type of skill being used
-     */
-    private static void applyAbilityAoE(Player attacker, LivingEntity target, int damage, mcMMO plugin, SkillType type) {
-        int numberOfTargets = m.getTier(attacker.getItemInHand()); //The higher the weapon tier, the more targets you hit
-        int damageAmount = 0;
-
-        if (type.equals(SkillType.AXES)) {
-            damageAmount = damage / 2;
-        }
-        else if (type.equals(SkillType.SWORDS)) {
-            damageAmount = damage / 4;
-        }
-
-        if (damageAmount < 1) {
-            damageAmount = 1;
-        }
-
-        for (Entity entity : target.getNearbyEntities(2.5, 2.5, 2.5)) {
-            EntityType entityType = entity.getType();
-
-            if (entityType.equals(EntityType.WOLF)) {
-                Wolf wolf = (Wolf) entity;
-                AnimalTamer tamer = wolf.getOwner();
-
-                if (tamer instanceof Player) {
-                    Player owner = (Player) tamer;
-
-                    if (owner.equals(attacker) || Party.getInstance().inSameParty(attacker, owner)) {
-                        continue;
-                    }
-                }
-            }
-
-            if (entity instanceof LivingEntity && numberOfTargets >= 1) {
-                if (entityType.equals(EntityType.PLAYER)) {
-                    Player defender = (Player) entity;
-                    PlayerProfile PP = Users.getProfile(defender);
-
-                    //Reasons why the target shouldn't be hit
-                    if (PP.getGodMode()) {
-                        continue;
-                    }
-
-                    if (defender.getName().equals(attacker.getName())) { //Is this even possible?
-                        continue;
-                    }
-
-                    if (Party.getInstance().inSameParty(attacker, defender)) {
-                        continue;
-                    }
-
-                    if (defender.isDead()) {
-                        continue;
-                    }
-
-                    //Apply effect to players only if PVP is enabled
-                    if (target.getWorld().getPVP()) {
-                        String message = "";
-
-                        if (type.equals(SkillType.AXES)) {
-                            message = mcLocale.getString("Axes.HitByCleave");
-                        }
-                        else if (type.equals(SkillType.SWORDS)) {
-                            message = mcLocale.getString("Swords.HitBySerratedStrikes");
-                        }
-
-                        dealDamage(defender, damageAmount, attacker);
-                        defender.sendMessage(message);
-
-                        if (type.equals(SkillType.SWORDS)) {
-                            PP.addBleedTicks(5);
-                        }
-
-                        numberOfTargets--;
-                    }
-                }
-                else {
-                    LivingEntity livingEntity = (LivingEntity) entity;
-
-                    if (type.equals(SkillType.SWORDS)) {
-                        mcBleedTimer.add(livingEntity);
-                    }
-
-                    dealDamage(livingEntity, damageAmount, attacker);
-                    numberOfTargets--;
-                }
-            }
-        }
-    }
-
-    /**
-     * Start the task that gives combat XP.
-     *
-     * @param attacker The attacking player
-     * @param PP The player's PlayerProfile
-     * @param target The defending entity
-     * @param skillType The skill being used
-     * @param plugin mcMMO plugin instance
-     */
-    public static void startGainXp(Player attacker, PlayerProfile PP, LivingEntity target, SkillType skillType, mcMMO pluginx) {
-        double baseXP = 0;
-
-        if (target instanceof Player) {
-            if (!LoadProperties.pvpxp) {
-                return;
-            }
-
-            Player defender = (Player) target;
-            PlayerProfile PPd = Users.getProfile(defender);
-
-            if (System.currentTimeMillis() >= (PPd.getRespawnATS() * 1000) + 5000 && ((PPd.getLastLogin() + 5) * 1000) < System.currentTimeMillis() && defender.getHealth() >= 1) {
-                baseXP = 20 * LoadProperties.pvpxprewardmodifier;
-            }
-        }
-        else if (!target.hasMetadata("mcmmoFromMobSpawner")) {
-            if (target instanceof Animals && !target.hasMetadata("mcmmoSummoned")) {
-                baseXP = LoadProperties.animalXP;
-            }
-            else {
-                EntityType type = target.getType();
-
-                switch (type) {
-                case BLAZE:
-                    baseXP = LoadProperties.blazeXP;
-                    break;
-
-                case CAVE_SPIDER:
-                    baseXP = LoadProperties.cavespiderXP;
-                    break;
-
-                case CREEPER:
-                    baseXP = LoadProperties.creeperXP;
-                    break;
-
-                case ENDER_DRAGON:
-                    baseXP = LoadProperties.enderdragonXP;
-                    break;
-
-                case ENDERMAN:
-                    baseXP = LoadProperties.endermanXP;
-                    break;
-
-                case GHAST:
-                    baseXP = LoadProperties.ghastXP;
-                    break;
-
-                case MAGMA_CUBE:
-                    baseXP = LoadProperties.magmacubeXP;
-                    break;
-
-                case PIG_ZOMBIE:
-                    baseXP = LoadProperties.pigzombieXP;
-                    break;
-
-                case SILVERFISH:
-                    baseXP = LoadProperties.silverfishXP;
-                    break;
-
-                case SKELETON:
-                    baseXP = LoadProperties.skeletonXP;
-                    break;
-
-                case SLIME:
-                    baseXP = LoadProperties.slimeXP;
-                    break;
-
-                case SPIDER:
-                    baseXP = LoadProperties.spiderXP;
-                    break;
-
-                case ZOMBIE:
-                    baseXP = LoadProperties.zombieXP;
-                    break;
-
-                default:
-                    break;
-                }
-            }
-
-            baseXP *= 10;
-        }
-
-        if (baseXP != 0) {
-            Bukkit.getScheduler().scheduleSyncDelayedTask(pluginx, new GainXp(attacker, PP, skillType, baseXP, target), 0);
-        }
-    }
-}

src/main/java/com/gmail/nossr50/Database.java

@@ -1,313 +0,0 @@
-package com.gmail.nossr50;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.DatabaseUpdate;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class Database {
-
-    private String connectionString = "jdbc:mysql://" + LoadProperties.MySQLserverName + ":" + LoadProperties.MySQLport + "/" + LoadProperties.MySQLdbName + "?user=" + LoadProperties.MySQLuserName + "&password=" + LoadProperties.MySQLdbPass;
-    private Connection conn = null;
-    private mcMMO plugin = null;
-    private long reconnectTimestamp = 0;
-
-    public Database(mcMMO instance) {
-        plugin = instance;
-        connect(); //Connect to MySQL
-
-        // Load the driver instance
-        try {
-            Class.forName("com.mysql.jdbc.Driver");
-            DriverManager.getConnection(connectionString);
-        }
-        catch (ClassNotFoundException e) {
-            Bukkit.getLogger().warning(e.getLocalizedMessage());
-        }
-        catch (SQLException ex) {
-            Bukkit.getLogger().warning(ex.getLocalizedMessage());
-            printErrors(ex);
-        }
-    }
-
-    /**
-     * Attempt to connect to the mySQL database.
-     */
-    public void connect() {
-        try {
-            System.out.println("[mcMMO] Attempting connection to MySQL...");
-            Properties conProperties = new Properties();
-            conProperties.put("autoReconnect", "false");
-            conProperties.put("maxReconnects", "0");
-            conn = DriverManager.getConnection(connectionString, conProperties);
-            System.out.println("[mcMMO] Connection to MySQL was a success!");
-        }
-        catch (SQLException ex) {
-            System.out.println("[mcMMO] Connection to MySQL failed!");
-            ex.printStackTrace();
-            printErrors(ex);
-        }
-    }
-
-    /**
-     * Attempt to create the database structure.
-     */
-    public void createStructure() {
-        write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "huds` (`user_id` int(10) unsigned NOT NULL,"
-                + "`hudtype` varchar(50) NOT NULL DEFAULT '',"
-                + "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-        write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "users` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT,"
-                + "`user` varchar(40) NOT NULL,"
-                + "`lastlogin` int(32) unsigned NOT NULL,"
-                + "`party` varchar(100) NOT NULL DEFAULT '',"
-                + "PRIMARY KEY (`id`),"
-                + "UNIQUE KEY `user` (`user`)) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;");
-        write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "cooldowns` (`user_id` int(10) unsigned NOT NULL,"
-                + "`taming` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`mining` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`woodcutting` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`repair` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`unarmed` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`herbalism` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`excavation` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`archery` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`swords` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`axes` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`acrobatics` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "`blast_mining` int(32) unsigned NOT NULL DEFAULT '0',"
-                + "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-        write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "skills` (`user_id` int(10) unsigned NOT NULL,"
-                + "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-        write("CREATE TABLE IF NOT EXISTS `" + LoadProperties.MySQLtablePrefix + "experience` (`user_id` int(10) unsigned NOT NULL,"
-                + "`taming` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`mining` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`woodcutting` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`repair` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`unarmed` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`herbalism` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`excavation` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`archery` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`swords` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`axes` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "`acrobatics` int(10) unsigned NOT NULL DEFAULT '0',"
-                + "PRIMARY KEY (`user_id`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
-        checkDatabaseStructure(DatabaseUpdate.FISHING);
-        checkDatabaseStructure(DatabaseUpdate.BLAST_MINING);
-    }
-
-    /**
-     * Check database structure for missing values.
-     *
-     * @param update Type of data to check updates for
-     */
-    public void checkDatabaseStructure(DatabaseUpdate update) {
-        String sql = null;
-        ResultSet rs = null;
-        HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
-
-        switch (update) {
-        case BLAST_MINING:
-            sql = "SELECT * FROM  `"+LoadProperties.MySQLtablePrefix+"cooldowns` ORDER BY  `"+LoadProperties.MySQLtablePrefix+"cooldowns`.`blast_mining` ASC LIMIT 0 , 30";
-            break;
-        case FISHING:
-            sql = "SELECT * FROM  `"+LoadProperties.MySQLtablePrefix+"experience` ORDER BY  `"+LoadProperties.MySQLtablePrefix+"experience`.`fishing` ASC LIMIT 0 , 30";
-            break;
-        default:
-            break;
-        }
-
-        try {
-            PreparedStatement stmt = conn.prepareStatement(sql);
-            if (stmt.executeQuery() != null) {
-                stmt.executeQuery();
-                rs = stmt.getResultSet();
-                while (rs.next()) {
-                    ArrayList<String> Col = new ArrayList<String>();
-                    for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-                        Col.add(rs.getString(i));
-                    }
-                    Rows.put(rs.getRow(), Col);
-                }
-            }
-        }
-        catch (SQLException ex) {
-            if (update.equals(DatabaseUpdate.BLAST_MINING)) {
-                System.out.println("Updating mcMMO MySQL tables for Blast Mining...");
-                write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "cooldowns` ADD `blast_mining` int(32) NOT NULL DEFAULT '0' ;");
-            }
-            else if (update.equals(DatabaseUpdate.FISHING)) {
-                System.out.println("Updating mcMMO MySQL tables for Fishing...");
-                write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "skills` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-                write("ALTER TABLE `"+LoadProperties.MySQLtablePrefix + "experience` ADD `fishing` int(10) NOT NULL DEFAULT '0' ;");
-            }
-        }
-    }
-
-    /**
-     * Attempt to write the SQL query.
-     *
-     * @param sql Query to write.
-     * @return true if the query was successfully written, false otherwise.
-     */
-    public boolean write(String sql) {
-        if (isConnected()) {
-            try {
-                PreparedStatement stmt = conn.prepareStatement(sql);
-                stmt.executeUpdate();
-                return true;
-            }
-            catch (SQLException ex) {
-                printErrors(ex);
-                return false;
-            }
-        }
-        else {
-            attemptReconnect();
-        }
-        return false;
-    }
-
-    /**
-     * Get the Integer. Only return first row / first field.
-     *
-     * @param sql SQL query to execute
-     * @return the value in the first row / first field
-     */
-    public Integer getInt(String sql) {
-        ResultSet rs = null;
-        Integer result = 0;
-
-        if (isConnected()) {
-            try {
-                PreparedStatement stmt = conn.prepareStatement(sql);
-                stmt = conn.prepareStatement(sql);
-                if (stmt.executeQuery() != null) {
-                    stmt.executeQuery();
-                    rs = stmt.getResultSet();
-                    if (rs.next()) {
-                        result = rs.getInt(1);
-                    }
-                    else {
-                        result = 0;
-                    }
-                }
-            }
-            catch (SQLException ex) {
-                printErrors(ex);
-            }
-        }
-        else {
-            attemptReconnect();
-        }
-        return result;
-    }
-    
-    /**
-     * Get connection status
-     * 
-     * @return the boolean value for whether or not we are connected
-     */
-    public boolean isConnected() {
-        if(conn == null)
-            return false;
-        
-        try {
-            return conn.isValid(3);
-        } catch (SQLException e) {
-            return false;
-        }
-    }
-    
-    /**
-     * Schedules a Sync Delayed Task with the Bukkit Scheduler to attempt reconnection after a minute has elapsed
-     * This will check for a connection being present or not to prevent unneeded reconnection attempts
-     */
-    public void attemptReconnect() {
-        if(reconnectTimestamp+60000 < System.currentTimeMillis()) //Only reconnect if another attempt hasn't been made recently
-        {
-            System.out.println("[mcMMO] Connection to MySQL was lost! Attempting to reconnect in 60 seconds...");
-            reconnectTimestamp = System.currentTimeMillis();
-            Bukkit.getScheduler().scheduleSyncDelayedTask(plugin,     
-            new Runnable() {
-                public void run() {
-                    if (!isConnected()) {
-                        connect();
-                        if(isConnected()) {
-                            for(PlayerProfile x : Users.players.values()) {
-                                x.save(); //Save all profiles
-                            }
-                            Users.players.clear(); //Clear the profiles
-                            for(Player x : Bukkit.getOnlinePlayers()) {
-                                Users.addUser(x); //Add in new profiles, forcing them to 'load' again from MySQL
-                            }
-                        }
-                    }
-                }
-            }, 20*60);
-        }
-    }
-
-    /**
-     * Read SQL query.
-     *
-     * @param sql SQL query to read
-     * @return the rows in this SQL query
-     */
-    public HashMap<Integer, ArrayList<String>> read(String sql) {
-        ResultSet rs = null;
-        HashMap<Integer, ArrayList<String>> Rows = new HashMap<Integer, ArrayList<String>>();
-
-        if (isConnected()) {
-            try {
-                PreparedStatement stmt = conn.prepareStatement(sql);
-                if (stmt.executeQuery() != null) {
-                    stmt.executeQuery();
-                    rs = stmt.getResultSet();
-                    while (rs.next()) {
-                        ArrayList<String> Col = new ArrayList<String>();
-                        for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-                            Col.add(rs.getString(i));
-                        }
-                        Rows.put(rs.getRow(), Col);
-                    }
-                }
-            }
-            catch (SQLException ex) {
-                printErrors(ex);
-            }
-        }
-        else {
-            attemptReconnect();
-        }
-        return Rows;
-    }
-
-    private static void printErrors(SQLException ex) {
-        System.out.println("SQLException: " + ex.getMessage());
-        System.out.println("SQLState: " + ex.getSQLState());
-        System.out.println("VendorError: " + ex.getErrorCode());
-    }
-}

src/main/java/com/gmail/nossr50/Item.java

@@ -1,64 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class Item {
-
-    /**
-     * Check for item usage.
-     *
-     * @param player Player whose item usage to check
-     */
-    public static void itemchecks(Player player) {
-        ItemStack inhand = player.getItemInHand();
-
-        if (LoadProperties.chimaeraWingEnable && inhand.getTypeId() == LoadProperties.chimaeraId) {
-            chimaerawing(player);
-        }
-    }
-
-    private static void chimaerawing(Player player) {
-        PlayerProfile PP = Users.getProfile(player);
-        ItemStack is = player.getItemInHand();
-        Block block = player.getLocation().getBlock();
-        int amount = is.getAmount();
-
-        if (mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == LoadProperties.chimaeraId) {
-            if (Skills.cooldownOver(PP.getRecentlyHurt(), 60) && amount >= LoadProperties.feathersConsumedByChimaeraWing) {
-                player.setItemInHand(new ItemStack(LoadProperties.chimaeraId, amount - LoadProperties.feathersConsumedByChimaeraWing));
-
-                for (int y = 0; block.getY() + y < player.getWorld().getMaxHeight(); y++) {
-                    if (!block.getRelative(0, y, 0).getType().equals(Material.AIR)) {
-                        player.sendMessage(mcLocale.getString("Item.ChimaeraWingFail"));
-                        player.teleport(block.getRelative(0, y - 1, 0).getLocation());
-                        return;
-                    }
-                }
-
-                if (player.getBedSpawnLocation() != null && player.getBedSpawnLocation().getBlock().getType().equals(Material.BED_BLOCK)) {
-                    player.teleport(player.getBedSpawnLocation());
-                }
-                else {
-                    player.teleport(player.getWorld().getSpawnLocation());
-                }
-
-                player.sendMessage(mcLocale.getString("Item.ChimaeraWingPass"));
-            }
-            else if (!Skills.cooldownOver(PP.getRecentlyHurt(), 60) && is.getAmount() >= LoadProperties.feathersConsumedByChimaeraWing) {
-                player.sendMessage(mcLocale.getString("Item.InjuredWait", new Object[] {Skills.calculateTimeLeft(PP.getRecentlyHurt(), 60)}));
-            }
-            else if (is.getAmount() <= LoadProperties.feathersConsumedByChimaeraWing) {
-                player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.chimaeraId));
-            }
-        }
-    }
-}

src/main/java/com/gmail/nossr50/ItemChecks.java

@@ -1,380 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-public class ItemChecks {
-
-    /**
-     * Checks if the item is a sword.
-     *
-     * @param is Item to check
-     * @return true if the item is a sword, false otherwise
-     */
-    public static boolean isSword(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_SWORD:
-        case GOLD_SWORD:
-        case IRON_SWORD:
-        case STONE_SWORD:
-        case WOOD_SWORD:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a hoe.
-     *
-     * @param is Item to check
-     * @return true if the item is a hoe, false otherwise
-     */
-    public static boolean isHoe(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_HOE:
-        case GOLD_HOE:
-        case IRON_HOE:
-        case STONE_HOE:
-        case WOOD_HOE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a shovel.
-     *
-     * @param is Item to check
-     * @return true if the item is a shovel, false otherwise
-     */
-    public static boolean isShovel(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_SPADE:
-        case GOLD_SPADE:
-        case IRON_SPADE:
-        case STONE_SPADE:
-        case WOOD_SPADE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is an axe.
-     *
-     * @param is Item to check
-     * @return true if the item is an axe, false otherwise
-     */
-    public static boolean isAxe(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_AXE:
-        case GOLD_AXE:
-        case IRON_AXE:
-        case STONE_AXE:
-        case WOOD_AXE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a pickaxe.
-     *
-     * @param is Item to check
-     * @return true if the item is a pickaxe, false otherwise
-     */
-    public static boolean isMiningPick(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_PICKAXE:
-        case GOLD_PICKAXE:
-        case IRON_PICKAXE:
-        case STONE_PICKAXE:
-        case WOOD_PICKAXE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a helmet.
-     *
-     * @param is Item to check
-     * @return true if the item is a helmet, false otherwise
-     */
-    public static boolean isHelmet(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_HELMET:
-        case GOLD_HELMET:
-        case IRON_HELMET:
-        case LEATHER_HELMET:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a chestplate.
-     *
-     * @param is Item to check
-     * @return true if the item is a chestplate, false otherwise
-     */
-    public static boolean isChestplate(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_CHESTPLATE:
-        case GOLD_CHESTPLATE:
-        case IRON_CHESTPLATE:
-        case LEATHER_CHESTPLATE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a pair of pants.
-     *
-     * @param is Item to check
-     * @return true if the item is a pair of pants, false otherwise
-     */
-    public static boolean isPants(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_LEGGINGS:
-        case GOLD_LEGGINGS:
-        case IRON_LEGGINGS:
-        case LEATHER_LEGGINGS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks if the item is a pair of boots.
-     *
-     * @param is Item to check
-     * @return true if the item is a pair of boots, false otherwise
-     */
-    public static boolean isBoots(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_BOOTS:
-        case GOLD_BOOTS:
-        case IRON_BOOTS:
-        case LEATHER_BOOTS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a wearable armor piece.
-     *
-     * @param is Item to check
-     * @return true if the item is armor, false otherwise
-     */
-    public static boolean isArmor(ItemStack is) {
-        return isLeatherArmor(is) || isGoldArmor(is) || isIronArmor(is) || isDiamondArmor(is);
-    }
-
-    /**
-     * Checks to see if an item is a leather armor piece.
-     *
-     * @param is Item to check
-     * @return true if the item is leather armor, false otherwise
-     */
-    public static boolean isLeatherArmor(ItemStack is) {
-        switch (is.getType()) {
-        case LEATHER_BOOTS:
-        case LEATHER_CHESTPLATE:
-        case LEATHER_HELMET:
-        case LEATHER_LEGGINGS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a gold armor piece.
-     *
-     * @param is Item to check
-     * @return true if the item is gold armor, false otherwise
-     */
-    public static boolean isGoldArmor(ItemStack is) {
-        switch (is.getType()) {
-        case GOLD_BOOTS:
-        case GOLD_CHESTPLATE:
-        case GOLD_HELMET:
-        case GOLD_LEGGINGS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is an iron armor piece.
-     *
-     * @param is Item to check
-     * @return true if the item is iron armor, false otherwise
-     */
-    public static boolean isIronArmor(ItemStack is) {
-        switch (is.getType()) {
-        case IRON_BOOTS:
-        case IRON_CHESTPLATE:
-        case IRON_HELMET:
-        case IRON_LEGGINGS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a diamond armor piece.
-     *
-     * @param is Item to check
-     * @return true if the item is diamond armor, false otherwise
-     */
-    public static boolean isDiamondArmor(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_BOOTS:
-        case DIAMOND_CHESTPLATE:
-        case DIAMOND_HELMET:
-        case DIAMOND_LEGGINGS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a tool.
-     *
-     * @param is Item to check
-     * @return true if the item is a tool, false otherwise
-     */
-    public static boolean isTool(ItemStack is) {
-        return isStoneTool(is) || isWoodTool(is) || isGoldTool(is) || isIronTool(is) || isDiamondTool(is) || is.getType().equals(Material.BOW);
-    }
-
-    /**
-     * Checks to see if an item is a stone tool.
-     *
-     * @param is Item to check
-     * @return true if the item is a stone tool, false otherwise
-     */
-    public static boolean isStoneTool(ItemStack is) {
-        switch (is.getType()) {
-        case STONE_AXE:
-        case STONE_HOE:
-        case STONE_PICKAXE:
-        case STONE_SPADE:
-        case STONE_SWORD:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a wooden tool.
-     *
-     * @param is Item to check
-     * @return true if the item is a wooden tool, false otherwise
-     */
-    public static boolean isWoodTool(ItemStack is) {
-        switch (is.getType()) {
-        case WOOD_AXE:
-        case WOOD_HOE:
-        case WOOD_PICKAXE:
-        case WOOD_SPADE:
-        case WOOD_SWORD:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a gold tool.
-     *
-     * @param is Item to check
-     * @return true if the item is a stone tool, false otherwise
-     */
-    public static boolean isGoldTool(ItemStack is) {
-        switch (is.getType()) {
-        case GOLD_AXE:
-        case GOLD_HOE:
-        case GOLD_PICKAXE:
-        case GOLD_SPADE:
-        case GOLD_SWORD:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is an iron tool.
-     *
-     * @param is Item to check
-     * @return true if the item is an iron tool, false otherwise
-     */
-    public static boolean isIronTool(ItemStack is) {
-        switch (is.getType()) {
-        case IRON_AXE:
-        case IRON_HOE:
-        case IRON_PICKAXE:
-        case IRON_SPADE:
-        case IRON_SWORD:
-        case SHEARS:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    /**
-     * Checks to see if an item is a diamond tool.
-     *
-     * @param is Item to check
-     * @return true if the item is a diamond tool, false otherwise
-     */
-    public static boolean isDiamondTool(ItemStack is) {
-        switch (is.getType()) {
-        case DIAMOND_AXE:
-        case DIAMOND_HOE:
-        case DIAMOND_PICKAXE:
-        case DIAMOND_SPADE:
-        case DIAMOND_SWORD:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}

src/main/java/com/gmail/nossr50/Leaderboard.java

@@ -1,291 +0,0 @@
-package com.gmail.nossr50;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.bukkit.Bukkit;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerStat;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.datatypes.Tree;
-
-public class Leaderboard {
-    static String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
-
-    /**
-     * Create the leaderboards.
-     */
-    public static void makeLeaderboards() {
-        //Make Trees
-        Tree Mining = new Tree();
-        Tree WoodCutting = new Tree();
-        Tree Herbalism = new Tree();
-        Tree Excavation = new Tree();
-        Tree Acrobatics = new Tree();
-        Tree Repair = new Tree();
-        Tree Swords = new Tree();
-        Tree Axes = new Tree();
-        Tree Archery = new Tree();
-        Tree Unarmed = new Tree();
-        Tree Taming = new Tree();
-        Tree Fishing = new Tree();
-        Tree PowerLevel = new Tree();
-
-        //Add Data To Trees
-        try {
-            FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
-            String line = "";
-            ArrayList<String> players = new ArrayList<String>();
-
-            while ((line = in.readLine()) != null) {
-                String[] character = line.split(":");
-                String p = character[0];
-                int powerLevel = 0;
-
-                //Prevent the same player from being added multiple times
-                if (players.contains(p)) {
-                    continue;
-                }
-                else {
-                    players.add(p);
-                }
-
-                if (character.length > 1 && m.isInt(character[1])) {
-                    Mining.add(p, Integer.valueOf(character[1]));
-                    powerLevel += Integer.valueOf(character[1]);
-                }
-
-                if (character.length > 5 && m.isInt(character[5])) {
-                    WoodCutting.add(p, Integer.valueOf(character[5]));
-                    powerLevel += Integer.valueOf(character[5]);
-                }
-
-                if (character.length > 7 && m.isInt(character[7])) {
-                    Repair.add(p, Integer.valueOf(character[7]));
-                    powerLevel += Integer.valueOf(character[7]);
-                }
-
-                if (character.length > 8 && m.isInt(character[8])) {
-                    Unarmed.add(p, Integer.valueOf(character[8]));
-                    powerLevel += Integer.valueOf(character[8]);
-                }
-
-                if (character.length > 9 && m.isInt(character[9])) {
-                    Herbalism.add(p, Integer.valueOf(character[9]));
-                    powerLevel += Integer.valueOf(character[9]);
-                }
-
-                if (character.length > 10 && m.isInt(character[10])) {
-                    Excavation.add(p, Integer.valueOf(character[10]));
-                    powerLevel += Integer.valueOf(character[10]);
-                }
-
-                if (character.length > 11 && m.isInt(character[11])) {
-                    Archery.add(p, Integer.valueOf(character[11]));
-                    powerLevel += Integer.valueOf(character[11]);
-                }
-
-                if (character.length > 12 && m.isInt(character[12])) {
-                    Swords.add(p, Integer.valueOf(character[12]));
-                    powerLevel += Integer.valueOf(character[12]);
-                }
-
-                if (character.length > 13 && m.isInt(character[13])) {
-                    Axes.add(p, Integer.valueOf(character[13]));
-                    powerLevel += Integer.valueOf(character[13]);
-                }
-
-                if (character.length > 14 && m.isInt(character[14])) {
-                    Acrobatics.add(p, Integer.valueOf(character[14]));
-                    powerLevel += Integer.valueOf(character[14]);
-                }
-
-                if (character.length > 24 && m.isInt(character[24])) {
-                    Taming.add(p, Integer.valueOf(character[24]));
-                    powerLevel += Integer.valueOf(character[24]);
-                }
-
-                if (character.length > 34 && m.isInt(character[34])) {
-                    Fishing.add(p, Integer.valueOf(character[34]));
-                    powerLevel += Integer.valueOf(character[34]);
-                }
-
-                PowerLevel.add(p, powerLevel);
-            }
-            in.close();
-        }
-        catch (Exception e) {
-            Bukkit.getLogger().severe(("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString()));
-        }
-
-        //Write the leader board files
-        leaderWrite(Mining.inOrder(), SkillType.MINING);
-        leaderWrite(WoodCutting.inOrder(), SkillType.WOODCUTTING);
-        leaderWrite(Repair.inOrder(), SkillType.REPAIR);
-        leaderWrite(Unarmed.inOrder(), SkillType.UNARMED);
-        leaderWrite(Herbalism.inOrder(), SkillType.HERBALISM);
-        leaderWrite(Excavation.inOrder(), SkillType.EXCAVATION);
-        leaderWrite(Archery.inOrder(), SkillType.ARCHERY);
-        leaderWrite(Swords.inOrder(), SkillType.SWORDS);
-        leaderWrite(Axes.inOrder(), SkillType.AXES);
-        leaderWrite(Acrobatics.inOrder(), SkillType.ACROBATICS);
-        leaderWrite(Taming.inOrder(), SkillType.TAMING);
-        leaderWrite(Fishing.inOrder(), SkillType.FISHING);
-        leaderWrite(PowerLevel.inOrder(), SkillType.ALL);
-    }
-
-    /**
-     * Write to the leaderboards.
-     *
-     * @param ps Stats to write to the leaderboard
-     * @param skillType Skill type to write the leaderboard of
-     */
-    private static void leaderWrite(PlayerStat[] ps, SkillType skillType) {
-        String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo";
-        File theDir = new File(theLocation); 
-
-        //CHECK IF THE FILE EXISTS
-        if (!theDir.exists()) {
-            FileWriter writer = null;
-
-            try {
-                writer = new FileWriter(theLocation);
-            }
-            catch (Exception e) {
-                Bukkit.getLogger().severe(("Exception while creating " + theLocation + e.toString()));
-            }
-            finally {
-                try {
-                    if (writer != null) {
-                        writer.close();
-                    }
-                }
-                catch (IOException e) {
-                    Bukkit.getLogger().severe("Exception while closing writer for " + theLocation + e.toString());
-                }
-            }
-        }
-        else {
-            try {
-                FileReader file = new FileReader(theLocation);
-                BufferedReader in = new BufferedReader(file);
-                StringBuilder writer = new StringBuilder();
-
-                for (PlayerStat p : ps) {
-                    if (p.name.equals("$mcMMO_DummyInfo")) {
-                        continue;
-                    }
-
-                    if (p.statVal == 0) {
-                        continue;
-                    }
-
-                    writer.append(p.name + ":" + p.statVal);
-                    writer.append("\r\n");
-                }
-
-                in.close();
-                FileWriter out = new FileWriter(theLocation);
-                out.write(writer.toString());
-                out.close();
-            }
-            catch (Exception e) {
-                Bukkit.getLogger().severe("Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)" + e.toString());
-            }
-        }
-    }
-
-    /**
-     * Retrieve leaderboard info.
-     *
-     * @param skillName Skill to retrieve info on.
-     * @param pagenumber Which page in the leaderboards to retrieve
-     * @return the requested leaderboard information
-     */
-    public static String[] retrieveInfo(String skillName, int pagenumber) {
-        String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillName + ".mcmmo"; //$NON-NLS-1$ //$NON-NLS-2$
-
-        try {
-            FileReader file = new FileReader(theLocation);
-            BufferedReader in = new BufferedReader(file);
-            int destination = (pagenumber - 1) * 10; //How many lines to skip through
-            int x = 0; //how many lines we've gone through
-            int y = 0; //going through the lines
-            String line = "";
-            String[] info = new String[10]; //what to return
-
-            while ((line = in.readLine()) != null && y < 10) {
-                x++;
-
-                if (x >= destination && y < 10) {
-                    info[y] = line.toString();
-                    y++;
-                }
-            }
-
-            in.close();
-            return info;
-        }
-        catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while reading " + theLocation + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-
-        return null; //Shouldn't get here
-    }
-
-    /**
-     * Update the leaderboards.
-     *
-     * @param ps Stats to update the leaderboard with.
-     * @param skillType Skill whose leaderboard is being updated.
-     */
-    public static void updateLeaderboard(PlayerStat ps, SkillType skillType) {
-        if (LoadProperties.useMySQL) {
-            return;
-        }
-
-        String theLocation = "plugins/mcMMO/FlatFileStuff/Leaderboards/" + skillType + ".mcmmo";
-
-        try {
-            FileReader file = new FileReader(theLocation);
-            BufferedReader in = new BufferedReader(file);
-            StringBuilder writer = new StringBuilder();
-            String line = "";
-            Boolean inserted = false;
-
-            while ((line = in.readLine()) != null) {
-
-                //Insert the player into the line before it finds a smaller one
-                if (Integer.valueOf(line.split(":")[1]) < ps.statVal && !inserted) {
-                    writer.append(ps.name + ":" + ps.statVal).append("\r\n");
-                    inserted = true;
-                }
-
-                //Write anything that isn't the player already in the file so we remove the duplicate
-                if (!line.split(":")[0].equalsIgnoreCase(ps.name)) {
-                    writer.append(line).append("\r\n");
-                }
-            }
-
-            if(!inserted) {
-                writer.append(ps.name + ":" + ps.statVal).append("\r\n");
-            }
-
-            in.close();
-
-            //Write the new file
-            FileWriter out = new FileWriter(theLocation);
-            out.write(writer.toString());
-            out.close();
-        }
-        catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while writing to " + theLocation + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-    }
-}

src/main/java/com/gmail/nossr50/Metrics.java

@@ -1,541 +0,0 @@
-package com.gmail.nossr50;
-
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-public class Metrics {
-
-    /**
-     * The current revision number
-     */
-    private final static int REVISION = 5;
-
-    /**
-     * The base url of the metrics domain
-     */
-    private static final String BASE_URL = "http://metrics.griefcraft.com";
-
-    /**
-     * The url used to report a server's status
-     */
-    private static final String REPORT_URL = "/report/%s";
-
-    /**
-     * The file where guid and opt out is stored in
-     */
-    private static final String CONFIG_FILE = "plugins/PluginMetrics/config.yml";
-
-    /**
-     * The separator to use for custom data. This MUST NOT change unless you are hosting your own
-     * version of metrics and want to change it.
-     */
-    private static final String CUSTOM_DATA_SEPARATOR = "~~";
-
-    /**
-     * Interval of time to ping (in minutes)
-     */
-    private final static int PING_INTERVAL = 10;
-
-    /**
-     * A map of all of the graphs for each plugin
-     */
-    private Map<Plugin, Set<Graph>> graphs = Collections.synchronizedMap(new HashMap<Plugin, Set<Graph>>());
-
-    /**
-     * A convenient map of the default Graph objects (used by addCustomData mainly)
-     */
-    private Map<Plugin, Graph> defaultGraphs = Collections.synchronizedMap(new HashMap<Plugin, Graph>());
-
-    /**
-     * The plugin configuration file
-     */
-    private final YamlConfiguration configuration;
-
-    /**
-     * Unique server id
-     */
-    private String guid;
-
-    public Metrics() throws IOException {
-        // load the config
-        File file = new File(CONFIG_FILE);
-        configuration = YamlConfiguration.loadConfiguration(file);
-
-        // add some defaults
-        configuration.addDefault("opt-out", false);
-        configuration.addDefault("guid", UUID.randomUUID().toString());
-
-        // Do we need to create the file?
-        if (configuration.get("guid", null) == null) {
-            configuration.options().header("http://metrics.griefcraft.com").copyDefaults(true);
-            configuration.save(file);
-        }
-
-        // Load the guid then
-        guid = configuration.getString("guid");
-    }
-
-    /**
-     * Construct and create a Graph that can be used to separate specific plotters to their own graphs
-     * on the metrics website. Plotters can be added to the graph object returned.
-     *
-     * @param plugin
-     * @param type
-     * @param name
-     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
-     */
-    public Graph createGraph(Plugin plugin, Graph.Type type, String name) {
-        if (plugin == null || type == null || name == null) {
-            throw new IllegalArgumentException("All arguments must not be null");
-        }
-
-        // Construct the graph object
-        Graph graph = new Graph(type, name);
-
-        // Get the graphs for the plugin
-        Set<Graph> graphs = getOrCreateGraphs(plugin);
-
-        // Now we can add our graph
-        graphs.add(graph);
-
-        // and return back
-        return graph;
-    }
-
-    /**
-     * Adds a custom data plotter for a given plugin
-     *
-     * @param plugin
-     * @param plotter
-     */
-    public void addCustomData(Plugin plugin, Plotter plotter) {
-        // The default graph for the plugin
-        Graph graph = getOrCreateDefaultGraph(plugin);
-
-        // Add the plotter to the graph o/
-        graph.addPlotter(plotter);
-
-        // Ensure the default graph is included in the submitted graphs
-        getOrCreateGraphs(plugin).add(graph);
-    }
-
-    /**
-     * Begin measuring a plugin
-     *
-     * @param plugin
-     */
-    public void beginMeasuringPlugin(final Plugin plugin) {
-        // Did we opt out?
-        if (configuration.getBoolean("opt-out", false)) {
-            return;
-        }
-
-        // Begin hitting the server with glorious data
-        plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
-            private boolean firstPost = true;
-
-            public void run() {
-                try {
-                    // We use the inverse of firstPost because if it is the first time we are posting,
-                    // it is not a interval ping, so it evaluates to FALSE
-                    // Each time thereafter it will evaluate to TRUE, i.e PING!
-                    postPlugin(plugin, !firstPost);
-
-                    // After the first post we set firstPost to false
-                    // Each post thereafter will be a ping
-                    firstPost = false;
-                } catch (IOException e) {
-                    System.out.println("[Metrics] " + e.getMessage());
-                }
-            }
-        }, 0, PING_INTERVAL * 1200);
-    }
-
-    /**
-     * Generic method that posts a plugin to the metrics website
-     *
-     * @param plugin
-     */
-    private void postPlugin(Plugin plugin, boolean isPing) throws IOException {
-        // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        PluginDescriptionFile description = plugin.getDescription();
-
-        // The author string, created with description.getAuthors()
-        // Authors are separated by a comma
-        String authors = "";
-
-        // Add each author to the string
-        for (String author : description.getAuthors()) {
-            authors += author + ", ";
-        }
-
-        // If there were any authors at all, we need to remove the last 2 characters
-        // the last 2 characters are the last comma and space
-        if (!authors.isEmpty()) {
-            authors = authors.substring(0, authors.length() - 2);
-        }
-
-        // Construct the post data
-        String data = encode("guid") + '=' + encode(guid)
-                + encodeDataPair("authors", authors)
-                + encodeDataPair("version", description.getVersion())
-                + encodeDataPair("server", Bukkit.getVersion())
-                + encodeDataPair("players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length))
-                + encodeDataPair("revision", String.valueOf(REVISION));
-
-        // If we're pinging, append it
-        if (isPing) {
-            data += encodeDataPair("ping", "true");
-        }
-
-        // Add any custom data available for the plugin
-        Set<Graph> graphs = getOrCreateGraphs(plugin);
-
-        // Acquire a lock on the graphs, which lets us make the assumption we also lock everything
-        // inside of the graph (e.g plotters)
-        synchronized(graphs) {
-            Iterator<Graph> iter = graphs.iterator();
-
-            while (iter.hasNext()) {
-                Graph graph = iter.next();
-
-                // Because we have a lock on the graphs set already, it is reasonable to assume
-                // that our lock transcends down to the individual plotters in the graphs also.
-                // Because our methods are private, no one but us can reasonably access this list
-                // without reflection so this is a safe assumption without adding more code.
-                for (Plotter plotter : graph.getPlotters()) {
-                    // The key name to send to the metrics server
-                    // The format is C-GRAPHNAME-PLOTTERNAME where separator - is defined at the top
-                    // Legacy (R4) submitters use the format Custom%s, or CustomPLOTTERNAME
-                    String key = String.format("C%s%s%s%s", CUSTOM_DATA_SEPARATOR, graph.getName(), CUSTOM_DATA_SEPARATOR, plotter.getColumnName());
-
-                    // The value to send, which for the foreseeable future is just the string
-                    // value of plotter.getValue()
-                    String value = Integer.toString(plotter.getValue());
-
-                    // Add it to the http post data :)
-                    data += encodeDataPair(key, value);
-                }
-            }
-        }
-
-        // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, plugin.getDescription().getName()));
-
-        // Connect to the website
-        URLConnection connection;
-
-        // Mineshafter creates a socks proxy, so we can safely bypass it
-        // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
-            connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
-            connection = url.openConnection();
-        }
-
-        connection.setDoOutput(true);
-
-        // Write the data
-        OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
-        writer.write(data);
-        writer.flush();
-
-        // Now read the response
-        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-        String response = reader.readLine();
-
-        // close resources
-        writer.close();
-        reader.close();
-
-        if (response.startsWith("ERR")) {
-            throw new IOException(response); //Throw the exception
-        } else {
-            // Is this the first update this hour?
-            if (response.contains("OK This is your first update this hour")) {
-                synchronized (graphs) {
-                    Iterator<Graph> iter = graphs.iterator();
-
-                    while (iter.hasNext()) {
-                        Graph graph = iter.next();
-
-                        for (Plotter plotter : graph.getPlotters()) {
-                            plotter.reset();
-                        }
-                    }
-                }
-            }
-        }
-        //if (response.startsWith("OK")) - We should get "OK" followed by an optional description if everything goes right
-    }
-
-    /**
-     * Get or create the Set of graphs for a specific plugin
-     *
-     * @param plugin
-     * @return
-     */
-    private Set<Graph> getOrCreateGraphs(Plugin plugin) {
-        Set<Graph> theGraphs = graphs.get(plugin);
-
-        // Create the Set if it does not already exist
-        if (theGraphs == null) {
-            theGraphs = Collections.synchronizedSet(new HashSet<Graph>());
-            graphs.put(plugin, theGraphs);
-        }
-
-        return theGraphs;
-    }
-
-    /**
-     * Get the default graph for a plugin and if it does not exist, create one
-     *
-     * @param plugin
-     * @return
-     */
-    private Graph getOrCreateDefaultGraph(Plugin plugin) {
-        Graph graph = defaultGraphs.get(plugin);
-
-        // Not yet created :(
-        if (graph == null) {
-            graph = new Graph(Graph.Type.Line, "Default");
-            defaultGraphs.put(plugin, graph);
-        }
-
-        return graph;
-    }
-
-    /**
-     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
-     *
-     * @return
-     */
-    private boolean isMineshafterPresent() {
-        try {
-            Class.forName("mineshafter.MineServer");
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
-     * key/value pair MUST be included manually, e.g:
-     * <p>
-     *     String httpData = encode("guid") + "=" + encode("1234") + encodeDataPair("authors") + "..";
-     * </p>
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    private static String encodeDataPair(String key, String value) throws UnsupportedEncodingException {
-        return "&" + encode(key) + "=" + encode(value);
-    }
-
-    /**
-     * Encode text as UTF-8
-     *
-     * @param text
-     * @return
-     */
-    private static String encode(String text) throws UnsupportedEncodingException {
-        return URLEncoder.encode(text, "UTF-8");
-    }
-
-    /**
-     * Represents a custom graph on the website
-     */
-    public static class Graph {
-
-        /**
-         * The graph's type that will be visible on the website
-         */
-        public static enum Type {
-
-            /**
-             * A simple line graph which also includes a scrollable timeline viewer to view
-             * as little or as much of the data as possible.
-             */
-            Line,
-
-            /**
-             * An area graph. This is the same as a line graph except the area under the curve is shaded
-             */
-            Area,
-
-            /**
-             * A column graph, which is a graph where the data is represented by columns on the vertical axis,
-             * i.e they go up and down.
-             */
-            Column,
-
-            /**
-             * A pie graph. The graph is generated by taking the data for the last hour and summing it
-             * together. Then the percentage for each plotter is calculated via round( (plot / total) * 100, 2 )
-             */
-            Pie
-
-        }
-
-        /**
-         * What the graph should be plotted as
-         */
-        private final Type type;
-
-        /**
-         * The graph's name, alphanumeric and spaces only :)
-         * If it does not comply to the above when submitted, it is rejected
-         */
-        private final String name;
-
-        /**
-         * The set of plotters that are contained within this graph
-         */
-        private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
-
-        private Graph(Type type, String name) {
-            this.type = type;
-            this.name = name;
-        }
-
-        /**
-         * Gets the graph's name
-         *
-         * @return
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Add a plotter to the graph, which will be used to plot entries
-         *
-         * @param plotter
-         */
-        public void addPlotter(Plotter plotter) {
-            plotters.add(plotter);
-        }
-
-        /**
-         * Remove a plotter from the graph
-         *
-         * @param plotter
-         */
-        public void removePlotter(Plotter plotter) {
-            plotters.remove(plotter);
-        }
-
-        /**
-         * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
-         * @return
-         */
-        public Set<Plotter> getPlotters() {
-            return Collections.unmodifiableSet(plotters);
-        }
-
-        @Override
-        public int hashCode() {
-            return (type.hashCode() * 17) ^ name.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (!(object instanceof Graph)) {
-                return false;
-            }
-
-            Graph graph = (Graph) object;
-            return graph.type == type && graph.name.equals(name);
-        }
-
-    }
-
-    /**
-     * Interface used to collect custom data for a plugin
-     */
-    public static abstract class Plotter {
-
-        /**
-         * The plot's name
-         */
-        private final String name;
-
-        /**
-         * Construct a plotter with the default plot name
-         */
-        public Plotter() {
-            this("Default");
-        }
-
-        /**
-         * Construct a plotter with a specific plot name
-         *
-         * @param name
-         */
-        public Plotter(String name) {
-            this.name = name;
-        }
-
-        /**
-         * Get the current value for the plotted point
-         *
-         * @return
-         */
-        public abstract int getValue();
-
-        /**
-         * Get the column name for the plotted point
-         *
-         * @return the plotted point's column name
-         */
-        public String getColumnName() {
-            return name;
-        }
-
-        /**
-         * Called after the website graphs have been updated
-         */
-        public void reset() {
-        }
-
-        @Override
-        public int hashCode() {
-            return getColumnName().hashCode() + getValue();
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (!(object instanceof Plotter)) {
-                return false;
-            }
-
-            Plotter plotter = (Plotter) object;
-            return plotter.name.equals(name) && plotter.getValue() == getValue();
-        }
-
-    }
-
-}

src/main/java/com/gmail/nossr50/Users.java

@@ -1,147 +0,0 @@
-package com.gmail.nossr50;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-
-public class Users {
-    private static volatile Users instance;
-
-    String location = "plugins/mcMMO/FlatFileStuff/mcmmo.users";
-    String directory = "plugins/mcMMO/FlatFileStuff/";
-    String directoryb = "plugins/mcMMO/FlatFileStuff/Leaderboards/";
-
-    public static HashMap<String, PlayerProfile> players = new HashMap<String, PlayerProfile>();
-
-    /**
-     * Load users.
-     */
-    public void loadUsers() {
-        new File(directory).mkdir();
-        new File(directoryb).mkdir();
-        File theDir = new File(location);
-
-        if (!theDir.exists()) {
-            try {
-                FileWriter writer = new FileWriter(theDir);
-                writer.close();
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Add a new user.
-     *
-     * @param player The player to create a user record for
-     */
-    public static void addUser(Player player) {
-        if (!players.containsKey(player.getName().toLowerCase())) {
-            players.put(player.getName().toLowerCase(), new PlayerProfile(player.getName()));
-        }
-    }
-
-    /**
-     * Clear all users.
-     */
-    public static void clearUsers() {
-        players.clear();
-    }
-
-    /**
-     * Get all PlayerProfiles.
-     *
-     * @return a HashMap containing the PlayerProfile of everyone in the database
-     */
-    public static HashMap<String, PlayerProfile> getProfiles() {
-        return players;
-    }
-
-    /**
-     * Remove a user from the database.
-     *
-     * @param player The player to remove
-     */
-    public static void removeUser(Player player) {
-
-        //Only remove PlayerProfile if user is offline and we have it in memory
-        if (!player.isOnline() && players.containsKey(player.getName().toLowerCase())) {
-            players.get(player.getName().toLowerCase()).save();
-            players.remove(player.getName().toLowerCase());
-        }
-    }
-
-    /**
-     * Remove a user from the DB by name.
-     *
-     * @param playerName The name of the player to remove
-     */
-    public static void removeUserByName(String playerName) {
-        players.remove(playerName.toLowerCase());
-    }
-
-    /**
-     * Get the profile of an online player.
-     *
-     * @param player The player whose profile to retrieve
-     * @return the player's profile
-     */
-    public static PlayerProfile getProfile(Player player) {
-        return getProfile(player.getName());
-    }
-    
-    /**
-     * Get the profile of an online player.
-     *
-     * @param player The player whose profile to retrieve
-     * @return the player's profile
-     */
-    public static PlayerProfile getProfile(String playerName) {
-        if (players.get(playerName.toLowerCase()) != null) {
-            return players.get(playerName.toLowerCase());
-        }
-        else {
-            players.put(playerName.toLowerCase(), new PlayerProfile(playerName));
-            return players.get(playerName.toLowerCase());
-        }
-    }
-
-    /**
-     * Get the profile of an offline player.
-     *
-     * @param player The player whose profile to retrieve
-     * @return the player's profile
-     */
-    public static PlayerProfile getOfflineProfile(OfflinePlayer player) {
-        return getOfflineProfile(player.getName());
-    }
-
-    /**
-     * Get the profile of an offline player.
-     *
-     * @param playerName Name of the player whose profile to retrieve
-     * @return the player's profile
-     */
-    public static PlayerProfile getOfflineProfile(String playerName) {
-        return new PlayerProfile(playerName, false);
-    }
-
-    /**
-     * Get an instance of this class.
-     *
-     * @return an instance of this class
-     */
-    public static Users getInstance() {
-        if (instance == null) {
-            instance = new Users();
-        }
-        return instance;
-    }
-}

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

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

@@ -0,0 +1,154 @@
+package com.gmail.nossr50.api;
+
+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.player.UserManager;
+
+public final class ChatAPI {
+    private ChatAPI() {}
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender
+     * @param displayName The display name of the sender
+     * @param party The name of the party to send to
+     * @param message The message to send
+     */
+    public static void sendPartyChat(Plugin plugin, String sender, String displayName, String party, String message) {
+        getPartyChatManager(plugin, party).handleChat(sender, displayName, message);
+    }
+
+    /**
+     * Send a message to all members of a party
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender to display in the chat
+     * @param party The name of the party to send to
+     * @param message The message to send
+     */
+    public static void sendPartyChat(Plugin plugin, String sender, String party, String message) {
+        getPartyChatManager(plugin, party).handleChat(sender, message);
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender
+     * @param displayName The display name of the sender
+     * @param message The message to send
+     */
+    public static void sendAdminChat(Plugin plugin, String sender, String displayName, String message) {
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, displayName, message);
+    }
+
+    /**
+     * Send a message to administrators
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param plugin The plugin sending the message
+     * @param sender The name of the sender to display in the chat
+     * @param message The message to send
+     */
+    public static void sendAdminChat(Plugin plugin, String sender, String message) {
+        ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN).handleChat(sender, message);
+    }
+
+    /**
+     * Check if a player is currently talking in party chat.
+     *
+     * @param player The player to check
+     * @return true if the player is using party chat, false otherwise
+     */
+    public static boolean isUsingPartyChat(Player player) {
+        return UserManager.getPlayer(player).isChatEnabled(ChatMode.PARTY);
+    }
+
+    /**
+     * Check if a player is currently talking in party chat.
+     *
+     * @param playerName The name of the player to check
+     * @return true if the player is using party chat, false otherwise
+     */
+    public static boolean isUsingPartyChat(String playerName) {
+        return UserManager.getPlayer(playerName).isChatEnabled(ChatMode.PARTY);
+    }
+
+    /**
+     * Check if a player is currently talking in admin chat.
+     *
+     * @param player The player to check
+     * @return true if the player is using admin chat, false otherwise
+     */
+    public static boolean isUsingAdminChat(Player player) {
+        return UserManager.getPlayer(player).isChatEnabled(ChatMode.ADMIN);
+    }
+
+    /**
+     * Check if a player is currently talking in admin chat.
+     *
+     * @param playerName The name of the player to check
+     * @return true if the player is using admin chat, false otherwise
+     */
+    public static boolean isUsingAdminChat(String playerName) {
+        return 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,136 +1,618 @@
-package com.gmail.nossr50.api;
-
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
-
-public class 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
-     */
-    private void checkXP(Player player, SkillType skillType) {
-        if (skillType.equals(SkillType.ALL)) {
-            Skills.XpCheckAll(player);
-        }
-        else {
-            Skills.XpCheckSkill(skillType, player);
-        }
-    }
-
-    /**
-     * Adds XP to the player, doesn't calculate for XP Rate or other modifiers.
-     * </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 void addRawXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXPOverride(skillType, XP);
-        checkXP(player, skillType);
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate but not skill modifiers.
-     * </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 void addMultipliedXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXPOverrideBonus(skillType, XP);
-        checkXP(player, skillType);
-    }
-
-    /**
-     * Adds XP to the player, calculates for XP Rate and skill modifiers.
-     * </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 void addXP(Player player, SkillType skillType, int XP) {
-        Users.getProfile(player).addXP(skillType, XP);
-        checkXP(player, 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 int getXP(Player player, SkillType skillType) {
-        return Users.getProfile(player).getSkillXpLevel(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 int getXPToNextLevel(Player player, SkillType skillType) {
-        return Users.getProfile(player).getXpToLevel(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 True if this should fire a level up notification, false otherwise.
-     */
-    public void addLevel(Player player, SkillType skillType, int levels, boolean notify) {
-        Users.getProfile(player).addLevels(skillType, levels);
-
-        if (notify) {
-            checkXP(player, 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 int getLevel(Player player, SkillType skillType) {
-        return Users.getProfile(player).getSkillLevel(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 int getPowerLevel(Player player) {
-        return Users.getProfile(player).getPowerLevel();
-    }
-}
+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);
+
+        if (skill == null) return false;
+
+        return !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,125 +1,190 @@
-package com.gmail.nossr50.api;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.util.ArrayList;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.party.Party;
-
-public class 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 String getPartyName(Player player) {
-        return Users.getProfile(player).getParty();
-    }
-
-    /**
-     * 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 boolean inParty(Player player) {
-        return Users.getProfile(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 boolean inSameParty(Player playera, Player playerb) {
-        return Party.getInstance().inSameParty(playera, playerb);
-    }
-
-    /**
-     * Get a list of all current party names.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @return the list of parties.
-     */
-    public ArrayList<String> getParties() {
-        String location = "plugins/mcMMO/mcmmo.users";
-        ArrayList<String> parties = new ArrayList<String>();
-
-        try {
-
-            //Open the users file
-            FileReader file = new FileReader(location);
-            BufferedReader in = new BufferedReader(file);
-            String line = "";
-
-            while((line = in.readLine()) != null) {
-                String[] character = line.split(":");
-                String theparty = null;
-
-                //Party
-                if (character.length > 3) {
-                    theparty = character[3];
-                }
-
-                if (!parties.contains(theparty)) {
-                    parties.add(theparty);
-                }
-            }
-            in.close();
-        }
-        catch (Exception e) {
-            Bukkit.getLogger().severe("Exception while reading " + location + " (Are you sure you formatted it correctly?)" + e.toString());
-        }
-        return parties;
-    }
-
-    /**
-     * 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 ArrayList<Player> getPartyMembers(Player player) {
-        return Party.getInstance().getPartyMembers(player);
-    }
-
-    /**
-     * 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 void addToParty(Player player, String partyName) {
-        Party.getInstance().addToParty(player, Users.getProfile(player), partyName, false, null);
-    }
-
-    /**
-     * Remove a player from a party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to remove
-     */
-    public void removeFromParty(Player player) {
-        Party.getInstance().removeFromParty(player, Users.getProfile(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/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

@@ -0,0 +1,53 @@
+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/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/commands/CommandHelper.java

@@ -1,138 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class CommandHelper {
-
-    /**
-     * Checks for command permissions.
-     *
-     * @param sender The command sender
-     * @param permission The permission to check
-     * @return true if the sender is a player without permissions, false otherwise
-     */
-    public static boolean noCommandPermissions(CommandSender sender, String permission) {
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-
-            if (player != null && !mcPermissions.getInstance().permission(player, permission)) {
-                player.sendMessage(mcLocale.getString("mcPlayerListener.NoPermission"));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Print out details on Gathering skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param display The sender to display stats to
-     * @param online true if the player to retrieve stats for is online, false otherwise
-     */
-    public static void printGatheringSkills(Player inspect, CommandSender display) {
-        if (Skills.hasGatheringSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
-
-            display.sendMessage(mcLocale.getString("Stats.GatheringHeader"));
-
-            if (mcPermissions.getInstance().excavation(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-            }
-
-            if (mcPermissions.getInstance().fishing(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-            }
-
-            if (mcPermissions.getInstance().herbalism(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-            }
-
-            if (mcPermissions.getInstance().mining(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-            }
-
-            if (mcPermissions.getInstance().woodcutting(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-            }
-        }
-    }
-
-    public static void printGatheringSkills(Player player) {
-        printGatheringSkills(player, player);
-    }
-
-    /**
-     * Print out details on Combat skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param display The sender to display stats to
-     * @param online true if the player to retrieve stats for is online, false otherwise
-     */
-    public static void printCombatSkills(Player inspect, CommandSender display) {
-        if (Skills.hasCombatSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
-
-            display.sendMessage(mcLocale.getString("Stats.CombatHeader"));
-
-            if (mcPermissions.getInstance().axes(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-            }
-
-            if (mcPermissions.getInstance().archery(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-            }
-
-            if (mcPermissions.getInstance().swords(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-            }
-
-            if (mcPermissions.getInstance().taming(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-            }
-
-            if (mcPermissions.getInstance().unarmed(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
-            }
-        }
-    }
-
-    public static void printCombatSkills(Player player) {
-        printCombatSkills(player, player);
-    }
-
-    /**
-     * Print out details on Misc skills. Only for online players.
-     *
-     * @param inspect The player to retrieve stats for
-     * @param display The sender to display stats to
-     * @param online true if the player to retrieve stats for is online, false otherwise
-     */
-    public static void printMiscSkills(Player inspect, CommandSender display) {
-        if (Skills.hasMiscSkills(inspect)) {
-            PlayerProfile PP = Users.getProfile(inspect);
-            display.sendMessage(mcLocale.getString("Stats.MiscHeader"));
-
-            if (mcPermissions.getInstance().acrobatics(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-            }
-
-            if (mcPermissions.getInstance().repair(inspect)) {
-                display.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-            }
-        }
-    }
-
-    public static void printMiscSkills(Player player) {
-        printMiscSkills(player, player);
-    }
-}

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

@@ -0,0 +1,67 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+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:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                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,109 @@
+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");
+                }
+
+                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,76 @@
+package com.gmail.nossr50.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+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:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                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/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.config.Config;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+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,52 @@
+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.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.party.Party;
+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;
+            }
+
+            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,54 @@
+package com.gmail.nossr50.commands.database;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+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.getPlayer(playerName, true) == 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:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                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,145 @@
+package com.gmail.nossr50.commands.experience;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+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.getPlayer(playerName, true);
+
+                // 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:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                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,167 @@
+package com.gmail.nossr50.commands.experience;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+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.getPlayer(playerName, true);
+
+                // 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:
+                Set<String> playerNames = UserManager.getPlayerNames();
+                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/general/AddlevelsCommand.java

@@ -1,91 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
-
-public class AddlevelsCommand implements CommandExecutor{
-    private final mcMMO plugin;
-
-    public AddlevelsCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player modifiedPlayer;
-        int levels;
-        SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addlevels <playername> <skillname> <levels>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            if (sender instanceof Player) {
-                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-                    modifiedPlayer = (Player) sender;
-                    levels = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = m.getCapitalized(skill.toString());
-                    }
-
-                    Users.getProfile(modifiedPlayer).addLevels(skill, levels);
-                    sender.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            modifiedPlayer = plugin.getServer().getPlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-
-            if (modifiedPlayer != null && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-                levels = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                Users.getProfile(modifiedPlayer).addLevels(skill, levels);
-
-                if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
-                }
-                else {
-                    skillName = m.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + levels + " levels in " + skillName + "!"); //TODO: Needs more locale.
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,106 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.skills.Skills;
-
-public class AddxpCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public AddxpCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player modifiedPlayer;
-        int xp;
-        SkillType skill;
-        String skillName;
-        String usage = ChatColor.RED + "Proper usage is /addxp <playername> <skillname> <xp>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.tools.mmoedit")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            if (sender instanceof Player) {
-                if (m.isInt(args[1]) && Skills.isSkill(args[0])) {
-                    modifiedPlayer = (Player) sender;
-                    xp = Integer.valueOf(args[1]);
-                    skill = Skills.getSkillType(args[0]);
-
-                    Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
-
-                    if (skill.equals(SkillType.ALL)) {
-                        skillName = "all skills";
-                    }
-                    else {
-                        skillName = m.getCapitalized(skill.toString());
-                    }
-
-                    modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
-
-                    if (skill.equals(SkillType.ALL)) {
-                        Skills.XpCheckAll(modifiedPlayer);
-                    }
-                    else {
-                        Skills.XpCheckSkill(skill, modifiedPlayer);
-                    }
-                }
-            }
-            else {
-                sender.sendMessage(usage);
-            }
-
-            return true;
-
-        case 3:
-            modifiedPlayer = plugin.getServer().getPlayer(args[0]);
-            String playerName = modifiedPlayer.getName();
-
-            if (modifiedPlayer != null && m.isInt(args[2]) && Skills.isSkill(args[1])) {
-                xp = Integer.valueOf(args[2]);
-                skill = Skills.getSkillType(args[1]);
-                String message;
-
-                Users.getProfile(modifiedPlayer).addXPOverride(skill, xp);
-
-                if (skill.equals(SkillType.ALL)) {
-                    skillName = "all skills";
-                    message = ChatColor.RED + "All skills have been modified for " + playerName + "."; //TODO: Use locale
-                }
-                else {
-                    skillName = m.getCapitalized(skill.toString());
-                    message = ChatColor.RED + skillName + " has been modified for " + playerName + "."; //TODO: Use locale
-                }
-
-                sender.sendMessage(message);
-                modifiedPlayer.sendMessage(ChatColor.GREEN + "You were awarded " + xp + " experience in " + skillName + "!"); //TODO: Needs more locale.
-
-                if (skill.equals(SkillType.ALL)) {
-                    Skills.XpCheckAll(modifiedPlayer);
-                }
-                else {
-                    Skills.XpCheckSkill(skill, modifiedPlayer);
-                }
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,92 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class InspectCommand implements CommandExecutor {
-    private final mcMMO plugin;
-
-    public InspectCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player target;
-        PlayerProfile PP;
-        String usage = "Proper usage is /inspect <playername>"; //TODO: Needs more locale.
-
-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.inspect")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 1:
-            target = plugin.getServer().getPlayer(args[0]);
-
-            if (target != null) {
-                PP = Users.getProfile(target);
-
-                if (sender instanceof Player && !sender.isOp() && !m.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0)) {
-                    sender.sendMessage(mcLocale.getString("Inspect.TooFar"));
-                    return true;
-                }
-
-                sender.sendMessage(mcLocale.getString("Inspect.Stats", new Object[] { target.getName() }));
-                CommandHelper.printGatheringSkills(target, sender);
-                CommandHelper.printCombatSkills(target, sender);
-                CommandHelper.printMiscSkills(target, sender);
-                sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel", new Object[] { PP.getPowerLevel() }));
-            }
-            else {
-                PP = Users.getOfflineProfile(args[0]);
-
-                if (sender instanceof Player && !sender.isOp()) {
-                    sender.sendMessage(mcLocale.getString("Inspect.Offline"));
-                    return true;
-                }
-
-                if (!PP.isLoaded()) {
-                    sender.sendMessage(mcLocale.getString("Inspect.DoesNotExist"));
-                    return true;
-                }
-
-                sender.sendMessage(mcLocale.getString("Inspect.OfflineStats", new Object[] { args[0] }));
-
-                sender.sendMessage(mcLocale.getString("Stats.GatheringHeader"));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING) }));
-
-                sender.sendMessage(mcLocale.getString("Stats.CombatHeader"));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED) }));
-
-                sender.sendMessage(mcLocale.getString("Stats.MiscHeader"));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS) }));
-                sender.sendMessage(mcLocale.getString("m.SkillStats", new Object[] { mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR) }));
-            }
-
-            return true;
-
-        default:
-            sender.sendMessage(usage);
-            return true;
-        }
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class McstatsCommand implements CommandExecutor {
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-        if (!(sender instanceof Player)) {
-            sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-            return true;
-        }
-
-		PlayerProfile PP = Users.getProfile(player);
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.YourStats"));
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.NoSkillNote"));
-
-		ChatColor header = ChatColor.GOLD;
-
-		if (Skills.hasGatheringSkills(player)) {
-			player.sendMessage(header + "-=GATHERING SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().excavation(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ExcavationSkill"), PP.getSkillLevel(SkillType.EXCAVATION), PP.getSkillXpLevel(SkillType.EXCAVATION), PP.getXpToLevel(SkillType.EXCAVATION)));
-			if (mcPermissions.getInstance().fishing(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.FishingSkill"), PP.getSkillLevel(SkillType.FISHING), PP.getSkillXpLevel(SkillType.FISHING), PP.getXpToLevel(SkillType.FISHING)));
-			if (mcPermissions.getInstance().herbalism(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.HerbalismSkill"), PP.getSkillLevel(SkillType.HERBALISM), PP.getSkillXpLevel(SkillType.HERBALISM), PP.getXpToLevel(SkillType.HERBALISM)));
-			if (mcPermissions.getInstance().mining(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.MiningSkill"), PP.getSkillLevel(SkillType.MINING), PP.getSkillXpLevel(SkillType.MINING), PP.getXpToLevel(SkillType.MINING)));
-			if (mcPermissions.getInstance().woodcutting(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.WoodcuttingSkill"), PP.getSkillLevel(SkillType.WOODCUTTING), PP.getSkillXpLevel(SkillType.WOODCUTTING), PP.getXpToLevel(SkillType.WOODCUTTING)));
-		}
-		if (Skills.hasCombatSkills(player)) {
-			player.sendMessage(header + "-=COMBAT SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().axes(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AxesSkill"), PP.getSkillLevel(SkillType.AXES), PP.getSkillXpLevel(SkillType.AXES), PP.getXpToLevel(SkillType.AXES)));
-			if (mcPermissions.getInstance().archery(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.ArcherySkill"), PP.getSkillLevel(SkillType.ARCHERY), PP.getSkillXpLevel(SkillType.ARCHERY), PP.getXpToLevel(SkillType.ARCHERY)));
-			if (mcPermissions.getInstance().swords(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.SwordsSkill"), PP.getSkillLevel(SkillType.SWORDS), PP.getSkillXpLevel(SkillType.SWORDS), PP.getXpToLevel(SkillType.SWORDS)));
-			if (mcPermissions.getInstance().taming(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.TamingSkill"), PP.getSkillLevel(SkillType.TAMING), PP.getSkillXpLevel(SkillType.TAMING), PP.getXpToLevel(SkillType.TAMING)));
-			if (mcPermissions.getInstance().unarmed(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.UnarmedSkill"), PP.getSkillLevel(SkillType.UNARMED), PP.getSkillXpLevel(SkillType.UNARMED), PP.getXpToLevel(SkillType.UNARMED)));
-		}
-
-		if (Skills.hasMiscSkills(player)) {
-			player.sendMessage(header + "-=MISC SKILLS=-"); //TODO: Needs more locale.
-			if (mcPermissions.getInstance().acrobatics(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.AcrobaticsSkill"), PP.getSkillLevel(SkillType.ACROBATICS), PP.getSkillXpLevel(SkillType.ACROBATICS), PP.getXpToLevel(SkillType.ACROBATICS)));
-			if (mcPermissions.getInstance().repair(player))
-				player.sendMessage(Skills.getSkillStats(mcLocale.getString("mcPlayerListener.RepairSkill"), PP.getSkillLevel(SkillType.REPAIR), PP.getSkillXpLevel(SkillType.REPAIR), PP.getXpToLevel(SkillType.REPAIR)));
-		}
-		player.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevel") + ChatColor.GREEN + (PP.getPowerLevel()));
-
-		return true;
-	}
-}

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

@@ -1,116 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-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.Users;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class MmoeditCommand implements CommandExecutor {
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		Player player = null;
-        if (sender instanceof Player) 
-        {
-            player = (Player) sender;
-        }
-		
-        if (player != null && !mcPermissions.getInstance().mmoedit(player)) {
-			sender.sendMessage("This command requires permissions."); //TODO: Needs more locale.
-			return true;
-		}
-
-		if (!(sender instanceof Player)) 
-		{
-			if (args.length < 2) 
-			{
-				System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-				return true;
-			} else if (args.length == 3)
-			{
-			    PlayerProfile PPt = null;
-			    
-			    if(Users.players.containsKey(args[0].toLowerCase())) {
-			        PPt = Users.players.get(args[0].toLowerCase());
-			    } else
-			        PPt = Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
-			        
-			    if(!PPt.isLoaded())
-		        {
-		            sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale.
-		            return true;
-		        }
-			    
-				if (m.isInt(args[2]) && Skills.isSkill(args[1])) 
-				{
-					int newvalue = Integer.valueOf(args[2]);
-					Users.getOfflineProfile(args[0]).modifyskill(Skills.getSkillType(args[1]), newvalue);
-					System.out.println(args[1] + " has been modified for " + args[0] + "."); //TODO: Needs more locale.
-				}
-			} else 
-			{
-				System.out.println("Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-			}
-
-			return true;
-		}
-
-		if (!mcPermissions.getInstance().mmoedit(player)) 
-		{
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		
-		if (args.length < 2) 
-		{
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-			return true;
-		}
-		if (args.length == 3) 
-		{
-		    PlayerProfile PPt = null;
-            
-            if(Users.players.containsKey(args[0].toLowerCase())) {
-                PPt = Users.players.get(args[0].toLowerCase());
-            }
-            
-            if(PPt == null)
-                Users.getOfflineProfile(args[0]); //Only grab offline profile if the above failed
-            
-		    if(!PPt.isLoaded())
-	        {
-	            sender.sendMessage("Player does not exist in the database!"); //TODO: Needs more locale.
-	            return true;
-	        }
-		    
-			if (m.isInt(args[2]) && Skills.isSkill(args[1])) 
-			{
-				int newvalue = Integer.valueOf(args[2]);
-				PPt.modifyskill(Skills.getSkillType(args[1]), newvalue);
-				player.sendMessage(ChatColor.RED + args[1] + " has been modified for "+args[0]); //TODO: Needs more locale.
-			}
-		} else if (args.length == 2) 
-		{
-			if (m.isInt(args[1]) && Skills.isSkill(args[0])) 
-			{
-			    PlayerProfile PP = Users.getProfile(player);
-				int newvalue = Integer.valueOf(args[1]);
-				PP.modifyskill(Skills.getSkillType(args[0]), newvalue);
-				player.sendMessage(ChatColor.RED + args[0] + " has been modified."); //TODO: Needs more locale.
-			}
-		} else 
-		{
-			player.sendMessage(ChatColor.RED + "Usage is /mmoedit playername skillname newvalue"); //TODO: Needs more locale.
-		}
-
-		return true;
-	}
-}

src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java

@@ -1,51 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.Bukkit;
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.runnables.SQLConversionTask;
-
-public class MmoupdateCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-
-		if (!mcPermissions.getInstance().admin(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		player.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
-		Users.clearUsers();
-		convertToMySQL();
-		for (Player x : Bukkit.getServer().getOnlinePlayers()) {
-			Users.addUser(x);
-		}
-		player.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
-
-		return true;
-	}
-	
-	/**
-     * Convert FlatFile data to MySQL data.
-     */
-    private void convertToMySQL() {
-        if (!LoadProperties.useMySQL) {
-            return;
-        }
-
-        Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1);
-    }
-}

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

@@ -1,124 +0,0 @@
-package com.gmail.nossr50.commands.general;
-
-import org.bukkit.Bukkit;
-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.m;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class XprateCommand implements CommandExecutor {
-	private static int oldrate = LoadProperties.xpGainMultiplier;
-	
-	public static boolean xpevent = false;
-	
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			if(args.length <= 0)
-			{
-				System.out.println(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-				System.out.println(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-			}
-			
-			if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-			{
-				if(xpevent)
-				{
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-						x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-					xpevent = !xpevent;
-					LoadProperties.xpGainMultiplier = oldrate;
-				} else
-				{
-					LoadProperties.xpGainMultiplier = oldrate;
-				}
-			}
-			
-			if(args.length >= 1 && m.isInt(args[0]))
-			{
-				oldrate = LoadProperties.xpGainMultiplier;
-				
-				if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-				{
-					if(args[1].equalsIgnoreCase("true"))
-						xpevent = true;
-					else
-						xpevent = false;
-				} else
-				{
-					System.out.println(mcLocale.getString("Commands.xprate.proper3"));
-					return true;
-				}
-				LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-				if(xpevent = true)
-					for(Player x : Bukkit.getServer().getOnlinePlayers())
-					{
-						x.sendMessage(ChatColor.GOLD+"XP EVENT FOR mcMMO HAS STARTED!"); //TODO: Needs more locale.
-						x.sendMessage(ChatColor.GOLD+"mcMMO XP RATE IS NOW "+LoadProperties.xpGainMultiplier+"x!!"); //TODO: Needs more locale.
-					}
-				
-				System.out.println("The XP RATE was modified to "+LoadProperties.xpGainMultiplier); //TODO: Needs more locale.
-			}
-			
-			return true;
-		}
-		
-		Player player = (Player) sender;
-		
-		if(!mcPermissions.getInstance().admin(player))
-		{
-			player.sendMessage(ChatColor.YELLOW+"[mcMMO] "+ChatColor.DARK_RED +mcLocale.getString("mcPlayerListener.NoPermission"));  
-			return true;
-		}
-		if(args.length <= 0)
-		{
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper", new Object[] {"xprate"}));
-			player.sendMessage(mcLocale.getString("Commands.xprate.proper2", new Object[] {"xprate"}));
-		}
-		if(args.length == 1 && args[0].equalsIgnoreCase("reset"))
-		{
-			if(xpevent)
-			{
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-					x.sendMessage(mcLocale.getString("Commands.xprate.over"));
-				xpevent = !xpevent;
-				LoadProperties.xpGainMultiplier = oldrate;
-			} else
-			{
-				LoadProperties.xpGainMultiplier = oldrate;
-			}
-		}
-		if(args.length >= 1 && m.isInt(args[0]))
-		{
-			oldrate = LoadProperties.xpGainMultiplier;
-			
-			if(args.length >= 2 && (args[1].equalsIgnoreCase("true") || args[1].equalsIgnoreCase("false")))
-			{
-				if(args[1].equalsIgnoreCase("true"))
-					xpevent = true;
-				else
-					xpevent = false;
-			} else
-			{
-				player.sendMessage(mcLocale.getString("Commands.xprate.proper3"));
-				return true;
-			}
-			LoadProperties.xpGainMultiplier = m.getInt(args[0]);
-			if(xpevent = true)
-				for(Player x : Bukkit.getServer().getOnlinePlayers())
-				{
-					x.sendMessage(mcLocale.getString("Commands.xprate.started"));
-					x.sendMessage(mcLocale.getString("Commands.xprate.started2", new Object[] {LoadProperties.xpGainMultiplier}));
-				}
-		}
-		
-		return true;
-	}
-}

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/mc/McabilityCommand.java

@@ -1,44 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McabilityCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null && !mcPermissions.getInstance().mcAbility(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (PP.getAbilityUse()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOff"));
-			PP.toggleAbilityUse();
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesOn"));
-			PP.toggleAbilityUse();
-		}
-
-		return true;
-	}
-}

src/main/java/com/gmail/nossr50/commands/mc/MccCommand.java

@@ -1,63 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-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.mcPermissions;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class MccCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage.");
-			return true;
-		}
-
-		Player player = (Player) sender;
-
-		player.sendMessage(ChatColor.RED + "---[]" + ChatColor.YELLOW + "mcMMO Commands" + ChatColor.RED + "[]---"); //TODO: Needs more locale.
-
-		if (mcPermissions.getInstance().party(player)) {
-			player.sendMessage(mcLocale.getString("m.mccPartyCommands"));
-			player.sendMessage("/party " + mcLocale.getString("m.mccParty"));
-			player.sendMessage("/party q " + mcLocale.getString("m.mccPartyQ"));
-
-			if (mcPermissions.getInstance().partyChat(player))
-				player.sendMessage("/p " + mcLocale.getString("m.mccPartyToggle"));
-
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyInvite"));
-			player.sendMessage("/invite " + mcLocale.getString("m.mccPartyAccept"));
-
-			if (mcPermissions.getInstance().partyTeleport(player))
-				player.sendMessage("/ptp " + mcLocale.getString("m.mccPartyTeleport"));
-		}
-		player.sendMessage(mcLocale.getString("m.mccOtherCommands"));
-		player.sendMessage("/mcstats " + ChatColor.RED + mcLocale.getString("m.mccStats"));
-		player.sendMessage("/mctop <skillname> <page> " + ChatColor.RED + mcLocale.getString("m.mccLeaderboards"));
-
-		if (mcPermissions.getInstance().mcAbility(player))
-			player.sendMessage("/mcability " + ChatColor.RED + mcLocale.getString("m.mccToggleAbility"));
-
-		if (mcPermissions.getInstance().adminChat(player))
-			player.sendMessage("/a " + ChatColor.RED + mcLocale.getString("m.mccAdminToggle"));
-
-		if (mcPermissions.getInstance().inspect(player))
-			player.sendMessage("/inspect " + mcLocale.getString("m.mccInspect"));
-
-		if (mcPermissions.getInstance().mmoedit(player))
-			player.sendMessage("/mmoedit " + mcLocale.getString("m.mccMmoedit"));
-
-		if (mcPermissions.getInstance().mcgod(player))
-			player.sendMessage("/mcgod " + ChatColor.RED + mcLocale.getString("m.mccMcGod"));
-
-		player.sendMessage(mcLocale.getString("m.mccSkillInfo"));
-		player.sendMessage("/mcmmo " + mcLocale.getString("m.mccModDescription"));
-
-		return true;
-	}
-}

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

@@ -1,43 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McgodCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mcgod(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-        if (mcPermissions.getInstance().mcgod(player)) {
-			if (PP.getGodMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeDisabled"));
-				PP.toggleGodMode();
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.GodModeEnabled"));
-				PP.toggleGodMode();
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,43 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-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 org.getspout.spoutapi.player.SpoutPlayer;
-
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McmmoCommand implements CommandExecutor {
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-
-		String description = mcLocale.getString("mcMMO.Description", new Object[] { "mcc" });
-		String[] mcSplit = description.split(",");
-
-		for (String x : mcSplit) {
-			player.sendMessage(x);
-		}
-
-		if (LoadProperties.spoutEnabled && player instanceof SpoutPlayer) {
-			SpoutPlayer sPlayer = (SpoutPlayer) player;
-			if (LoadProperties.donateMessage)
-				sPlayer.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"nossr50@gmail.com"); //Where'd our notification go?
-		} else {
-			if (LoadProperties.donateMessage)
-			    player.sendMessage(ChatColor.YELLOW + "[mcMMO]"+ChatColor.GOLD+" Donate! Paypal "+ChatColor.GREEN+"nossr50@gmail.com");
-		}
-
-		return true;
-	}
-}

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

@@ -1,68 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-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.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.AbilityType;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.datatypes.ToolType;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McrefreshCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public McrefreshCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().mcrefresh(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-		if (args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			player.sendMessage("You have refreshed " + args[0] + "'s cooldowns!"); //TODO: Needs more locale.
-			player = plugin.getServer().getPlayer(args[0]);
-		}
-
-		/*
-		 * PREP MODES
-		 */
-		PP = Users.getProfile(player);
-		PP.setRecentlyHurt((long) 0);
-		PP.setToolPreparationMode(ToolType.AXE, false);
-		PP.setToolPreparationMode(ToolType.FISTS, false);
-		PP.setToolPreparationMode(ToolType.HOE, false);
-		PP.setToolPreparationMode(ToolType.PICKAXE, false);
-		PP.setToolPreparationMode(ToolType.SWORD, false);
-
-		//RESET COOLDOWNS
-		PP.resetCooldowns();
-		PP.setAbilityMode(AbilityType.GREEN_TERRA, false);
-		PP.setAbilityMode(AbilityType.GIGA_DRILL_BREAKER, false);
-		PP.setAbilityMode(AbilityType.SERRATED_STRIKES, false);
-		PP.setAbilityMode(AbilityType.SUPER_BREAKER, false);
-		PP.setAbilityMode(AbilityType.TREE_FELLER, false);
-		PP.setAbilityMode(AbilityType.BERSERK, false);
-
-		player.sendMessage(mcLocale.getString("mcPlayerListener.AbilitiesRefreshed"));
-
-		return true;
-	}
-}

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

@@ -1,109 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import org.bukkit.Bukkit;
-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.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class McremoveCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Player player = null;
-        
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-        if (player != null && !mcPermissions.getInstance().mcremove(player)) {
-            player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-            return true;
-        }
-        
-        if(args.length == 0)
-        {
-            sender.sendMessage("Correct usage is /mcremove [Player Name]"); //TODO: Needs more locale.
-            return true;
-        }
-        
-        String playerName = args[0]; //Player that we are going to remove
-        
-        //If the server is using MySQL
-        if(LoadProperties.useMySQL)
-        {
-            int userId = mcMMO.database.getInt("SELECT id FROM "+LoadProperties.MySQLtablePrefix+"users WHERE user = '" + playerName + "'");
-            
-            //Remove user from tables
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"users WHERE "
-                    +LoadProperties.MySQLtablePrefix+"users.id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"cooldowns WHERE "
-                    +LoadProperties.MySQLtablePrefix+"cooldowns.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"huds WHERE "
-                    +LoadProperties.MySQLtablePrefix+"huds.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-                    +LoadProperties.MySQLdbName+"."
-                    +LoadProperties.MySQLtablePrefix+"skills WHERE "
-                    +LoadProperties.MySQLtablePrefix+"skills.user_id="+userId);
-            
-            mcMMO.database.write("DELETE FROM "
-            +LoadProperties.MySQLdbName+"."
-            +LoadProperties.MySQLtablePrefix+"experience WHERE "
-            +LoadProperties.MySQLtablePrefix+"experience.user_id="+userId);
-
-            sender.sendMessage("User "+playerName+" removed from MySQL DB!"); //TODO: Needs more locale.
-        } else {
-            //FlatFile removal
-            //TODO: Properly remove users from FlatFile, it's going to be a huge bitch with how our FlatFile system works. Let's adopt SQLite support.
-            if(Bukkit.getServer().getPlayer(playerName) != null)
-            {
-                Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
-                if(targetPlayer.isOnline()) 
-                {
-                    Users.getProfile(targetPlayer).resetAllData();
-                    sender.sendMessage("User "+playerName+" removed from FlatFile DB!"); //TODO: Needs more locale.
-                } else {
-                    sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale.
-                    return true;
-                }
-            } else {
-                sender.sendMessage("[mcMMO] This command is not fully functional for FlatFile yet, the player needs to be online."); //TODO: Needs more locale.
-                return true;
-            }
-        }
-        
-        //Force PlayerProfile stuff to update
-        if(Bukkit.getServer().getPlayer(playerName) != null)
-        {
-            Player targetPlayer = Bukkit.getServer().getPlayer(playerName);
-            if(targetPlayer.isOnline())
-            {
-                targetPlayer.kickPlayer("[mcMMO] Stats have been reset! Rejoin!"); //TODO: Needs more locale.
-                Users.removeUserByName(playerName);
-            } else {
-                Users.removeUser(targetPlayer);
-            }
-        } else {
-            Users.removeUserByName(playerName);
-        }
-        
-        sender.sendMessage("[mcMMO] mcremove operation completed."); //TODO: Needs more locale.
-        
-        return true;
-    }
-}

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

@@ -1,186 +0,0 @@
-package com.gmail.nossr50.commands.mc;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import com.gmail.nossr50.Leaderboard;
-import com.gmail.nossr50.m;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.SkillType;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.skills.Skills;
-
-public class MctopCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (LoadProperties.useMySQL == false) {
-			/*
-			 * POWER LEVEL INFO RETRIEVAL
-			 */
-			if (args.length == 0) {
-				int p = 1;
-				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				int n = 1 * p; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-			if (args.length >= 1 && m.isInt(args[0])) {
-				int p = 1;
-				// Grab page value if specified
-				if (args.length >= 1) {
-					if (m.isInt(args[0])) {
-						p = Integer.valueOf(args[0]);
-					}
-				}
-				int pt = p;
-				if (p > 1) {
-					pt -= 1;
-					pt += (pt * 10);
-					pt = 10;
-				}
-				String[] info = Leaderboard.retrieveInfo(SkillType.ALL.toString(), p);
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				int n = 1 * pt; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-			/*
-			 * SKILL SPECIFIED INFO RETRIEVAL
-			 */
-			if (args.length >= 1 && Skills.isSkill(args[0])) {
-				int p = 1;
-				// Grab page value if specified
-				if (args.length >= 2) {
-					if (m.isInt(args[1])) {
-						p = Integer.valueOf(args[1]);
-					}
-				}
-				int pt = p;
-				if (p > 1) {
-					pt -= 1;
-					pt += (pt * 10);
-					pt = 10;
-				}
-				String firstLetter = args[0].substring(0, 1); // Get first letter
-				String remainder = args[0].substring(1); // Get remainder of word.
-				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
-
-				String[] info = Leaderboard.retrieveInfo(args[0].toUpperCase(), p);
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
-				int n = 1 * pt; // Position
-				for (String x : info) {
-					if (x != null) {
-						String digit = String.valueOf(n);
-						if (n < 10)
-							digit = "0" + String.valueOf(n);
-						String[] splitx = x.split(":");
-						// Format: 1. Playername - skill value
-						sender.sendMessage(digit + ". " + ChatColor.GREEN + splitx[1] + " - " + ChatColor.WHITE + splitx[0]);
-						n++;
-					}
-				}
-			}
-		} else {
-			/*
-			 * MYSQL LEADERBOARDS
-			 */
-			String powerlevel = "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing";
-			if (args.length >= 1 && Skills.isSkill(args[0])) {
-				/*
-				 * Create a nice consistent capitalized leaderboard name
-				 */
-				String lowercase = args[0].toLowerCase(); // For the query
-				String firstLetter = args[0].substring(0, 1); // Get first letter
-				String remainder = args[0].substring(1); // Get remainder of word.
-				String capitalized = firstLetter.toUpperCase() + remainder.toLowerCase();
-
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.SkillLeaderboard", new Object[] { capitalized }));
-				if (args.length >= 2 && m.isInt(args[1])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[1]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
-
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				// If no page number is specified
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + lowercase + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + lowercase + " > 0 ORDER BY `" + LoadProperties.MySQLtablePrefix + "skills`.`" + lowercase + "` DESC ");
-				for (int i = 1; i <= 10; i++) { // i<=userslist.size()
-					if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-				}
-				return true;
-			}
-			if (args.length >= 0) {
-				sender.sendMessage(mcLocale.getString("mcPlayerListener.PowerLevelLeaderboard"));
-				if (args.length >= 1 && m.isInt(args[0])) {
-					int n = 1; // For the page number
-					int n2 = Integer.valueOf(args[0]);
-					if (n2 > 1) {
-						// Figure out the 'page' here
-						n = 10;
-						n = n * (n2 - 1);
-					}
-					// If a page number is specified
-					HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-					for (int i = n; i <= n + 10; i++) {
-						if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-							break;
-						HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-						sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					}
-					return true;
-				}
-				HashMap<Integer, ArrayList<String>> userslist = mcMMO.database.read("SELECT " + powerlevel + ", user_id FROM " + LoadProperties.MySQLtablePrefix + "skills WHERE " + powerlevel + " > 0 ORDER BY " + powerlevel + " DESC ");
-				for (int i = 1; i <= 10; i++) {
-					if (i > userslist.size() || mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'") == null)
-						break;
-					HashMap<Integer, ArrayList<String>> username = mcMMO.database.read("SELECT user FROM " + LoadProperties.MySQLtablePrefix + "users WHERE id = '" + Integer.valueOf(userslist.get(i).get(1)) + "'");
-					sender.sendMessage(String.valueOf(i) + ". " + ChatColor.GREEN + userslist.get(i).get(0) + " - " + ChatColor.WHITE + username.get(1).get(0));
-					// System.out.println(username.get(1).get(0));
-					// System.out.println("Mining : " + userslist.get(i).get(0) + ", User id : " + userslist.get(i).get(1));
-				}
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,86 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-
-public class ACommand implements CommandExecutor {
-
-	public ACommand() {}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		// Console message?
-		if (!(sender instanceof Player) && args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + "*Console*" + ChatColor.AQUA + "} ";
-
-			Bukkit.getLogger().info("[A]<*Console*> " + aMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		Player player = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-        }
-
-		if (player != null && !mcPermissions.getInstance().adminChat(player) && !player.isOp()) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		// Not a toggle, a message
-
-		if (args.length >= 1) {
-			String aMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				aMessage = aMessage + " " + args[i];
-			}
-
-			String name = (LoadProperties.aDisplayNames) ? player.getDisplayName() : player.getName();
-			String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + name + ChatColor.AQUA + "} ";
-			Bukkit.getLogger().info("[A]<" + name + "> " + aMessage);
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (mcPermissions.getInstance().adminChat(herp) || herp.isOp())
-					herp.sendMessage(aPrefix + aMessage);
-			}
-			return true;
-		}
-
-		if(player != null)
-		{
-			PlayerProfile PP = Users.getProfile(player);
-			
-			if (PP.getPartyChatMode())
-				PP.togglePartyChat();
-	
-			PP.toggleAdminChat();
-	
-			if (PP.getAdminChatMode()) {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOn"));
-			} else {
-				player.sendMessage(mcLocale.getString("mcPlayerListener.AdminChatOff"));
-			}
-		}
-		return true;
-	}
-}

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

@@ -1,65 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class AcceptCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		if (PP.hasPartyInvite()) {
-			Party Pinstance = Party.getInstance();
-
-			if (PP.inParty()) {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), PP.getInvite(), EventReason.CHANGED_PARTIES);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-				Pinstance.removeFromParty(player, PP);
-			}
-			else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, PP.getInvite(), EventReason.JOINED_PARTY);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-			}
-            PP.acceptInvite();
-            Pinstance.addToParty(player, PP, PP.getParty(), true, null);
-
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NoInvites"));
-		}
-
-		return true;
-	}
-}

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

@@ -1,66 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-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.Users;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class InviteCommand implements CommandExecutor {
-	private final mcMMO plugin;
-
-	public InviteCommand(mcMMO instance) {
-		this.plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		Party Pinstance = Party.getInstance();
-
-		if (!PP.inParty()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.NotInParty"));
-			return true;
-		}
-		if (args.length < 1) {
-			player.sendMessage(ChatColor.RED + "Usage is /invite <playername>"); //TODO: Needs more locale.
-			return true;
-		}
-		if (PP.inParty() && args.length >= 1 && (plugin.getServer().getPlayer(args[0]) != null)) {
-			if (Pinstance.canInvite(player, PP)) {
-				Player target = plugin.getServer().getPlayer(args[0]);
-				PlayerProfile PPt = Users.getProfile(target);
-				PPt.modifyInvite(PP.getParty());
-
-				player.sendMessage(mcLocale.getString("mcPlayerListener.InviteSuccess"));
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite1", new Object[] { PPt.getInvite(), player.getName() }));
-				target.sendMessage(mcLocale.getString("mcPlayerListener.ReceivedInvite2", new Object[] { "accept" }));
-			} else {
-				player.sendMessage(mcLocale.getString("Party.Locked"));
-				return true;
-			}
-		}
-
-		return true;
-	}
-}

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

@@ -1,94 +0,0 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.config.LoadProperties;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class PCommand implements CommandExecutor {
-	public PCommand() {}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		// Console message?
-		if (!(sender instanceof Player)) {
-			if (args.length < 2)
-				return true;
-			String pMessage = args[1];
-			for (int i = 2; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
-
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + "*Console*" + ChatColor.GREEN + ") ";
-
-			Bukkit.getLogger().info("[P](" + args[0] + ")" + "<*Console*> " + pMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Users.getProfile(herp).getParty().equalsIgnoreCase(args[0])) {
-						herp.sendMessage(pPrefix + pMessage);
-					}
-				}
-			}
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		// Not a toggle, a message
-
-		if (args.length >= 1) {
-			if(!PP.inParty()) {
-				player.sendMessage("You're not in a party."); //TODO: Use mcLocale
-				return true;
-			}
-			
-			String pMessage = args[0];
-			for (int i = 1; i <= args.length - 1; i++) {
-				pMessage = pMessage + " " + args[i];
-			}
-
-			String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
-			String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") ";
-			Bukkit.getLogger().info("[P](" + PP.getParty() + ")<" + name + "> " + pMessage);
-
-			for (Player herp : Bukkit.getServer().getOnlinePlayers()) {
-				if (Users.getProfile(herp).inParty()) {
-					if (Party.getInstance().inSameParty(herp, player))
-						herp.sendMessage(pPrefix + pMessage);
-				}
-			}
-
-			return true;
-		}
-
-		if (PP.getAdminChatMode())
-			PP.toggleAdminChat();
-
-		PP.togglePartyChat();
-
-		if (PP.getPartyChatMode()) {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOn"));
-		} else {
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyChatOff"));
-		}
-
-		return true;
-	}
-}

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

@@ -1,269 +1,227 @@
-package com.gmail.nossr50.commands.party;
-
-import org.bukkit.Bukkit;
-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.Users;
-import com.gmail.nossr50.mcPermissions;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.locale.mcLocale;
-import com.gmail.nossr50.party.Party;
-
-public class PartyCommand implements CommandExecutor {
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-
-		if (!(sender instanceof Player)) {
-			sender.sendMessage("This command does not support console useage."); //TODO: Needs more locale.
-			return true;
-		}
-
-		Player player = (Player) sender;
-		PlayerProfile PP = Users.getProfile(player);
-
-		if (!mcPermissions.getInstance().party(player)) {
-			player.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
-			return true;
-		}
-
-		Party Pinstance = Party.getInstance();
-
-		if (PP.inParty() && (!Pinstance.isParty(PP.getParty()) || !Pinstance.isInParty(player, PP))) {
-			Pinstance.addToParty(player, PP, PP.getParty(), false, null);
-		}
-
-		if (args.length == 0 && !PP.inParty()) {
-			player.sendMessage(mcLocale.getString("Party.Help1", new Object[] { "party "}));
-			player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "party "}));
-			player.sendMessage(mcLocale.getString("Party.Help3", new Object[] { "party " }));
-			return true;
-		} else if (args.length == 0 && PP.inParty()) {
-			String tempList = "";
-			int x = 0;
-			for (Player p : Bukkit.getServer().getOnlinePlayers()) {
-				if (PP.getParty().equals(Users.getProfile(p).getParty())) {
-					if (p != null && x + 1 >= Pinstance.partyCount(player)) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName();
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName();
-							x++;
-						}
-					}
-					if (p != null && x < Pinstance.partyCount(player)) {
-						if (Pinstance.isPartyLeader(p.getName(), PP.getParty())) {
-							tempList += ChatColor.GOLD + p.getName() + ", ";
-							x++;
-						} else {
-							tempList += ChatColor.WHITE + p.getName() + ", ";
-							x++;
-						}
-					}
-				}
-			}
-			player.sendMessage(mcLocale.getString("mcPlayerListener.YouAreInParty", new Object[] { PP.getParty() }));
-			player.sendMessage(mcLocale.getString("mcPlayerListener.PartyMembers") + " (" + tempList + ChatColor.GREEN + ")");
-			
-			//Master Apprentice Stuff
-			//Show the player all their bonuses when they type /party
-			
-			/*
-			for(Player a : Party.getInstance().getPartyMembers(player))
-			{
-			    if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && !a.getName().equals(player.getName()))
-			    {
-			        PlayerProfile LP = Users.getProfile(a);
-			        for(SkillType type : SkillType.values())
-			        {
-			            //Skip this one
-			            if(type == SkillType.ALL)
-			                continue;
-			            
-			            if(LP.getSkillLevel(type) > PP.getSkillLevel(type))
-			            {
-			                //Tell them what their skill bonus is for this skill
-        			        int leaderLevel = LP.getSkillLevel(type); 
-        		            int difference = leaderLevel - PP.getSkillLevel(type);
-        		            
-        		            double bonusModifier = (difference*0.75D)/100D;
-        		            double trueBonus = bonusModifier * 100;
-        		            player.sendMessage("You get "+trueBonus+"% more XP from "+type.toString());
-        		            //double percent = (trueBonus/100)*100;
-			            } else
-			            {
-			                //Tell them they have no bonus.. or not
-			            }
-			        }
-			    } else if(Party.getInstance().isPartyLeader(a.getName(), PP.getParty()) && a.getName().equals(player.getName()))
-			    {
-			        //Tell them they are providing bonuses
-			    }
-			}
-			*/
-            
-			return true;
-		} else if (args.length == 1) {
-			if (args[0].equals("q") && PP.inParty()) {
-
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), null, EventReason.LEFT_PARTY);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-				Pinstance.removeFromParty(player, PP);
-				player.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-				return true;
-
-			} else if (args[0].equalsIgnoreCase("?")) {
-				player.sendMessage(mcLocale.getString("Party.Help4", new Object[] { "party " }));
-				player.sendMessage(mcLocale.getString("Party.Help2", new Object[] { "party " }));
-				player.sendMessage(mcLocale.getString("Party.Help5", new Object[] { "party " }));
-				player.sendMessage(mcLocale.getString("Party.Help6", new Object[] { "party " }));
-				player.sendMessage(mcLocale.getString("Party.Help7", new Object[] { "party " }));
-				player.sendMessage(mcLocale.getString("Party.Help8", new Object[] { "party " }));
-				player.sendMessage(mcLocale.getString("Party.Help9", new Object[] { "party " }));
-			} else if (args[0].equalsIgnoreCase("lock")) {
-				if (PP.inParty()) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-						Pinstance.lockParty(PP.getParty());
-						player.sendMessage(mcLocale.getString("Party.Locked"));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
-				}
-			} else if (args[0].equalsIgnoreCase("unlock")) {
-				if (PP.inParty()) {
-					if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-						Pinstance.unlockParty(PP.getParty());
-						player.sendMessage(mcLocale.getString("Party.Unlocked"));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.NotOwner"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.InvalidName"));
-				}
-				// Party debugging command.
-				// } else if (args[0].equalsIgnoreCase("dump")) {
-				// Pinstance.dump(player);
-			} else {
-				if (PP.inParty()) {
-				    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), args[0], EventReason.CHANGED_PARTIES);
-				    Bukkit.getPluginManager().callEvent(event);
-
-				    if (event.isCancelled()) {
-				        return true;
-				    }
-
-					Pinstance.removeFromParty(player, PP);
-				}
-				else {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
-                    Bukkit.getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-				}
-				Pinstance.addToParty(player, PP, args[0], false, null);
-				return true;
-			}
-		} else if (args.length == 2 && PP.inParty()) {
-			if (args[0].equalsIgnoreCase("password")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Pinstance.setPartyPassword(PP.getParty(), args[1]);
-						player.sendMessage(mcLocale.getString("Party.PasswordSet", new Object[] { args[1] }));
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("kick")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					if (Pinstance.isPartyLocked(PP.getParty())) {
-						Player tPlayer = null;
-						if (Bukkit.getServer().getPlayer(args[1]) != null)
-							tPlayer = Bukkit.getServer().getPlayer(args[1]);
-						if (tPlayer == null) {
-							player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { args[1] }));
-						}
-						if (!Pinstance.inSameParty(player, tPlayer)) {
-							player.sendMessage(mcLocale.getString("Party.NotInYourParty", new Object[] { tPlayer.getName() }));
-						} else {
-							// Not an admin
-							if (!mcPermissions.getInstance().admin(player)) {
-								// Can't kick an admin
-								if (mcPermissions.getInstance().admin(tPlayer)) {
-									player.sendMessage(mcLocale.getString("Party.CouldNotKick", new Object[] { tPlayer.getName() }));
-								}
-							}
-							PlayerProfile tPP = Users.getProfile(tPlayer);
-
-			                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, tPP.getParty(), null, EventReason.KICKED_FROM_PARTY);
-			                Bukkit.getPluginManager().callEvent(event);
-
-			                if (event.isCancelled()) {
-			                    return true;
-			                }
-
-							Pinstance.removeFromParty(tPlayer, tPP);
-
-							tPlayer.sendMessage(mcLocale.getString("mcPlayerListener.LeftParty"));
-						}
-					} else {
-						player.sendMessage(mcLocale.getString("Party.IsntLocked"));
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else if (args[0].equalsIgnoreCase("owner")) {
-				if (Pinstance.isPartyLeader(player.getName(), PP.getParty())) {
-					Player tPlayer = null;
-					if (Bukkit.getServer().getPlayer(args[1]) != null)
-						tPlayer = Bukkit.getServer().getPlayer(args[1]);
-					if (tPlayer == null) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { args[1] }));
-					}
-					if (!Pinstance.inSameParty(player, tPlayer)) {
-						player.sendMessage(mcLocale.getString("Party.CouldNotSetOwner", new Object[] { tPlayer.getName() }));
-					} else {
-						Pinstance.setPartyLeader(PP.getParty(), tPlayer.getName());
-					}
-				} else {
-					player.sendMessage(mcLocale.getString("Party.NotOwner"));
-				}
-			} else {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, PP.getParty(), args[0], EventReason.CHANGED_PARTIES);
-                Bukkit.getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-				Pinstance.removeFromParty(player, PP);
-				Pinstance.addToParty(player, PP, args[0], false, args[1]);
-			}
-		} else if (args.length == 2 && !PP.inParty()) {
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, null, args[0], EventReason.JOINED_PARTY);
-            Bukkit.getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-			Pinstance.addToParty(player, PP, args[0], false, args[1]);
-		}
-
-		return true;
-	}
-}
+package com.gmail.nossr50.commands.party;
+
+import java.util.*;
+
+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.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:
+                        Set<String> playerNames = UserManager.getPlayerNames();
+                        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) {
+                            playerNames = UserManager.getPlayerNames();
+                            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 - 1);
+    }
+
+    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 expshare"));
+                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.getPlayer(targetName, true);
+
+                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;
+        }
+    }
+}