Added new active ability, Charge, to Taming

We can assume a player knows how scoreboards work after showing them
the tips a few times across multiple login sessions

Adds #1833

Changelog.txt

@@ -7,24 +7,66 @@ Key:
   ! Change
   - Removal
 
-Version 1.5.01-dev
+Version 1.5.02-dev
+ + Added new active ability "Charge" to Taming!
+ + Added option to config.yml for Chimaera Wings to stop using bed spawn points
+ = Fixed bug where no Mining XP was granted when Flux Mining was successful
+ = Fixed bug where MobHealthbarTypes were not saved between server restarts
+ ! Changed Flux Mining mechanics. In order to use the ability, you need to infuse a pickaxe with furnace powers first.
+ ! Scoreboard tips are only shown a couple of times to the player, instead of once per login session
+
+Version 1.5.01
  + Added new child skill; Salvage
+ + Added UUID support!
+ + Added SQL connection pooling and async loading!
+ + Added the long awaited Diminished Returns feature
  + Added new feature to Herbalism. Instantly-regrown crops are protected from being broken for 1 second
  + Added option to config.yml to show the /mcstats scoreboard automatically after logging in
  + Added option to config.yml for Alchemy. Skills.Alchemy.Prevent_Hopper_Transfer_Bottles
+ + Added option to config.yml for Scoreboards, display "Ability" instead of ability names on the scoreboards
+ + Added options to experience.yml for Dirt and Sand variations
  + Added support for `MATERIAL|data` format in treasures.yml
  + Added API to experience events to get XP gain reason
  + Added API to check if an entity is bleeding
+ + Added API to ExperienceAPI to get the amount of XP needed for a level
+ + Added API class SkillAPI used to get a list of valid skill names
+ + Added API events for hardcore features, McMMOPlayerPreDeathPenaltyEvent, McMMOPlayerStatLossEvent and McMMOPlayerVampirismEvent
+ + Added API to ExperienceAPI to specify if XP can be shared
+ + Added options to tools.yml and armor.yml config files to set a pretty repair material name
+ + Added full support for repairables in tools.yml and armor.yml config files
+ + Added magical mod config file import command, for Cauldron 1.7+. Check wiki for usage
+ + Added particle effects and sounds to "Call of the Wild" (Taming)
+ + Added summon length to "Call of the Wild". Summons will now commit suicide after their lifespan expires
+ + Added feature which makes tamed wolves attack a target shot by the owner
+ = Fixed bug where pistons would mess with the block tracking
  = Fixed bug where the Updater was running on the main thread.
  = Fixed bug when players would use /ptp without being in a party
  = Fixed bug where player didn't have a mcMMOPlayer object in AsyncPlayerChatEvent
  = Fixed bug where dodge would check the wrong player skill level
  = Fixed bug which causes /party teleport to stop working
  = Fixed bug where SaveTimerTask would produce an IndexOutOfBoundsException
+ = Fixed bug where Alchemy would not fire BrewEvents
+ = Fixed bug with setting custom names and lore in treasures config
+ = Fixed bug which would cause a NullPointerException with getFlowerAndGrassXp()
+ = Fixed bug which could cause and SQLException regarding the connection property 'maxReconnects'.
+ = Fixed bug where falling blocks were incorrectly tracked
+ = Fixed bug where items would get deleted when in Berserk with a full inventory
+ = Fixed bug where the console would not correctly show party chat colors
+ = Fixed bug where party chat was using non thread safe methods
+ = Fixed bug where Blast Mining unlock levels could be to high in certain occasions
+ = Fixed bug where Blast Minings ability "Demolition Expert" would not work
+ = Fixed bug where Repair_Material_Quantity wasn't read in mod config files
+ ! Changed SecondaryAbilityEvent to implement Cancellable and it now gets fired for damage related secondary abilities
+ ! Changed the way mcMMO handles bonus damage, updated for the new damage event API
  ! Changed player data saving. Save tasks are now asynchronous
  ! Vanished players no longer get hit by AoE effects
  ! Changed Alchemy config option 'Prevent_Hopper_Transfer' renamed to 'Prevent_Hopper_Transfer_Ingredients'
  ! Changed Alchemy XP distribution. XP is granted based on the stage of the potion.
+ ! Changed behavior of the Blast Mining ability "Demolition Expert"; now only decreases damage for the ability user
+ ! Updated for new getOnlinePlayers() behavior
+ ! Updated for new blocks and entities
+ ! Changed McMMOPlayerDeathPenaltyEvent to get fired after hardcore penalty calculations, use McMMOPlayerPreDeathPenaltyEvent for old behavior
+ ! Moved Refresh_Chunks setting from hidden.yml to config.yml
  - Removed salvage ability from Repair, salvage has it's own (child) skill now
 
 Version 1.5.00

README.md

@@ -1,8 +1,8 @@
 # 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/).
+### Builds
+Currently, you can obtain our builds via the Spigot resource page: http://www.spigotmc.org/resources/mcmmo.2445/
 
 ### 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.
