Updating the readme to reflect current times.

This could possibly eliminate a few issues.

.gitignore

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

Changelog.txt

@@ -7,7 +7,134 @@ Key:
   ! Change
   - Removal
 
-Version 1.4.08-dev
+Version 2.0.00
+    = Fixed an interaction between Tree Feller and Stripped Wood
+    ! Fireworks no longer fire by default for ability activation/deactivation
+    ! Website has been changed and the MOTD string relating to it reflects this
+    ! Discord link added to mcMMO command
+    ! Updated misc strings relating to mcMMO
+
+
+Version 1.5.05-SNAPSHOT
+
+Version 1.5.04
+ + Added option to config.yml to control mcMMO generated sound volume
+ + Added option to config.yml to truncate existing player skill levels that exceed the skill level cap
+ + Falling blocks persist mcMMO natural data
+ = Woodcutting double drops correctly identify acacia and dark oak logs
+ = Skill Reset command now correctly identifies arguments
+ = Hylian Treasure config options are now actually used
+ = Child skills now use parent skills configured skill caps properly
+ = Auto Update config now properly works
+ ! Item dropped from blocks now drop from the center
+ ! Potions Config updated for 1.9
+ ! Flux mining now simulates a block break event for other plugins to act upon
+ ! Zombie Pigmen spawned from nether portals are now considered spawner mobs
+ ! Flux Pickaxe lore now appends to existing lore as opposed to replacing it
+ ! Party chat no longer displays colors when logged in server console
+ - Treefeller no longer lowers exp for big trees
+ - No longer supports 1.8 :(
+ - Removed plugin metrics
+
+Version 1.5.03
+ = Fixed bug where absorption hearts could be attacked by allied players
+ = Fixed bug where new forms of stone would drop the wrong type when mined with Silk Touch
+ = Fixed bug where blocks would not get tracked correctly when using sticky pistons and slime blocks in certain situations
+ = Fixed bug where config value for Daze damage was ignored
+ = Fixed UUID updater to not lose data on errors
+ = Fixed bug where uuid update could result in large amounts of user data being deleted
+ = Fixed bug where custom potions were missed in potion stage calculation
+ = Fixed piston dupe bugs permanently
+ = Fixed bug involving user name changes
+ = Fixed old user purge to properly calculate months
+ = Fixed bug where Repair would incorrectly check items
+ = Fixed bug where apostrophes in locale files would not read correctly
+ = Fixed bug where treasure data was limited to 255 instead of Short.MAX_VALUE
+ ! Moved more user loading calculations to async loading thread to reduce lag on login
+
+Version 1.5.02
+ + Added option to config.yml for Chimaera Wings to stop using bed spawn points
+ + Added option to config.yml to let non-tools in hand count as unarmed
+ + Added option to experience.yml to control XP gained by killing bred animals
+ + Added support for 1.8 mobs and features
+ = Fixed bug where no Mining XP was granted when Flux Mining was successful
+ = Fixed bug with UUID conversions in Flatfile
+ = Fixed a couple Dupe bugs that were introduced recently
+ = Fixed bug where MobHealthbarTypes were not saved between server restarts
+ ! Changed Flux Mining mechanics. In order to use the ability, you need to infuse a pickaxe with furnace powers first.
+ ! Scoreboard tips are only shown a couple of times to the player, instead of once per login session
+ ! Changed Archery distance multiplier to be configurable
+ ! Archery distance XP bonus cannot exceed indefinitely anymore
+
+Version 1.5.01
+ + 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
+ + Added Podzol & Red Sand to Excavation
+ + Added Hardened Clay, Stained Clay, and Packed Ice to Mining blocks
+ + Added Acacia and Dark Oak to Woodcutting blocks
+ + Added Salmon, Clownfish, and Pufferfish to Fishing XP
+ + Added new flowers and grasses to Herbalism XP
+ + Added option to config.yml which allows players to always catch fish, even when a treasure is found
+ + Added option to config.yml to override vanilla Minecraft treasures
+ ! Fishing XP now depends on the type of fish.
+ ! Woodcutting XP in experience.yml and Woodcutting double drops in config.yml now use the tree species names. Oak is now Generic, and Spruce is now Redwood.
+ ! Red_Rose was replaced by Poppy, and so the key in experience.yml has been updated accordingly.
+ - Removed deprecated permission nodes
+ - Removed "Treasure found!" message
+
+Version 1.4.08
  + Added a new skill; Alchemy. Special thanks to EasyMFnE for creating this!
  + Added SecondaryAbilityType enum, and new SecondaryAbilityWeightedActivationCheckEvent, fired when a secondary ability checkes its activation chances
  + Added the possibility to gain experience when using Fishing "Shake"
@@ -21,6 +148,10 @@ Version 1.4.08-dev
  + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
  + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
  + Added support for multiple mod config files, naming can be done as either armor.<modname>.yml or <modname>.armor.yml
+ + Added config options to configure the items used in "Call of the Wild"
+ + Added config option to configure the database command cooldown
+ = Fixed bug where healthbars wouldn't display if skills were disabled
+ = Fixed bug with "Call of the Wild" entities despawning
  = Fixed bug with updating (very) old user data.
  = Fixed bug with checking maximum durability of mod items.
  = Fixed exploit involving Call of The Wild.
@@ -37,9 +168,12 @@ Version 1.4.08-dev
  = Fixed bug where party chat broke if the display name contained special characters
  = Fixed bug where `/addlevels all` and `/skillreset all` didn't work
  = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse
+ = Fixed bug where some horses summoned with "Call of the Wild" were unable to jump
  = Fixed bug where the /ptp request expiration time was checked wrongly - preventing players from using the command
  = Fixed bug where Hylian Luck was broken
  = Fixed bug where Snow would never drop treasures
+ = Fixed issues with commands giving away vanished players.
+ = Fixed bug where the Repair lucky perk would increase the Arcane Forging downgrade chance, instead of decreasing it
  ! Changed party system. Parties now have XP and Levels. Party features such as party teleport and party chat have to be unlocked before they can be used by the party members
  ! Changed appearance of party member list. Gold = party leader, White = online, Gray = offline, Italic = not nearby
  ! Updated localization files
@@ -49,6 +183,8 @@ Version 1.4.08-dev
  ! Changed /ptp config setting, Commands.ptp.Confirm_Required is now Commands.ptp.Accept.Required
  ! Changed config validation for UnlockLevels, they can now also be 0
  ! Changed config validation for Rank_Levels, successive Ranks can now be less than or equal to each other
+ ! Changed default amount of XP gained from mining Quartz Ore. From 250 to 100 XP.
+ ! Changed Acrobatics config setting, Skills.Acrobatics.Prevent_XP_After_Teleport is now Skills.Acrobatics.XP_After_Teleport_Cooldown
  - Removed /stats alias for /mcstats
 
 Version 1.4.07

README.md

@@ -1,8 +1,10 @@
 # mcMMO
 ## The RPG lovers mod
 
-### Dev builds
+### 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/).
+Currently, you can obtain our builds via the Spigot resource page: https://www.spigotmc.org/resources/official-mcmmo.63489/
+
+
 
 ### 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,31 +12,24 @@ 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)]
+### Project Lead & Founder
-(https://github.com/gmcferrin)
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
+
+### Former Lead
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
 
 ### Developers
-[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
+[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)](https://github.com/bm01)
-(https://github.com/bm01)
+[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)](https://github.com/Glitchfinder)
-[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
+[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)](https://github.com/NuclearW)
-(https://github.com/Glitchfinder)
+[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)](https://github.com/shatteredbeam)
-[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)]
+[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)](https://github.com/TfT-02)
-(https://github.com/nossr50)
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)](https://github.com/t00thpick1)
-[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)]
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)](https://github.com/riking)
-(https://github.com/NuclearW)
-[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)]
-(https://github.com/shatteredbeam)
-[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
-(https://github.com/TfT-02)
-[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
-(https://github.com/t00thpick1)
-[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
-(https://github.com/riking)
 
 ### Special thanks
-[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)]
+[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)](https://github.com/EasyMFnE)  
-(https://github.com/EasyMFnE)
 Added the Alchemy skill
 
 ## Compiling
@@ -44,8 +39,7 @@ mcMMO uses Maven 3 to manage dependencies, packaging, and shading of necessary c
 The typical command used to build mcMMO is: `mvn clean package install`
 
 Required Libraries:
-* JUnit
-* EMetrics
 * Bukkit
+* JUnit
 
-http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
+https://www.spigotmc.org/resources/official-mcmmo.63489/ 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
+# Config wrote by Dragyn, updated by M1cr0man
-# Created For Railcraft_1.6.2-8.1.0.0 
+# Up to date as of Railcraft 8.4.0.0
-#
-#
-#  Settings for Axes
-###
 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

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,35 +1,35 @@
-# Config created by Dragyn
+# Config created by joulesbeef
-# Created For twilightforest-1.20.3 
+# Created For twilightforest-2.2.3
 #
 #
 #  Settings for 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
@@ -39,30 +39,30 @@ Boots:
 ###
 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

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
+# Config created by joulesbeef
-# Created For twilightforest-1.20.3 
+# 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

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.4.08-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>
@@ -38,6 +38,14 @@
                     <include>*.yml</include>
                 </includes>
             </resource>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>LICENSE</include>
+                </includes>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -45,8 +53,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
+                    <source>1.8</source>
-                    <target>1.6</target>
+                    <target>1.8</target>
                     <excludes>
                     </excludes>
                 </configuration>
@@ -71,17 +79,27 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
+                <version>3.1.1</version>
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>com.turt2live.metrics:MetricsExtension</include>
+                            <include>commons-logging:commons-logging</include>
+                            <include>org.apache.tomcat:tomcat-jdbc</include>
+                            <include>org.apache.tomcat:tomcat-juli</include>
                         </includes>
                     </artifactSet>
                     <relocations>
                         <relocation>
-                            <pattern>com.turt2live.metrics</pattern>
+                            <pattern>org.apache.commons.logging</pattern>
-                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
+                            <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>
@@ -103,27 +121,12 @@
             </extension>
         </extensions>
     </build>
-    <repositories>
-        <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>md_5-releases</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>Plugin MetricsExtension</id>
-            <url>http://repo.turt2live.com</url>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.6.4-R2.0</version>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
-            <type>jar</type>
+            <scope>provided</scope>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -132,26 +135,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.turt2live.metrics</groupId>
+            <groupId>org.apache.tomcat</groupId>
-            <artifactId>MetricsExtension</artifactId>
+            <artifactId>tomcat-jdbc</artifactId>
-            <version>0.0.5-SNAPSHOT</version>
+            <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>
-        </repository>
-        <snapshotRepository>
-            <id>md_5-snapshots</id>
-            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    <ciManagement>
-        <system>Jenkins</system>
-        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
-    </ciManagement>
 </project>

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

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

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

@@ -1,9 +1,11 @@
 package com.gmail.nossr50.api;
 
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
+import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.util.player.UserManager;
 
 public final class AbilityAPI {
@@ -80,4 +82,8 @@ public final class AbilityAPI {
     public static void setTreeFellerCooldown(Player player, long cooldown) {
         UserManager.getPlayer(player).setAbilityDATS(AbilityType.TREE_FELLER, cooldown);
     }
+
+    public static boolean isBleeding(LivingEntity entity) {
+        return BleedTimerTask.isBleeding(entity);
+    }
 }

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

@@ -1,16 +1,23 @@
 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;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -43,9 +50,7 @@ public final class ExperienceAPI {
     public static boolean isNonChildSkill(String skillType) {
         SkillType skill = SkillType.getSkill(skillType);
 
-        if (skill == null) return false;
+        return skill != null && !skill.isChildSkill();
-
-        return !skill.isChildSkill();
     }
 
     @Deprecated
@@ -64,10 +69,59 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
+    @Deprecated
     public static void addRawXP(Player player, String skillType, float XP) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
+        addRawXP(player, skillType, XP, "UNKNOWN");
     }
 
+    /**
+     * 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
+     *
+     * @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) {
+        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);
@@ -78,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
@@ -85,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>
@@ -100,8 +174,26 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
+    @Deprecated
     public static void addMultipliedXP(Player player, String skillType, int XP) {
-        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
+        addMultipliedXP(player, skillType, XP, "UNKNOWN");
+    }
+
+    /**
+     * Adds XP to the player, calculates for XP Rate only.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to add XP to
+     * @param skillType The skill to add XP to
+     * @param XP The amount of XP to add
+     * @param xpGainReason The reason to gain XP
+     *
+     * @throws InvalidSkillException if the given skill is not valid
+     * @throws InvalidXPGainReasonException if the given xpGainReason is not valid
+     */
+    public static void addMultipliedXP(Player player, String skillType, int XP, String xpGainReason) {
+        getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason));
     }
 
     /**
@@ -116,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()));
     }
@@ -131,10 +224,51 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
+    @Deprecated
     public static void addModifiedXP(Player player, String skillType, int XP) {
+        addModifiedXP(player, skillType, XP, "UNKNOWN");
+    }
+
+    /**
+     * 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
+     *
+     * @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) {
+        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()));
+        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));
     }
 
     /**
@@ -149,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);
 
@@ -167,8 +302,51 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
+    @Deprecated
     public static void addXP(Player player, String skillType, int XP) {
-        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
+        addXP(player, skillType, XP, "UNKNOWN");
+    }
+
+    /**
+     * 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
+     *
+     * @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) {
+        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));
     }
 
     /**
@@ -184,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));
     }
 
     /**
@@ -200,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>
@@ -217,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));
     }
 
     /**
@@ -233,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>
@@ -250,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));
     }
 
     /**
@@ -266,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>
@@ -285,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);
     }
@@ -303,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>
@@ -323,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);
     }
 
     /**
@@ -338,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);
@@ -349,12 +602,43 @@ public final class ExperienceAPI {
                 profile.addLevels(parentSkill, (levels / parentSkills.size()));
             }
 
-            profile.save();
+            profile.scheduleAsyncSave();
             return;
         }
 
         profile.addLevels(skill, levels);
-        profile.save();
+        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();
     }
 
     /**
@@ -369,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));
     }
 
     /**
@@ -384,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>
@@ -397,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();
     }
 
     /**
@@ -410,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);
@@ -421,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>
@@ -460,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.
@@ -476,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>
@@ -492,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);
     }
 
     /**
@@ -507,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>
@@ -524,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);
     }
 
     /**
@@ -540,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>
@@ -557,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);
     }
 
     /**
@@ -573,21 +965,85 @@ 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);
+    }
 
-    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
+    /**
-        PlayerProfile profile = getOfflineProfile(playerName);
+     * 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);
+
+        profile.addXp(skill, XP);
+        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();
@@ -615,4 +1071,32 @@ public final class ExperienceAPI {
 
         return skill;
     }
+
+    private static XPGainReason getXPGainReason(String reason) throws InvalidXPGainReasonException {
+        XPGainReason xpGainReason = XPGainReason.getXPGainReason(reason);
+
+        if (xpGainReason == null) {
+            throw new InvalidXPGainReasonException();
+        }
+
+        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) {
+    @Deprecated
-        PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
+    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)) {
+        for (UUID memberUniqueId : PartyManager.getAllMembers(player).keySet()) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
+            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);
     }
 
@@ -176,7 +193,7 @@ public final class PartyAPI {
     }
 
     public static boolean hasAlly(String partyName) {
-        return PartyManager.getParty(partyName).getAlly() != null;
+        return getAllyName(partyName) != null;
     }
 
     public static String getAllyName(String partyName) {

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/InvalidXPGainReasonException.java

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

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())) {
+        new PartyChatTask(plugin, party, senderName, displayName, message).runTask(plugin);
-            message = message.replaceFirst(Pattern.quote(displayName), ChatColor.GOLD + Matcher.quoteReplacement(displayName) + ChatColor.RESET);
-        }
-
-        for (Player member : party.getOnlineMembers()) {
-            member.sendMessage(message);
-        }
-
-        if (party.getAlly() != null) {
-            for (Player member : party.getAlly().getOnlineMembers()) {
-                String allyPrefix = LocaleLoader.formatString(Config.getInstance().getPartyChatPrefixAlly());
-                member.sendMessage(allyPrefix + message);
-            }
-        }
-
-        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
     }
 }

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -30,6 +29,10 @@ public class KrakenCommand implements TabExecutor {
                     return true;
                 }
 
+                if (!CommandUtils.hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
                 UserManager.getPlayer(sender.getName()).getFishingManager().unleashTheKraken();
                 return true;
 
@@ -58,7 +61,7 @@ public class KrakenCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

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

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

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

@@ -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 + "nossr50@gmail.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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -29,6 +28,10 @@ public abstract class ToggleCommand implements TabExecutor {
                     return true;
                 }
 
+                if (!CommandUtils.hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
                 applyCommandAction(UserManager.getPlayer(sender.getName()));
                 return true;
 
@@ -62,7 +65,7 @@ public abstract class ToggleCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

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

@@ -9,12 +9,12 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -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/database/McremoveCommand.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands.database;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -23,7 +22,7 @@ public class McremoveCommand implements TabExecutor {
             case 1:
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
 
-                if (UserManager.getPlayer(playerName, true) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                if (UserManager.getOfflinePlayer(playerName) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
                     return true;
                 }
 
@@ -45,7 +44,7 @@ public class McremoveCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

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

@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
@@ -26,11 +27,11 @@ public class AddlevelsCommand extends ExperienceCommand {
         profile.addLevels(skill, value);
 
         if (player == null) {
-            profile.save();
+            profile.scheduleAsyncSave();
             return;
         }
 
-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true);
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true, XPGainReason.COMMAND);
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -23,11 +24,11 @@ public class AddxpCommand extends ExperienceCommand {
     @Override
     protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         if (player != null) {
-            UserManager.getPlayer(player).applyXpGain(skill, value);
+            UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND);
         }
         else {
             profile.addXp(skill, value);
-            profile.save();
+            profile.scheduleAsyncSave();
         }
     }
 

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/experience/ExperienceCommand.java

@@ -2,8 +2,9 @@ package com.gmail.nossr50.commands.experience;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
+import java.util.UUID;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -17,7 +18,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 public abstract class ExperienceCommand implements TabExecutor {
@@ -46,6 +46,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     skill = null;
                 }
 
+                if (skill != null && skill.isChildSkill())
+                {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
+                    return true;
+                }
+
                 editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
                 return true;
 
@@ -65,14 +71,25 @@ public abstract class ExperienceCommand implements TabExecutor {
                     skill = null;
                 }
 
+                if (skill != null && skill.isChildSkill())
+                {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
+                    return true;
+                }
+
                 int value = Integer.parseInt(args[2]);
 
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    UUID uuid = null;
+                    OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(playerName);
+                    if (player != null) {
+                        uuid = player.getUniqueId();
+                    }
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -96,7 +113,7 @@ public abstract class ExperienceCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
                 return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));

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

@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
@@ -28,7 +29,7 @@ public class MmoeditCommand extends ExperienceCommand {
         profile.modifySkill(skill, value);
 
         if (player == null) {
-            profile.save();
+            profile.scheduleAsyncSave();
             return;
         }
 
@@ -36,7 +37,7 @@ public class MmoeditCommand extends ExperienceCommand {
             return;
         }
 
-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel);
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND);
     }
 
     @Override

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

@@ -2,8 +2,9 @@ package com.gmail.nossr50.commands.experience;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
+import java.util.UUID;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -14,12 +15,12 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.skills.XPGainReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
 
 /**
@@ -29,6 +30,7 @@ import com.google.common.collect.ImmutableList;
 public class SkillresetCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        SkillType skill;
         switch (args.length) {
             case 1:
                 if (CommandUtils.noConsoleUsage(sender)) {
@@ -44,7 +46,14 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]));
+                if (args[0].equalsIgnoreCase("all")) {
+                    skill = null;
+                }
+                else {
+                    skill = SkillType.getSkill(args[1]);
+                }
+
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill);
                 return true;
 
             case 2:
@@ -57,7 +66,6 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
-                SkillType skill;
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
                 }
@@ -66,11 +74,16 @@ public class SkillresetCommand implements TabExecutor {
                 }
 
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
+                    UUID uuid = null;
+                    OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(playerName);
+                    if (player != null) {
+                        uuid = player.getUniqueId();
+                    }
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -94,7 +107,7 @@ public class SkillresetCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
                 return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
@@ -110,11 +123,11 @@ public class SkillresetCommand implements TabExecutor {
         profile.modifySkill(skill, 0);
 
         if (player == null) {
-            profile.save();
+            profile.scheduleAsyncSave();
             return;
         }
 
-        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false);
+        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false, XPGainReason.COMMAND);
     }
 
     protected boolean permissionsCheckSelf(CommandSender sender) {
@@ -134,7 +147,7 @@ public class SkillresetCommand implements TabExecutor {
     }
 
     private boolean validateArguments(CommandSender sender, String skillName) {
-        return !(CommandUtils.isInvalidSkill(sender, skillName) && !skillName.equalsIgnoreCase("all"));
+        return skillName.equalsIgnoreCase("all") || !CommandUtils.isInvalidSkill(sender, skillName);
     }
 
     protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {

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

@@ -1,6 +1,9 @@
 package com.gmail.nossr50.commands.party;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -9,10 +12,10 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.chat.PartyChatCommand;
 import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
+import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -52,7 +55,7 @@ public class PartyCommand implements TabExecutor {
     private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
     private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
     private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
-    private CommandExecutor partyTeleportCommand       = mcMMO.p.getCommand("ptp").getExecutor();
+    private CommandExecutor partyTeleportCommand       = new PtpCommand();
     private CommandExecutor partyChatCommand           = new PartyChatCommand();
     private CommandExecutor partyAllianceCommand       = new PartyAllianceCommand();
 
@@ -68,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) {
@@ -126,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;
         }
@@ -175,7 +183,7 @@ public class PartyCommand implements TabExecutor {
                     case INVITE:
                     case KICK:
                     case OWNER:
-                        Set<String> playerNames = UserManager.getPlayerNames();
+                        List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                         return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                     case XPSHARE:
                         return StringUtil.copyPartialMatches(args[1], XPSHARE_COMPLETIONS, new ArrayList<String>(XPSHARE_COMPLETIONS.size()));
@@ -190,7 +198,10 @@ public class PartyCommand implements TabExecutor {
                         List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));
 
                         if (matches.size() == 0) {
-                            playerNames = UserManager.getPlayerNames();
+                            Player player = (Player) sender;
+                            Party party = UserManager.getPlayer(player).getParty();
+
+                            playerNames = party.getOnlinePlayerNames(player);
                             return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                         }
 

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

@@ -18,7 +18,7 @@ public class PartyInviteCommand implements CommandExecutor {
         switch (args.length) {
             case 2:
                 String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);
+                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
 
                 if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                     return false;

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

@@ -11,6 +11,7 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
 
 public class PartyKickCommand implements CommandExecutor {
@@ -19,13 +20,15 @@ public class PartyKickCommand implements CommandExecutor {
         switch (args.length) {
             case 2:
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
-                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);
+                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
 
-                if (!playerParty.getMembers().contains(target.getName())) {
+                if (!playerParty.hasMember(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
                     return true;
                 }
 
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
+
                 if (target.isOnline()) {
                     Player onlineTarget = target.getPlayer();
                     String partyName = playerParty.getName();

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/PartyAllianceCommand.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands.party.alliance;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -111,7 +110,7 @@ public class PartyAllianceCommand implements TabExecutor {
                 List<String> matches = StringUtil.copyPartialMatches(args[0], ALLIANCE_SUBCOMMANDS, new ArrayList<String>(ALLIANCE_SUBCOMMANDS.size()));
 
                 if (matches.size() == 0) {
-                    Set<String> playerNames = UserManager.getPlayerNames();
+                    List<String> playerNames = CommandUtils.getOnlinePlayerNames(commandSender);
                     return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                 }
 

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

@@ -18,7 +18,7 @@ public class PartyAllianceInviteCommand implements CommandExecutor {
         switch (args.length) {
             case 3:
                 String targetName = CommandUtils.getMatchedPlayerName(args[2]);
-                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);
+                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
 
                 if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                     return false;
@@ -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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands.party.teleport;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -11,10 +10,10 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -43,7 +42,18 @@ public class PtpCommand implements TabExecutor {
         }
 
         Player player = (Player) sender;
+
+        if (!UserManager.hasPlayerDataKey(player)) {
+            return true;
+        }
+
         McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+        if (!mcMMOPlayer.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return true;
+        }
+
         Party party = mcMMOPlayer.getParty();
 
         if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.TELEPORT)) {
@@ -109,7 +119,14 @@ public class PtpCommand implements TabExecutor {
                 List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));
 
                 if (matches.size() == 0) {
-                    Set<String> playerNames = UserManager.getPlayerNames();
+                    Player player = (Player) sender;
+                    McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+                    if (!mcMMOPlayer.inParty()) {
+                        return ImmutableList.of();
+                    }
+
+                    List<String> playerNames = mcMMOPlayer.getParty().getOnlinePlayerNames(player);
                     return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                 }
 

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.commands.player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -29,12 +28,16 @@ public class InspectCommand implements TabExecutor {
         switch (args.length) {
             case 1:
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
                     PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false); // Temporary Profile
 
+                    if (!CommandUtils.isLoaded(sender, profile)) {
+                        return true;
+                    }
+
                     if (CommandUtils.inspectOffline(sender, profile, Permissions.inspectOffline(sender))) {
                         return true;
                     }
@@ -104,7 +107,7 @@ public class InspectCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();

src/main/java/com/gmail/nossr50/commands/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

@@ -2,12 +2,12 @@ package com.gmail.nossr50.commands.player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.util.StringUtil;
 
 import com.gmail.nossr50.mcMMO;
@@ -15,7 +15,6 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -36,6 +35,10 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
+                if (!CommandUtils.hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
                 display(sender, sender.getName());
 
                 return true;
@@ -46,8 +49,12 @@ public class McrankCommand implements TabExecutor {
                     return true;
                 }
 
+                if (!CommandUtils.hasPlayerDataKey(sender)) {
+                    return true;
+                }
+
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
+                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
 
                 if (mcMMOPlayer != null) {
                     Player player = mcMMOPlayer.getPlayer();
@@ -73,7 +80,7 @@ public class McrankCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                Set<String> playerNames = UserManager.getPlayerNames();
+                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             default:
                 return ImmutableList.of();
@@ -83,12 +90,20 @@ public class McrankCommand implements TabExecutor {
     private void display(CommandSender sender, String playerName) {
         if (sender instanceof Player) {
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
 
-            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
+            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                 return;
             }
 
+            if (((Player) sender).hasMetadata(mcMMO.databaseCommandKey)) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Database.Processing"));
+                return;
+            } else {
+                ((Player) sender).setMetadata(mcMMO.databaseCommandKey, new FixedMetadataValue(mcMMO.p, null));
+            }
+
             mcMMOPlayer.actualizeDatabaseATS();
         }
 

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

@@ -1,27 +1,25 @@
 package com.gmail.nossr50.commands.player;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-
 import com.google.common.collect.ImmutableList;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class MctopCommand implements TabExecutor {
     @Override
@@ -84,13 +82,30 @@ public class MctopCommand implements TabExecutor {
         }
 
         if (sender instanceof Player) {
-            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+            if (!CommandUtils.hasPlayerDataKey(sender)) {
-
-            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                 return;
             }
 
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
+            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
+
+            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+                double seconds = ((mcMMOPlayer.getDatabaseATS() + cooldownMillis) - System.currentTimeMillis()) / 1000;
+                if (seconds < 1) {
+                    seconds = 1;
+                }
+
+                sender.sendMessage(LocaleLoader.formatString(LocaleLoader.getString("Commands.Database.Cooldown"), seconds));
+                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/AprilCommand.java

@@ -0,0 +1,205 @@
+package com.gmail.nossr50.commands.skills;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.HolidayManager.FakeSkillType;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
+
+public class AprilCommand implements TabExecutor {
+    private String skillName;
+
+    protected DecimalFormat percent = new DecimalFormat("##0.00%");
+    protected DecimalFormat decimal = new DecimalFormat("##0.00");
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        skillName = StringUtils.getCapitalized(label);
+
+        switch (args.length) {
+            case 0:
+                Player player = (Player) sender;
+                FakeSkillType fakeSkillType = FakeSkillType.getByName(skillName);
+
+                float skillValue = Misc.getRandom().nextInt(99);
+
+                player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
+                player.sendMessage(LocaleLoader.getString("Commands.XPGain", getXPGainString(fakeSkillType)));
+                player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, Misc.getRandom().nextInt(1000), 1000 + Misc.getRandom().nextInt(1000)));
+
+
+                List<String> effectMessages = effectsDisplay(fakeSkillType);
+
+                if (!effectMessages.isEmpty()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
+
+                    for (String message : effectMessages) {
+                        player.sendMessage(message);
+                    }
+                }
+
+                List<String> statsMessages = statsDisplay(fakeSkillType);
+
+                if (!statsMessages.isEmpty()) {
+                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
+
+                    for (String message : statsMessages) {
+                        player.sendMessage(message);
+                    }
+                }
+
+                player.sendMessage(LocaleLoader.formatString("[[DARK_AQUA]]Guide for {0} available - type /APRIL FOOLS ! :D", skillName));
+                return true;
+
+            default:
+                return true;
+        }
+    }
+
+    private String getXPGainString(FakeSkillType fakeSkillType) {
+        switch (fakeSkillType) {
+            case MACHO:
+                return "Get beaten up";
+            case JUMPING:
+                return "Kris Kross will make ya Jump Jump";
+            case THROWING:
+                return "Chuck your items on the floor";
+            case WRECKING:
+                return "I'M GONNA WRECK IT!";
+            case CRAFTING:
+                return "Craft apple pies";
+            case WALKING:
+                return "Walk around the park";
+            case SWIMMING:
+                return "Like a fish on a bicycle";
+            case FALLING:
+                return "Faceplant the floor, headbutt the ground";
+            case CLIMBING:
+                return "Climb the highest mountain";
+            case FLYING:
+                return "I believe I can fly";
+            case DIVING:
+                return "Scuba club 4000";
+            case PIGGY:
+                return "OINK! OINK!";
+            default:
+                return "Sit and wait?";
+        }
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        switch (args.length) {
+            case 1:
+                return ImmutableList.of("?");
+            default:
+                return ImmutableList.of();
+        }
+    }
+
+    private List<String> effectsDisplay(FakeSkillType fakeSkillType) {
+        List<String> messages = new ArrayList<String>();
+
+        switch (fakeSkillType) {
+            case MACHO:
+                messages.add(LocaleLoader.getString("Effects.Template", "Punching bag", "Absorb damage, like a bag of sand"));
+                break;
+            case JUMPING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Jump", "PRESS SPACE TO JUMP"));
+                messages.add(LocaleLoader.getString("Effects.Template", "Jump Twice", "PRESS SPACE TWICE TO JUMP TWICE"));
+                break;
+            case THROWING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Drop Item", "Randomly drop items, at random"));
+                break;
+            case WRECKING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Ralphinator", "Smash windows with your fists"));
+                break;
+            case CRAFTING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Crafting", "Chance of successful craft"));
+                break;
+            case WALKING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Walk", "Traveling gracefully by foot"));
+                break;
+            case SWIMMING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Swim", "Just keep swimming, swimming, swimming"));
+                break;
+            case FALLING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Skydiving", "Go jump of a cliff. No, seriously."));
+                break;
+            case CLIMBING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Rock Climber", "Use string to climb mountains faster"));
+                break;
+            case FLYING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Fly", "Throw yourself at the ground and miss"));
+                break;
+            case DIVING:
+                messages.add(LocaleLoader.getString("Effects.Template", "Hold Breath", "Press shift to hold your breath longer"));
+                break;
+            case PIGGY:
+                messages.add(LocaleLoader.getString("Effects.Template", "Carrot Turbo", "Supercharge your pigs with carrots"));
+                break;
+        }
+
+        return messages;
+    }
+
+    private List<String> statsDisplay(FakeSkillType fakeSkillType) {
+        List<String> messages = new ArrayList<String>();
+
+        switch (fakeSkillType) {
+            case MACHO:
+                messages.add(LocaleLoader.formatString("[[RED]]Damage Taken: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(77))));
+                break;
+            case JUMPING:
+                messages.add(LocaleLoader.formatString("[[RED]]Double Jump Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case THROWING:
+                messages.add(LocaleLoader.formatString("[[RED]]Drop Item Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(87))));
+                break;
+            case WRECKING:
+                messages.add(LocaleLoader.formatString("[[RED]]Wrecking Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(14))));
+                break;
+            case CRAFTING:
+                messages.add(LocaleLoader.formatString("[[RED]]Crafting Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case WALKING:
+                messages.add(LocaleLoader.formatString("[[RED]]Walk Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case SWIMMING:
+                messages.add(LocaleLoader.formatString("[[RED]]Swim Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case FALLING:
+                messages.add(LocaleLoader.formatString("[[RED]]Skydiving Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(37))));
+                break;
+            case CLIMBING:
+                messages.add(LocaleLoader.formatString("[[RED]]Rock Climber Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case FLYING:
+                messages.add(LocaleLoader.formatString("[[RED]]Fly Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case DIVING:
+                messages.add(LocaleLoader.formatString("[[RED]]Hold Breath Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
+                break;
+            case PIGGY:
+                messages.add(LocaleLoader.formatString("[[RED]]Carrot Turbo Boost: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(80)) + 10));
+                break;
+        }
+
+        return messages;
+    }
+}

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/FishingCommand.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.Location;
-import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
@@ -51,7 +50,6 @@ public class FishingCommand extends SkillCommand {
     @Override
     protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
-        boolean isStorming = player.getWorld().hasStorm();
 
         // TREASURE HUNTER
         if (canTreasureHunt) {
@@ -70,7 +68,7 @@ public class FishingCommand extends SkillCommand {
             double totalEnchantChance = 0;
 
             for (Rarity rarity : Rarity.values()) {
-                if (rarity != Rarity.TRAP || rarity != Rarity.RECORD) {
+                if (rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
                     totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
                 }
             }
@@ -92,16 +90,14 @@ public class FishingCommand extends SkillCommand {
 
         // MASTER ANGLER
         if (canMasterAngler) {
-            double rawBiteChance = 1.0 / (isStorming ? 300 : 500);
+            double rawBiteChance = 1.0 / (player.getWorld().hasStorm() ? 300 : 500);
             Location location = fishingManager.getHookLocation();
 
             if (location == null) {
                 location = player.getLocation();
             }
 
-            Biome biome = location.getBlock().getBiome();
+            if (Fishing.masterAnglerBiomes.contains(location.getBlock().getBiome())) {
-
-            if (biome == Biome.RIVER || biome == Biome.OCEAN) {
                 rawBiteChance = rawBiteChance * AdvancedConfig.getInstance().getMasterAnglerBiomeModifier();
             }
 

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

@@ -1,16 +1,15 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.herbalism.Herbalism;
 import com.gmail.nossr50.util.Permissions;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class HerbalismCommand extends SkillCommand {
     private String greenTerraLength;
@@ -87,8 +86,8 @@ public class HerbalismCommand extends SkillCommand {
     protected void permissionsCheck(Player player) {
         hasHylianLuck = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HYLIAN_LUCK);
         canGreenTerra = Permissions.greenTerra(player);
-        canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
+        canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.WHEAT) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.BEETROOT) || Permissions.greenThumbPlant(player, Material.NETHER_WART) || Permissions.greenThumbPlant(player, Material.COCOA);
-        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
+        canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLESTONE_WALL) || Permissions.greenThumbBlock(player, Material.STONE_BRICKS);
         canFarmersDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET);
         canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();
         canShroomThumb = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHROOM_THUMB);

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/RepairCommand.java

@@ -1,15 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import java.util.ArrayList;
+import com.gmail.nossr50.datatypes.skills.MaterialType;
-import java.util.List;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.ArcaneForging;
 import com.gmail.nossr50.skills.repair.ArcaneForging.Tier;
 import com.gmail.nossr50.skills.repair.Repair;
@@ -17,6 +12,11 @@ import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class RepairCommand extends SkillCommand {
     private String repairMasteryBonus;
@@ -26,7 +26,6 @@ public class RepairCommand extends SkillCommand {
     private boolean canSuperRepair;
     private boolean canMasterRepair;
     private boolean canArcaneForge;
-    private boolean canSalvage;
     private boolean canRepairStone;
     private boolean canRepairIron;
     private boolean canRepairGold;
@@ -49,7 +48,7 @@ public class RepairCommand extends SkillCommand {
     protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
         // We're using pickaxes here, not the best but it works
         Repairable diamondRepairable = mcMMO.getRepairableManager().getRepairable(Material.DIAMOND_PICKAXE);
-        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLD_PICKAXE);
+        Repairable goldRepairable = mcMMO.getRepairableManager().getRepairable(Material.GOLDEN_PICKAXE);
         Repairable ironRepairable = mcMMO.getRepairableManager().getRepairable(Material.IRON_PICKAXE);
         Repairable stoneRepairable = mcMMO.getRepairableManager().getRepairable(Material.STONE_PICKAXE);
 
@@ -77,14 +76,13 @@ public class RepairCommand extends SkillCommand {
         canSuperRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SUPER_REPAIR);
         canMasterRepair = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.REPAIR_MASTERY);
         canArcaneForge = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_FORGING);
-        canSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SALVAGE);
+        canRepairDiamond = Permissions.repairMaterialType(player, MaterialType.DIAMOND);
-        canRepairDiamond = Permissions.repairDiamond(player);
+        canRepairGold = Permissions.repairMaterialType(player, MaterialType.GOLD);
-        canRepairGold = Permissions.repairGold(player);
+        canRepairIron = Permissions.repairMaterialType(player, MaterialType.IRON);
-        canRepairIron = Permissions.repairIron(player);
+        canRepairStone = Permissions.repairMaterialType(player, MaterialType.STONE);
-        canRepairStone = Permissions.repairStone(player);
+        canRepairString = Permissions.repairMaterialType(player, MaterialType.STRING);
-        canRepairString = Permissions.repairString(player);
+        canRepairLeather = Permissions.repairMaterialType(player, MaterialType.LEATHER);
-        canRepairLeather = Permissions.repairLeather(player);
+        canRepairWood = Permissions.repairMaterialType(player, MaterialType.WOOD);
-        canRepairWood = Permissions.repairWood(player);
         arcaneBypass = Permissions.arcaneBypass(player);
     }
 
@@ -122,10 +120,6 @@ public class RepairCommand extends SkillCommand {
             messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.6", diamondLevel), LocaleLoader.getString("Repair.Effect.7")));
         }
 
-        if (canSalvage && Repair.salvageUnlockLevel > 0) {
-            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.16", Repair.salvageUnlockLevel), LocaleLoader.getString("Repair.Effect.17")));
-        }
-
         if (canArcaneForge) {
             messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Repair.Effect.8"), LocaleLoader.getString("Repair.Effect.9")));
         }

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

@@ -0,0 +1,79 @@
+package com.gmail.nossr50.commands.skills;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.salvage.Salvage;
+import com.gmail.nossr50.skills.salvage.SalvageManager;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.player.UserManager;
+
+public class SalvageCommand extends SkillCommand {
+    private boolean canAdvancedSalvage;
+    private boolean canArcaneSalvage;
+
+    public SalvageCommand() {
+        super(SkillType.SALVAGE);
+    }
+
+    @Override
+    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    protected void permissionsCheck(Player player) {
+        canAdvancedSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ADVANCED_SALVAGE);
+        canArcaneSalvage = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ARCANE_SALVAGE);
+    }
+
+    @Override
+    protected List<String> effectsDisplay() {
+        List<String> messages = new ArrayList<String>();
+
+        if (canAdvancedSalvage) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Salvage.Effect.0"), LocaleLoader.getString("Salvage.Effect.1")));
+        }
+
+        if (canArcaneSalvage) {
+            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Salvage.Effect.2"), LocaleLoader.getString("Salvage.Effect.3")));
+        }
+
+        return messages;
+    }
+
+    @Override
+    protected List<String> statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) {
+        List<String> messages = new ArrayList<String>();
+        SalvageManager salvageManager = UserManager.getPlayer(player).getSalvageManager();
+
+        if (canAdvancedSalvage) {
+            if (skillValue < Salvage.advancedSalvageUnlockLevel) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Salvage.Ability.Locked.0", Salvage.advancedSalvageUnlockLevel)));
+            }
+            else {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Ability.Bonus.0"), LocaleLoader.getString("Salvage.Ability.Bonus.1", percent.format(salvageManager.getMaxSalvagePercentage()))));
+            }
+        }
+
+        if (canArcaneSalvage) {
+            messages.add(LocaleLoader.getString("Salvage.Arcane.Rank", salvageManager.getArcaneSalvageRank(), Salvage.Tier.values().length));
+
+            if (Salvage.arcaneSalvageEnchantLoss) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Arcane.ExtractFull"), percent.format(salvageManager.getExtractFullEnchantChance() / 100)));
+            }
+
+            if (Salvage.arcaneSalvageDowngrades) {
+                messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Arcane.ExtractPartial"), percent.format(salvageManager.getExtractPartialEnchantChance() / 100)));
+            }
+        }
+
+        return messages;
+    }
+}

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

@@ -4,7 +4,6 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Set;
 
-import com.gmail.nossr50.util.Motd;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -18,6 +17,7 @@ import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.child.FamilyTree;
+import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -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,6 +12,7 @@ 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;
@@ -44,7 +45,7 @@ public class TamingCommand extends SkillCommand {
     protected void permissionsCheck(Player 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);
+        canEnvironmentallyAware = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.ENVIRONMENTALLY_AWARE);
         canFastFood = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FAST_FOOD);
         canGore = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.GORE);
         canSharpenedClaws = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHARPENED_CLAWS);
@@ -91,9 +92,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().getTamingCOTWOcelotCost()));
+            int costOcelot = Config.getInstance().getTamingCOTWCost(EntityType.OCELOT);
-            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+            String itemOcelot = StringUtils.getPrettyItemString(Config.getInstance().getTamingCOTWMaterial(EntityType.OCELOT));
-            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
+            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/commands/skills/UnarmedCommand.java

@@ -57,7 +57,7 @@ public class UnarmedCommand extends SkillCommand {
 
         // IRON ARM
         if (canIronArm) {
-            ironArmBonus = Math.min(3 + ((int) skillValue / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage);
+            ironArmBonus = Math.min(Unarmed.ironArmMinBonusDamage + ((int) skillValue / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage);
         }
 
         // IRON GRIP