Fix off-by-one chunk coords calculation for ChunkStore.

.gitignore

@@ -2,18 +2,6 @@
 /.classpath
 /.project
 /.settings
-/dependency-reduced-pom.xml
-
-#vs code
-/.vscode
-
-# Maven Depends
-/lib
-
-# gradle
-/.gradle
-/mcMMO-core/.gradle
-/mcMMO-core/gradle
 
 # netbeans
 /nbproject

Changelog.txt

@@ -7,664 +7,7 @@ Key:
   ! Change
   - Removal
 
-Version 2.1.47
-    Fix NPE when party leader is offline and players grab a party list
-
-Version 2.1.46
-    Party member lists now show the whole party, including offline players again.
-    Party lists now have special markers for players who are in shared XP range
-    Party lists now have special markers for players who are offline
-    Party lists now have special markers for the party leader
-    Fixed an error where bleed was setting health outside minimum values
-    [See NOTE] Fixed a bug where Creepers and Zombies were not dropping the correct heads from Shake (thanks Zed-I)
-    [See NOTE] Fixed a bug where salvage was not returning the correct amount of materials for AXE items (thanks Zed-I)
-    [See NOTE] Added missing STRIPPED_WOOD entries to experience.yml for Woodcutting
-    [See NOTE] Added about 15-20 missing entries to experience.yml for coral to Herbalism
-    Fixed a bug where admin chat from console would fail to send (thanks OverCrave)
-    Reduced default XP values for DEAD_* coral plants from 30 -> 10
-    Updated hu_HU locale (thanks andris155)
-
-    NOTE: These bugfixes were related to default config values, to receive these changes you can either delete experience.yml, treasures.yml and salvage.vanilla.yml to generate new ones or make the necessary edits.
-    This is what the files should look like after being edited.
-    Experience Correct Default Config - https://paste.gg/p/anonymous/ff695df1417e4232957a3d176fd14ed4
-    Salvage Correct Default Config - https://paste.gg/p/anonymous/c4eb2f4e66ed444e872021051760f3be
-    Treasures Correct Default Config - https://paste.gg/p/anonymous/b0120210f8c149958ca0303c68c19ebd
-
-Version 2.1.45
-    mcMMO will now check to see if the server version is incompatible and inform server admins on how to fix the problem.
-
-Version 2.1.44
-    Fixed a NPE with Alchemy brewing
-
-Version 2.1.43
-    Fixed a bug that would result in players being told they they failed to salvage enchantments when in reality they succeeded.
-
-Version 2.1.42
-    Fixed McMMOPlayerNotFoundException being thrown instead of null
-    (API) UserManager.getPlayer() returns null again (oopsie)
-    Added new perk permission node `mcmmo.perks.bypass.salvageenchant` - guarantees full enchantment return for Salvage
-    Added alternative permission node `mcmmo.perks.bypass.repairenchant` - guarantees full enchantment return for Repair
-    Added new wildcard perk `mcmmo.perks.bypass.*` and `mcmmo.perks.bypass.all` (either of these will grant all new mcmmo.perks.bypass perk permissions)
-
-    NOTE: Sorry about that, when trying to improve Bungee Cord compatibility I made a big oopsie!
-    NOTE: Repair's new perk permission works in the exact same way as mcmmo.bypass.arcanebypass, bypass perk permissions will all eventually be moved to `mcmmo.perks.bypass`
-    NOTE: Expect perk permissions to all be moved to `mcmmo.perks.X` in the near future
-
-Version 2.1.41
-    Fixed NullPointerException errors when trying to grab PlayerProfiles for players who have not loaded
-    Added new locale string Profile.PendingLoad
-    Added new locale string Commands.Database.CooldownMS
-    Fixed a display error preventing the remaining time on /mcrank from being shown if it was on cooldown
-
-Version 2.1.40
-    (API) mcMMO will now return null in all cases for UserManager.getPlayerProfile() if they have not been loaded yet
-    (API) Roll stores exploit data in AcrobaticsManager now
-    Added new locale string "Profile.Loading.FailureNotice"
-    Added new locale string "Profile.Loading.FailurePlayer"
-    mcMMO no longer gives up forever if a player profile fails to load and the player is still online
-    mcMMO will attempt to save a profile up to 10 times now, previously it would only try one time.
-    Fixed an ArrayIndexOutOfBounds error with Party Chat
-    Player data for mcMMO is now loaded 3 seconds after a player connects in order to give any ongoing save tasks from other servers a small grace period to finish. This will mostly be useful to Bungee servers.
-
-NOTES: I received reports from some users saying that saving and loading was failing could fail and not recover, I have implemented some fail safes to greatly reduce the the odds of that happening.
-
-Version 2.1.39
-    Salvaging an item should now only play the item break sound (was playing the anvil sound simultaneously before)
-    Fixed bug where Tall_Grass was not giving full XP
-    Added Tall_Seagrass and Seagrass to experience.yml under Herbalism (update your configs)
-
-    NOTE: This is what your herbalism section in experience.yml should look like - https://paste.gg/p/anonymous/d5b03bd56e8442f2836f8a954d2974de
-Version 2.1.38
-    Roll XP cooldown down from 60 seconds to 10
-    Updated pt_BR localization (thanks FabioZumbi12)
-    NOTE: The XP Cooldown will be configurable in 2.2 which is nearing the finish line
-
-Version 2.1.37
-    Fixed a potential IndexOutOfBoundsException when informing a disconnected player that their Blast Mining was off CD
-    Updated hu_HU locale (thanks andris)
-    
-Version 2.1.36
-    Updated German locale (Thanks OverCrave)
-    Fixed a bug preventing Villagers from giving combat XP
-    The /mcnotify command will now squelch almost all chat messages or action bar notifications sent to the player from mcMMO
-    mcMMO will now remind players on an hourly basis that they are are not receiving notifications from mcMMO if they have run the mcnotify command and toggled squelch mode
-    Added a new setting to advanced.yml "Feedback.PlayerTips", when set to true this will allow mcMMO to send periodic helpful messages to players, currently this only affects mcnotify reminders.
-
-Version 2.1.35
-    Readded the detonator config option
-
-    NOTE: I decided to make the detonator configurable again because 2.2 is some ways off. Sorry for the inconvenience.
-    NOTE: Pickaxes are now usable for blast mining, this is in addition to the detonator that you can specify in the config. This will be more configurable in the upcoming 2.2 update.
-
-Version 2.1.34
-    Added Llama to taming XP tables
-    Added Parrot to taming XP tables
-    Pickaxes are now used to activate Blast Mining instead of Flint
-    The detonator for Blast Mining is no longer configurable
-    Fixed a bug where Blast Mining did not show cooldown length correctly
-
-    NOTE: You'll have to add these entries in yourself, this is what it should look like: https://paste.gg/p/anonymous/aadbcfde3eb3470fb13caebde4065a03
-    Alternatively you can delete the experience config file to generate a new one
-
-Version 2.1.33
-    Renamed "Skills.Acrobatics.Prevent_AFK_Leveling" to "ExploitFix.Acrobatics"
-    ExploitFix.Acrobatics when set to false allows gaining XP in Acrobatics freely with no anti-grind measures
-    NOTE: The anti-grinding/exploit stuff is fully configurable in update 2.2 coming soon, this hotfix is to hold you over until that update comes out.
-
-Version 2.1.32
-    Completely removed Fireworks from mcMMO because they lag
-    Added 'General.AprilFoolsEvent' setting to config.yml to turn off April Fools
-    NOTE: April Fools event has been in mcMMO for a long time, I did not write it so I didn't know it spawned fireworks like crazy.
-
-Version 2.1.31
-    Fixed a bug where certain SubSkills did not properly send unlock or rank up notifications
-    Fixed a bug where unlock notifications would send simultaneously for a specific skill (still happens if mmoedit changes all skill levels on a player at once)
-    Fixed a bug where mmoedit triggered notifications for skills already gained
-    Fixed NPE with grabbing offline player skill ranks through certain API methods (thanks Ineusia)
-    Updated German language locale (thanks OverCrave)
-
-Version 2.1.30
-    Fixed double drops behaving oddly
-    Double_Drop config table has been renamed to Bonus_Drops, this is to jankily auto-update everyones config
-    DoubleDrop config tables now must contain all things that can possibly be doubled, such as the Ore block, the ore itself, etc.
-    Added the following items to the Bonus_Drops tables for Mining: Coal, Diamond, Emerald, Glowstone_Dust, Iron_Ingot, Lapis_Lazuli, Nether_Quartz, Redstone, Cobblestone
-    Added the following items to the Bonus_Drops tables for Herbalism: Beetroot, Carrot, Cocoa_Beans, Melon_Slice, Potatoe
-    Added the following items to the Bonus_Drops tables for Woodcutting: Birch_Wood, Spruce_Wood, Jungle_Wood, Dark_Oak_Wood, Oak_Wood, Acacia_Wood
-
-    NOTE: You don't need to update your configs for this one unless you had custom entries in the Double_Drop tables, the renaming of the key will auto-insert default values and give everyone correct defaults
-    NOTE: I'm gonna have to blame Bukkit on this one, several API methods I used are actually unfinished and kind of janky. So I hacked something together to make them work.
-
-Version 2.1.29
-    Fixed a bug where double drops and triple drops were not activating
-
-Version 2.1.28
-    Fixed a bug where Archery could not gain XP
-
-Version 2.1.27
-    Fixed an exploit that allowed players to duplicate torches, and rails
-
-Version 2.1.26
-    Added new scaling damage buffs to all existing Combat Skills
-    Added a new subskill named Stab to Swords
-    Fixed a bug where Berserk was not adding 50% damage to attacks
-    Changed how Iron Arm damage is calculated (Rank 1 now effectively gives twice the damage bonus it used to, higher ranks have more damage)
-
-    NOTE: Combat skills will be completely configurable in the upcoming 2.2 update, be patient <3
-
-    New Permissions
-            - mcmmo.ability.unarmed.unarmedlimitbreak
-            - mcmmo.ability.axes.axeslimitbreak
-            - mcmmo.ability.archery.archerylimitbreak
-            - mcmmo.ability.swords.swordslimitbreak
-            - mcmmo.ability.swords.stab
-
-    Notes:
-    The new Limit Break subskills are intended to make Prot IV players less tanky and for you to feel more powerful for having high skill level.
-    Limit Break has 10 ranks, each rank gives 1 extra RAW damage, this is damage before reductions from armor and enchantments. The net result is you deal about 50% more damage with an end game skill compared to before.
-    With these new changes, most skills can 2 shot normal diamond armor, and it takes about 5 hits to kill someone in Prot IV Diamond Armor.
-    I'm not sure everyone will like these changes, the net result is players are a lot easier to kill now, whereas before you could take quite a beating before getting killed.
-    I collected several sets of data before making these changes, including damage to player with and without prot 4 diamond armor, damage to those players with and without enchanted weapons, damage with and without leveling your skills, and combinations of the previously mentioned things.
-
-Version 2.1.25
-    Shake now has an upper limit of damage (10) - Will be configurable in 2.2 which is coming in the near future
-    Rank 1 of Catalysis & Concoctions are now available at level 0 by default (update skillranks.yml or delete it to regen a new one)
-    NOTE: The change to shake was to make mcMMO more compatible with plugins that spawn entities with large amounts of HP
-
-Version 2.1.24
-    Fixed an exploit where you could clone inventories
-
-Version 2.1.23
-    Fixed a bug with Double Drops for Mining (Update your configs instructions below)
-    Fixed a 7 year old bug where damage in mcMMO from SkillBs was potentially getting reduced by damage reduction TWICE
-    Fixed a bug where killing entities with Rupture would not properly credit you as the killer
-    Fixed a bug where Serrated Strikes was applying Rupture twice
-    Players will now be ejected from Minecarts if they cast their fishing rod (anti-afk)
-    Many nerfs to Rupture, its now much more reasonable and not very useful against Protection IV opponents
-    Rupture's strength is now related to your equipped Sword
-    Rupture will no longer be applied if the target is blocking, this doesn't prevent existing bleed damage from occurring though.
-    Wolf's Rupture has strength equivalent to a Stone Sword
-    Only Diamond swords will have bonus rupture damage at Rank 4
-    Rupture damage is cut in half for weapons below Diamond in quality, if the weapon is wooden, the damage is cut in half again.
-    Swords below Diamond quality will have their tick duration drastically reduced
-    Rupture damage is reduced by 25% on players if they are wearing Full Armor (can be any type)
-    Note: You'll need to add these entries to your config.yml manually, or wait for the upcoming config update where this will be fixed for you automatically.
-    NOTE: Here's what your Double_Drop entries in Config.yml for Mining should look like
-        https://paste.gg/p/anonymous/dcd06f1215844311b4f2225f200090d1
-    IMPORTANT: Version 2.1.22 which came before this had a similar fix for Herbalism, instructions on how to fix your Herbalism Double Drops can be found here
-        https://www.spigotmc.org/resources/official-mcmmo.64348/update?update=269868
-    NOTE: Due to the nature of these fixes, Fortune enchants now work with Double/Triple drops
-
-Version 2.1.22
-    Less aggressive spam click protection on Fishing
-    Updated Hungarian file for missing entries related to Fishing messages (credit: andris155)
-    Added all missing flowers to Double Drop tables for Herbalism
-    Fixed bug where Repair Mastery was calculating player skill level incorrectly when determining bonuses
-    Fixed Double Drop entries for all farming crops for Herbalism
-    It no longer requires seeds to replant crops if you are harvesting crops with a hoe (will still consume seeds if you aren't)
-    NOTE: You'll need to add these entries to your config.yml manually, or wait for the upcoming config update where this will be fixed for you automatically.
-    NOTE: Here's what your Double_Drop entries in Config.yml for Herbalism should look like: https://paste.gg/p/anonymous/8d8db4ac69bd495fa48a7f5190484c5e
-
-Version 2.1.21
-    Improved anti-farm/anti-grinding mechanics for Rolling
-    When you gain XP from Rolling there is a cooldown period (60~ seconds) for gaining XP again
-    This XP cooldown period extends if players are taking fall damage within the cooldown period
-        NOTE: Roll already has a few built in measures to prevent XP grinding / abuse, those are still the same.
-        NOTE: Rolls still happen in the cooldown period, you just won't gain XP.
-
-Version 2.1.20
-Added Hungarian localization (Locale code: hu_HU) (thanks andris155)
-Players can now fish in the same spot about 3 times before mcMMO will mark the area as being over-fished (over-fishing is to prevent abuse)
-Added a toggle to turn off the fishing exploit detection to experience.yml "ExploitFix.Fishing"
-    Note: The new config update is coming soon and will use a different setting, putting this out as a band-aid fix for people that don't like the new fishing exploit prevention stuff
-Added a message to warn players that their next fishing attempt will result in over-fishing (Locale: Fishing.LowResources)
-
-Version 2.1.19
-    Greatly Improved Fishing AFK/Exploit Detection
-    Fixed a bug where Fishing AFK detection did not work on a new exploit
-    Certain exploits for Fishing now result in players losing small amounts of hunger and durability
-    Players who get detected by Fishing's anti-exploit measures will no longer get vanilla rewards from Minecraft
-        **Note: Previously if mcMMO detected you abusing Fishing it just switched you over to vanilla Minecraft fishing rewards, this change is to help server admins who don't want players to get any kind of reward from AFK fishing
-    Fishing now drops several hints to players if they are triggering the exploit detection
-        **Note: Not all types of exploit detection will warn players, this is just to prevent legitimate fishers from being confused by the aggressive exploit detection.
-    Added messages to warn players about fishing in the same spot (Locale: Fishing.Scarcity)
-    Added messages to warn players who exploit in order to catch fish unusually fast (Locale: Fishing.Scared)
-    Added messages to warn players about casting the fishing rod too often (Locale: Fishing.Exhausting)
-
-Version 2.1.18
-    You will need to add Kelp to your experience.yml file for this fix to be fully functional
-    Breaking Kelp will now properly count its XP
-    Added "Kelp" to experience.yml (Kelp is actually made up of two blocks mixed together)
-    It is recommended that Kelp and Kelp_Plant have the same XP value in experience.yml
-    mcMMO will now calculate XP for plants that are taller than naturally allowed (Cactus above 3 block height, etc)
-
-Version 2.1.17
-    Fixed a logic error that resulted in Drowned giving no XP
-    Fixed a bug that resulted in mob spawner entities to not be marked for no xp after being transforming into Drowned
-
-Version 2.1.16
-    Breaking Kelp should now count the whole plant for XP
-    Spawned Mobs that are not supposed to award XP will no longer reward XP once transformed (ie: drowned)
-
-Version 2.1.15
-    Fixed a bug where a max rank of Fuel Efficiency would cause its benefits to be lost
-
-Version 2.1.14
-    Added a config option to toggle double drops for Silk Touch pickaxes (advanced.yml "Skills.Mining.DoubleDrops.SilkTouch"
-    Mycelium removed from Woodcutting XP tables (because its soil!)
-    Kelp added to Herbalism XP tables
-    mcMMO now flags blocks moved by piston as not natural to prevent automated XP farms
-    Fixed a bug where Fuel Efficiency was way too good
-    Fixed a display issue with Fisherman's Diet
-    Fuel Efficiency now uses the rank system
-    Removed Fuel Efficiency config options in advanced.yml
-    Added Tropical Fish, Raw Cod, Raw Salmon to the list of foods that benefit from Fisherman's Diet
-
-Version 2.1.13
-    Fixed a bug where Archery's Arrow Retrieval was using the wrong permission node
-
-Version 2.1.12
-    Salvage config entries are no longer case sensitive
-    Fixed a bug where Fishing was not rewarding vanilla XP orbs
-
-Version 2.1.11
-    Fixed a bug where Rupture was using the wrong permission node (new permission node: mcmmo.ability.swords.rupture)
-
-Version 2.1.10
-    Fishing command did an oopsie
-    Endstone now gives the same XP as Stone (update your experience.yml)
-
-Version 2.1.9
-    Fixed a bug where grabbing the version of WG would throw classnotdefined errors
-
-Version 2.1.8
-    mcMMO now checks for WG 7 before attempting to use the WG API
-    Made some optimizations for our WG integration
-    Fixed a bug where Bite chance for Master Angler was displaying too many decimal places
-    Fixed a bug where Abilities didn't check for permission nodes before activating
-    MaxBonusLevel now has specific entries for Standard and Retro in advanced.yml
-    MaxBonusLevel for Critical Strikes changed from 75/750 to 100/1000
-    MaxBonusLevel of Dodge changed from 80/800 to 100/1000
-    MaxBonusLevel of Rupture changed from 20/200 to 100/1000
-    MaxBonusLevel of Counter Attack changed from 60/600 to 100/1000
-
-Version 2.1.7
-    Fixed an almost 6 year old bug where Salvage materials did not have a defined material count so they defaulted to 2 (which could lead to shovels giving back more diamonds than normal)
-    Added spam detection for Unarmed's bonus damage and disarm
-    Corrected an error where master angler for retro only required level 150 instead of 500 (update your skillranks.yml)
-    Fixed a bug where Players could see hidden party members in the party member listings
-    (API) Added addXpFromBlocks to ExperienceAPI to help make adding XP for a player easier
-    (API) Added addXpFromBlocksBySkill to ExperienceAPI to help make adding XP for a player easier
-    (API) Added addXpFromBlock to ExperienceAPI to help make adding XP for a player easier
-    (API) Added addXpFromBlockBySkill to ExperienceAPI to help make adding XP for a player easier
-
-Version 2.1.6
-    Fixed a bug where Arcane Salvage could never fail
-    Recolored some lines in the locale related to failure from white to red
-    Fixed a bug where Salvage was giving back too many resources
-    SubSkillFailure renamed to SubSkillFailed in config.yml
-    SubSkillFailed now sends copies to chat by default
-    SubSkillFailed no longer sends messages to the action bar by default
-
-Version 2.1.5
-    mcMMO no longer ignores cancelled events relating to the player left or right clicking
-
-Version 2.1.4
-    Fixed a bug where Alchemy didn't gain XP
-    Fixed a bug where Archery gained XP from mob spawned entities
-    Fixed a display bug with Roll on /acrobatics command
-    Fixed a display bug for bite chance on Fishing
-    Fixed a display bug for treasure drop chances on Fishing
-    Fixed a display bug for Arcane Forging on Repair
-    Fixed a display bug for Super Repair on Repair
-    Fixed a display bug for Repair Mastery on Repair
-    Fixed a display bug for Second Smelt on Smelting
-    Repair Mastery now uses a rank system
-    Super Repair now uses a rank system
-    Changed the stat for bite chance to be more clear that its additive chance
-    Fixed Styling for the /salvage command
-    Temporarily disabled Flux Mining
-    Removed XP from entities that target endermite to prevent easy exploitation (Credits to TheBentoBox for the tip!) [Can be turned off in experience.yml]
-    Fixed a bug where static chance skills like Arcane Salvage were using incorrect calculations for success
-    Advanced Salvage now uses a rank system
-    Arcane Salvage now goes by your rank to determine the maximum amount of materials salvaged and is no longer percentage based
-    Fixed a bug where Iron Arm was checking for Iron Grip to be unlocked instead of itself
-    (Plugin Compatibility) mcMMO no longer ignores cancelled block place events (this is to prevent XP gains from placed blocks)
-    (Plugin Compatibility) mcMMO now ignores cancelled events relating to the player left or right clicking
-    (Locale) Changed the string for "Salvage.Ability.Bonus.1" to fit the new material recovery mechanics of Salvage
-    (Config) Added a toggle for the new endermite enderman xp farm fix in experience.yml "ExploitFix.EndermanEndermiteFarms"
-    (Config) Cleaned up some leftover 'unlocklevel' settings, this stuff is now handled in skillranks.yml
-    (Config) Removed Salvage.MaxPercentage
-    (Config) Removed Salvage.MaxPercentageChance
-    (Config) Added Salvage.ArcaneSalvage.MaxBonusLevel
-    (Config) Added Salvage.ArcaneSalvage.MaxChance
-
-Version 2.1.3
-    Temporarily removed the unarmed no-item pickup feature until its fixed
-
-Version 2.1.2
-    (Compatibility) mcMMO now deals custom damage type for all damage sources to be more compatible with other plugins (such as anti-cheat)
-    (Perks) Fixed a bug where the Lucky perk wasn't adding to success
-    (Skills) mcMMO will now listen to cancelled events to remove our temporary enchantments from tools
-    (Skills) Fixing a bug where Shake didn't calculate success correctly
-    (Skills) Fixed a bug where Arcane Forging didn't calculate success and failure correctly
-    (Skills) Fixed a bug where Salvage didn't calculate success and failure correctly
-    (Skills) Fixed a bug where Flux Mining didn't calculate success correctly
-    (Skills) Fixed a bug where Shake didn't calculate correctly
-    (Skills) Fixed a bug where Pummel didn't calculate correctly
-    (Skills) Tree Feller now works on Mushroom Stems
-    (Skills) Fixed a bug where magic chance would show as null
-    (Skills) Fixed a bug where Trap percentages were added to Fishing even though they no longer exist
-    (Skills) Magic Hunter now uses a rank system
-    (Skills) Fixed a bug where Magic Hunter would work without treasure hunter
-    (Skills) As long are you are empty handed mcMMO will no longer put items into your hands
-    (Skills) Improved the styling on /smelting
-    (Skills) Iron Arm Style can now reach a bonus damage of 10 (up from 8)
-    (Skills) Iron Arm Style now uses a rank system
-    (Skills) Iron Grip now uses a rank system
-    (Skills) Disarm now uses a rank system
-    (Skills) Arrow Deflect now uses a rank system
-    (Skills) Flux Mining is now a passive effect when you mine ore instead of requiring a special pickaxe
-    (Skills) Removed the Flux Mining mcMMO Pickaxe Item
-    (Style) Locked skills now are styled differently in the skill command display
-    (Experience) Phantoms have been added to the default experience.yml with a value of 4.0 (update your config!)
-    (Experience) Default XP value for witch set to 0.1 instead of 0.0
-    (Experience) Default XP value for ender dragon set to 1.0 instead of 0.0
-    (Style) Added @ symbol styling for hover tooltips to the locale
-    (Style) Added the skill names in the skill commands display to the locale so it can now be edited and styled
-    (Experience) Renamed Grass to Grass_Block in treasures.yml to allow grass to give items again (update your configs manually or delete to regen)
-    (Experience) Wood blocks now give XP and are affected by Tree Feller (6 sided bark blocks)
-    (API) Moved XPGainReason from skills to experience package
-    (API) Added XpGainSource for tracking sources of XP
-    (API) You can now specify XpGainSource when adding xp to players
-    (Config) The Extra Stats option for XP bars now overrides the setting for updating XP bars every time XP is gained
-    (Config) Added an option for Party XP gains to not update XP bars
-    (Config) Added an option for Passive XP gains to not update XP bars (smelting/brewing)
-    (Config) Added warnings if mcMMO finds a MaxBonusLevel of 0 for any skill that incorporates RNG
-    (Config) Removed config options for Iron Arm
-    (Config) Removed the options related to the Flux Mining Item
-    (Config) Second Smelt has a max activation chance of 50% instead of 100% (you can update your configs or gen new ones to get this change)
-
-Version 2.1.1
-    = Fixed an issue where excavation wasn't using the correct permission node
-    = Added protection against AFK fishing
-    = Acrobatics now uses much better anti-exploit detection
-
-Version 2.1.0
- + mcMMO now features XP bars! Configurable in experience.yml
- + Locale files now support & codes for colors and formatting!
- + Prevented exploits involving blocks made from entities (snowmen, etc..)
- + Added JSON integration to all Skill Commands
- + Added config setting to enable or disable old mcMMO skill scaling (General.RetroMode) this is on by default for existing installs
- + You can now disable specific skills in coreskills.yml without the need for permissions
- + Added links to mcMMO related websites to various commands
- + Certain elements of mcMMO's UI have been restyled
- + Added the tagline "Overhaul Era" to various locations until 3.0.0 comes out
- + You can now disable mcMMO completely for specific worlds via world_blacklist.txt in /plugins/mcMMO/
- + (WorldGuard) mcMMO now supports worldguard, you can use the flags "mcmmo" and "mcmmo-xp" on regions (they default to on unless otherwise specified)
- ! (Scoreboards) Scoreboards are now disabled by default, I don't like them. You can turn them back on in config.yml
- + (Sounds) Rolling now plays a sound (Graceful Roll has a different sound :) )
- + (Sounds) Activating Super abilities plays a sound (other plays can hear this)
- + (Sounds) Skill Unlock Notifications have sounds
- + (Sounds) Readying a tool for a super ability now plays a sound
- + (Sounds) Bleed DOT now plays a sound
- + (Experience) mcMMO now notifies you when you progress in a skill!
- + (Experience) Coral (blocks) now give Mining XP
- + (Experience) Coral (plants) now give Herbalism XP
- + (Experience) Blue Ice now gives Mining XP
- + (Experience) Dolphins now give combat XP
- + (Experience) Drowned mobs now count towards combat XP
- + (Experience) You can now set guaranteed minimum values for XP gained if diminishing returns are enabled, this value defaults to 5% (experience.yml)
- + (Events) Starting an XP event will now use the title API (toggle this in advanced.yml)
- + (Sound) Volume and Pitch of sounds can now be configured in the new sounds.yml file
- + (MySQL) Added support for SSL for MySQL/MariaDB (On by default)
- ! (Skills) Taming's Gore now uses Rupture Rank 1 for its DoT calculations
- ! (Skills) Sword's Bleed has been renamed to Rupture
- ! (Skills) Sword's Rupture no longer has an internal hard coded limit
- ! (Skills) Sword's Serrated Strikes now uses your Rupture rank to determine the damage/ticks for its bleed effect.
- ! (Skills) Sword's Rupture now ticks four times as fast
- ! (Skills) Sword's Rupture now refreshes bleed duration instead of adding duration when applying bleed to the same target
- ! (Skills) Sword's Rupture will now deal lethal damage
- = (Skills) Fixed a bug where Rupture would apply an incorrect amount of bleed ticks
- ! (Skills) Sword's Rupture now reaches its max proc chance at level 20 (200 in Retro)
- ! (Skills) Sword's Rupture now has a max chance to proc of 33% instead of 70%
- ! (Skills) Sword's Rupture now deals 50% more damage at above Rank 3 and can last much longer! The base damage for Bleed has been increased as well (update your advanced.yml admins)
- ! (Skills) Sword's Rupture no longer triggers invincibility frames when damaging your opponent
- = (Skills) Furnaces now give XP to the last person to modify their inventory instead of the first person to open them
- + (Skills) Ability Lengths now have a default skill cap at which they stop increasing in length, configurable in advanced.yml (endurance perks extend this limit)
- + (Skills) Added a new subskill to some skills 'Understanding The Art' this adds nothing new, but tracks benefits that increase together that seemed unrelated, which was previously a bit obfuscated.
- + (Skills) Tool alerts now are sent to the Action Bar
- + (Skills) Super Ability activation alerts are now sent to the Action Bar
- + (Skills) Certain Skill messages are now sent to the Action Bar
- + (Skills) Added some missing information to skill stats
- + (Config) Skill Rank requirements are now defined in skillranks.yml you cannot add or remove ranks from this file
- + (Config) Added option to use SSL for MySQL in config.yml
- + (Config) Added option to disable the new URL links to config.yml
- + (Config) New config file added coreskills.yml
- + (Config) Added rank settings for the new Woodcutting skill
- + (Config) Added configurable parameters for the new Tree Feller
- + (Config) Added retro toggle for Tree Feller
- + (Config) Added toggle to disable all scoreboards
- + (Chat) Added ability for admins to spy on party chat (off unless toggled on)
- + (Commands) Added new info command /mmoinfo or /mcinfo
- + (Commands) Added toggle command /mcchatspy
- + (API) Added many missing SubSkills to SubSkillType class
- + (Permissions) Added permission node mcmmo.commands.mcchatspy & mcmmo.commands.mcchatspy.others
- + (Permissions) Added permission nodes for Harvest Lumber, Splinter, Nature's Bounty, and Bark Surgeon
- + (Permissions) Added mcmmo.commands.mmoinfo for the new mmoinfo/mcinfo command
- ! (Permissions) Call of the wild now uses mcmmo.ability.taming.callofthewild instead of mcmmo.ability.taming.callofthewild.all
- + (Locale) Added locale strings for new Woodcutting abilities
- + (Locale) Added locale strings for mcchatspy command
- + (Locale) Added locale strings for JSON integration
- + (Locale) Added locale strings for Taming's Pummel SubSkill
- + (Locale) Added locale strings for Unarmed's Block Cracker SubSkill
- - (Locale) Removed localizations with the following codes for being almost empty: id, HR_hr, et_EE, lv, lt, no, pl_PL, pt_PT, tr_TR
- - (Config) Removed SkillShot's IncreaseLevel & IncreasePercentage (replaced by RankDamageMultiplier)
- - (Config) Removed AxeMastery's MaxBonus & MaxBonusLevel (replaced by RankDamageMultiplier)
- = (Events) Fixed bug where XP rate could be a negative number
- = (Experience) Fixed a bug where you could set a players levels into the negative and bad things would happen
- = (Plugin Compatibility) mcMMO now fires new custom events relating to changes it makes to player scoreboards, plugin authors can listen to these events to improve compatibility
- = (Items) Chimaera Wing now tracks cooldowns between sessions for players (no more disconnect abuse)
- = (Skills) Added missing mushroom blocks to experience.yml defaults
- = (Skills) Tridents will no longer be considered unarmed
- = (MySQL) You can now inspect offline players
- = (MySQL) When converting from MySQL to flatfile mcMMO will now properly include all users in the conversion process
- = (Commands) '/mcMMO help' no longer displays the other/special commands category to players lacking permissions
- + (Party) Parties can now have size limits (configurable in config.yml), party size is unlimited by default
- + (Party) You can now turn on Friendly Fire for parties in config.yml
- + (Debug Stick) The Debug stick can now tell you about properties of a block related to Excavation
- ! (Deaths) Fixed the bug where mob names would be replaced by hearts
- ! (Experience) The XP values of fish are now based on their rarity and have been drastically changed
- ! (Experience) Skills now start at level 1 (configurable in advanced.yml)
- ! (Item) Improved some of the messages sent to the player regarding the Chimaera Wing
- ! (Party) Party member list will only include members of the party that you can see (aren't vanished)
- ! (Skills) Excavation Treasure Hunter is renamed to Archaeology
- ! (Skills) Swords no longer require blocking with a shield to trigger counter attacks
- ! (Skills) Stripping wood and right clicking on stripped wood will no longer ready your Axe
- ! (Skills) Some skill level rank requirements have changed
- ! (Skills) Green Thumb now uses a rank system
- ! (Skills) Farmer's Diet & Fisherman's Diet now use a rank system
- ! (Skills) Fixed an edge case bug where Blast Mining wouldn't inform the player that it was on cooldown
- ! (Skills) mcMMO skills will now be on a scale from 1-100 instead of 0-1000 (for existing mcMMO installs this is opt-in and off by default)
- ! (Skills) Skill Super Powers now use a rank system, almost all of them unlocking first at level 10
- ! (Skills) Acrobatics' Roll exploit detection was tweaked to still allow for Roll to trigger even if it rewards no XP
- ! (Skills) Acrobatics' Roll & Gracefull Roll are now considered the same skill (both mechanics are still there)
- ! (Skills) Woodcutting's Double Drop subskill is now named Harvest Lumber
- ! (Skills) Archery's Skill Shot now uses a rank system
- ! (Skills) Swords' Bleed now uses a rank system
- ! (Skills) Swords' Counter Attack now uses a rank system
- ! (Skills) Axe's Axe Mastery now uses a rank system
- ! (Skills) Axe's Impact now uses a rank system
- ! (Skills) Herbalism's Farmer's Diet now uses a rank system
- ! (Skills) Herbalism's Green Thumb now uses a rank system
- ! (Skills) Shake now uses a rank system
- ! (Skills) Flux Mining now uses a rank system
- ! (Skills) Removed traps from fishing
- ! (Skills) Dodge now uses a rank system
- ! (Skills) Arrow Retrieval now uses a rank system
- ! (Skills) Axes' Critical Strikes now uses a rank system
- ! (Skills) Axes' Greater Impact now uses a rank system
- ! (Skills) Taming's Beast Lore now uses a rank system
- ! (Skills) Taming's Gore now uses a rank system
- ! (Skills) Taming's Call of the Wild now uses a rank system
- ! (Skills) Taming's Pummel now uses a rank system
- ! (Kraken) Removed everything involving the kraken
- = (Skills) Shake now sends custom damage types for better nocheat compat
- ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle
- ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect
- ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack
- ! (Config) Archery.Retrieve in advanced.yml is now Archery.ArrowRetrieval
- ! (Config) Axes.CriticalHit in advanced.yml is now Axes.CriticalStrikes
- ! (Config) Archery's Skill Shot now uses RankDamageMultiplier for its damage bonus calculations
- ! (Config) Axe's Axe mastery now uses RankDamageMultiplier for its damage bonus calculations
- ! (Permissions) Replaced the old Double Drop permission node for woodcutting with a new Harvest Lumber permission node
- ! (Permissions) Fast Food Service permission node renamed to mcmmo.ability.taming.fastfoodservice
- ! (Permissions) Counter Attack permission node renamed to mcmmo.ability.swords.counterattack
- ! (Permissions) Arrow Deflect permission node renamed to mcmmo.ability.unarmed.arrowdeflect
- ! (Permissions) Iron Arm Style permission node renamed to mcmmo.ability.unarmed.ironarmstyle
- ! (Permissions) Remove all mob health bar permissions, this is no longer a per-player setting.
- ! (Commands) Removed the mobhealthbar command, this is no longer a per-player setting.
- ! (Locale) The descriptions of a few skills have changed
- ! (Locale) Removed redundant information from some skill names and descriptions en_US (other locales will need to be updated)
- ! (Locale) SubSkill locale keys are now located at {ParentSkill}.SubSkill.SubSkillName
- ! (Locale) Super Abilities no longer have (ABILITY) in their Skill.Effect strings
- ! (API) mcMMO is now built against Spigot-API instead of Bukkit
- ! (API) Moved a lot of methods from SkillCommand to SkillUtils
- ! (API) SkillType is now PrimarySkillType
- ! (API) SecondarySkill is now SubSkillType
- ! (API) AbilityType is now SuperAbilityType
- ! (API) SecondaryAbilityEvent is now SubSkillEvent
- ! (API) SubSkillType has had many helpful methods added to it
- ! (API) GREEN_THUMB_PLANT & GREEN_THUMB_BLOCK are replaced by GREEN_THUMB
- ! (Code) Refactored some unreadable code relating to SecondaryAbilityType activation in SkillUtils
-
-Version 2.0.0
- = 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
+Version 1.4.08-dev
  + 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"
@@ -677,14 +20,6 @@ Version 1.4.08
  + Added new experience bonus perk 'mcmmo.perks.xp.10percentboost.<skillname>' multiplies incoming XP by 1.1
  + 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.
  = Fixed bug where LeafBlower permissions were ignored
  = Fixed bug with toggle commands not properly displaying the success message.
  = Fixed IllegalArgumentException caused by an empty Fishing treasure category
@@ -698,12 +33,9 @@ Version 1.4.08
  = 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
@@ -713,8 +45,6 @@ Version 1.4.08
  ! 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

Changelog_2.1.0.md

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

README.md

@@ -1,47 +1,41 @@
 # mcMMO
 ## The RPG lovers mod
 
-## Website
-I'm working on a brand new website for mcMMO
-
-You can check it out here http://www.mcmmo.org
-Spigot Resource: https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/
-
-I plan to post links to our new wiki (its still under development), downloads, and dev blogs there.
-
-
-### Builds
-Currently, you can obtain our builds via the Spigot resource page: http://spigot.mcmmo.org
+### Dev builds
+Our latest development builds are available ~~[here](http://ci.mcmmo.info)~~. Unfortunately, the mcMMO site is down; a temporary dev build location is hosted [here](http://ci.ecocitycraft.com/job/mcMMO/).
 
 ### Brief Description
 The goal of mcMMO is to take core Minecraft game mechanics and expand them into add an extensive and quality RPG experience. Everything in mcMMO has been carefully thought out and is constantly being improved upon. Currently, mcMMO adds fourteen unique skills to train and level in. Each of these skills is highly customizable through our configuration files, allowing server admins to tweak mcMMO to best suit the needs of his or her server. Know that the mcMMO team is dedicated to providing an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update.
 
 ## About the Team
-In December 2018 nossr50 returned as project lead for mcMMO once again to develop and improve mcMMO.
-The mcMMO team currently has two members, nossr50 (lead) and t00thpick1 (classic maintainer).
-mcMMO is currently developed almost entirely by nossr50, many thanks go out to the many developers who have worked on the project over the years.
 
-### Project Lead & Founder
-[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
+mcMMO is currently developed by a team of individuals from all over the world.
+### Glorious Leader
+[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)]
+(https://github.com/gmcferrin)
 
-Other mcMMO Projects
+### Developers
+[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)]
+(https://github.com/bm01)
+[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)]
+(https://github.com/Glitchfinder)
+[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)]
+(https://github.com/nossr50)
+[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)]
+(https://github.com/NuclearW)
+[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)]
+(https://github.com/shatteredbeam)
+[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)]
+(https://github.com/TfT-02)
+[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)]
+(https://github.com/t00thpick1)
+[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)]
+(https://github.com/riking)
 
-### Classic Maintainer
-[![t00thpick1](http://www.gravatar.com/avatar/ee23c7794a0c40120c3474287c7bce06.png)](https://github.com/t00thpick1)
-
-## Former Team Members
-
-### Former Lead & Awesome guy
-[![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
-
-### Former team members
-[![bm01](http://www.gravatar.com/avatar/ec8146f5358177f12e9a252271bbc391.png)](https://github.com/bm01)
-[![Glitchfinder](http://www.gravatar.com/avatar/5aa4cce22f72ae9c002ecec30f061d00.png)](https://github.com/Glitchfinder)
-[![NuclearW](http://www.gravatar.com/avatar/90926bdcf1c8a75918df5ea5fa801ce6.png)](https://github.com/NuclearW)
-[![shatteredbeam](http://www.gravatar.com/avatar/cad3b5d7d39cf5387afb87f494389610.png)](https://github.com/shatteredbeam)
-[![TfT_02](http://www.gravatar.com/avatar/b8914f9970e1f6ffd5281ce4770e20a7.png)](https://github.com/TfT-02)
-[![riking](https://1.gravatar.com/avatar/aca9f37e569ac3a63929920035a91ba4.png)](https://github.com/riking)
-[![TheYeti](https://i.imgur.com/tzFrxdo.png)](https://github.com/TheYeti)
+### Special thanks
+[![EasyMFnE](https://www.gravatar.com/avatar/99c9a1fa3bbf957791ceac7b45daadb0.png)]
+(https://github.com/EasyMFnE)
+Added the Alchemy skill
 
 ## Compiling
 
@@ -50,10 +44,8 @@ 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:
-* Bukkit
 * JUnit
-* WorldGuard 7
-* bStats Bukkit
+* EMetrics
+* Bukkit
 
-http://spigot.mcmmo.org for more up to date information.
-https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/ 
+http://dev.bukkit.org/server-mods/mcmmo for more up to date information.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,49 +0,0 @@
-# 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/stargatetech2.blocks.yml

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

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

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

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

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

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

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

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

@@ -1,181 +0,0 @@
-# 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.blocks.yml

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

@@ -1,152 +0,0 @@
-# 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/railcraft.armor.yml

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

extras/mods/railcraft.tools.yml

@@ -1,66 +1,76 @@
-# Config wrote by Dragyn, updated by M1cr0man
-# Up to date as of Railcraft 8.4.0.0
+# Config created by Dragyn
+# Created For Railcraft_1.6.2-8.1.0.0 
+#
+#
+#  Settings for Axes
+###
 Axes:
     # Steel
     X7819:
-        XP_Modifier: 1.0
+        XP_Modifer: 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_Modifier: 1.0
+        XP_Modifer: 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_Modifier: 1.0
+        XP_Modifer: 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_Modifier: 1.0
+        XP_Modifer: 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_Modifier: 1.0
+        XP_Modifer: 1.0
         Ability_Enabled: true
         Tier: 1
         Repairable: true
         Repair_Material: X7796
-        Repair_Material_Pretty_Name: "Steel Ingot"
         Repair_Material_Data_Value: 0
         Repair_Material_Quantity: 2
-        Durability: 500
+        Durability: 500

extras/mods/twilightforest.armor.yml

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

extras/mods/twilightforest.tools.yml

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

pom.xml

@@ -2,22 +2,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.47</version>
+    <version>1.4.08-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
-    <scm>
-        <url>https://github.com/mcMMO-Dev/mcMMO</url>
-        <connection>scm:git:git://github.com/mcMMO-Dev/mcMMO.git</connection>
-        <developerConnection>scm:git:git@github.com:mcMMO-Dev/mcMMO.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
     <issueManagement>
         <url>https://github.com/mcMMO-Dev/mcMMO/issues</url>
         <system>GitHub</system>
     </issueManagement>
-    <packaging>jar</packaging>
     <build>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>mcMMO</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -45,28 +38,15 @@
                     <include>*.yml</include>
                 </includes>
             </resource>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                </includes>
-            </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.2</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                     <excludes>
                     </excludes>
                 </configuration>
@@ -91,32 +71,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>1.5</version>
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>commons-logging:commons-logging</include>
-                            <include>org.apache.tomcat:tomcat-jdbc</include>
-                            <include>org.apache.tomcat:tomcat-juli</include>
-                            <include>org.bstats:bstats-bukkit</include>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
                         </includes>
                     </artifactSet>
                     <relocations>
                         <relocation>
-                            <pattern>org.apache.commons.logging</pattern>
-                            <shadedPattern>com.gmail.nossr50.commons.logging</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache.juli</pattern>
-                            <shadedPattern>com.gmail.nossr50.database.tomcat.juli</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache.tomcat</pattern>
-                            <shadedPattern>com.gmail.nossr50.database.tomcat</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>com.gmail.nossr50.metrics.bstat</shadedPattern>
+                            <pattern>com.turt2live.metrics</pattern>
+                            <shadedPattern>com.gmail.nossr50.metrics.mcstats</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -140,52 +105,26 @@
     </build>
     <repositories>
         <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
         </repository>
         <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
         </repository>
         <repository>
-            <id>sk89q-repo</id>
-            <url>http://maven.sk89q.com/repo/</url>
+            <id>Plugin MetricsExtension</id>
+            <url>http://repo.turt2live.com</url>
         </repository>
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-gitexe</artifactId>
-            <version>1.8.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.4</version>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>RELEASE</version>
+            <type>jar</type>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q.worldguard</groupId>
-            <artifactId>worldguard-core</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q.worldguard</groupId>
-            <artifactId>worldguard-legacy</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bukkit</groupId>
-                    <artifactId>bukkit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit-dep</artifactId>
@@ -193,13 +132,26 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jdbc</artifactId>
-            <version>7.0.52</version>
-            <scope>compile</scope>
+            <groupId>com.turt2live.metrics</groupId>
+            <artifactId>MetricsExtension</artifactId>
+            <version>0.0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>md_5-releases</id>
+            <url>http://repo.md-5.net/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>md_5-snapshots</id>
+            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+    <ciManagement>
+        <system>Jenkins</system>
+        <url>http://ci.ecocitycraft.com/job/mcMMO</url>
+    </ciManagement>
 </project>

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

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

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

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

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

@@ -1,13 +1,14 @@
 package com.gmail.nossr50.api;
 
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
 import com.gmail.nossr50.chat.PartyChatManager;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 
 public final class ChatAPI {
     private ChatAPI() {}

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

@@ -1,23 +1,18 @@
 package com.gmail.nossr50.api;
 
-import com.gmail.nossr50.api.exceptions.*;
-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.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.experience.XPGainSource;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.child.FamilyTree;
-import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.block.BlockState;
+import java.util.Set;
+
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.UUID;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.api.exceptions.InvalidPlayerException;
+import com.gmail.nossr50.api.exceptions.InvalidSkillException;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.skills.child.FamilyTree;
+import com.gmail.nossr50.util.player.UserManager;
 
 public final class ExperienceAPI {
     private ExperienceAPI() {}
@@ -32,7 +27,7 @@ public final class ExperienceAPI {
      * @return true if this is a valid mcMMO skill
      */
     public static boolean isValidSkillType(String skillType) {
-        return PrimarySkillType.getSkill(skillType) != null;
+        return SkillType.getSkill(skillType) != null;
     }
 
     /**
@@ -46,9 +41,11 @@ public final class ExperienceAPI {
      * @return true if this is a valid, non-child mcMMO skill
      */
     public static boolean isNonChildSkill(String skillType) {
-        PrimarySkillType skill = PrimarySkillType.getSkill(skillType);
+        SkillType skill = SkillType.getSkill(skillType);
 
-        return skill != null && !skill.isChildSkill();
+        if (skill == null) return false;
+
+        return !skill.isChildSkill();
     }
 
     @Deprecated
@@ -67,59 +64,10 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
-    @Deprecated
     public static void addRawXP(Player player, String skillType, float XP) {
-        addRawXP(player, skillType, XP, "UNKNOWN");
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), XP);
     }
 
-    /**
-     * Adds raw XP to the player.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add XP to
-     * @param skillType The skill to add XP to
-     * @param XP The amount of XP to add
-     * @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), XPGainSource.CUSTOM);
-            return;
-        }
-
-        getPlayer(player).applyXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason), XPGainSource.CUSTOM);
-    }
-
-    /**
-     * 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);
@@ -130,9 +78,6 @@ 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
@@ -140,27 +85,10 @@ 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>
@@ -172,26 +100,8 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
-    @Deprecated
     public static void addMultipliedXP(Player player, String skillType, int XP) {
-        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), XPGainSource.CUSTOM);
+        UserManager.getPlayer(player).applyXpGain(getSkillType(skillType), (int) (XP * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -206,7 +116,6 @@ 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()));
     }
@@ -222,51 +131,10 @@ 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");
-    }
+        SkillType skill = getSkillType(skillType);
 
-    /**
-     * 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) {
-        PrimarySkillType skill = getSkillType(skillType);
-
-        if (isUnshared) {
-            getPlayer(player).beginUnsharedXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason), XPGainSource.CUSTOM);
-            return;
-        }
-
-        getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()), getXPGainReason(xpGainReason), XPGainSource.CUSTOM);
+        UserManager.getPlayer(player).applyXpGain(skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
 
     /**
@@ -281,9 +149,8 @@ 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) {
-        PrimarySkillType skill = getSkillType(skillType);
+        SkillType skill = getSkillType(skillType);
 
         addOfflineXP(playerName, skill, (int) (XP / skill.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
     }
@@ -300,51 +167,8 @@ public final class ExperienceAPI {
      *
      * @throws InvalidSkillException if the given skill is not valid
      */
-    @Deprecated
     public static void addXP(Player player, String skillType, int 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), XPGainSource.CUSTOM);
-            return;
-        }
-
-        getPlayer(player).beginXpGain(getSkillType(skillType), XP, getXPGainReason(xpGainReason), XPGainSource.CUSTOM);
+        UserManager.getPlayer(player).beginXpGain(getSkillType(skillType), XP);
     }
 
     /**
@@ -360,7 +184,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXP(Player player, String skillType) {
-        return getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillXpLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -376,28 +200,10 @@ 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>
@@ -411,7 +217,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static float getXPRaw(Player player, String skillType) {
-        return getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillXpLevelRaw(getNonChildSkillType(skillType));
     }
 
     /**
@@ -427,28 +233,10 @@ 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>
@@ -462,7 +250,7 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPToNextLevel(Player player, String skillType) {
-        return getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
+        return UserManager.getPlayer(player).getXpToLevel(getNonChildSkillType(skillType));
     }
 
     /**
@@ -478,28 +266,10 @@ 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>
@@ -513,9 +283,9 @@ public final class ExperienceAPI {
      * @throws UnsupportedOperationException if the given skill is a child skill
      */
     public static int getXPRemaining(Player player, String skillType) {
-        PrimarySkillType skill = getNonChildSkillType(skillType);
+        SkillType skill = getNonChildSkillType(skillType);
 
-        PlayerProfile profile = getPlayer(player).getProfile();
+        PlayerProfile profile = UserManager.getPlayer(player).getProfile();
 
         return profile.getXpToLevel(skill) - profile.getSkillXpLevel(skill);
     }
@@ -533,34 +303,14 @@ 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) {
-        PrimarySkillType skill = getNonChildSkillType(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) {
-        PrimarySkillType skill = getNonChildSkillType(skillType);
-        PlayerProfile profile = getOfflineProfile(uuid);
-
-        return profile.getXpToLevel(skill) - profile.getSkillXpLevelRaw(skill);
-    }
-
     /**
      * Add levels to a skill.
      * </br>
@@ -573,7 +323,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void addLevel(Player player, String skillType, int levels) {
-        getPlayer(player).addLevels(getSkillType(skillType), levels);
+        UserManager.getPlayer(player).addLevels(getSkillType(skillType), levels);
     }
 
     /**
@@ -588,55 +338,23 @@ 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);
-        PrimarySkillType skill = getSkillType(skillType);
+        SkillType skill = getSkillType(skillType);
 
         if (skill.isChildSkill()) {
-            Set<PrimarySkillType> parentSkills = FamilyTree.getParents(skill);
+            Set<SkillType> parentSkills = FamilyTree.getParents(skill);
 
-            for (PrimarySkillType parentSkill : parentSkills) {
+            for (SkillType parentSkill : parentSkills) {
                 profile.addLevels(parentSkill, (levels / parentSkills.size()));
             }
 
-            profile.scheduleAsyncSave();
+            profile.save();
             return;
         }
 
         profile.addLevels(skill, levels);
-        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);
-        PrimarySkillType skill = getSkillType(skillType);
-
-        if (skill.isChildSkill()) {
-            Set<PrimarySkillType> parentSkills = FamilyTree.getParents(skill);
-
-            for (PrimarySkillType parentSkill : parentSkills) {
-                profile.addLevels(parentSkill, (levels / parentSkills.size()));
-            }
-
-            profile.scheduleAsyncSave();
-            return;
-        }
-
-        profile.addLevels(skill, levels);
-        profile.scheduleAsyncSave();
+        profile.save();
     }
 
     /**
@@ -651,7 +369,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static int getLevel(Player player, String skillType) {
-        return getPlayer(player).getSkillLevel(getSkillType(skillType));
+        return UserManager.getPlayer(player).getSkillLevel(getSkillType(skillType));
     }
 
     /**
@@ -666,27 +384,10 @@ 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>
@@ -696,7 +397,7 @@ public final class ExperienceAPI {
      * @return the power level of the player
      */
     public static int getPowerLevel(Player player) {
-        return getPlayer(player).getPowerLevel();
+        return UserManager.getPlayer(player).getPowerLevel();
     }
 
     /**
@@ -709,33 +410,11 @@ 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);
 
-        for (PrimarySkillType type : PrimarySkillType.NON_CHILD_SKILLS) {
-            powerLevel += profile.getSkillLevel(type);
-        }
-
-        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 (PrimarySkillType type : PrimarySkillType.NON_CHILD_SKILLS) {
+        for (SkillType type : SkillType.NON_CHILD_SKILLS) {
             powerLevel += profile.getSkillLevel(type);
         }
 
@@ -781,28 +460,10 @@ public final class ExperienceAPI {
      *
      * @return the position on the leaderboard
      */
-    @Deprecated
     public static int getPlayerRankSkill(String playerName, String skillType) {
-        return mcMMO.getDatabaseManager().readRank(mcMMO.p.getServer().getOfflinePlayer(playerName).getName()).get(getNonChildSkillType(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(mcMMO.p.getServer().getOfflinePlayer(uuid).getName()).get(getNonChildSkillType(skillType));
-    }
 
     /**
      * Get the position on the power level leaderboard of a player.
@@ -815,24 +476,8 @@ public final class ExperienceAPI {
      *
      * @return the position on the power level leaderboard
      */
-    @Deprecated
     public static int getPlayerRankOverall(String playerName) {
-        return mcMMO.getDatabaseManager().readRank(mcMMO.p.getServer().getOfflinePlayer(playerName).getName()).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(mcMMO.p.getServer().getOfflinePlayer(uuid).getName()).get(null);
+        return mcMMO.getDatabaseManager().readRank(getOfflineProfile(playerName).getPlayerName()).get(null);
     }
 
     /**
@@ -847,7 +492,7 @@ public final class ExperienceAPI {
      * @throws InvalidSkillException if the given skill is not valid
      */
     public static void setLevel(Player player, String skillType, int skillLevel) {
-        getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
+        UserManager.getPlayer(player).modifySkill(getSkillType(skillType), skillLevel);
     }
 
     /**
@@ -862,27 +507,10 @@ 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>
@@ -896,7 +524,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) {
-        getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
+        UserManager.getPlayer(player).setSkillXpLevel(getNonChildSkillType(skillType), newValue);
     }
 
     /**
@@ -912,28 +540,10 @@ 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>
@@ -947,7 +557,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) {
-        getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
+        UserManager.getPlayer(player).removeXp(getNonChildSkillType(skillType), xp);
     }
 
     /**
@@ -963,153 +573,21 @@ 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);
     }
 
-    /**
-     * Removes XP from an offline player in a specific skill type.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param uuid The player to change the XP of
-     * @param skillType The skill to change the XP for
-     * @param xp The amount of XP to remove
-     *
-     * @throws InvalidSkillException if the given skill is not valid
-     * @throws InvalidPlayerException if the given player does not exist in the database
-     * @throws UnsupportedOperationException if the given skill is a child skill
-     */
-    public static void removeXPOffline(UUID uuid, String skillType, int xp) {
-        getOfflineProfile(uuid).removeXp(getNonChildSkillType(skillType), xp);
-    }
-
-    /**
-     * Check how much XP is needed for a specific level with the selected level curve.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param level The level to get the amount of XP for
-     *
-     * @throws InvalidFormulaTypeException if the given formulaType is not valid
-     */
-    public static int getXpNeededToLevel(int level) {
-        return mcMMO.getFormulaManager().getCachedXpToLevel(level, ExperienceConfig.getInstance().getFormulaType());
-    }
-
-    /**
-     * Check how much XP is needed for a specific level with the provided level curve.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param level The level to get the amount of XP for
-     * @param formulaType The formula type to get the amount of XP for
-     *
-     * @throws InvalidFormulaTypeException if the given formulaType is not valid
-     */
-    public static int getXpNeededToLevel(int level, String formulaType) {
-        return mcMMO.getFormulaManager().getCachedXpToLevel(level, getFormulaType(formulaType));
-    }
-
-    /**
-     * Will add the appropriate type of XP from the block to the player based on the material of the blocks given
-     * @param blockStates the blocks to reward XP for
-     * @param mcMMOPlayer the target player
-     */
-    public static void addXpFromBlocks(ArrayList<BlockState> blockStates, McMMOPlayer mcMMOPlayer)
-    {
-        for(BlockState bs : blockStates)
-        {
-            for(PrimarySkillType skillType : PrimarySkillType.values())
-            {
-                if(ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0)
-                {
-                    mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, bs.getType()), XPGainReason.PVE, XPGainSource.SELF);
-                }
-            }
-        }
-    }
-
-    /**
-     * Will add the appropriate type of XP from the block to the player based on the material of the blocks given if it matches the given skillType
-     * @param blockStates the blocks to reward XP for
-     * @param mcMMOPlayer the target player
-     * @param skillType target primary skill
-     */
-    public static void addXpFromBlocksBySkill(ArrayList<BlockState> blockStates, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType)
-    {
-        for(BlockState bs : blockStates)
-        {
-            if(ExperienceConfig.getInstance().getXp(skillType, bs.getType()) > 0)
-            {
-                mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, bs.getType()), XPGainReason.PVE, XPGainSource.SELF);
-            }
-        }
-    }
-
-    /**
-     * Will add the appropriate type of XP from the block to the player based on the material of the blocks given
-     * @param blockState The target blockstate
-     * @param mcMMOPlayer The target player
-     */
-    public static void addXpFromBlock(BlockState blockState, McMMOPlayer mcMMOPlayer)
-    {
-        for(PrimarySkillType skillType : PrimarySkillType.values())
-        {
-            if(ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0)
-            {
-                mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, blockState.getType()), XPGainReason.PVE, XPGainSource.SELF);
-            }
-        }
-    }
-
-    /**
-     * Will add the appropriate type of XP from the block to the player based on the material of the blocks given if it matches the given skillType
-     * @param blockState The target blockstate
-     * @param mcMMOPlayer The target player
-     * @param skillType target primary skill
-     */
-    public static void addXpFromBlockBySkill(BlockState blockState, McMMOPlayer mcMMOPlayer, PrimarySkillType skillType)
-    {
-        if(ExperienceConfig.getInstance().getXp(skillType, blockState.getType()) > 0)
-        {
-            mcMMOPlayer.applyXpGain(skillType, ExperienceConfig.getInstance().getXp(skillType, blockState.getType()), XPGainReason.PVE, XPGainSource.SELF);
-        }
-    }
-
-
-
     // Utility methods follow.
-    private static void addOfflineXP(UUID playerUniqueId, PrimarySkillType skill, int XP) {
-        PlayerProfile profile = getOfflineProfile(playerUniqueId);
+
+    private static void addOfflineXP(String playerName, SkillType skill, int XP) {
+        PlayerProfile profile = getOfflineProfile(playerName);
 
         profile.addXp(skill, XP);
         profile.save();
     }
 
-    @Deprecated
-    private static void addOfflineXP(String playerName, PrimarySkillType 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) {
-        UUID uuid = mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId();
-        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(uuid);
+        PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
         if (!profile.isLoaded()) {
             throw new InvalidPlayerException();
@@ -1118,8 +596,8 @@ public final class ExperienceAPI {
         return profile;
     }
 
-    private static PrimarySkillType getSkillType(String skillType) throws InvalidSkillException {
-        PrimarySkillType skill = PrimarySkillType.getSkill(skillType);
+    private static SkillType getSkillType(String skillType) throws InvalidSkillException {
+        SkillType skill = SkillType.getSkill(skillType);
 
         if (skill == null) {
             throw new InvalidSkillException();
@@ -1128,8 +606,8 @@ public final class ExperienceAPI {
         return skill;
     }
 
-    private static PrimarySkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
-        PrimarySkillType skill = getSkillType(skillType);
+    private static SkillType getNonChildSkillType(String skillType) throws InvalidSkillException, UnsupportedOperationException {
+        SkillType skill = getSkillType(skillType);
 
         if (skill.isChildSkill()) {
             throw new UnsupportedOperationException("Child skills do not have XP");
@@ -1137,39 +615,4 @@ 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;
-    }
-
-    /**
-     * @deprecated Use UserManager::getPlayer(Player player) instead
-     * @param player target player
-     * @return McMMOPlayer for that player if the profile is loaded, otherwise null
-     * @throws McMMOPlayerNotFoundException
-     */
-    @Deprecated
-    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,17 +1,16 @@
 package com.gmail.nossr50.api;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyLeader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.player.NotificationManager;
-import com.gmail.nossr50.util.player.UserManager;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.player.UserManager;
 
 public final class PartyAPI {
     private PartyAPI() {}
@@ -41,9 +40,6 @@ public final class PartyAPI {
      * @return true if the player is in a party, false otherwise
      */
     public static boolean inParty(Player player) {
-        if(UserManager.getPlayer(player) == null)
-            return false;
-
         return UserManager.getPlayer(player).inParty();
     }
 
@@ -78,58 +74,12 @@ public final class PartyAPI {
      *
      * @param player The player to add to the party
      * @param partyName The party to add the player to
-     * @deprecated parties can have limits, use the other method
      */
-    @Deprecated
     public static void addToParty(Player player, String partyName) {
-        //Check if player profile is loaded
-        if(UserManager.getPlayer(player) == null)
-            return;
-
         Party party = PartyManager.getParty(partyName);
 
         if (party == null) {
-            party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName);
-        } else {
-            if(PartyManager.isPartyFull(player, party))
-            {
-                NotificationManager.sendPlayerInformation(player, NotificationType.PARTY_MESSAGE, "Commands.Party.PartyFull", party.toString());
-                return;
-            }
-        }
-
-        PartyManager.addToParty(UserManager.getPlayer(player), party);
-    }
-
-    /**
-     * The max party size of the server
-     * 0 or less for no size limit
-     * @return the max party size on this server
-     */
-    public static int getMaxPartySize()
-    {
-        return Config.getInstance().getPartyMaxSize();
-    }
-
-    /**
-     * Add a player to a party.
-     * </br>
-     * This function is designed for API usage.
-     *
-     * @param player The player to add to the party
-     * @param partyName The party to add the player to
-     * @param bypassLimit if true bypasses party size limits
-     */
-    //TODO: bypasslimit not used?
-    public static void addToParty(Player player, String partyName, boolean bypassLimit) {
-        //Check if player profile is loaded
-        if(UserManager.getPlayer(player) == null)
-            return;
-
-        Party party = PartyManager.getParty(partyName);
-
-        if (party == null) {
-            party = new Party(new PartyLeader(player.getUniqueId(), player.getName()), partyName);
+            party = new Party(player.getName(), partyName);
         }
 
         PartyManager.addToParty(UserManager.getPlayer(player), party);
@@ -143,10 +93,6 @@ public final class PartyAPI {
      * @param player The player to remove
      */
     public static void removeFromParty(Player player) {
-        //Check if player profile is loaded
-        if(UserManager.getPlayer(player) == null)
-            return;
-
         PartyManager.removeFromParty(UserManager.getPlayer(player));
     }
 
@@ -159,7 +105,7 @@ public final class PartyAPI {
      * @return the leader of the party
      */
     public static String getPartyLeader(String partyName) {
-        return PartyManager.getPartyLeaderName(partyName);
+        return PartyManager.getPartyLeader(partyName);
     }
 
     /**
@@ -168,11 +114,10 @@ public final class PartyAPI {
      * This function is designed for API usage.
      *
      * @param partyName The name of the party to set the leader of
-     * @param playerName The playerName to set as leader
+     * @param player The player to set as leader
      */
-    @Deprecated
-    public static void setPartyLeader(String partyName, String playerName) {
-        PartyManager.setPartyLeader(mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId(), PartyManager.getParty(partyName));
+    public static void setPartyLeader(String partyName, String player) {
+        PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
     }
 
     /**
@@ -187,8 +132,8 @@ public final class PartyAPI {
     public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
         List<OfflinePlayer> members = new ArrayList<OfflinePlayer>();
 
-        for (UUID memberUniqueId : PartyManager.getAllMembers(player).keySet()) {
-            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberUniqueId);
+        for (String memberName : PartyManager.getAllMembers(player)) {
+            OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
             members.add(member);
         }
         return members;
@@ -202,20 +147,7 @@ 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);
     }
 
@@ -244,7 +176,7 @@ public final class PartyAPI {
     }
 
     public static boolean hasAlly(String partyName) {
-        return getAllyName(partyName) != null;
+        return PartyManager.getParty(partyName).getAlly() != null;
     }
 
     public static String getAllyName(String partyName) {

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

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

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

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

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

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

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

@@ -1,8 +1,9 @@
 package com.gmail.nossr50.chat;
 
+import org.bukkit.plugin.Plugin;
+
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
-import org.bukkit.plugin.Plugin;
 
 public class AdminChatManager extends ChatManager {
     protected AdminChatManager(Plugin plugin) {

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

@@ -1,14 +1,11 @@
 package com.gmail.nossr50.chat;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.events.chat.McMMOChatEvent;
-import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import com.gmail.nossr50.events.chat.McMMOChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
+
 public abstract class ChatManager {
     protected Plugin plugin;
     protected boolean useDisplayNames;
@@ -36,38 +33,6 @@ public abstract class ChatManager {
         message = LocaleLoader.formatString(chatPrefix, displayName) + " " + event.getMessage();
 
         sendMessage();
-
-        /*
-         * Party Chat Spying
-         * Party messages will be copied to people with the mcmmo.admin.chatspy permission node
-         */
-        if(event instanceof McMMOPartyChatEvent)
-        {
-            //We need to grab the party chat name
-            McMMOPartyChatEvent partyChatEvent = (McMMOPartyChatEvent) event;
-
-            //Find the people with permissions
-            for(McMMOPlayer mcMMOPlayer : UserManager.getPlayers())
-            {
-                Player player = mcMMOPlayer.getPlayer();
-
-                //Check for toggled players
-                if(mcMMOPlayer.isPartyChatSpying())
-                {
-                    Party adminParty = mcMMOPlayer.getParty();
-
-                    //Only message admins not part of this party
-                    if(adminParty != null)
-                    {
-                        //TODO: Incorporate JSON
-                        if(!adminParty.getName().equalsIgnoreCase(partyChatEvent.getParty()))
-                            player.sendMessage(LocaleLoader.getString("Commands.AdminChatSpy.Chat", partyChatEvent.getParty(), message));
-                    } else {
-                        player.sendMessage(LocaleLoader.getString("Commands.AdminChatSpy.Chat", partyChatEvent.getParty(), message));
-                    }
-                }
-            }
-        }
     }
 
     public void handleChat(String senderName, String message) {

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

@@ -1,9 +1,10 @@
 package com.gmail.nossr50.chat;
 
-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import java.util.HashMap;
+
 import org.bukkit.plugin.Plugin;
 
-import java.util.HashMap;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
 
 public class ChatManagerFactory {
     private static final HashMap<Plugin, AdminChatManager> adminChatManagers = new HashMap<Plugin, AdminChatManager>();

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

@@ -1,10 +1,16 @@
 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.runnables.party.PartyChatTask;
-import org.bukkit.plugin.Plugin;
+import com.gmail.nossr50.locale.LocaleLoader;
 
 public class PartyChatManager extends ChatManager {
     private Party party;
@@ -24,6 +30,21 @@ public class PartyChatManager extends ChatManager {
 
     @Override
     protected void sendMessage() {
-        new PartyChatTask(plugin, party, senderName, displayName, message).runTask(plugin);
+        if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
+            message = message.replaceFirst(Pattern.quote(displayName), ChatColor.GOLD + Matcher.quoteReplacement(displayName) + ChatColor.RESET);
+        }
+
+        for (Player member : party.getOnlineMembers()) {
+            member.sendMessage(message);
+        }
+
+        if (party.getAlly() != null) {
+            for (Player member : party.getAlly().getOnlineMembers()) {
+                String allyPrefix = LocaleLoader.formatString(Config.getInstance().getPartyChatPrefixAlly());
+                member.sendMessage(allyPrefix + message);
+            }
+        }
+
+        plugin.getLogger().info("[P]<" + party.getName() + ">" + message);
     }
 }

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

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

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

@@ -1,45 +0,0 @@
-package com.gmail.nossr50.commands;
-
-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.mcMMO;
-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 java.util.List;
-
-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

@@ -1,344 +0,0 @@
-package com.gmail.nossr50.commands;
-
-import com.gmail.nossr50.datatypes.skills.ModConfigType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-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/McabilityCommand.java

@@ -1,9 +1,10 @@
 package com.gmail.nossr50.commands;
 
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
-import org.bukkit.command.CommandSender;
 
 public class McabilityCommand extends ToggleCommand {
     @Override

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

@@ -1,21 +1,23 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
-import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
-import com.gmail.nossr50.datatypes.experience.FormulaType;
-import com.gmail.nossr50.mcMMO;
-import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
+import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+
+import com.google.common.collect.ImmutableList;
 
 public class McconvertCommand implements TabExecutor {
     private static final List<String> FORMULA_TYPES;

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

@@ -1,9 +1,10 @@
 package com.gmail.nossr50.commands;
 
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
-import org.bukkit.command.CommandSender;
 
 public class McgodCommand extends ToggleCommand {
     @Override

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

@@ -1,15 +1,16 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.commands.party.PartySubcommandType;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.commands.party.PartySubcommandType;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
 public class McmmoCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -26,13 +27,10 @@ public class McmmoCommand implements CommandExecutor {
 
                 if (Config.getInstance().getDonateMessageEnabled()) {
                     sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
-                }
-
-                if (Permissions.showversion(sender)) {
-                    sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
                 }
 
+                sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
                 mcMMO.getHolidayManager().anniversaryCheck(sender);
                 return true;
 
@@ -70,10 +68,6 @@ public class McmmoCommand implements CommandExecutor {
     }
 
     private void displayOtherCommands(CommandSender sender) {
-        //Don't show them this category if they have none of the permissions
-        if(!Permissions.skillreset(sender) && !Permissions.mmoedit(sender) && !Permissions.adminChat(sender) && !Permissions.mcgod(sender))
-            return;
-
         sender.sendMessage(LocaleLoader.getString("Commands.Other"));
 
         if (Permissions.skillreset(sender)) {

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

@@ -1,15 +1,17 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
+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 java.util.List;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
 
 public class McnotifyCommand implements TabExecutor {
     @Override
@@ -18,10 +20,6 @@ public class McnotifyCommand implements TabExecutor {
             case 0:
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
 
-                //Not Loaded yet
-                if(mcMMOPlayer == null)
-                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
-
                 sender.sendMessage(LocaleLoader.getString("Commands.Notifications." + (mcMMOPlayer.useChatNotifications() ? "Off" : "On")));
                 mcMMOPlayer.toggleChatNotifications();
                 return true;

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

@@ -1,9 +1,10 @@
 package com.gmail.nossr50.commands;
 
+import org.bukkit.command.CommandSender;
+
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
-import org.bukkit.command.CommandSender;
 
 public class McrefreshCommand extends ToggleCommand {
     @Override

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

@@ -1,17 +1,19 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import com.google.common.collect.ImmutableList;
 
 public class McscoreboardCommand implements TabExecutor {
     private static final List<String> FIRST_ARGS = ImmutableList.of("keep", "time", "clear");
@@ -31,7 +33,7 @@ public class McscoreboardCommand implements TabExecutor {
                 }
 
                 if (args[0].equalsIgnoreCase("keep")) {
-                    if (!Config.getInstance().getAllowKeepBoard() || !Config.getInstance().getScoreboardsEnabled()) {
+                    if (!Config.getInstance().getAllowKeepBoard()) {
                         sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
                         return true;
                     }

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

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

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

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

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

@@ -1,22 +1,21 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-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.NotificationManager;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.ChatColor;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
 
 public class XprateCommand implements TabExecutor {
     private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier();
@@ -25,7 +24,7 @@ public class XprateCommand implements TabExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 1:
-                if (!args[0].equalsIgnoreCase("reset") &&  !args[0].equalsIgnoreCase("clear")) {
+                if (!args[0].equalsIgnoreCase("reset")) {
                     return false;
                 }
 
@@ -35,18 +34,7 @@ public class XprateCommand implements TabExecutor {
                 }
 
                 if (mcMMO.p.isXPEventEnabled()) {
-
-                    if(AdvancedConfig.getInstance().useTitlesForXPEvent())
-                    {
-                        NotificationManager.broadcastTitle(mcMMO.p.getServer(),
-                                LocaleLoader.getString("Commands.Event.Stop"),
-                                LocaleLoader.getString("Commands.Event.Stop.Subtitle"),
-                                10, 10*20, 20);
-                    }
-
-                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop"));
-                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop.Subtitle"));
-
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.over"));
                     mcMMO.p.toggleXpEventEnabled();
                 }
 
@@ -74,25 +62,11 @@ public class XprateCommand implements TabExecutor {
                 }
 
                 int newXpRate = Integer.parseInt(args[0]);
-
-                if(newXpRate < 0)
-                {
-                    sender.sendMessage(ChatColor.RED+LocaleLoader.getString("Commands.NegativeNumberWarn"));
-                    return true;
-                }
-
                 ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
 
                 if (mcMMO.p.isXPEventEnabled()) {
-                    if(AdvancedConfig.getInstance().useTitlesForXPEvent())
-                    {
-                        NotificationManager.broadcastTitle(mcMMO.p.getServer(),
-                                LocaleLoader.getString("Commands.Event.Start"),
-                                LocaleLoader.getString("Commands.Event.XP", newXpRate),
-                                10, 10*20, 20);
-                    }
-                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Start"));
-                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.XP", newXpRate));
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                    mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
                 }
                 else {
                     sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));

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

@@ -1,8 +1,9 @@
 package com.gmail.nossr50.commands.chat;
 
-import com.gmail.nossr50.datatypes.chat.ChatMode;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+
 public class AdminChatCommand extends ChatCommand {
     public AdminChatCommand() {
         super(ChatMode.ADMIN);

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

@@ -1,24 +1,26 @@
 package com.gmail.nossr50.commands.chat;
 
-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.mcMMO;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
 
 public abstract class ChatCommand implements TabExecutor {
     private ChatMode chatMode;
@@ -39,10 +41,6 @@ public abstract class ChatCommand implements TabExecutor {
                     return true;
                 }
 
-                if (!CommandUtils.hasPlayerDataKey(sender)) {
-                    return true;
-                }
-
                 mcMMOPlayer = UserManager.getPlayer(sender.getName());
 
                 if (mcMMOPlayer.isChatEnabled(chatMode)) {
@@ -59,9 +57,6 @@ public abstract class ChatCommand implements TabExecutor {
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;
                     }
-                    if (!CommandUtils.hasPlayerDataKey(sender)) {
-                        return true;
-                    }
 
                     enableChatMode(UserManager.getPlayer(sender.getName()), sender);
                     return true;
@@ -71,9 +66,6 @@ public abstract class ChatCommand implements TabExecutor {
                     if (CommandUtils.noConsoleUsage(sender)) {
                         return true;
                     }
-                    if (!CommandUtils.hasPlayerDataKey(sender)) {
-                        return true;
-                    }
 
                     disableChatMode(UserManager.getPlayer(sender.getName()), sender);
                     return true;

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

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

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

@@ -1,15 +1,14 @@
 package com.gmail.nossr50.commands.chat;
 
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class PartyChatCommand extends ChatCommand {
     public PartyChatCommand() {
@@ -22,10 +21,6 @@ public class PartyChatCommand extends ChatCommand {
         String message;
 
         if (sender instanceof Player) {
-            //Check if player profile is loaded
-            if(UserManager.getPlayer((Player) sender) == null)
-                return;
-
             party = UserManager.getPlayer((Player) sender).getParty();
 
             if (party == null) {
@@ -33,11 +28,6 @@ public class PartyChatCommand extends ChatCommand {
                 return;
             }
 
-            if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
-                sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
-                return;
-            }
-
             message = buildChatMessage(args, 0);
         }
         else {

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

@@ -1,18 +1,18 @@
 package com.gmail.nossr50.commands.database;
 
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.database.DatabaseManagerFactory;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class ConvertDatabaseCommand implements CommandExecutor {
     @Override
@@ -55,13 +55,13 @@ public class ConvertDatabaseCommand implements CommandExecutor {
                 UserManager.clearAll();
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getUniqueId());
+                    PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getName(), false);
 
                     if (profile.isLoaded()) {
                         mcMMO.getDatabaseManager().saveUser(profile);
                     }
 
-                    new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                    UserManager.addUser(player);
                 }
 
                 new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()).runTaskAsynchronously(mcMMO.p);

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

@@ -1,14 +1,16 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.google.common.collect.ImmutableList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 
-import java.util.List;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
 
 public class McpurgeCommand implements TabExecutor {
     @Override

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

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

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

@@ -1,14 +1,16 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.google.common.collect.ImmutableList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 
-import java.util.List;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.locale.LocaleLoader;
+
+import com.google.common.collect.ImmutableList;
 
 public class MmoshowdbCommand implements TabExecutor {
     @Override

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

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class AddlevelsCommand extends ExperienceCommand {
     @Override
@@ -21,16 +21,16 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
         profile.addLevels(skill, value);
 
         if (player == null) {
-            profile.scheduleAsyncSave();
+            profile.save();
             return;
         }
 
-        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true, XPGainReason.COMMAND);
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, true);
     }
 
     @Override
@@ -39,7 +39,7 @@ public class AddlevelsCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", value, skill.getName()));
     }
 }

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

@@ -1,14 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.experience.XPGainSource;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class AddxpCommand extends ExperienceCommand {
     @Override
@@ -22,17 +21,13 @@ public class AddxpCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         if (player != null) {
-            //Check if player profile is loaded
-            if(UserManager.getPlayer(player) == null)
-                return;
-
-            UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND, XPGainSource.COMMAND);
+            UserManager.getPlayer(player).applyXpGain(skill, value);
         }
         else {
             profile.addXp(skill, value);
-            profile.scheduleAsyncSave();
+            profile.save();
         }
     }
 
@@ -42,7 +37,7 @@ public class AddxpCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", value, skill.getName()));
     }
 }

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

@@ -1,16 +1,16 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.FormulaType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.FormulaConversionTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.database.FormulaConversionTask;
+import com.gmail.nossr50.util.player.UserManager;
+
 public class ConvertExperienceCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -37,7 +37,7 @@ public class ConvertExperienceCommand implements CommandExecutor {
                 new FormulaConversionTask(sender, newType).runTaskLater(mcMMO.p, 1);
 
                 for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
+                    UserManager.addUser(player);
                 }
 
                 return true;

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

@@ -1,28 +1,29 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
-import org.bukkit.OfflinePlayer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
 
 public abstract class ExperienceCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PrimarySkillType skill;
+        SkillType skill;
 
         switch (args.length) {
             case 2:
@@ -39,26 +40,12 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                skill = PrimarySkillType.getSkill(args[0]);
+                skill = SkillType.getSkill(args[0]);
 
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
                 }
 
-                if (skill != null && skill.isChildSkill())
-                {
-                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
-                    return true;
-                }
-
-                //Profile not loaded
-                if(UserManager.getPlayer(sender.getName()) == null)
-                {
-                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
-                    return true;
-                }
-
-
                 editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill, Integer.parseInt(args[1]));
                 return true;
 
@@ -72,31 +59,20 @@ public abstract class ExperienceCommand implements TabExecutor {
                     return true;
                 }
 
-                skill = PrimarySkillType.getSkill(args[1]);
+                skill = SkillType.getSkill(args[1]);
 
                 if (args[1].equalsIgnoreCase("all")) {
                     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.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    UUID uuid = null;
-                    OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(playerName);
-                    if (player != null) {
-                        uuid = player.getUniqueId();
-                    }
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -120,10 +96,10 @@ public abstract class ExperienceCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
-                return StringUtil.copyPartialMatches(args[1], PrimarySkillType.SKILL_NAMES, new ArrayList<String>(PrimarySkillType.SKILL_NAMES.size()));
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
             default:
                 return ImmutableList.of();
         }
@@ -131,15 +107,15 @@ public abstract class ExperienceCommand implements TabExecutor {
 
     protected abstract boolean permissionsCheckSelf(CommandSender sender);
     protected abstract boolean permissionsCheckOthers(CommandSender sender);
-    protected abstract void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value);
+    protected abstract void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value);
     protected abstract void handlePlayerMessageAll(Player player, int value);
-    protected abstract void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill);
+    protected abstract void handlePlayerMessageSkill(Player player, int value, SkillType skill);
 
     private boolean validateArguments(CommandSender sender, String skillName, String value) {
         return !(CommandUtils.isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && CommandUtils.isInvalidSkill(sender, skillName)));
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
         if (skill == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
         }
@@ -148,10 +124,10 @@ public abstract class ExperienceCommand implements TabExecutor {
         }
     }
 
-    protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill, int value) {
         if (skill == null) {
-            for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
-                handleCommand(player, profile, primarySkillType, value);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                handleCommand(player, profile, skillType, value);
             }
 
             if (player != null) {

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

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class MmoeditCommand extends ExperienceCommand {
     @Override
@@ -21,14 +21,14 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill, int value) {
         int skillLevel = profile.getSkillLevel(skill);
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
 
         profile.modifySkill(skill, value);
 
         if (player == null) {
-            profile.scheduleAsyncSave();
+            profile.save();
             return;
         }
 
@@ -36,7 +36,7 @@ public class MmoeditCommand extends ExperienceCommand {
             return;
         }
 
-        EventUtils.handleLevelChangeEventEdit(player, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND, skillLevel);
+        EventUtils.handleLevelChangeEvent(player, skill, value, xpRemoved, value > skillLevel);
     }
 
     @Override
@@ -45,7 +45,7 @@ public class MmoeditCommand extends ExperienceCommand {
     }
 
     @Override
-    protected void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill) {
+    protected void handlePlayerMessageSkill(Player player, int value, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", skill.getName(), value));
     }
 }

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

@@ -1,26 +1,26 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-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;
-import org.bukkit.OfflinePlayer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
+import com.google.common.collect.ImmutableList;
 
 /**
  * This class mirrors the structure of ExperienceCommand, except the
@@ -29,7 +29,6 @@ import java.util.UUID;
 public class SkillresetCommand implements TabExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        PrimarySkillType skill;
         switch (args.length) {
             case 1:
                 if (CommandUtils.noConsoleUsage(sender)) {
@@ -45,14 +44,7 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
-                if (args[0].equalsIgnoreCase("all")) {
-                    skill = null;
-                }
-                else {
-                    skill = PrimarySkillType.getSkill(args[1]);
-                }
-
-                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), skill);
+                editValues((Player) sender, UserManager.getPlayer(sender.getName()).getProfile(), SkillType.getSkill(args[0]));
                 return true;
 
             case 2:
@@ -65,24 +57,20 @@ public class SkillresetCommand implements TabExecutor {
                     return true;
                 }
 
+                SkillType skill;
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
                 }
                 else {
-                    skill = PrimarySkillType.getSkill(args[1]);
+                    skill = SkillType.getSkill(args[1]);
                 }
 
                 String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
 
                 // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
                 if (mcMMOPlayer == null) {
-                    UUID uuid = null;
-                    OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(playerName);
-                    if (player != null) {
-                        uuid = player.getUniqueId();
-                    }
-                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, uuid, false);
+                    PlayerProfile profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);
 
                     if (CommandUtils.unloadedProfile(sender, profile)) {
                         return true;
@@ -106,27 +94,27 @@ public class SkillresetCommand implements TabExecutor {
     public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
         switch (args.length) {
             case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                 return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
             case 2:
-                return StringUtil.copyPartialMatches(args[1], PrimarySkillType.SKILL_NAMES, new ArrayList<String>(PrimarySkillType.SKILL_NAMES.size()));
+                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
             default:
                 return ImmutableList.of();
         }
     }
 
-    protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill) {
+    protected void handleCommand(Player player, PlayerProfile profile, SkillType skill) {
         int levelsRemoved = profile.getSkillLevel(skill);
         float xpRemoved = profile.getSkillXpLevelRaw(skill);
 
         profile.modifySkill(skill, 0);
 
         if (player == null) {
-            profile.scheduleAsyncSave();
+            profile.save();
             return;
         }
 
-        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false, XPGainReason.COMMAND);
+        EventUtils.handleLevelChangeEvent(player, skill, levelsRemoved, xpRemoved, false);
     }
 
     protected boolean permissionsCheckSelf(CommandSender sender) {
@@ -141,15 +129,15 @@ public class SkillresetCommand implements TabExecutor {
         player.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
     }
 
-    protected void handlePlayerMessageSkill(Player player, PrimarySkillType skill) {
+    protected void handlePlayerMessageSkill(Player player, SkillType skill) {
         player.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skill.getName()));
     }
 
     private boolean validateArguments(CommandSender sender, String skillName) {
-        return skillName.equalsIgnoreCase("all") || !CommandUtils.isInvalidSkill(sender, skillName);
+        return !(CommandUtils.isInvalidSkill(sender, skillName) && !skillName.equalsIgnoreCase("all"));
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, SkillType skill) {
         if (skill == null) {
             sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
         }
@@ -158,10 +146,10 @@ public class SkillresetCommand implements TabExecutor {
         }
     }
 
-    protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill) {
+    protected void editValues(Player player, PlayerProfile profile, SkillType skill) {
         if (skill == null) {
-            for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
-                handleCommand(player, profile, primarySkillType);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                handleCommand(player, profile, skillType);
             }
 
             if (player != null) {

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

@@ -1,12 +1,13 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
 public class HardcoreCommand extends HardcoreModeCommand {
     @Override
     protected boolean checkTogglePermissions(CommandSender sender) {
@@ -19,10 +20,10 @@ public class HardcoreCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected boolean checkEnabled(PrimarySkillType skill) {
+    protected boolean checkEnabled(SkillType skill) {
         if (skill == null) {
-            for (PrimarySkillType primarySkillType : PrimarySkillType.values()) {
-                if (!primarySkillType.getHardcoreStatLossEnabled()) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreStatLossEnabled()) {
                     return false;
                 }
             }
@@ -34,12 +35,12 @@ public class HardcoreCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected void enable(PrimarySkillType skill) {
+    protected void enable(SkillType skill) {
         toggle(true, skill);
     }
 
     @Override
-    protected void disable(PrimarySkillType skill) {
+    protected void disable(SkillType skill) {
         toggle(false, skill);
     }
 
@@ -49,10 +50,10 @@ public class HardcoreCommand extends HardcoreModeCommand {
         sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
     }
 
-    private void toggle(boolean enable, PrimarySkillType skill) {
+    private void toggle(boolean enable, SkillType skill) {
         if (skill == null) {
-            for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
-                primarySkillType.setHardcoreStatLossEnabled(enable);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreStatLossEnabled(enable);
             }
         }
         else {

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

@@ -1,18 +1,20 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.google.common.collect.ImmutableList;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.util.StringUtil;
 
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.commands.CommandUtils;
+
+import com.google.common.collect.ImmutableList;
 
 public abstract class HardcoreModeCommand implements TabExecutor {
     protected final DecimalFormat percent = new DecimalFormat("##0.00%");
@@ -74,7 +76,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
                     return true;
                 }
 
-                PrimarySkillType skill = PrimarySkillType.getSkill(args[0]);
+                SkillType skill = SkillType.getSkill(args[0]);
 
                 if (!CommandUtils.isChildSkill(sender, skill)) {
                     return true;
@@ -123,8 +125,8 @@ public abstract class HardcoreModeCommand implements TabExecutor {
 
     protected abstract boolean checkTogglePermissions(CommandSender sender);
     protected abstract boolean checkModifyPermissions(CommandSender sender);
-    protected abstract boolean checkEnabled(PrimarySkillType skill);
-    protected abstract void enable(PrimarySkillType skill);
-    protected abstract void disable(PrimarySkillType skill);
+    protected abstract boolean checkEnabled(SkillType skill);
+    protected abstract void enable(SkillType skill);
+    protected abstract void disable(SkillType skill);
     protected abstract void modify(CommandSender sender, double newPercentage);
 }

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

@@ -1,12 +1,13 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.Permissions;
+
 public class VampirismCommand extends HardcoreModeCommand {
     @Override
     protected boolean checkTogglePermissions(CommandSender sender) {
@@ -19,10 +20,10 @@ public class VampirismCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected boolean checkEnabled(PrimarySkillType skill) {
+    protected boolean checkEnabled(SkillType skill) {
         if (skill == null) {
-            for (PrimarySkillType primarySkillType : PrimarySkillType.values()) {
-                if (!primarySkillType.getHardcoreVampirismEnabled()) {
+            for (SkillType skillType : SkillType.values()) {
+                if (!skillType.getHardcoreVampirismEnabled()) {
                     return false;
                 }
             }
@@ -34,12 +35,12 @@ public class VampirismCommand extends HardcoreModeCommand {
     }
 
     @Override
-    protected void enable(PrimarySkillType skill) {
+    protected void enable(SkillType skill) {
         toggle(true, skill);
     }
 
     @Override
-    protected void disable(PrimarySkillType skill) {
+    protected void disable(SkillType skill) {
         toggle(false, skill);
     }
 
@@ -49,10 +50,10 @@ public class VampirismCommand extends HardcoreModeCommand {
         sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
     }
 
-    private void toggle(boolean enable, PrimarySkillType skill) {
+    private void toggle(boolean enable, SkillType skill) {
         if (skill == null) {
-            for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
-                primarySkillType.setHardcoreVampirismEnabled(enable);
+            for (SkillType skillType : SkillType.NON_CHILD_SKILLS) {
+                skillType.setHardcoreVampirismEnabled(enable);
             }
         }
         else {

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

@@ -1,13 +1,14 @@
 package com.gmail.nossr50.commands.party;
 
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class PartyAcceptCommand implements CommandExecutor {
     @Override
@@ -15,17 +16,8 @@ public class PartyAcceptCommand implements CommandExecutor {
         switch (args.length) {
             case 1:
                 Player player = (Player) sender;
-
-                //Check if player profile is loaded
-                if(UserManager.getPlayer(player) == null)
-                {
-                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
-                    return true;
-                }
-
                 McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
-
                 if (!mcMMOPlayer.hasPartyInvite()) {
                     sender.sendMessage(LocaleLoader.getString("mcMMO.NoInvites"));
                     return true;

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

@@ -1,39 +1,30 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-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.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+
 public class PartyChangeOwnerCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
-                //Check if player profile is loaded
-                if(UserManager.getPlayer((Player) sender) == null)
-                {
-                    sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
-                    return true;
-                }
-
                 Party playerParty = UserManager.getPlayer((Player) sender).getParty();
                 String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
 
-                if (!playerParty.hasMember(target.getUniqueId())) {
+                if (!playerParty.getMembers().contains(targetName)) {
                     sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
                     return true;
                 }
 
-                PartyManager.setPartyLeader(target.getUniqueId(), playerParty);
+                PartyManager.setPartyLeader(targetName, playerParty);
                 return true;
 
             default:

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

@@ -1,22 +1,17 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.player.UserManager;
+
 public class PartyChangePasswordCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if(UserManager.getPlayer((Player) sender) == null)
-        {
-            sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
-            return true;
-        }
-
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
         switch (args.length) {