@@ -10,11 +10,10 @@ The goal of mcMMO is to take core Minecraft game mechanics and expand them into
 ## 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
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
+(https://github.com/gmcferrin)
 [![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
 (https://github.com/bm01)
 [![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
@@ -48,4 +47,4 @@ Required Libraries:
 * EMetrics
 * Bukkit
 
-http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
+http://www.spigotmc.org/resources/mcmmo.2445/ for more up to date information.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,68 +1,68 @@
-# Config created by Dragyn
-# Created For twilightforest-1.20.3 
+# Config created by joulesbeef
+# Created For twilightforest-2.2.3
 #
 #
 #  Settings for Boots
 ###
-Boots:  
+Boots:
     # Ironwood
-    X27978:
+    TWILIGHTFOREST_ITEM_IRONWOODBOOTS:
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Fiery
-    X27995:
+    TWILIGHTFOREST_ITEM_FIERYBOOTS:
         Repairable: true
-        Repair_Material: X27991
+        Repair_Material: TWILIGHTFOREST_ITEM_FIERYINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Stealeaf
-    X28002:
+    TWILIGHTFOREST_ITEM_STEELEAFBOOTS:
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28037:
+    TWILIGHTFOREST_ITEM_KNIGHTLYBOOTS:
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
-        
+
 #
 #  Settings for Chestplates
 ###
 Chestplates:
     # Ironwood
-    X27976:
+    TWILIGHTFOREST_ITEM_IRONWOODPLATE:
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Fiery
-    X27993:
+    TWILIGHTFOREST_ITEM_FIERYPLATE:
         Repairable: true
-        Repair_Material: X27991
+        Repair_Material: TWILIGHTFOREST_ITEM_FIERYINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Stealeaf
-    X28000:
+    TWILIGHTFOREST_ITEM_STEELEAFPLATE:
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28035:
+    TWILIGHTFOREST_ITEM_KNIGHTLYPLATE:
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
@@ -72,63 +72,61 @@ Chestplates:
 ###
 Helmets:
     # Ironwood
-    X27975:
+    TWILIGHTFOREST_ITEM_IRONWOODHELM:
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Fiery
-    X27992:
+    TWILIGHTFOREST_ITEM_FIERYHELM:
         Repairable: true
-        Repair_Material: X27991
+        Repair_Material: TWILIGHTFOREST_ITEM_FIERYINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Stealeaf
-    X27999:
+    TWILIGHTFOREST_ITEM_STEELEAFHELM:
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28034:
+    TWILIGHTFOREST_ITEM_KNIGHTLYHELM:
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 500
-
-#
+        Durability: 50
 #  Settings for Leggings
 ###
 Leggings:
     # Ironwood
-    X27977:
+    TWILIGHTFOREST_ITEM_IRONWOODLEGS:
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Fiery
-    X27994:
+    TWILIGHTFOREST_ITEM_FIERYLEGS:
         Repairable: true
-        Repair_Material: X27991
+        Repair_Material: TWILIGHTFOREST_ITEM_FIERYINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Stealeaf
-    X28001:
+    TWILIGHTFOREST_ITEM_STEELEAFLEGS:
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28036:
+    TWILIGHTFOREST_ITEM_KNIGHTLYLEGS:
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 500
+        Durability: 500

extras/mods/1.7.x/twilightforest.blocks.yml

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

extras/mods/1.7.x/twilightforest.entities.yml

@@ -0,0 +1,152 @@
+# Config created by joulesbeef
+# Created For twilightforest-2.2.3
+#
+#  Settings for Custom Mobs
+MoCreatures-Ogre:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-TwilightLich:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-HelmetCrab:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-SlimeBeetle:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-TwilightWraith:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-Naga:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+MoCreatures-Shark:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-TowerTermite:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+MoCreatures-SmallFish:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-Redcap:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-YetiBoss:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+MoCreatures-HellRat:
+  Class: Monster
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-Hydra:
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-Firefly:
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-KnightPhantom:
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+TwilightForest-TowerGolem:
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0
+MoCreatures-FishBowl:
+  XP_Multiplier: 1.0
+  Tameable: false
+  Taming_XP: 0
+  CanBeSummoned: false
+  COTW_Material: ''
+  COTW_Material_Data: 0
+  COTW_Material_Amount: 0

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

@@ -1,73 +1,71 @@
-# Config created by Dragyn
-# Created For twilightforest-1.20.3 
+# Config created by joulesbeef
+# Created For twilightforest-2.2.3
 #
 #
 #  Settings for Axes
 ###
 Axes:
     # Ironwood
-    X27982:
+    TWILIGHTFOREST_ITEM_IRONWOODAXE:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Steeleaf
-    X31989:
+    TWILIGHTFOREST_ITEM_STEELEAFAXE:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28040:
+    TWILIGHTFOREST_ITEM_KNIGHTLYAXE:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Minotaur
-    X31984:
+    TWILIGHTFOREST_ITEM_MINOTAURAXE:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X264
+        Repair_Material: Diamond
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
-
-
 #
 #  Settings for Hoes
 ###
 Hoes:
     # Ironwood
-    X27983:
+    TWILIGHTFOREST_ITEM_IRONWOODHOE:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Steeleaf
-    X31988:
+    TWILIGHTFOREST_ITEM_STEELEAFHOE:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
@@ -77,42 +75,42 @@ Hoes:
 ###
 Pickaxes:
     # Ironwood
-    X27981:
+    TWILIGHTFOREST_ITEM_IRONWOODPICK:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Fiery
-    X27997:
+    TWILIGHTFOREST_ITEM_FIERYPICK:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27991
+        Repair_Material: TWILIGHTFOREST_ITEM_FIERYINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Steeleaf
-    X28005:
+    TWILIGHTFOREST_ITEM_STEELEAFPICK:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28039:
+    TWILIGHTFOREST_ITEM_KNIGHTLYPICK:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
@@ -121,22 +119,22 @@ Pickaxes:
 ###
 Shovels:
     # Ironwood
-    X27980:
+    TWILIGHTFOREST_ITEM_IRONWOODSHOVEL:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Steeleaf
-    X28004:
+    TWILIGHTFOREST_ITEM_STEELEAFSHOVEL:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
@@ -145,42 +143,42 @@ Shovels:
 ###
 Swords:
     # Ironwood
-    X27979:
+    TWILIGHTFOREST_ITEM_IRONWOODSWORD:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27974
+        Repair_Material: TWILIGHTFOREST_ITEM_IRONWOODINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Fiery
-    X27996:
+    TWILIGHTFOREST_ITEM_FIERYSWORD:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27991
+        Repair_Material: TWILIGHTFOREST_ITEM_FIERYINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Steeleaf
-    X28003:
+    TWILIGHTFOREST_ITEM_STEELEAFSWORD:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X27998
+        Repair_Material: TWILIGHTFOREST_ITEM_STEELEAFINGOT
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
         Durability: 500
     # Knightmetal
-    X28038:
+    TWILIGHTFOREST_ITEM_KNIGHTLYSWORD:
         XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
-        Repair_Material: X28032
+        Repair_Material: TWILIGHTFOREST_ITEM_KNIGHTMETAL
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 500
+        Durability: 500

extras/mods/railcraft.armor.yml

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

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.5.01-SNAPSHOT</version>
+    <version>1.5.02-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -76,6 +76,9 @@
                     <artifactSet>
                         <includes>
                             <include>com.turt2live.metrics:MetricsExtension</include>
+                            <include>commons-logging:commons-logging</include>
+                            <include>org.apache.tomcat:tomcat-jdbc</include>
+                            <include>org.apache.tomcat:tomcat-juli</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -83,6 +86,18 @@
                             <pattern>com.turt2live.metrics</pattern>
                             <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.logging</pattern>
+                            <shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.juli</pattern>
+                            <shadedPattern>com.gmail.nossr50.database.tomcat.juli</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.tomcat</pattern>
+                            <shadedPattern>com.gmail.nossr50.database.tomcat</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -105,12 +120,8 @@
     </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>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
         </repository>
         <repository>
             <id>Plugin MetricsExtension</id>
@@ -121,9 +132,9 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>LATEST</version>
+            <version>1.8-R0.1-SNAPSHOT</version>
             <type>jar</type>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -136,22 +147,24 @@
             <artifactId>MetricsExtension</artifactId>
             <version>0.0.5-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>7.0.52</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <distributionManagement>
         <repository>
-            <id>md_5-releases</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
+            <id>drtshock-releases</id>
+            <url>https://ci.drtshock.net/plugin/repository/everything/com/gmail/nossr50/mcMMO/</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>
+        <url>https://ci.drtshock.net/job/mcmmo/</url>
     </ciManagement>
 </project>

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

@@ -1,15 +1,20 @@
 package com.gmail.nossr50.api;
 
 import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.api.exceptions.InvalidFormulaTypeException;
 import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
 import com.gmail.nossr50.api.exceptions.InvalidSkillException;
 import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException;
+import com.gmail.nossr50.api.exceptions.McMMOPlayerNotFoundException;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.XPGainReason;
@@ -83,9 +88,40 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addRawXP(Player player, String skillType, float XP, String xpGainReason) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        addRawXP(player, skillType, XP, xpGainReason, false);
     }
 
+    /**
+     * Adds raw XP to the player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @param xpGainReason The reason to gain XP
+     * @param isUnshared true if the XP cannot be shared with party members
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
+     */
+    public static void addRawXP(Player player, String skillType, float XP, String xpGainReason, boolean isUnshared) {
+        if (isUnshared) {
+            getPlayer(player).beginUnsharedXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+            return;
+        }
+
+        getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+    }
+
+    /**
+     * Adds raw XP to an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @deprecated We're using float for our XP values now
+     * replaced by {@link #addRawXPOffline(String playerName, String skillType, float XP)}
+     */
     @Deprecated
     public static void addRawXPOffline(String playerName, String skillType, int XP) {
         addRawXPOffline(playerName, skillType, (float) XP);
@@ -96,6 +132,9 @@ public final class ExperienceAPI {
      * </br>
      * This function is designed for API usage.
      *
+     * @deprecated We're using uuids to get an offline player
+     * replaced by {@link #addRawXPOffline(UUID uuid, String skillType, float XP)}
+     *
      * @param playerName The player to add XP to
      * @param skillType The skill to add XP to
      * @param XP The amount of XP to add
@@ -103,10 +142,27 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static void addRawXPOffline(String playerName, String skillType, float XP) {
         addOfflineXP(playerName, getSkillType(skillType), (int) Math.floor(XP));
     }
 
+    /**
+     * Adds raw XP to an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid The UUID of 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(UUID uuid, String skillType, float XP) {
+        addOfflineXP(uuid, getSkillType(skillType), (int) Math.floor(XP));
+    }
+
     /**
      * Adds XP to the player, calculates for XP Rate only.
      * </br>
@@ -137,7 +193,7 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addMultipliedXP(Player player, String skillType, int XP, String xpGainReason) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
     }
 
     /**
@@ -152,6 +208,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static void addMultipliedXPOffline(String playerName, String skillType, int XP) {
         addOfflineXP(playerName, getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
@@ -186,9 +243,32 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason) {
+        addModifiedXP(player, skillType, XP, xpGainReason, false);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate and skill modifier.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @param xpGainReason The reason to gain XP
+     * @param isUnshared true if the XP cannot be shared with party members
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
+     */
+    public static void addModifiedXP(Player player, String skillType, int XP, String xpGainReason, boolean isUnshared) {
         SkillType skill = getSkillType(skillType);
 
-        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+        if (isUnshared) {
+            getPlayer(player).beginUnsharedXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
+            return;
+        }
+
+        getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
     }
 
     /**
@@ -203,6 +283,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static void addModifiedXPOffline(String playerName, String skillType, int XP) {
         SkillType skill = getSkillType(skillType);
 
@@ -241,7 +322,31 @@ public final class ExperienceAPI {
      * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
      */
     public static void addXP(Player player, String skillType, int XP, String xpGainReason) {
-        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+        addXP(player, skillType, XP, xpGainReason, false);
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate, skill modifiers, perks, child skills,
+     * and party sharing.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @param xpGainReason The reason to gain XP
+     * @param isUnshared true if the XP cannot be shared with party members
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
+     */
+    public static void addXP(Player player, String skillType, int XP, String xpGainReason, boolean isUnshared) {
+        if (isUnshared) {
+            getPlayer(player).beginUnsharedXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
+            return;
+        }
+
+        getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason));
     }
 
     /**
@@ -257,7 +362,7 @@ public final class ExperienceAPI {
      * @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));
+        return getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -273,10 +378,28 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
+    @Deprecated
     public static int getOfflineXP(String playerName, String skillType) {
         return getOfflineProfile(playerName).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 uuid 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(UUID uuid, String skillType) {
+        return getOfflineProfile(uuid).getSkillXpLevel(getNonChildSkillType(skillType));
+    }
+
     /**
      * Get the raw amount of XP a player has in a specific skill.
      * </br>
@@ -290,7 +413,7 @@ public final class ExperienceAPI {
      * @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));
+        return getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
@@ -306,10 +429,28 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
+    @Deprecated
     public static float getOfflineXPRaw(String playerName, String skillType) {
         return getOfflineProfile(playerName).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 uuid 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(UUID uuid, String skillType) {
+        return getOfflineProfile(uuid).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+    }
+
     /**
      * Get the total amount of XP needed to reach the next level.
      * </br>
@@ -323,7 +464,7 @@ public final class ExperienceAPI {
      * @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));
+        return getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -339,10 +480,28 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
+    @Deprecated
     public static int getOfflineXPToNextLevel(String playerName, String skillType) {
         return getOfflineProfile(playerName).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 uuid 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(UUID uuid, String skillType) {
+        return getOfflineProfile(uuid).getXpToLevel(getNonChildSkillType(skillType));
+    }
+
     /**
      * Get the amount of XP remaining until the next level.
      * </br>
@@ -358,7 +517,7 @@ public final class ExperienceAPI {
     public static int getXPRemaining(Player player, String skillType) {
         SkillType skill = getNonChildSkillType(skillType);
 
-        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
+        PlayerProfile profile = getPlayer(player).getProfile();
 
         return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
     }
@@ -376,14 +535,34 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
+    @Deprecated
     public static int getOfflineXPRemaining(String playerName, String skillType) {
         SkillType skill = getNonChildSkillType(skillType);
-
         PlayerProfile profile = getOfflineProfile(playerName);
 
         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 uuid 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 float getOfflineXPRemaining(UUID uuid, String skillType) {
+        SkillType skill = getNonChildSkillType(skillType);
+        PlayerProfile profile = getOfflineProfile(uuid);
+
+        return profile.getXpToLevel(skill) - profile.getSkillXpLevelRaw(skill);
+    }
+
     /**
      * Add levels to a skill.
      * </br>
@@ -396,7 +575,7 @@ public final class ExperienceAPI {
      * @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);
+        getPlayer(player).addLevels(getSkillType(skillType), levels);
     }
 
     /**
@@ -411,6 +590,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static void addLevelOffline(String playerName, String skillType, int levels) {
         PlayerProfile profile = getOfflineProfile(playerName);
         SkillType skill = getSkillType(skillType);
@@ -430,6 +610,37 @@ public final class ExperienceAPI {
         profile.scheduleAsyncSave();
     }
 
+    /**
+     * Add levels to a skill for an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid 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(UUID uuid, String skillType, int levels) {
+        PlayerProfile profile = getOfflineProfile(uuid);
+        SkillType skill = getSkillType(skillType);
+
+        if (skill.isChildSkill()) {
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
+
+            for (SkillType parentSkill : parentSkills) {
+                profile.addLevels(parentSkill, (levels / parentSkills.size()));
+            }
+
+            profile.scheduleAsyncSave();
+            return;
+        }
+
+        profile.addLevels(skill, levels);
+        profile.scheduleAsyncSave();
+    }
+
     /**
      * Get the level a player has in a specific skill.
      * </br>
@@ -442,7 +653,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevel(Player player, String skillType) {
-        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
+        return getPlayer(player).getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -457,10 +668,27 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static int getLevelOffline(String playerName, String skillType) {
         return getOfflineProfile(playerName).getSkillLevel(getSkillType(skillType));
     }
 
+    /**
+     * Get the level an offline player has in a specific skill.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid 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(UUID uuid, String skillType) {
+        return getOfflineProfile(uuid).getSkillLevel(getSkillType(skillType));
+    }
+
     /**
      * Gets the power level of a player.
      * </br>
@@ -470,7 +698,7 @@ public final class ExperienceAPI {
      * @return the power level of the player
      */
     public static int getPowerLevel(Player player) {
-        return UserManager.getPlayer(player).getPowerLevel();
+        return getPlayer(player).getPowerLevel();
     }
 
     /**
@@ -483,6 +711,7 @@ public final class ExperienceAPI {
      *
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static int getPowerLevelOffline(String playerName) {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(playerName);
@@ -494,6 +723,27 @@ public final class ExperienceAPI {
         return powerLevel;
     }
 
+    /**
+     * Gets the power level of an offline player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid 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(UUID uuid) {
+        int powerLevel = 0;
+        PlayerProfile profile = getOfflineProfile(uuid);
+
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
+            powerLevel += profile.getSkillLevel(type);
+        }
+
+        return powerLevel;
+    }
+
     /**
      * Get the level cap of a specific skill.
      * </br>
@@ -533,10 +783,28 @@ public final class ExperienceAPI {
      *
      * @return the position on the leaderboard
      */
+    @Deprecated
     public static int getPlayerRankSkill(String playerName, String skillType) {
         return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(getNonChildSkillType(skillType));
     }
 
+    /**
+     * Get the position on the leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid 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(UUID uuid, String skillType) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(uuid).getPlayerName()).get(getNonChildSkillType(skillType));
+    }
 
     /**
      * Get the position on the power level leaderboard of a player.
@@ -549,10 +817,26 @@ public final class ExperienceAPI {
      *
      * @return the position on the power level leaderboard
      */
+    @Deprecated
     public static int getPlayerRankOverall(String playerName) {
         return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
     }
 
+    /**
+     * Get the position on the power level leaderboard of a player.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid 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(UUID uuid) {
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(uuid).getPlayerName()).get(null);
+    }
+
     /**
      * Sets the level of a player in a specific skill type.
      * </br>
@@ -565,7 +849,7 @@ public final class ExperienceAPI {
      * @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);
+        getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -580,10 +864,27 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      * @throws InvalidPlayerException if the given player does not exist in the database
      */
+    @Deprecated
     public static void setLevelOffline(String playerName, String skillType, int skillLevel) {
         getOfflineProfile(playerName).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 uuid 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(UUID uuid, String skillType, int skillLevel) {
+        getOfflineProfile(uuid).modifySkill(getSkillType(skillType), skillLevel);
+    }
+
     /**
      * Sets the XP of a player in a specific skill type.
      * </br>
@@ -597,7 +898,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void setXP(Player player, String skillType, int newValue) {
-        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+        getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -613,10 +914,28 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
+    @Deprecated
     public static void setXPOffline(String playerName, String skillType, int newValue) {
         getOfflineProfile(playerName).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 uuid 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(UUID uuid, String skillType, int newValue) {
+        getOfflineProfile(uuid).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+    }
+
     /**
      * Removes XP from a player in a specific skill type.
      * </br>
@@ -630,7 +949,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static void removeXP(Player player, String skillType, int xp) {
-        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+        getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
     }
 
     /**
@@ -646,12 +965,64 @@ public final class ExperienceAPI {
      * @throws InvalidPlayerException if the given player does not exist in the database
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
+    @Deprecated
     public static void removeXPOffline(String playerName, String skillType, int xp) {
         getOfflineProfile(playerName).removeXp(getNonChildSkillType(skillType), xp);
     }
 
-    // Utility methods follow.
+    /**
+     * Removes XP from an offline player in a specific skill type.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param uuid 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(UUID uuid, String skillType, int xp) {
+        getOfflineProfile(uuid).removeXp(getNonChildSkillType(skillType), xp);
+    }
 
+    /**
+     * Check how much XP is needed for a specific level with the selected level curve.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param level The level to get the amount of XP for
+     *
+     * @throws InvalidFormulaTypeException if the given formulaType is not valid
+     */
+    public static int getXpNeededToLevel(int level) {
+        return mcMMO.getFormulaManager().getCachedXpToLevel(level, ExperienceConfig.getInstance().getFormulaType());
+    }
+
+    /**
+     * Check how much XP is needed for a specific level with the provided level curve.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param level The level to get the amount of XP for
+     * @param formulaType The formula type to get the amount of XP for
+     *
+     * @throws InvalidFormulaTypeException if the given formulaType is not valid
+     */
+    public static int getXpNeededToLevel(int level, String formulaType) {
+        return mcMMO.getFormulaManager().getCachedXpToLevel(level, getFormulaType(formulaType));
+    }
+
+    // Utility methods follow.
+    private static void addOfflineXP(UUID playerUniqueId, SkillType skill, int XP) {
+        PlayerProfile profile = getOfflineProfile(playerUniqueId);
+
+        profile.addXp(skill, XP);
+        profile.save();
+    }
+
+    @Deprecated
     private static void addOfflineXP(String playerName, SkillType skill, int XP) {
         PlayerProfile profile = getOfflineProfile(playerName);
 
@@ -659,8 +1030,20 @@ public final class ExperienceAPI {
         profile.scheduleAsyncSave();
     }
 
+    private static PlayerProfile getOfflineProfile(UUID uuid) {
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
+
+        if (!profile.isLoaded()) {
+            throw new InvalidPlayerException();
+        }
+
+        return profile;
+    }
+
+    @Deprecated
     private static PlayerProfile getOfflineProfile(String playerName) {
-        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+        UUID uuid = mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId();
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
 
         if (!profile.isLoaded()) {
             throw new InvalidPlayerException();
@@ -698,4 +1081,22 @@ public final class ExperienceAPI {
 
         return xpGainReason;
     }
+
+    private static FormulaType getFormulaType(String formula) throws InvalidFormulaTypeException {
+        FormulaType formulaType = FormulaType.getFormulaType(formula);
+
+        if (formulaType == null) {
+            throw new InvalidFormulaTypeException();
+        }
+
+        return formulaType;
+    }
+
+    private static McMMOPlayer getPlayer(Player player) throws McMMOPlayerNotFoundException {
+        if (!UserManager.hasPlayerDataKey(player)) {
+            throw new McMMOPlayerNotFoundException(player);
+        }
+
+        return UserManager.getPlayer(player);
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -1,16 +1,11 @@
 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;
+import com.gmail.nossr50.runnables.party.PartyChatTask;
 
 public class PartyChatManager extends ChatManager {
     private Party party;
@@ -30,21 +25,6 @@ public class PartyChatManager extends ChatManager {
 
     @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);
+        new PartyChatTask(plugin, party, senderName, displayName, message).runTask(plugin);
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12,6 +12,7 @@ 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.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class ConvertDatabaseCommand implements CommandExecutor {
@@ -55,13 +56,13 @@ public class ConvertDatabaseCommand implements CommandExecutor {
                 UserManager.clearAll();
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getUniqueId());
 
                     if (profile.isLoaded()) {
                         mcMMO.getDatabaseManager().saveUser(profile);
                     }
 
-                    UserManager.addUser(player);
+                    new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
                 }
 
                 new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);

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

@@ -9,6 +9,7 @@ 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.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class ConvertExperienceCommand implements CommandExecutor {
@@ -37,7 +38,7 @@ public class ConvertExperienceCommand implements CommandExecutor {
                 new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    UserManager.addUser(player);
+                    new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
                 }
 
                 return true;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -34,6 +34,10 @@ public class InspectCommand implements TabExecutor {
                 if (mcMMOPlayer == null) {
                     PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
 
+                    if (!CommandUtils.isLoaded(sender, profile)) {
+                        return true;
+                    }
+
                     if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
                         return true;
                     }

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

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

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

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

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

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

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

@@ -7,6 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
@@ -19,7 +20,6 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public class MctopCommand implements TabExecutor {
@@ -83,6 +83,10 @@ public class MctopCommand implements TabExecutor {
         }
 
         if (sender instanceof Player) {
+            if (!CommandUtils.hasPlayerDataKey(sender)) {
+                return;
+            }
+
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
             long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
 
@@ -91,6 +95,13 @@ public class MctopCommand implements TabExecutor {
                 return;
             }
 
+            if (((Player) sender).hasMetadata(mcMMO.databaseCommandKey)) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Processing"));
+                return;
+            } else {
+                ((Player) sender).setMetadata(mcMMO.databaseCommandKey, new FixedMetadataValue(mcMMO.p, null));
+            }
+
             mcMMOPlayer.actualizeDatabaseATS();
         }
 

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

@@ -65,7 +65,7 @@ public class ArcheryCommand extends SkillCommand {
         }
 
         if (canDaze) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeModifier)));
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Archery.Effect.2"), LocaleLoader.getString("Archery.Effect.3", Archery.dazeBonusDamage)));
         }
 
         if (canRetrieve) {

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

@@ -9,6 +9,7 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.mining.BlastMining;
 import com.gmail.nossr50.skills.mining.BlastMining.Tier;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.util.Permissions;
@@ -126,7 +127,7 @@ public class MiningCommand extends SkillCommand {
         }
 
         if (canBiggerBombs) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.TWO);
+            int unlockLevel = BlastMining.getBiggerBombsUnlockLevel();
 
             if (skillValue < unlockLevel) {
                 messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.1", unlockLevel)));
@@ -137,7 +138,7 @@ public class MiningCommand extends SkillCommand {
         }
 
         if (canDemoExpert) {
-            int unlockLevel = AdvancedConfig.getInstance().getBlastMiningRankLevel(Tier.FOUR);
+            int unlockLevel = BlastMining.getDemolitionExpertUnlockLevel();
 
             if (skillValue < unlockLevel) {
                 messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.2", unlockLevel)));

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

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

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

@@ -12,11 +12,13 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.taming.Taming;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
 
 public class TamingCommand extends SkillCommand {
     private String goreChance;
     private String goreChanceLucky;
 
+    private boolean canCharge;
     private boolean canBeastLore;
     private boolean canGore;
     private boolean canSharpenedClaws;
@@ -42,6 +44,7 @@ public class TamingCommand extends SkillCommand {
 
     @Override
     protected void permissionsCheck(Player player) {
+        canCharge = Permissions.charge(player);
         canBeastLore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.BEAST_LORE);
         canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
         canEnvironmentallyAware = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ENVIROMENTALLY_AWARE);
@@ -57,6 +60,10 @@ public class TamingCommand extends SkillCommand {
     protected List<String> effectsDisplay() {
         List<String> messages = new ArrayList<String>();
 
+        if (canCharge) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.20"), LocaleLoader.getString("Taming.Effect.21")));
+        }
+
         if (canBeastLore) {
             messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.0"), LocaleLoader.getString("Taming.Effect.1")));
         }
@@ -91,9 +98,13 @@ public class TamingCommand extends SkillCommand {
 
         if (canCallWild) {
             messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWCost(EntityType.OCELOT)));
-            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWCost(EntityType.WOLF)));
-            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWCost(EntityType.HORSE)));
+            int costOcelot = Config.getInstance().getTamingCOTWCost(EntityType.OCELOT);
+            String itemOcelot = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.OCELOT));
+            int costWolf = Config.getInstance().getTamingCOTWCost(EntityType.WOLF);
+            String itemWolf = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.WOLF));
+            int costHorse = Config.getInstance().getTamingCOTWCost(EntityType.HORSE);
+            String itemHorse = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.HORSE));
+            messages.add(LocaleLoader.getString("Taming.Effect.14", costOcelot, itemOcelot, costWolf, itemWolf, costHorse, itemHorse));
         }
 
         return messages;

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

@@ -134,7 +134,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Acrobatics.Daze.MaxBonusLevel should be at least 1!");
         }
 
-        if (getDazeModifier() < 0) {
+        if (getDazeBonusDamage() < 0) {
             reason.add("Skills.Acrobatics.Daze.BonusDamage should be at least 0!");
         }
 
@@ -200,7 +200,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         if (getSkullSplitterModifier() < 1) {
-            reason.add("Skills.Axes.SkullSplitter.DamagerModifier should be at least 1!");
+            reason.add("Skills.Axes.SkullSplitter.DamageModifier should be at least 1!");
         }
 
         /* FISHING */
@@ -420,8 +420,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Salvage.MaxPercentageLevel should be at least 1!");
         }
 
-        if (getAdvancedSalvageUnlockLevel() < 1) {
-            reason.add("Skills.Salvage.AdvancedSalvage.UnlockLevel should be at least 1!");
+        if (getAdvancedSalvageUnlockLevel() < 0) {
+            reason.add("Skills.Salvage.AdvancedSalvage.UnlockLevel should be at least 0!");
         }
 
         List<Salvage.Tier> salvageTierList = Arrays.asList(Salvage.Tier.values());
@@ -442,8 +442,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             if (tier != Salvage.Tier.EIGHT) {
                 Salvage.Tier nextTier = salvageTierList.get(salvageTierList.indexOf(tier) - 1);
 
-                if (getArcaneSalvageRankLevel(tier) >= getArcaneSalvageRankLevel(nextTier)) {
-                    reason.add("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical() + " should be less than Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + nextTier.toNumerical() + "!");
+                if (getArcaneSalvageRankLevel(tier) > getArcaneSalvageRankLevel(nextTier)) {
+                    reason.add("Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + tier.toNumerical() + " should be less than or equal to Skills.Salvage.ArcaneSalvage.Rank_Levels.Rank_" + nextTier.toNumerical() + "!");
                 }
 
                 if (getArcaneSalvageExtractFullEnchantsChance(tier) > getArcaneSalvageExtractFullEnchantsChance(nextTier)) {
@@ -714,7 +714,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getSkillShotBonusMax() { return config.getDouble("Skills.Archery.SkillShot.MaxBonus", 2.0D); }
     public double getSkillShotDamageMax() { return config.getDouble("Skills.Archery.SkillShot.MaxDamage", 9.0D); }
 
-    public double getDazeModifier() { return config.getDouble("Skills.Archery.Daze.BonusDamage", 4.0D); }
+    public double getDazeBonusDamage() { return config.getDouble("Skills.Archery.Daze.BonusDamage", 4.0D); }
 
     public double getForceMultiplier() { return config.getDouble("Skills.Archery.ForceMultiplier", 2.0D); }
 
@@ -733,7 +733,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getImpactChance() { return config.getDouble("Skills.Axes.ArmorImpact.Chance", 25.0D); }
     public double getArmorImpactMaxDurabilityDamage() { return config.getDouble("Skills.Axes.ArmorImpact.MaxPercentageDurabilityDamage", 20.0D); }
 
-    public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter.DamagerModifier", 2.0D); }
+    public double getSkullSplitterModifier() { return config.getDouble("Skills.Axes.SkullSplitter.DamageModifier", 2.0D); }
 
     /* EXCAVATION */
     //Nothing to configure, everything is already configurable in config.yml
@@ -802,6 +802,9 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getSmeltingVanillaXPBoostMultiplier(Smelting.Tier tier) { return config.getInt("Skills.Smelting.VanillaXPMultiplier.Rank_" + tier.toNumerical()); }
 
     /* SWORDS */
+    public double getBleedDamagePlayer() { return config.getDouble("Skills.Swords.Bleed.DamagePlayer", 1.0); }
+    public double getBleedDamageMobs() { return config.getDouble("Skills.Swords.Bleed.DamageMobs", 2.0); }
+
     public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed.MaxTicks", 3); }
     public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed.BaseTicks", 2); }
 

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

@@ -9,6 +9,7 @@ import org.bukkit.TreeSpecies;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;
 
+import com.gmail.nossr50.database.SQLDatabaseManager.PoolIdentifier;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
@@ -41,6 +42,16 @@ public class Config extends AutoUpdateConfigLoader {
             reason.add("General.Save_Interval should be greater than 0!");
         }
 
+        /* MySQL Settings */
+        for (PoolIdentifier identifier : PoolIdentifier.values()) {
+            if (getMySQLMaxConnections(identifier) <= 0) {
+                reason.add("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()) + " should be greater than 0!");
+            }
+            if (getMySQLMaxPoolSize(identifier) <= 0) {
+                reason.add("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()) + " should be greater than 0!");
+            }
+        }
+
         /* Mob Healthbar */
         if (getMobHealthbarTime() == 0) {
             reason.add("Mob_Healthbar.Display_Time cannot be 0! Set to -1 to disable or set a valid value.");
@@ -232,12 +243,12 @@ public class Config extends AutoUpdateConfigLoader {
     /* General Settings */
     public String getLocale() { return config.getString("General.Locale", "en_us"); }
     public boolean getMOTDEnabled() { return config.getBoolean("General.MOTD_Enabled", true); }
+    public boolean getShowProfileLoadedMessage() { return config.getBoolean("General.Show_Profile_Loaded", true); }
     public boolean getDonateMessageEnabled() { return config.getBoolean("Commands.mcmmo.Donate_Message", true); }
     public int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
     public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
     public boolean getUpdateCheckEnabled() { return config.getBoolean("General.Update_Check", true); }
     public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
-    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
     public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
 
     public String getPartyChatPrefix() { return config.getString("Commands.partychat.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
@@ -252,6 +263,7 @@ public class Config extends AutoUpdateConfigLoader {
     public long getDatabasePlayerCooldown() { return config.getLong("Commands.Database.Player_Cooldown", 1750); }
 
     public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); }
+    public boolean getRefreshChunksEnabled() { return config.getBoolean("General.Refresh_Chunks", false); }
 
     /* Mob Healthbar */
     public MobHealthbarType getMobHealthbarDefault() {
@@ -268,8 +280,10 @@ public class Config extends AutoUpdateConfigLoader {
     /* Scoreboards */
     public boolean getPowerLevelTagsEnabled() { return config.getBoolean("Scoreboard.Power_Level_Tags", false); }
     public boolean getAllowKeepBoard() { return config.getBoolean("Scoreboard.Allow_Keep", true); }
+    public int getTipsAmount() { return config.getInt("Scoreboard.Tips_Amount", 5); }
     public boolean getShowStatsAfterLogin() { return config.getBoolean("Scoreboard.Show_Stats_After_Login", false); }
     public boolean getScoreboardRainbows() { return config.getBoolean("Scoreboard.Rainbows", false); }
+    public boolean getShowAbilityNames() { return config.getBoolean("Scoreboard.Ability_Names", true); }
 
     public boolean getRankUseChat() { return config.getBoolean("Scoreboard.Types.Rank.Print", false); }
     public boolean getRankUseBoard() { return config.getBoolean("Scoreboard.Types.Rank.Board", true); }
@@ -314,6 +328,8 @@ public class Config extends AutoUpdateConfigLoader {
     public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); }
     public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); }
     public String getMySQLUserPassword() { return getStringIncludingInts("MySQL.Database.User_Password"); }
+    public int getMySQLMaxConnections(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()), 30); }
+    public int getMySQLMaxPoolSize(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()), 10); }
 
     private String getStringIncludingInts(String key) {
         String str = config.getString(key);
@@ -357,17 +373,23 @@ public class Config extends AutoUpdateConfigLoader {
     public Material getChimaeraItem() { return Material.matchMaterial(config.getString("Items.Chimaera_Wing.Item_Name", "Feather")); }
     public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
     public boolean getChimaeraPreventUseUnderground() { return config.getBoolean("Items.Chimaera_Wing.Prevent_Use_Underground", true); }
+    public boolean getChimaeraUseBedSpawn() { return config.getBoolean("Items.Chimaera_Wing.Use_Bed_Spawn", true); }
     public int getChimaeraCooldown() { return config.getInt("Items.Chimaera_Wing.Cooldown", 240); }
     public int getChimaeraWarmup() { return config.getInt("Items.Chimaera_Wing.Warmup", 5); }
     public int getChimaeraRecentlyHurtCooldown() { return config.getInt("Items.Chimaera_Wing.RecentlyHurt_Cooldown", 60); }
     public boolean getChimaeraSoundEnabled() { return config.getBoolean("Items.Chimaera_Wing.Sound_Enabled", true); }
 
+    public boolean getFluxPickaxeEnabled() { return config.getBoolean("Items.Flux_Pickaxe.Enabled", true); }
+    public boolean getFluxPickaxeSoundEnabled() { return config.getBoolean("Items.Flux_Pickaxe.Sound_Enabled", true); }
+
     /* Particles */
     public boolean getAbilityActivationEffectEnabled() { return config.getBoolean("Particles.Ability_Activation", true); }
     public boolean getAbilityDeactivationEffectEnabled() { return config.getBoolean("Particles.Ability_Deactivation", true); }
-    public boolean getDodgeEffectEnabled() { return config.getBoolean("Particles.Dodge", true); }
     public boolean getBleedEffectEnabled() { return config.getBoolean("Particles.Bleed", true); }
+    public boolean getDodgeEffectEnabled() { return config.getBoolean("Particles.Dodge", true); }
+    public boolean getFluxEffectEnabled() { return config.getBoolean("Particles.Flux", true); }
     public boolean getGreaterImpactEffectEnabled() { return config.getBoolean("Particles.Greater_Impact", true); }
+    public boolean getCallOfTheWildEffectEnabled() { return config.getBoolean("Particles.Call_of_the_Wild", true); }
     public boolean getLevelUpEffectsEnabled() { return config.getBoolean("Particles.LevelUp_Enabled", true); }
     public int getLevelUpEffectsTier() { return config.getInt("Particles.LevelUp_Tier", 100); }
     public boolean getLargeFireworks() { return config.getBoolean("Particles.LargeFireworks", true); }
@@ -475,11 +497,14 @@ public class Config extends AutoUpdateConfigLoader {
 
     /* Unarmed */
     public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }
+    public boolean getUnarmedItemPickupDisabled() { return config.getBoolean("Skills.Unarmed.Item_Pickup_Disabled_Full_Inventory", true); }
 
     /* Taming */
     public Material getTamingCOTWMaterial(EntityType type) { return Material.matchMaterial(config.getString("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Material")); }
     public int getTamingCOTWCost(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Amount"); }
     public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Summon_Amount"); }
+    public int getTamingCOTWLength(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ ".Summon_Length"); }
+    public int getTamingCOTWMaxAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ ".Summon_Max_Amount"); }
     public double getTamingCOTWRange() { return config.getDouble("Skills.Taming.Call_Of_The_Wild.Range", 40.0D); }
 
     /* Woodcutting */

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

@@ -6,15 +6,17 @@ import com.gmail.nossr50.mcMMO;
 
 public class HiddenConfig {
     private static HiddenConfig instance;
-    private static String fileName;
-    private static YamlConfiguration config;
-    private static boolean chunkletsEnabled;
-    private static int conversionRate;
-    private static boolean useEnchantmentBuffs;
-    private static boolean resendChunksAfterBlockAbility;
+    private String fileName;
+    private YamlConfiguration config;
+    private boolean chunkletsEnabled;
+    private int conversionRate;
+    private boolean useEnchantmentBuffs;
+    private int uuidConvertAmount;
+    private int mojangRateLimit;
+    private long mojangLimitPeriod;
 
     public HiddenConfig(String fileName) {
-        HiddenConfig.fileName = fileName;
+        this.fileName = fileName;
         load();
     }
 
@@ -32,7 +34,9 @@ public class HiddenConfig {
             chunkletsEnabled = config.getBoolean("Options.Chunklets", true);
             conversionRate = config.getInt("Options.ConversionRate", 1);
             useEnchantmentBuffs = config.getBoolean("Options.EnchantmentBuffs", true);
-            resendChunksAfterBlockAbility = config.getBoolean("Options.RefreshChunks", false);
+            uuidConvertAmount = config.getInt("Options.UUIDConvertAmount", 5);
+            mojangRateLimit = config.getInt("Options.MojangRateLimit", 50000);
+            mojangLimitPeriod = config.getLong("Options.MojangLimitPeriod", 600000);
         }
     }
 
@@ -48,7 +52,15 @@ public class HiddenConfig {
         return useEnchantmentBuffs;
     }
 
-    public boolean resendChunksAfterBlockAbility() {
-        return resendChunksAfterBlockAbility;
+    public int getUUIDConvertAmount() {
+        return uuidConvertAmount;
+    }
+
+    public int getMojangRateLimit() {
+        return mojangRateLimit;
+    }
+
+    public long getMojangLimitPeriod() {
+        return mojangLimitPeriod;
     }
 }

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

@@ -3,6 +3,7 @@ package com.gmail.nossr50.config.experience;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bukkit.GrassSpecies;
 import org.bukkit.Material;
 import org.bukkit.TreeSpecies;
 import org.bukkit.entity.EntityType;
@@ -178,6 +179,11 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
     /* Custom XP perk */
     public double getCustomXpPerkBoost() { return config.getDouble("Experience_Formula.Custom_XP_Perk.Boost", 1.25); }
 
+    /* Diminished Returns */
+    public boolean getDiminishedReturnsEnabled() { return config.getBoolean("Diminished_Returns.Enabled", false); }
+    public int getDiminishedReturnsThreshold(SkillType skill) { return config.getInt("Diminished_Returns.Threshold." + StringUtils.getCapitalized(skill.toString()), 20000); }
+    public int getDiminishedReturnsTimeInterval() { return config.getInt("Diminished_Returns.Time_Interval", 10); }
+
     /* Conversion */
     public double getExpModifier() { return config.getDouble("Conversion.Exp_Modifier", 1); }
 
@@ -192,6 +198,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
     public double getCombatXP(EntityType entity) { return config.getDouble("Experience.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_")); }
     public double getAnimalsXP() { return config.getDouble("Experience.Combat.Multiplier.Animals", 1.0); }
     public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 4.0); }
+    public double getElderGuardianXP() { return config.getDouble("Experience.Combat.Multiplier.Elder_Guardian", 4.0); }
 
     /* Materials  */
     public int getXp(SkillType skill, Material material) { return config.getInt("Experience." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getPrettyItemString(material).replace(" ", "_")); }
@@ -206,6 +213,41 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
     /* Alchemy */
     public double getPotionXP(PotionStage stage) { return config.getDouble("Experience.Alchemy.Potion_Stage_" + stage.toNumerical(), 10D); }
 
+    /* Excavation */
+    public int getDirtAndSandXp(MaterialData data) {
+        Material type = data.getItemType();
+
+        if (type == Material.DIRT) {
+            switch (data.getData()) {
+                case 0x0:
+                    return config.getInt("Experience.Excavation.Dirt", 40);
+
+                case 0x1:
+                    return config.getInt("Experience.Excavation.Coarse_Dirt", 40);
+
+                case 0x2:
+                    return config.getInt("Experience.Excavation.Podzol", 40);
+
+                default:
+                    return 0;
+            }
+        }
+        else if (type == Material.SAND) {
+            switch (data.getData()) {
+                case 0x0:
+                    return config.getInt("Experience.Excavation.Sand", 40);
+
+                case 0x1:
+                    return config.getInt("Experience.Excavation.Red_Sand", 40);
+
+                default:
+                    return 0;
+            }
+        }
+
+        return 0;
+    }
+
     /* Fishing */
     public int getFishXp(MaterialData data) {
         switch (data.getData()) {
@@ -267,7 +309,12 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
 
         }
         else if (type == Material.LONG_GRASS) {
-            switch (((LongGrass) data).getSpecies()) {
+            GrassSpecies species = ((LongGrass) data).getSpecies();
+            if (species == null) {
+                return 0;
+            }
+
+            switch (species) {
                 case DEAD:
                     return config.getInt("Experience.Herbalism.Dead_Bush", 30);
 
@@ -322,4 +369,5 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
     public int getWoodcuttingTreeXP(TreeSpecies species) { return config.getInt("Experience.Woodcutting." + StringUtils.getPrettyTreeSpeciesString(species).replace(" ", "_")); }
     public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
     public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
+
 }

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

@@ -72,7 +72,7 @@ public class CustomArmorConfig extends ConfigLoader {
             boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
             Material repairMaterial = Material.matchMaterial(config.getString(armorType + "." + armorName + ".Repair_Material", ""));
 
-            if (repairMaterial == null) {
+            if (repairable && (repairMaterial == null)) {
                 plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + armorName);
                 repairable = false;
             }
@@ -82,16 +82,20 @@ public class CustomArmorConfig extends ConfigLoader {
                 int repairQuantity = SkillUtils.getRepairAndSalvageQuantities(new ItemStack(armorMaterial), repairMaterial, repairData);
 
                 if (repairQuantity == 0) {
-                    repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Data_Quantity", 2);
+                    repairQuantity = config.getInt(armorType + "." + armorName + ".Repair_Material_Quantity", 2);
                 }
 
+                String repairItemName = config.getString(armorType + "." + armorName + ".Repair_Material_Pretty_Name");
+                int repairMinimumLevel = config.getInt(armorType + "." + armorName + ".Repair_MinimumLevel", 0);
+                double repairXpMultiplier = config.getDouble(armorType + "." + armorName + ".Repair_XpMultiplier", 1);
+
                 short durability = armorMaterial.getMaxDurability();
 
                 if (durability == 0) {
                     durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 70);
                 }
 
-                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, 0, repairQuantity, durability, ItemType.ARMOR, MaterialType.OTHER, 1.0));
+                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairData, repairItemName, repairMinimumLevel, repairQuantity, durability, ItemType.ARMOR, MaterialType.OTHER, repairXpMultiplier));
             }
 
             materialList.add(armorMaterial);

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

@@ -80,7 +80,7 @@ public class CustomToolConfig extends ConfigLoader {
             boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
             Material repairMaterial = Material.matchMaterial(config.getString(toolType + "." + toolName + ".Repair_Material", ""));
 
-            if (repairMaterial == null) {
+            if (repairable && (repairMaterial == null)) {
                 plugin.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + toolName);
                 repairable = false;
             }
@@ -90,16 +90,20 @@ public class CustomToolConfig extends ConfigLoader {
                 int repairQuantity = SkillUtils.getRepairAndSalvageQuantities(new ItemStack(toolMaterial), repairMaterial, repairData);
 
                 if (repairQuantity == 0) {
-                    repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Data_Quantity", 2);
+                    repairQuantity = config.getInt(toolType + "." + toolName + ".Repair_Material_Quantity", 2);
                 }
 
+                String repairItemName = config.getString(toolType + "." + toolName + ".Repair_Material_Pretty_Name");
+                int repairMinimumLevel = config.getInt(toolType + "." + toolName + ".Repair_MinimumLevel", 0);
+                double repairXpMultiplier = config.getDouble(toolType + "." + toolName + ".Repair_XpMultiplier", 1);
+
                 short durability = toolMaterial.getMaxDurability();
 
                 if (durability == 0) {
                     durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 60);
                 }
 
-                repairables.add(RepairableFactory.getRepairable(toolMaterial, repairMaterial, repairData, 0, repairQuantity, durability, ItemType.TOOL, MaterialType.OTHER, 1.0));
+                repairables.add(RepairableFactory.getRepairable(toolMaterial, repairMaterial, repairData, repairItemName, repairMinimumLevel, repairQuantity, durability, ItemType.TOOL, MaterialType.OTHER, repairXpMultiplier));
             }
 
             double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);

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

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
@@ -117,11 +118,14 @@ public class PotionConfig extends ConfigLoader {
             short dataValue = Short.parseShort(potion_section.getName());
 
             String name = potion_section.getString("Name");
+            if (name != null) {
+                name = ChatColor.translateAlternateColorCodes('&', name);
+            }
 
             List<String> lore = new ArrayList<String>();
             if (potion_section.contains("Lore")) {
                 for (String line : potion_section.getStringList("Lore")) {
-                    lore.add(line);
+                    lore.add(ChatColor.translateAlternateColorCodes('&', line));
                 }
             }
 

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.bukkit.ChatColor;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
@@ -56,6 +57,7 @@ public class TreasureConfig extends ConfigLoader {
     public List<ShakeTreasure> shakeFromMushroomCow = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromPig         = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromPigZombie   = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromPlayer      = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSheep       = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSkeleton    = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSlime       = new ArrayList<ShakeTreasure>();
@@ -174,6 +176,11 @@ public class TreasureConfig extends ConfigLoader {
             else if (materialName.contains("INK_SACK")) {
                 material = Material.INK_SACK;
             }
+            else if (materialName.contains("INVENTORY")) {
+                // Use magic material BED_BLOCK to know that we're grabbing something from the inventory and not a normal treasure
+                shakeFromPlayer.add(new ShakeTreasure(new ItemStack(Material.BED_BLOCK, 1, (byte) 0), 1, getInventoryStealDropChance(), getInventoryStealDropLevel()));
+                continue;
+            }
             else {
                 material = Material.matchMaterial(materialName);
             }
@@ -236,6 +243,22 @@ public class TreasureConfig extends ConfigLoader {
 
                 try {
                     item = new Potion(PotionType.valueOf(potionType.toUpperCase().trim())).toItemStack(amount);
+
+                    if (config.contains(type + "." + treasureName + ".Custom_Name")) {
+                        ItemMeta itemMeta = item.getItemMeta();
+                        itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString(type + "." + treasureName + ".Custom_Name")));
+                        item.setItemMeta(itemMeta);
+                    }
+
+                    if (config.contains(type + "." + treasureName + ".Lore")) {
+                        ItemMeta itemMeta = item.getItemMeta();
+                        List<String> lore = new ArrayList<String>();
+                        for (String s : config.getStringList(type + "." + treasureName + ".Lore")) {
+                            lore.add(ChatColor.translateAlternateColorCodes('&', s));
+                        }
+                        itemMeta.setLore(lore);
+                        item.setItemMeta(itemMeta);
+                    }
                 }
                 catch (IllegalArgumentException ex) {
                     reason.add("Invalid Potion_Type: " + potionType);
@@ -249,6 +272,22 @@ public class TreasureConfig extends ConfigLoader {
                     dye.setColor(DyeColor.valueOf(color.toUpperCase().trim()));
 
                     item = dye.toItemStack(amount);
+
+                    if (config.contains(type + "." + treasureName + ".Custom_Name")) {
+                        ItemMeta itemMeta = item.getItemMeta();
+                        itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString(type + "." + treasureName + ".Custom_Name")));
+                        item.setItemMeta(itemMeta);
+                    }
+
+                    if (config.contains(type + "." + treasureName + ".Lore")) {
+                        ItemMeta itemMeta = item.getItemMeta();
+                        List<String> lore = new ArrayList<String>();
+                        for (String s : config.getStringList(type + "." + treasureName + ".Lore")) {
+                            lore.add(ChatColor.translateAlternateColorCodes('&', s));
+                        }
+                        itemMeta.setLore(lore);
+                        item.setItemMeta(itemMeta);
+                    }
                 }
                 catch (IllegalArgumentException ex) {
                     reason.add("Invalid Dye_Color: " + color);
@@ -259,13 +298,17 @@ public class TreasureConfig extends ConfigLoader {
 
                 if (config.contains(type + "." + treasureName + ".Custom_Name")) {
                     ItemMeta itemMeta = item.getItemMeta();
-                    itemMeta.setDisplayName(config.getString(type + "." + treasureName + "Custom_Name"));
+                    itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString(type + "." + treasureName + ".Custom_Name")));
                     item.setItemMeta(itemMeta);
                 }
 
                 if (config.contains(type + "." + treasureName + ".Lore")) {
                     ItemMeta itemMeta = item.getItemMeta();
-                    itemMeta.setLore(config.getStringList(type + "." + treasureName + "Custom_Name"));
+                    List<String> lore = new ArrayList<String>();
+                    for (String s : config.getStringList(type + "." + treasureName + ".Lore")) {
+                        lore.add(ChatColor.translateAlternateColorCodes('&', s));
+                    }
+                    itemMeta.setLore(lore);
                     item.setItemMeta(itemMeta);
                 }
             }
@@ -316,6 +359,9 @@ public class TreasureConfig extends ConfigLoader {
                     else if (type.equals("Shake.PIG_ZOMBIE")) {
                         shakeFromPigZombie.add(shakeTreasure);
                     }
+                    else if (type.equals("Shake.PLAYER")) {
+                        shakeFromPlayer.add(shakeTreasure);
+                    }
                     else if (type.equals("Shake.SHEEP")) {
                         shakeFromSheep.add(shakeTreasure);
                     }
@@ -435,6 +481,11 @@ public class TreasureConfig extends ConfigLoader {
         }
     }
 
+    public boolean getInventoryStealEnabled() { return config.contains("Shake.PLAYER.INVENTORY"); }
+    public boolean getInventoryStealStacks() { return config.getBoolean("Shake.PLAYER.INVENTORY.Whole_Stacks"); }
+    public double getInventoryStealDropChance() { return config.getDouble("Shake.PLAYER.INVENTORY.Drop_Chance"); }
+    public int getInventoryStealDropLevel() { return config.getInt("Shake.PLAYER.INVENTORY.Drop_Level"); }
+
     public double getItemDropRate(int tier, Rarity rarity) { return config.getDouble("Item_Drop_Rates.Tier_" + tier + "." + rarity.toString()); }
     public double getEnchantmentDropRate(int tier, Rarity rarity) { return config.getDouble("Enchantment_Drop_Rates.Tier_" + tier + "." + rarity.toString()); }
 }

src/main/java/com/gmail/nossr50/database/DatabaseManager.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.database;
 
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
@@ -10,8 +11,8 @@ import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 
 public interface DatabaseManager {
-    // One month in milliseconds
-    public final long PURGE_TIME = 2630000000L * Config.getInstance().getOldUsersCutoff();
+    // One month in seconds
+    public final long PURGE_TIME = 2630000L * Config.getInstance().getOldUsersCutoff();
     // During convertUsers, how often to output a status
     public final int progressInterval = 200;
 
@@ -66,20 +67,44 @@ public interface DatabaseManager {
      * Add a new user to the database.
      *
      * @param playerName The name of the player to be added to the database
+     * @param uuid The uuid of the player to be added to the database
      */
-    public void newUser(String playerName);
+    public void newUser(String playerName, UUID uuid);
 
     /**
      * Load a player from the database.
      *
+     * @deprecated replaced by {@link #loadPlayerProfile(String playerName, UUID uuid, boolean createNew)}
+     *
      * @param playerName The name of the player to load from the database
      * @param createNew Whether to create a new record if the player is not
      *          found
      * @return The player's data, or an unloaded PlayerProfile if not found
      *          and createNew is false
      */
+    @Deprecated
     public PlayerProfile loadPlayerProfile(String playerName, boolean createNew);
 
+    /**
+     * Load a player from the database.
+     *
+     * @param uuid The uuid of the player to load from the database
+     * @return The player's data, or an unloaded PlayerProfile if not found
+     */
+    public PlayerProfile loadPlayerProfile(UUID uuid);
+
+    /**
+     * Load a player from the database. Attempt to use uuid, fall back on playername
+     *
+     * @param playerName The name of the player to load from the database
+     * @param uuid The uuid of the player to load from the database
+     * @param createNew Whether to create a new record if the player is not
+     *          found
+     * @return The player's data, or an unloaded PlayerProfile if not found
+     *          and createNew is false
+     */
+    public PlayerProfile loadPlayerProfile(String playerName, UUID uuid, boolean createNew);
+
     /**
      * Get all users currently stored in the database.
      *
@@ -95,10 +120,19 @@ public interface DatabaseManager {
      */
     public void convertUsers(DatabaseManager destination);
 
+    public boolean saveUserUUID(String userName, UUID uuid);
+
+    public boolean saveUserUUIDs(Map<String, UUID> fetchedUUIDs);
+
     /**
      * Retrieve the type of database in use. Custom databases should return CUSTOM.
      *
      * @return The type of database
      */
     public DatabaseType getDatabaseType();
+
+    /**
+     * Called when the plugin disables
+     */
+    public void onDisable();
 }

src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.database;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.Closeable;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -10,10 +9,12 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.bukkit.OfflinePlayer;
 
@@ -22,9 +23,11 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
+import com.gmail.nossr50.datatypes.database.UpgradeType;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.StringUtils;
 
@@ -43,6 +46,10 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         usersFile = new File(mcMMO.getUsersFilePath());
         checkStructure();
         updateLeaderboards();
+
+        if (mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.ADD_UUIDS)) {
+            new UUIDUpdateAsyncTask(mcMMO.p, getStoredUsers()).runTaskAsynchronously(mcMMO.p);
+        }
     }
 
     public void purgePowerlessUsers() {
@@ -79,7 +86,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     }
                     else {
                         purgedUsers++;
-                        Misc.profileCleanup(character[0]);
                     }
                 }
 
@@ -91,8 +97,22 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
             }
             finally {
-                tryClose(in);
-                tryClose(out);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
 
@@ -134,7 +154,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                     if (currentTime - lastPlayed > PURGE_TIME) {
                         removedPlayers++;
-                        Misc.profileCleanup(name);
                     }
                     else {
                         if (rewrite) {
@@ -157,8 +176,22 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
             }
             finally {
-                tryClose(in);
-                tryClose(out);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
 
@@ -196,8 +229,22 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
             }
             finally {
-                tryClose(in);
-                tryClose(out);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
 
@@ -208,6 +255,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
     public boolean saveUser(PlayerProfile profile) {
         String playerName = profile.getPlayerName();
+        UUID uuid = profile.getUniqueId();
 
         BufferedReader in = null;
         FileWriter out = null;
@@ -222,8 +270,9 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                 // While not at the end of the file
                 while ((line = in.readLine()) != null) {
-                    // Read the line in and copy it to the output it's not the player we want to edit
-                    if (!line.split(":")[0].equalsIgnoreCase(playerName)) {
+                    // Read the line in and copy it to the output if it's not the player we want to edit
+                    String[] character = line.split(":");
+                    if (!character[41].equalsIgnoreCase(uuid.toString()) && !character[0].equalsIgnoreCase(playerName)) {
                         writer.append(line).append("\r\n");
                     }
                     else {
@@ -251,7 +300,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         writer.append(profile.getSkillXpLevel(SkillType.SWORDS)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.AXES)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.ACROBATICS)).append(":");
-                        writer.append(":");
+                        writer.append((int) profile.getAbilityDATS(AbilityType.CHARGE)).append(":");
                         writer.append(profile.getSkillLevel(SkillType.TAMING)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.TAMING)).append(":");
                         writer.append((int) profile.getAbilityDATS(AbilityType.BERSERK)).append(":");
@@ -270,6 +319,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         writer.append(mobHealthbarType == null ? Config.getInstance().getMobHealthbarDefault().toString() : mobHealthbarType.toString()).append(":");
                         writer.append(profile.getSkillLevel(SkillType.ALCHEMY)).append(":");
                         writer.append(profile.getSkillXpLevel(SkillType.ALCHEMY)).append(":");
+                        writer.append(uuid.toString()).append(":");
+                        writer.append(profile.getScoreboardTipsShown()).append(":");
                         writer.append("\r\n");
                     }
                 }
@@ -284,8 +335,22 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 return false;
             }
             finally {
-                tryClose(in);
-                tryClose(out);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
     }
@@ -312,7 +377,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         return skills;
     }
 
-    public void newUser(String playerName) {
+    public void newUser(String playerName, UUID uuid) {
         BufferedWriter out = null;
         synchronized (fileWritingLock) {
             try {
@@ -343,7 +408,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 out.append("0:"); // SwordsXp
                 out.append("0:"); // AxesXp
                 out.append("0:"); // AcrobaticsXp
-                out.append(":");
+                out.append("0:"); // DATS
                 out.append("0:"); // Taming
                 out.append("0:"); // TamingXp
                 out.append("0:"); // DATS
@@ -361,7 +426,8 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 out.append(Config.getInstance().getMobHealthbarDefault().toString()).append(":"); // Mob Healthbar HUD
                 out.append("0:"); // Alchemy
                 out.append("0:"); // AlchemyXp
-                
+                out.append(uuid != null ? uuid.toString() : "NULL").append(":"); // UUID
+                out.append("0:"); // Scoreboard tips shown
                 // Add more in the same format as the line above
 
                 out.newLine();
@@ -370,12 +436,28 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 e.printStackTrace();
             }
             finally {
-                tryClose(out);
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
     }
 
+    @Deprecated
     public PlayerProfile loadPlayerProfile(String playerName, boolean create) {
+        return loadPlayerProfile(playerName, null, false);
+    }
+
+    public PlayerProfile loadPlayerProfile(UUID uuid) {
+        return loadPlayerProfile("", uuid, false);
+    }
+
+    public PlayerProfile loadPlayerProfile(String playerName, UUID uuid, boolean create) {
         BufferedReader in = null;
         String usersFilePath = mcMMO.getUsersFilePath();
 
@@ -389,17 +471,36 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     // Find if the line contains the player we want.
                     String[] character = line.split(":");
 
-                    if (!character[0].equalsIgnoreCase(playerName)) {
+                    // Compare names because we don't have a valid uuid for that player even
+                    // if input uuid is not null
+                    if (character[41].equalsIgnoreCase("NULL")) {
+                        if (!character[0].equalsIgnoreCase(playerName)) {
+                            continue;
+                        }
+                    }
+                    // If input uuid is not null then we should compare uuids
+                    else if ((uuid != null && !character[41].equalsIgnoreCase(uuid.toString())) || (uuid == null && !character[0].equalsIgnoreCase(playerName))) {
                         continue;
                     }
 
+                    // Update playerName in database after name change
+                    if (!character[0].equalsIgnoreCase(playerName)) {
+                        mcMMO.p.debug("Name change detected: " + character[0] + " => " + playerName);
+                        character[0] = playerName;
+                    }
+
                     return loadFromLine(character);
                 }
 
                 // Didn't find the player, create a new one
                 if (create) {
-                    newUser(playerName);
-                    return new PlayerProfile(playerName, true);
+                    if (uuid == null) {
+                        newUser(playerName, uuid);
+                        return new PlayerProfile(playerName, true);
+                    }
+
+                    newUser(playerName, uuid);
+                    return new PlayerProfile(playerName, uuid, true);
                 }
             }
             catch (Exception e) {
@@ -413,14 +514,18 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         in.close();
                     }
                     catch (IOException e) {
-                        e.printStackTrace();
+                        // Ignore
                     }
                 }
             }
         }
 
         // Return unloaded profile
-        return new PlayerProfile(playerName);
+        if (uuid == null) {
+            return new PlayerProfile(playerName);
+        }
+
+        return new PlayerProfile(playerName, uuid);
     }
 
     public void convertUsers(DatabaseManager destination) {
@@ -452,11 +557,132 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 e.printStackTrace();
             }
             finally {
-                tryClose(in);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
     }
 
+    public boolean saveUserUUID(String userName, UUID uuid) {
+        boolean worked = false;
+
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                in = new BufferedReader(new FileReader(usersFilePath));
+                StringBuilder writer = new StringBuilder();
+                String line;
+
+                while ((line = in.readLine()) != null) {
+                    String[] character = line.split(":");
+                    if (!worked && character[0].equalsIgnoreCase(userName)) {
+                        if (character.length < 42) {
+                            mcMMO.p.getLogger().severe("Could not update UUID for " + userName + "!");
+                            mcMMO.p.getLogger().severe("Database entry is invalid.");
+                            break;
+                        }
+
+                        line = line.replace(character[41], uuid.toString());
+                        worked = true;
+                    }
+
+                    writer.append(line).append("\r\n");
+                }
+
+                out = new FileWriter(usersFilePath); // Write out the new file
+                out.write(writer.toString());
+            }
+            catch (Exception e) {
+                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            finally {
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        return worked;
+    }
+
+    public boolean saveUserUUIDs(Map<String, UUID> fetchedUUIDs) {
+        BufferedReader in = null;
+        FileWriter out = null;
+        String usersFilePath = mcMMO.getUsersFilePath();
+
+        synchronized (fileWritingLock) {
+            try {
+                in = new BufferedReader(new FileReader(usersFilePath));
+                StringBuilder writer = new StringBuilder();
+                String line;
+
+                while (((line = in.readLine()) != null) && !fetchedUUIDs.isEmpty()) {
+                    String[] character = line.split(":");
+                    if (fetchedUUIDs.containsKey(character[0])) {
+                        if (character.length < 42) {
+                            mcMMO.p.getLogger().severe("Could not update UUID for " + character[0] + "!");
+                            mcMMO.p.getLogger().severe("Database entry is invalid.");
+                            continue;
+                        }
+
+                        character[41] = fetchedUUIDs.remove(character[0]).toString();
+                        line = new StringBuilder(org.apache.commons.lang.StringUtils.join(character, ":")).append(":").toString();
+                    }
+
+                    writer.append(line).append("\r\n");
+                }
+
+                out = new FileWriter(usersFilePath); // Write out the new file
+                out.write(writer.toString());
+            }
+            catch (Exception e) {
+                mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
+            }
+            finally {
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+                if (out != null) {
+                    try {
+                        out.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
     public List<String> getStoredUsers() {
         ArrayList<String> users = new ArrayList<String>();
         BufferedReader in = null;
@@ -477,7 +703,14 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 e.printStackTrace();
             }
             finally {
-                tryClose(in);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
         return users;
@@ -547,7 +780,14 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                 mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " during user " + playerName + " (Are you sure you formatted it correctly?) " + e.toString());
             }
             finally {
-                tryClose(in);
+                if (in != null) {
+                    try {
+                        in.close();
+                    }
+                    catch (IOException e) {
+                        // Ignore
+                    }
+                }
             }
         }
 
@@ -597,6 +837,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     in = new BufferedReader(new FileReader(usersFilePath));
                     StringBuilder writer = new StringBuilder();
                     String line;
+                    HashSet<String> usernames = new HashSet<String>();
                     HashSet<String> players = new HashSet<String>();
 
                     while ((line = in.readLine()) != null) {
@@ -611,8 +852,13 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                         }
                         String[] character = line.split(":");
 
+                        // Prevent the same username from being present multiple times
+                        if (!usernames.add(character[0])) {
+                            continue;
+                        }
+
                         // Prevent the same player from being present multiple times
-                        if (!players.add(character[0])) {
+                        if (character.length == 42 && (!character[41].isEmpty() && !players.add(character[41]))) {
                             continue;
                         }
 
@@ -643,8 +889,17 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                             }
                         }
 
+                        if (character[23].isEmpty()) {
+                            // Addition of "Charge" Taming ability
+                            // Version 1.5.02
+                            line = line.replace(character[23], "0:");
+                            if (oldVersion == null) {
+                                oldVersion = "1.5.02";
+                            }
+                        }
+
                         // If they're valid, rewrite them to the file.
-                        if (character.length == 41) {
+                        if (character.length == 42) {
                             writer.append(line).append("\r\n");
                             continue;
                         }
@@ -698,16 +953,33 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                                 oldVersion = "1.4.08";
                             }
                         }
+                        if (character.length <= 41) {
+                            // Addition of UUIDs
+                            // Version 1.5.01
+                            // Add a value because otherwise it gets removed
+                            newLine.append("NULL:");
+                            if (oldVersion == null) {
+                                oldVersion = "1.5.01";
+                            }
+                        }
+                        if (character.length <= 42) {
+                            // Addition of scoreboard tips auto disable
+                            // Version 1.5.02
+                            newLine.append("0").append(":");
+                            if (oldVersion == null) {
+                                oldVersion = "1.5.02";
+                            }
+                        }
 
                         // Remove any blanks that shouldn't be there, and validate the other fields
                         String[] newCharacter = newLine.toString().split(":");
                         boolean corrupted = false;
 
                         for (int i = 0; i < newCharacter.length; i++) {
-                            if (newCharacter[i].isEmpty() && !(i == 2 || i == 3 || i == 23 || i == 33)) {
+                            if (newCharacter[i].isEmpty() && !(i == 2 || i == 3 || i == 23 || i == 33 || i == 41)) {
                                 corrupted = true;
 
-                                if (newCharacter.length != 41) {
+                                if (newCharacter.length != 42) {
                                     newCharacter = (String[]) ArrayUtils.remove(newCharacter, i);
                                 }
                                 else {
@@ -728,7 +1000,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                                 newCharacter[i] = Config.getInstance().getMobHealthbarDefault().toString();
                             }
 
-                            if (!StringUtils.isInt(newCharacter[i]) && !(i == 0 || i == 2 || i == 3 || i == 23 || i == 33 || i == 38)) {
+                            if (!StringUtils.isInt(newCharacter[i]) && !(i == 0 || i == 2 || i == 3 || i == 23 || i == 33 || i == 38 || i == 41)) {
                                 corrupted = true;
                                 newCharacter[i] = "0";
                             }
@@ -736,11 +1008,15 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                         if (corrupted) {
                             mcMMO.p.debug("Updating corrupted database line for player " + newCharacter[0]);
-                            newLine = new StringBuilder(org.apache.commons.lang.StringUtils.join(newCharacter, ":"));
                         }
 
                         if (oldVersion != null) {
-                            mcMMO.p.debug("Updating database line for player " + character[0] + " from before version " + oldVersion);
+                            mcMMO.p.debug("Updating database line from before version " + oldVersion + " for player " + character[0]);
+                        }
+
+                        if (corrupted || oldVersion != null) {
+                            newLine = new StringBuilder(org.apache.commons.lang.StringUtils.join(newCharacter, ":"));
+                            newLine = newLine.append(":");
                         }
 
                         writer.append(newLine).append("\r\n");
@@ -754,10 +1030,32 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                     mcMMO.p.getLogger().severe("Exception while reading " + usersFilePath + " (Are you sure you formatted it correctly?)" + e.toString());
                 }
                 finally {
-                    tryClose(in);
-                    tryClose(out);
+                    if (in != null) {
+                        try {
+                            in.close();
+                        }
+                        catch (IOException e) {
+                            // Ignore
+                        }
+                    }
+                    if (out != null) {
+                        try {
+                            out.close();
+                        }
+                        catch (IOException e) {
+                            // Ignore
+                        }
+                    }
                 }
             }
+
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_FISHING);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_BLAST_MINING_COOLDOWN);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_SQL_INDEXES);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_MOB_HEALTHBARS);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SQL_PARTY_NAMES);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SPOUT);
+            mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_ALCHEMY);
             return;
         }
 
@@ -772,18 +1070,6 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         }
     }
 
-    private void tryClose(Closeable c) {
-        if (c == null) {
-            return;
-        }
-        try {
-            c.close();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     private Integer getPlayerRank(String playerName, List<PlayerStat> statsList) {
         if (statsList == null) {
             return null;
@@ -816,9 +1102,10 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
     private PlayerProfile loadFromLine(String[] character) {
         Map<SkillType, Integer>   skills     = getSkillMapFromLine(character);      // Skill levels
-        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
-        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
+        Map<SkillType, Float>     skillsXp   = new EnumMap<SkillType, Float>(SkillType.class);     // Skill & XP
+        Map<AbilityType, Integer> skillsDATS = new EnumMap<AbilityType, Integer>(AbilityType.class); // Ability & Cooldown
         MobHealthbarType mobHealthbarType;
+        int scoreboardTipsShown;
 
         // TODO on updates, put new values in a try{} ?
 
@@ -836,7 +1123,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
         skillsXp.put(SkillType.FISHING, (float) Integer.valueOf(character[35]));
         skillsXp.put(SkillType.ALCHEMY, (float) Integer.valueOf(character[40]));
 
-        // Taming - Unused
+        skillsDATS.put(AbilityType.CHARGE, Integer.valueOf(character[23]));
         skillsDATS.put(AbilityType.SUPER_BREAKER, Integer.valueOf(character[32]));
         // Repair - Unused
         skillsDATS.put(AbilityType.TREE_FELLER, Integer.valueOf(character[28]));
@@ -856,11 +1143,25 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
             mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
         }
 
-        return new PlayerProfile(character[0], skills, skillsXp, skillsDATS, mobHealthbarType);
+        UUID uuid;
+        try {
+            uuid = UUID.fromString(character[41]);
+        }
+        catch (Exception e) {
+            uuid = null;
+        }
+        try {
+            scoreboardTipsShown = Integer.valueOf(character[41]);
+        }
+        catch (Exception e) {
+            scoreboardTipsShown = 0;
+        }
+
+        return new PlayerProfile(character[0], uuid, skills, skillsXp, skillsDATS, mobHealthbarType, scoreboardTipsShown);
     }
 
     private Map<SkillType, Integer> getSkillMapFromLine(String[] character) {
-        Map<SkillType, Integer> skills = new HashMap<SkillType, Integer>();   // Skill & Level
+        Map<SkillType, Integer> skills = new EnumMap<SkillType, Integer>(SkillType.class);   // Skill & Level
 
         skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
         skills.put(SkillType.MINING, Integer.valueOf(character[1]));
@@ -882,4 +1183,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
     public DatabaseType getDatabaseType() {
         return DatabaseType.FLATFILE;
     }
+
+    @Override
+    public void onDisable() { }
 }

src/main/java/com/gmail/nossr50/datatypes/database/DatabaseUpdateType.java

@@ -1,13 +0,0 @@
-package com.gmail.nossr50.datatypes.database;
-
-public enum DatabaseUpdateType {
-    FISHING,
-    BLAST_MINING,
-    INDEX,
-    MOB_HEALTHBARS,
-    PARTY_NAMES,
-    KILL_ORPHANS,
-    DROPPED_SPOUT,
-    ALCHEMY
-    ;
-}

src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java

@@ -0,0 +1,14 @@
+package com.gmail.nossr50.datatypes.database;
+
+public enum UpgradeType {
+    ADD_FISHING,
+    ADD_BLAST_MINING_COOLDOWN,
+    ADD_SQL_INDEXES,
+    ADD_MOB_HEALTHBARS,
+    DROP_SQL_PARTY_NAMES,
+    DROP_SPOUT,
+    ADD_ALCHEMY,
+    ADD_UUIDS,
+    ADD_UUIDS_PARTY,
+    ADD_SCOREBOARD_TIPS;
+}

src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java

@@ -0,0 +1,55 @@
+package com.gmail.nossr50.datatypes.experience;
+
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+
+public class SkillXpGain implements Delayed {
+    private final long expiryTime;
+    private final float xp;
+    private final SkillType type;
+
+    public SkillXpGain(SkillType type, float xp) {
+        this.expiryTime = System.currentTimeMillis() + getDuration();
+        this.xp = xp;
+        this.type = type;
+    }
+
+    public SkillType getSkill() {
+        return type;
+    }
+
+    public float getXp() {
+        return xp;
+    }
+
+    private static long getDuration() {
+        return TimeUnit.MINUTES.toMillis(ExperienceConfig.getInstance().getDiminishedReturnsTimeInterval());
+    }
+
+    public int compareTo(SkillXpGain other) {
+        if (this.expiryTime < other.expiryTime) {
+            return -1;
+        }
+        else if (this.expiryTime > other.expiryTime) {
+            return 1;
+        }
+        return 0;
+    }
+
+    @Override
+    public int compareTo(Delayed other) {
+        if (other instanceof SkillXpGain) {
+            // Use more efficient method if possible (private fields)
+            return this.compareTo((SkillXpGain) other);
+        }
+        return (int) (getDelay(TimeUnit.MILLISECONDS) - other.getDelay(TimeUnit.MILLISECONDS));
+    }
+
+    @Override
+    public long getDelay(TimeUnit arg0) {
+        return arg0.convert(expiryTime - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/party/Party.java

@@ -2,8 +2,10 @@ package com.gmail.nossr50.datatypes.party;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map.Entry;
+import java.util.UUID;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Sound;
@@ -20,9 +22,10 @@ import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
 
 public class Party {
-    private final LinkedHashSet<String> members = new LinkedHashSet<String>();
+    private final LinkedHashMap<UUID, String> members = new LinkedHashMap<UUID, String>();
+    private final List<Player> onlineMembers = new ArrayList<Player>();
 
-    private String leader;
+    private PartyLeader leader;
     private String name;
     private String password;
     private boolean locked;
@@ -43,14 +46,14 @@ public class Party {
         this.name = name;
     }
 
-    public Party(String leader, String name) {
+    public Party(PartyLeader leader, String name) {
         this.leader = leader;
         this.name = name;
         this.locked = true;
         this.level = 0;
     }
 
-    public Party(String leader, String name, String password) {
+    public Party(PartyLeader leader, String name, String password) {
         this.leader = leader;
         this.name = name;
         this.password = password;
@@ -58,7 +61,7 @@ public class Party {
         this.level = 0;
     }
 
-    public Party(String leader, String name, String password, boolean locked) {
+    public Party(PartyLeader leader, String name, String password, boolean locked) {
         this.leader = leader;
         this.name = name;
         this.password = password;
@@ -66,21 +69,11 @@ public class Party {
         this.level = 0;
     }
 
-    public LinkedHashSet<String> getMembers() {
+    public LinkedHashMap<UUID, String> getMembers() {
         return members;
     }
 
     public List<Player> getOnlineMembers() {
-        List<Player> onlineMembers = new ArrayList<Player>();
-
-        for (String memberName : members) {
-            Player member = mcMMO.p.getServer().getPlayerExact(memberName);
-
-            if (member != null) {
-                onlineMembers.add(member);
-            }
-        }
-
         return onlineMembers;
     }
 
@@ -97,11 +90,19 @@ public class Party {
         return onlinePlayerNames;
     }
 
+    public boolean addOnlineMember(Player player) {
+        return onlineMembers.add(player);
+    }
+
+    public boolean removeOnlineMember(Player player) {
+        return onlineMembers.remove(player);
+    }
+
     public String getName() {
         return name;
     }
 
-    public String getLeader() {
+    public PartyLeader getLeader() {
         return leader;
     }
 
@@ -133,7 +134,7 @@ public class Party {
         this.name = name;
     }
 
-    public void setLeader(String leader) {
+    public void setLeader(PartyLeader leader) {
         this.leader = leader;
     }
 
@@ -220,7 +221,8 @@ public class Party {
         }
 
         if (!Config.getInstance().getPartyInformAllMembers()) {
-            Player leader = mcMMO.p.getServer().getPlayer(this.leader);
+            Player leader = mcMMO.p.getServer().getPlayer(this.leader.getUniqueId());
+
             if (leader != null) {
                 leader.sendMessage(LocaleLoader.getString("Party.LevelUp", levelsGained, getLevel()));
 
@@ -303,13 +305,24 @@ public class Party {
         }
     }
 
+    public boolean hasMember(String memberName) {
+        return this.getMembers().values().contains(memberName);
+    }
+
+    public boolean hasMember(UUID uuid) {
+        return this.getMembers().keySet().contains(uuid);
+    }
+
     public String createMembersList(String playerName, List<Player> nearMembers) {
         StringBuilder memberList = new StringBuilder();
 
-        for (String memberName : this.getMembers()) {
-            Player member = mcMMO.p.getServer().getPlayerExact(memberName);
+        for (Entry<UUID, String> memberEntry : this.getMembers().entrySet()) {
+            UUID uuid = memberEntry.getKey();
+            String memberName = memberEntry.getValue();
 
-            if (this.getLeader().equalsIgnoreCase(memberName)) {
+            Player member = mcMMO.p.getServer().getPlayer(uuid);
+
+            if (this.getLeader().getUniqueId().equals(uuid)) {
                 memberList.append(ChatColor.GOLD);
 
                 if (member == null) {

src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java

@@ -0,0 +1,21 @@
+package com.gmail.nossr50.datatypes.party;
+
+import java.util.UUID;
+
+public class PartyLeader {
+    private UUID uuid;
+    private String playerName;
+
+    public PartyLeader(UUID uuid, String playerName) {
+        this.uuid = uuid;
+        this.playerName = playerName;
+    }
+
+    public UUID getUniqueId() {
+        return uuid;
+    }
+
+    public String getPlayerName() {
+        return playerName;
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -3,15 +3,16 @@ package com.gmail.nossr50.datatypes.player;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.Server;
 import org.bukkit.Sound;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.scheduler.BukkitRunnable;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
@@ -29,6 +30,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.runnables.skills.AbilityDisableTask;
+import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.runnables.skills.ToolLowerTask;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
@@ -44,6 +46,7 @@ import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.salvage.SalvageManager;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
 import com.gmail.nossr50.skills.swords.SwordsManager;
+import com.gmail.nossr50.skills.taming.Taming;
 import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.skills.unarmed.UnarmedManager;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
@@ -51,6 +54,8 @@ import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.ParticleEffectUtils;
 import com.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -92,15 +97,24 @@ public class McMMOPlayer {
     private boolean isUsingUnarmed;
     private final FixedMetadataValue playerMetadata;
 
-    public McMMOPlayer(Player player) {
+    public McMMOPlayer(Player player, PlayerProfile profile) {
         String playerName = player.getName();
+        UUID uuid = player.getUniqueId();
 
         this.player = player;
         playerMetadata = new FixedMetadataValue(mcMMO.p, playerName);
-        profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, true);
-        party = PartyManager.getPlayerParty(playerName);
+        this.profile = profile;
+        party = PartyManager.getPlayerParty(playerName, uuid);
         ptpRecord = new PartyTeleportRecord();
 
+        if (inParty()) {
+            loginParty();
+        }
+
+        if (profile.getUniqueId() == null) {
+            profile.setUniqueId(uuid);
+        }
+
         /*
          * I'm using this method because it makes code shorter and safer (we don't have to add all SkillTypes manually),
          * but I actually have no idea about the performance impact, if there is any.
@@ -124,69 +138,6 @@ public class McMMOPlayer {
         for (ToolType toolType : ToolType.values()) {
             toolMode.put(toolType, false);
         }
-
-        if (!profile.isLoaded()) {
-            mcMMO.p.getLogger().warning("Unable to load the PlayerProfile for " + playerName + ". Will retry over the next several seconds.");
-            new RetryProfileLoadingTask().runTaskTimerAsynchronously(mcMMO.p, 11L, 31L);
-        }
-    }
-
-    private class RetryProfileLoadingTask extends BukkitRunnable {
-        private static final int MAX_TRIES = 5;
-        private final String playerName = McMMOPlayer.this.player.getName();
-        private int attempt = 0;
-
-        // WARNING: ASYNC TASK
-        // DO NOT MODIFY THE McMMOPLAYER FROM THIS CODE
-        @Override
-        public void run() {
-            // Quit if they logged out
-            if (!player.isOnline()) {
-                mcMMO.p.getLogger().info("Aborting profile loading recovery for " + playerName + " - player logged out");
-                this.cancel();
-                return;
-            }
-
-            // Send the message that we're doing the recovery
-            if (attempt == 0) {
-                player.sendMessage(LocaleLoader.getString("Recovery.Notice"));
-            }
-
-            // Increment attempt counter and try
-            attempt++;
-            PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, true);
-            // If successful, schedule the apply
-            if (profile.isLoaded()) {
-                new ApplySuccessfulProfile(profile).runTask(mcMMO.p);
-                player.sendMessage(LocaleLoader.getString("Recovery.Success"));
-                this.cancel();
-                return;
-            }
-
-            // If we've failed five times, give up
-            if (attempt >= MAX_TRIES) {
-                mcMMO.p.getLogger().severe("Giving up on attempting to load the PlayerProfile for " + playerName);
-                mcMMO.p.getServer().broadcast(LocaleLoader.getString("Recovery.AdminFailureNotice", playerName), Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
-                player.sendMessage(LocaleLoader.getString("Recovery.Failure").split("\n"));
-                this.cancel();
-                return;
-            }
-        }
-    }
-
-    private class ApplySuccessfulProfile extends BukkitRunnable {
-        private final PlayerProfile profile;
-
-        private ApplySuccessfulProfile(PlayerProfile profile) {
-            this.profile = profile;
-        }
-
-        // Synchronized task
-        // No database access permitted
-        @Override
-        public void run() {
-            McMMOPlayer.this.profile = profile;
-        }
     }
 
     public AcrobaticsManager getAcrobaticsManager() {
@@ -636,6 +587,10 @@ public class McMMOPlayer {
         allianceInvite = null;
     }
 
+    public void loginParty() {
+        party.addOnlineMember(this.getPlayer());
+    }
+
     public int getItemShareModifier() {
         if (itemShareModifier < 10) {
             setItemShareModifier(10);
@@ -787,6 +742,21 @@ public class McMMOPlayer {
             return;
         }
 
+        LivingEntity livingEntity = null;
+
+        if (ability == AbilityType.CHARGE) {
+            livingEntity = this.getTamingManager().getTarget(20);
+
+            if (!this.getTamingManager().isEntityTypeNearby(EntityType.WOLF, Taming.wolfCommandRange, true)) {
+                player.sendMessage(LocaleLoader.getString("Taming.Skills.Charge.NoneNearby"));
+                return;
+            }
+            else if (livingEntity == null) {
+                player.sendMessage(LocaleLoader.getString("Taming.Skills.Charge.NoTarget"));
+                return;
+            }
+        }
+
         if (EventUtils.callPlayerAbilityActivateEvent(player, skill).isCancelled()) {
             return;
         }
@@ -810,6 +780,10 @@ public class McMMOPlayer {
             SkillUtils.handleAbilitySpeedIncrease(player);
         }
 
+        if (ability == AbilityType.CHARGE) {
+            this.getTamingManager().handleCharge(livingEntity);
+        }
+
         new AbilityDisableTask(this, ability).runTaskLater(mcMMO.p, ticks * Misc.TICK_CONVERSION_FACTOR);
     }
 
@@ -851,6 +825,11 @@ public class McMMOPlayer {
                 }
             }
 
+            if (ability == AbilityType.CHARGE && !this.getTamingManager().isEntityTypeNearby(EntityType.WOLF, Taming.wolfCommandRange, true)) {
+                player.sendMessage(LocaleLoader.getString("Taming.Skills.Charge.NoneNearby"));
+                return;
+            }
+
             if (Config.getInstance().getAbilityMessagesEnabled()) {
                 player.sendMessage(tool.getRaiseTool());
             }
@@ -926,4 +905,28 @@ public class McMMOPlayer {
     public FixedMetadataValue getPlayerMetadata() {
         return playerMetadata;
     }
+
+    /**
+     * This method is called by PlayerQuitEvent to tear down the mcMMOPlayer.
+     *
+     * @param syncSave if true, data is saved synchronously
+     */
+    public void logout(boolean syncSave) {
+        Player thisPlayer = getPlayer();
+        resetAbilityMode();
+        BleedTimerTask.bleedOut(thisPlayer);
+
+        if (syncSave) {
+            getProfile().save();
+        } else {
+            getProfile().scheduleAsyncSave();
+        }
+
+        UserManager.remove(thisPlayer);
+        ScoreboardManager.teardownPlayer(thisPlayer);
+
+        if (inParty()) {
+            party.removeOnlineMember(thisPlayer);
+        }
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -3,12 +3,15 @@ package com.gmail.nossr50.datatypes.player;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.DelayQueue;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.datatypes.experience.SkillXpGain;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
@@ -19,21 +22,34 @@ import com.google.common.collect.ImmutableMap;
 
 public class PlayerProfile {
     private final String playerName;
+    private UUID uuid;
     private boolean loaded;
     private volatile boolean changed;
 
     /* HUDs */
     private MobHealthbarType mobHealthbarType;
+    private int scoreboardTipsShown;
 
     /* Skill Data */
     private final Map<SkillType, Integer>   skills     = new HashMap<SkillType, Integer>();   // Skill & Level
     private final Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
     private final Map<AbilityType, Integer> abilityDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
 
+    // Store previous XP gains for deminished returns
+    private DelayQueue<SkillXpGain> gainedSkillsXp = new DelayQueue<SkillXpGain>();
+    private HashMap<SkillType, Float> rollingSkillsXp = new HashMap<SkillType, Float>();
+
+    @Deprecated
     public PlayerProfile(String playerName) {
+        this(playerName, null);
+    }
+
+    public PlayerProfile(String playerName, UUID uuid) {
+        this.uuid = uuid;
         this.playerName = playerName;
 
         mobHealthbarType = Config.getInstance().getMobHealthbarDefault();
+        scoreboardTipsShown = 0;
 
         for (AbilityType abilityType : AbilityType.values()) {
             abilityDATS.put(abilityType, 0);
@@ -45,14 +61,22 @@ public class PlayerProfile {
         }
     }
 
+    @Deprecated
     public PlayerProfile(String playerName, boolean isLoaded) {
         this(playerName);
         this.loaded = isLoaded;
     }
 
-    public PlayerProfile(String playerName, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, MobHealthbarType mobHealthbarType) {
+    public PlayerProfile(String playerName, UUID uuid, boolean isLoaded) {
+        this(playerName, uuid);
+        this.loaded = isLoaded;
+    }
+
+    public PlayerProfile(String playerName, UUID uuid, Map<SkillType, Integer> levelData, Map<SkillType, Float> xpData, Map<AbilityType, Integer> cooldownData, MobHealthbarType mobHealthbarType, int scoreboardTipsShown) {
         this.playerName = playerName;
+        this.uuid = uuid;
         this.mobHealthbarType = mobHealthbarType;
+        this.scoreboardTipsShown = scoreboardTipsShown;
 
         skills.putAll(levelData);
         skillsXp.putAll(xpData);
@@ -71,11 +95,11 @@ public class PlayerProfile {
         }
 
         // TODO should this part be synchronized?
-        PlayerProfile profileCopy = new PlayerProfile(playerName, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), mobHealthbarType);
+        PlayerProfile profileCopy = new PlayerProfile(playerName, uuid, ImmutableMap.copyOf(skills), ImmutableMap.copyOf(skillsXp), ImmutableMap.copyOf(abilityDATS), mobHealthbarType, scoreboardTipsShown);
         changed = !mcMMO.getDatabaseManager().saveUser(profileCopy);
 
         if (changed) {
-            mcMMO.p.getLogger().warning("PlayerProfile for " + playerName + " failed to save");
+            mcMMO.p.getLogger().warning("PlayerProfile saving failed for player: " + playerName + " " + uuid);
         }
     }
 
@@ -83,6 +107,16 @@ public class PlayerProfile {
         return playerName;
     }
 
+    public UUID getUniqueId() {
+        return uuid;
+    }
+
+    public void setUniqueId(UUID uuid) {
+        changed = true;
+
+        this.uuid = uuid;
+    }
+
     public boolean isLoaded() {
         return loaded;
     }
@@ -96,9 +130,25 @@ public class PlayerProfile {
     }
 
     public void setMobHealthbarType(MobHealthbarType mobHealthbarType) {
+        changed = true;
+
         this.mobHealthbarType = mobHealthbarType;
     }
 
+    public int getScoreboardTipsShown() {
+        return scoreboardTipsShown;
+    }
+
+    public void setScoreboardTipsShown(int scoreboardTipsShown) {
+        changed = true;
+
+        this.scoreboardTipsShown = scoreboardTipsShown;
+    }
+
+    public void increaseTipsShown() {
+        setScoreboardTipsShown(getScoreboardTipsShown() + 1);
+    }
+
     /*
      * Cooldowns
      */
@@ -189,6 +239,16 @@ public class PlayerProfile {
         skillsXp.put(skill, skillsXp.get(skill) - xp);
     }
 
+    public void removeXp(SkillType skill, float xp) {
+        if (skill.isChildSkill()) {
+            return;
+        }
+
+        changed = true;
+
+        skillsXp.put(skill, skillsXp.get(skill) - xp);
+    }
+
     /**
      * Modify a skill level.
      *
@@ -239,7 +299,46 @@ public class PlayerProfile {
     }
 
     /**
-     * Get the total amount of Xp before the next level.
+     * Get the registered amount of experience gained
+     * This is used for diminished XP returns
+     *
+     * @return xp Experience amount registered
+     */
+    public float getRegisteredXpGain(SkillType skillType) {
+        float xp = 0F;
+
+        if (rollingSkillsXp.get(skillType) != null) {
+            xp = rollingSkillsXp.get(skillType);
+        }
+
+        return xp;
+    }
+
+    /**
+     * Register an experience gain
+     * This is used for diminished XP returns
+     *
+     * @param skillType Skill being used
+     * @param xp Experience amount to add
+     */
+    public void registerXpGain(SkillType skillType, float xp) {
+        gainedSkillsXp.add(new SkillXpGain(skillType, xp));
+        rollingSkillsXp.put(skillType, getRegisteredXpGain(skillType) + xp);
+    }
+
+    /**
+     * Remove experience gains older than a given time
+     * This is used for diminished XP returns
+     */
+    public void purgeExpiredXpGains() {
+        SkillXpGain gain;
+        while ((gain = gainedSkillsXp.poll()) != null) {
+            rollingSkillsXp.put(gain.getSkill(), getRegisteredXpGain(gain.getSkill()) - gain.getXp());
+        }
+    }
+
+    /**
+     * Get the amount of Xp remaining before the next level.
      *
      * @param skillType Type of skill to check
      * @return the total amount of Xp until next level

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

@@ -60,6 +60,13 @@ public enum AbilityType {
             "Swords.Skills.SS.Refresh",
             "Swords.Skills.SS.Other.Off"),
 
+    CHARGE(
+            "Taming.Skills.Charge.On",
+            "Taming.Skills.Charge.Off",
+            "Taming.Skills.Charge.Other.On",
+            "Taming.Skills.Charge.Refresh",
+            "Taming.Skills.Charge.Other.Off"),
+
     /**
      * Has cooldown - but has to share a skill with Super Breaker, so needs special treatment
      */
@@ -152,6 +159,9 @@ public enum AbilityType {
             case BLAST_MINING:
                 return Permissions.remoteDetonation(player);
 
+            case CHARGE:
+                return Permissions.charge(player);
+
             case GIGA_DRILL_BREAKER:
                 return Permissions.gigaDrillBreaker(player);