Fix compiler errors on FlatFileDatabase

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

@@ -6,13 +6,13 @@ import com.gmail.nossr50.chat.mailer.AdminChatMailer;
 import com.gmail.nossr50.chat.mailer.PartyChatMailer;
 import com.gmail.nossr50.config.ChatConfig;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
-import com.neetgames.mcmmo.party.Party;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.text.StringUtils;
+import com.neetgames.mcmmo.party.Party;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.command.ConsoleCommandSender;

src/main/java/com/gmail/nossr50/chat/mailer/PartyChatMailer.java

@@ -4,12 +4,12 @@ import com.gmail.nossr50.chat.author.Author;
 import com.gmail.nossr50.chat.message.ChatMessage;
 import com.gmail.nossr50.chat.message.PartyChatMessage;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
-import com.neetgames.mcmmo.party.Party;
 import com.gmail.nossr50.events.chat.McMMOChatEvent;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.text.TextUtils;
+import com.neetgames.mcmmo.party.Party;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Bukkit;

src/main/java/com/gmail/nossr50/chat/message/PartyChatMessage.java

@@ -2,12 +2,12 @@ package com.gmail.nossr50.chat.message;
 
 import com.gmail.nossr50.chat.author.Author;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
-import com.neetgames.mcmmo.party.Party;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.base.Objects;
+import com.neetgames.mcmmo.party.Party;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.entity.Player;

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

@@ -57,7 +57,7 @@ public class ConvertDatabaseCommand implements CommandExecutor {
                 PlayerProfile profile = oldDatabase.loadPlayerProfile(player.getUniqueId(), null);
 
                 if (profile.isLoaded()) {
-                    mcMMO.getDatabaseManager().saveUser(profile);
+                    mcMMO.getDatabaseManager().saveUser(profile.getPlayerData());
                 }
 
                 new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.util.text.TextComponentFactory;
 import com.neetgames.mcmmo.player.OnlineMMOPlayer;

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

@@ -1,12 +1,11 @@
 package com.gmail.nossr50.config;
 
 import com.gmail.nossr50.database.SQLDatabaseManager.PoolIdentifier;
-import com.gmail.nossr50.party.PartyFeature;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.party.PartyFeature;
 import com.gmail.nossr50.util.text.StringUtils;
 import com.neetgames.mcmmo.MobHealthBarType;
-import com.neetgames.mcmmo.skill.RootSkill;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.configuration.ConfigurationSection;

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

@@ -6,7 +6,6 @@ import com.gmail.nossr50.datatypes.skills.MaterialType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
 import com.gmail.nossr50.util.text.StringUtils;
-import com.neetgames.mcmmo.skill.RootSkill;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;

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

@@ -4,6 +4,7 @@ import com.gmail.nossr50.api.exceptions.InvalidSkillException;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
+import com.gmail.nossr50.datatypes.player.PlayerData;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.neetgames.mcmmo.player.MMOPlayer;
@@ -50,10 +51,10 @@ public interface DatabaseManager {
     /**
      * Save a user to the database.
      *
-     * @param mmoPlayer The player to save
+     * @param playerData target player data
      * @return true if successful, false on failure
      */
-    boolean saveUser(@NotNull MMOPlayer mmoPlayer);
+    boolean saveUser(@NotNull PlayerData playerData);
 
     /**
     * Retrieve leaderboard info.

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

@@ -5,7 +5,10 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.database.UpgradeType;
-import com.gmail.nossr50.datatypes.player.*;
+import com.gmail.nossr50.datatypes.player.MMODataBuilder;
+import com.gmail.nossr50.datatypes.player.MMODataSnapshot;
+import com.gmail.nossr50.datatypes.player.PlayerData;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
@@ -18,6 +21,7 @@ import com.neetgames.mcmmo.UniqueDataType;
 import com.neetgames.mcmmo.exceptions.InvalidSkillException;
 import com.neetgames.mcmmo.player.MMOPlayer;
 import com.neetgames.mcmmo.skill.SkillBossBarState;
+import org.apache.commons.lang.NullArgumentException;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -256,10 +260,10 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
     }
 
 
-    public boolean saveUser(@NotNull MMOPlayer mmoPlayer) {
-        PlayerData mmoPlayerData = mmoPlayer.getPlayerData();
-        String playerName = dataSnapshot.getPlayerName();
-        UUID uuid = dataSnapshot.getPlayerUUID();
+    public boolean saveUser(@NotNull PlayerData playerData) {
+        MMODataSnapshot mmoDataSnapshot = new MMODataSnapshot(playerData); //Clone data into Immutable data
+        String playerName = mmoDataSnapshot.getPlayerName();
+        UUID uuid = mmoDataSnapshot.getPlayerUUID();
 
         BufferedReader in = null;
         FileWriter out = null;
@@ -290,7 +294,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                     String[] splitData = line.split(":");
 
                     //This would be rare, but check the splitData for having enough entries to contain a username
-                    if(splitData.length < USERNAME) { //UUID have been in mcMMO DB for a very long time so any user without
+                    if(splitData.length < FlatFileMappings.USERNAME) { //UUID have been in mcMMO DB for a very long time so any user without
                         //Something is wrong if we don't have enough split data to have an entry for a username
 
                         if(!corruptDataFound) {
@@ -307,7 +311,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                         writer.append(line).append("\r\n"); //Not the user so write it to file and move on
                     } else {
                         //User found
-                        writeUserToLine(profile, playerName, uuid, writer);
+                        writeUserToLine(mmoDataSnapshot, playerName, uuid, writer);
                         wroteUser = true;
                     }
                 }
@@ -316,7 +320,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                  * If we couldn't find the user in the DB we need to add him
                  */
                 if(!wroteUser) {
-                    writeUserToLine(profile, playerName, uuid, writer);
+                    writeUserToLine(mmoDataSnapshot, playerName, uuid, writer);
                 }
 
                 // Write the new file
@@ -487,7 +491,10 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
 
     public @NotNull PlayerProfile newUser(@NotNull Player player) {
         newUser(player.getName(), player.getUniqueId());
-        return new PlayerProfile(player.getName(), player.getUniqueId(), true);
+        MMODataBuilder mmoDataBuilder = new MMODataBuilder();
+        PlayerData newPlayerData = mmoDataBuilder.buildNewPlayerData(player);
+
+        return new PlayerProfile(newPlayerData, true);
     }
 
     public void newUser(String playerName, UUID uuid) {
@@ -649,7 +656,15 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                         rawSplitData[FlatFileMappings.USERNAME] = playerName;
                     }
 
-                    return loadFromLine(rawSplitData);
+                    PlayerData playerData = loadFromLine(rawSplitData);
+                    if(playerData == null) {
+                        mcMMO.p.getLogger().severe("Could not load player data from line");
+                        mcMMO.p.getLogger().severe("Data: "+line);
+
+                        return grabUnloadedProfile(uuid, playerName);
+                    } else {
+                        return new PlayerProfile(playerData, true);
+                    }
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -688,13 +703,20 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                     String[] rawSplitData = line.split(":");
 
                     /* Don't read corrupt data */
-                    if(rawSplitData.length < (USERNAME + 1)) {
+                    if(rawSplitData.length < (FlatFileMappings.USERNAME + 1)) {
                         continue;
                     }
 
                     //If we couldn't find anyone
                     if(playerName.equalsIgnoreCase(rawSplitData[FlatFileMappings.USERNAME])) {
-                        return loadFromLine(rawSplitData);
+                        PlayerData playerData = loadFromLine(rawSplitData);
+                        if(playerData != null) {
+                            //Data loaded
+                            return new PlayerProfile(playerData, true);
+                        } else {
+                            //Data was unable to be loaded, return "unloaded" profile
+                            return grabUnloadedProfile(null, playerName);
+                        }
                     }
                 }
             } catch (Exception e) {
@@ -713,15 +735,17 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
         }
 
         //Return a new blank profile
-        return new PlayerProfile(playerName, null);
+        return grabUnloadedProfile(null, playerName);
     }
 
-    private @NotNull PlayerProfile grabUnloadedProfile(@NotNull UUID uuid, @Nullable String playerName) {
+    private @NotNull PlayerProfile grabUnloadedProfile(@Nullable UUID uuid, @Nullable String playerName) {
         if(playerName == null) {
             playerName = ""; //No name for you boy!
         }
 
-        return new PlayerProfile(playerName, uuid);
+        MMODataBuilder mmoDataBuilder = new MMODataBuilder();
+        PlayerData newPlayerData = mmoDataBuilder.buildNewPlayerData(uuid, playerName);
+        return new PlayerProfile(newPlayerData, false);
     }
 
     public void convertUsers(@NotNull DatabaseManager destination) {
@@ -740,7 +764,15 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                     String[] character = line.split(":");
 
                     try {
-                        destination.saveUser(loadFromLine(character));
+                        PlayerData processedLineData = loadFromLine(character);
+
+                        if(processedLineData == null) {
+                            mcMMO.p.getLogger().severe("Unable to convert data from line in FlatFile DB");
+                            mcMMO.p.getLogger().info("Data: "+line);
+                            continue;
+                        }
+
+                        destination.saveUser(processedLineData);
                     }
                     catch (Exception e) {
                         e.printStackTrace();
@@ -1105,8 +1137,15 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
                             String[] correctSizeSplitData = Arrays.copyOf(rawSplitData, FlatFileMappings.LENGTH_OF_SPLIT_DATA_ARRAY);
                             line = org.apache.commons.lang.StringUtils.join(correctSizeSplitData, ":") + ":";
                             rawSplitData = line.split(":");
-                            PlayerProfile temporaryProfile = loadFromLine(rawSplitData);
-                            writeUserToLine(temporaryProfile, rawSplitData[FlatFileMappings.USERNAME], temporaryProfile.getUniqueId(), writer);
+                            PlayerData dataFromLine = loadFromLine(rawSplitData);
+
+                            if(dataFromLine == null)
+                                continue;
+
+
+                            PlayerProfile temporaryProfile = new PlayerProfile(dataFromLine, true);
+                            //TODO: MMODataSnapshot is an unnecessary creation of resources for this operation
+                            writeUserToLine(new MMODataSnapshot(temporaryProfile.getPlayerData()), rawSplitData[FlatFileMappings.USERNAME], temporaryProfile.getUUID(), writer);
                         } else {
                             writer.append(line).append("\r\n");
                         }
@@ -1298,7 +1337,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
 
             //Build Data
             return playerDataBuilder.build();
-        } catch (Exception e) {
+        } catch (NullArgumentException e) {
             mcMMO.p.getLogger().severe("Critical failure when trying to construct persistent player data!");
             e.printStackTrace();
             return null;

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

@@ -4,7 +4,10 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.database.UpgradeType;
-import com.gmail.nossr50.datatypes.player.*;
+import com.gmail.nossr50.datatypes.player.MMODataBuilder;
+import com.gmail.nossr50.datatypes.player.MMODataSnapshot;
+import com.gmail.nossr50.datatypes.player.PlayerData;
+import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.datatypes.experience;
 
-import com.neetgames.mcmmo.experience.ExperienceHandler;
 //TODO: T&C Write implementation, this should be the exact same way OnlineExperienceProcessor handles stuff but without sending player messages or sounds and stuff like that
 //TODO: Is this needed? Maybe just make OnlineExperienceProcessor handle both in a clean way
 public class OfflineExperienceProcessor {

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

@@ -4,22 +4,22 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.PlayerData;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.neetgames.mcmmo.party.Party;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.neetgames.mcmmo.experience.XPGainReason;
-import com.neetgames.mcmmo.experience.XPGainSource;
-import com.neetgames.mcmmo.player.MMOPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.experience.ExperienceUtils;
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.neetgames.mcmmo.exceptions.UnknownSkillException;
+import com.neetgames.mcmmo.experience.XPGainReason;
+import com.neetgames.mcmmo.experience.XPGainSource;
+import com.neetgames.mcmmo.party.Party;
+import com.neetgames.mcmmo.player.MMOPlayer;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

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

@@ -14,6 +14,7 @@ public abstract class AbstractMMOPlayer implements MMOPlayer {
     /* Managers */
     protected final @NotNull ExperienceProcessor experienceProcessor;
     protected final @NotNull CooldownManager cooldownManager;
+    protected boolean isLoaded;
 
     /**
      * Init for online players
@@ -21,10 +22,11 @@ public abstract class AbstractMMOPlayer implements MMOPlayer {
      *
      * @param mmoPlayerData player data
      */
-    public AbstractMMOPlayer(@NotNull Player player, @NotNull PlayerData mmoPlayerData) {
+    public AbstractMMOPlayer(@NotNull Player player, @NotNull PlayerData mmoPlayerData, boolean isLoaded) {
         this.mmoPlayerData = mmoPlayerData;
         this.experienceProcessor = new OnlineExperienceProcessor(mmoPlayerData);
         this.cooldownManager = new CooldownManager(mmoPlayerData);
+        this.isLoaded = isLoaded;
     }
 
     /**
@@ -32,9 +34,18 @@ public abstract class AbstractMMOPlayer implements MMOPlayer {
      *
      * @param mmoPlayerData player data
      */
-    public AbstractMMOPlayer(@NotNull PlayerData mmoPlayerData) {
+    public AbstractMMOPlayer(@NotNull PlayerData mmoPlayerData, boolean isLoaded) {
         this.mmoPlayerData = mmoPlayerData;
         this.experienceProcessor = new OfflineExperienceProcessor(mmoPlayerData);
         this.cooldownManager = new CooldownManager(mmoPlayerData);
+        this.isLoaded = isLoaded;
+    }
+
+    public boolean isLoaded() {
+        return isLoaded;
+    }
+
+    public void setLoaded(boolean loaded) {
+        isLoaded = loaded;
     }
 }

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

@@ -52,14 +52,14 @@ public class MMODataBuilder {
             return null;
     }
 
-    public @NotNull PlayerData buildNewPlayerData(@NotNull UUID playerUUID, @NotNull String playerName) {
+    public @NotNull PlayerData buildNewPlayerData(@Nullable UUID playerUUID, @NotNull String playerName) {
         /*
          * New Profile with default values
          */
         return new PlayerData(playerUUID, playerName);
     }
 
-    public @NotNull PlayerData build() throws Exception {
+    public PlayerData build() throws NullArgumentException {
         if(playerUUID == null)
             throw new NullArgumentException("playerUUID");
 
@@ -91,7 +91,9 @@ public class MMODataBuilder {
 
         validateBarStateMapEntries(barStateMap);
 
-        return new PlayerData(playerUUID, playerName, partyChatSpying, skillLevelValues, skillExperienceValues, abilityDeactivationTimestamps, uniquePlayerData, barStateMap, scoreboardTipsShown, lastLogin, leaderBoardExemption);
+        return new PlayerData(playerUUID, playerName, partyChatSpying, skillLevelValues,
+                skillExperienceValues, abilityDeactivationTimestamps, uniquePlayerData,
+                barStateMap, scoreboardTipsShown, lastLogin, leaderBoardExemption);
     }
 
     private void validateBarStateMapEntries(@NotNull Map<PrimarySkillType, SkillBossBarState> map) {

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

@@ -4,10 +4,7 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.google.common.collect.ImmutableMap;
 import com.neetgames.mcmmo.UniqueDataType;
-import com.neetgames.mcmmo.player.MMOPlayerDataImpl;
-import com.neetgames.mcmmo.skill.RootSkill;
 import com.neetgames.mcmmo.skill.SkillBossBarState;
-import com.neetgames.mcmmo.skill.SuperSkill;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;

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

@@ -5,11 +5,10 @@ import com.gmail.nossr50.config.ChatConfig;
 import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
 import com.gmail.nossr50.datatypes.skills.CoreRootSkill;
-import com.neetgames.mcmmo.party.Party;
-import com.gmail.nossr50.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.party.PartyTeleportRecord;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
 import com.gmail.nossr50.skills.alchemy.AlchemyManager;
@@ -33,6 +32,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
 import com.gmail.nossr50.util.input.AbilityActivationProcessor;
 import com.gmail.nossr50.util.input.SuperSkillManagerImpl;
+import com.neetgames.mcmmo.party.Party;
 import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.identity.Identified;
 import net.kyori.adventure.identity.Identity;

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

@@ -10,7 +10,7 @@ import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
 import com.google.common.collect.ImmutableMap;
 import com.neetgames.mcmmo.UniqueDataType;
 import com.neetgames.mcmmo.exceptions.UnexpectedValueException;
-import com.neetgames.mcmmo.skill.*;
+import com.neetgames.mcmmo.skill.SkillBossBarState;
 import com.neetgames.neetlib.dirtydata.DirtyData;
 import com.neetgames.neetlib.dirtydata.DirtyMap;
 import com.neetgames.neetlib.mutableprimitives.MutableBoolean;
@@ -19,6 +19,8 @@ import com.neetgames.neetlib.mutableprimitives.MutableLong;
 import com.neetgames.neetlib.mutableprimitives.MutableString;
 import org.apache.commons.lang.NullArgumentException;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,7 +32,7 @@ public class PlayerData {
 
     /* Player Stuff */
     private final @NotNull DirtyData<MutableString> playerName;
-    private final @NotNull UUID playerUUID;
+    private final @Nullable UUID playerUUID;
 
     /* Records */
     private final DirtyData<MutableLong> lastLogin;
@@ -57,7 +59,7 @@ public class PlayerData {
      * @param playerName target player's name
      * @throws NullArgumentException thrown when never null arguments are null
      */
-    public PlayerData(@NotNull UUID playerUUID, @NotNull String playerName) throws NullArgumentException {
+    public PlayerData(@Nullable UUID playerUUID, @NotNull String playerName) throws NullArgumentException {
         /*
          * New Data
          */

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

@@ -14,8 +14,8 @@ public class PlayerProfile extends AbstractMMOPlayer {
      *
      * @param mmoPlayerData target persistent player data
      */
-    public PlayerProfile(@NotNull PlayerData mmoPlayerData) {
-        super(mmoPlayerData);
+    public PlayerProfile(@NotNull PlayerData mmoPlayerData, boolean isLoaded) {
+        super(mmoPlayerData, isLoaded);
     }
 
     @Override
@@ -63,8 +63,7 @@ public class PlayerProfile extends AbstractMMOPlayer {
         return experienceProcessor;
     }
 
-    @Override
-    public @NotNull PlayerData getMMOPlayerDataImpl() {
+    public @NotNull PlayerData getPlayerData() {
         return mmoPlayerData;
     }
 }

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

@@ -5,7 +5,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.text.StringUtils;
-import com.neetgames.mcmmo.player.MMOPlayer;
 import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.neetgames.mcmmo.skill.AbstractRootSkill;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.datatypes.skills.subskills.acrobatics;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
@@ -19,6 +18,7 @@ import com.gmail.nossr50.util.skills.SkillActivationType;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Location;

src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.datatypes.skills.subskills.interfaces;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.interfaces.Skill;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -6,7 +6,6 @@ import com.gmail.nossr50.config.HiddenConfig;
 import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.meta.BonusDropMeta;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -26,6 +25,7 @@ import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.*;
 import org.bukkit.block.*;
 import org.bukkit.entity.Item;

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -6,8 +6,6 @@ import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.meta.ProjectileOriginMeta;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.neetgames.mcmmo.player.MMOPlayer;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType;
@@ -33,6 +31,7 @@ import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.OfflinePlayer;

src/main/java/com/gmail/nossr50/listeners/InventoryListener.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.WorldBlacklist;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.events.fake.FakeBrewEvent;
@@ -15,6 +14,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -5,13 +5,9 @@ import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.chat.ChatChannel;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.player.UserManager;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
-import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType;
 import com.gmail.nossr50.events.McMMOReplaceVanillaTreasureEvent;
-import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.party.ShareHandler;
@@ -23,6 +19,7 @@ import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.salvage.Salvage;
 import com.gmail.nossr50.skills.salvage.SalvageManager;
 import com.gmail.nossr50.util.*;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -30,10 +27,10 @@ import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.*;
 import org.bukkit.entity.minecart.PoweredMinecart;

src/main/java/com/gmail/nossr50/listeners/SelfListener.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
@@ -13,6 +12,7 @@ import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.worldguard.WorldGuardManager;
 import com.gmail.nossr50.worldguard.WorldGuardUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/main/java/com/gmail/nossr50/party/PartyManagerImpl.java

@@ -1,15 +1,12 @@
 package com.gmail.nossr50.party;
 
+import com.gmail.nossr50.mcMMO;
 import com.neetgames.mcmmo.party.Party;
 import com.neetgames.mcmmo.party.PartyManager;
-import com.gmail.nossr50.events.party.McMMOPartyAllianceChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
-import com.gmail.nossr50.mcMMO;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.util.*;
+import java.util.HashMap;
 
 /**
  * About mcMMO parties

src/main/java/com/gmail/nossr50/party/PartyMemberManagerImpl.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.party;
 
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.util.Misc;
 import com.neetgames.mcmmo.party.Party;
 import com.neetgames.mcmmo.party.PartyMember;
 import com.neetgames.mcmmo.party.PartyMemberManager;
 import com.neetgames.mcmmo.party.PartyMemberRank;
 import com.neetgames.mcmmo.player.MMOPlayer;
 import com.neetgames.mcmmo.player.OnlineMMOPlayer;
-import com.gmail.nossr50.util.Misc;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/gmail/nossr50/party/ShareHandler.java

@@ -1,17 +1,13 @@
 package com.gmail.nossr50.party;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.party.ItemWeightConfig;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
 import com.neetgames.mcmmo.experience.XPGainReason;
 import com.neetgames.mcmmo.experience.XPGainSource;
 import com.neetgames.mcmmo.party.Party;
 import com.neetgames.mcmmo.player.OnlineMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.runnables;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.mcMMO;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 
 public class SaveTimerTask extends BukkitRunnable {

src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables.commands;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
-import com.neetgames.mcmmo.skill.RootSkill;
 import org.apache.commons.lang.Validate;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java

@@ -2,12 +2,10 @@ package com.gmail.nossr50.runnables.commands;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
-import com.gmail.nossr50.datatypes.skills.CoreSkills;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import com.neetgames.mcmmo.skill.RootSkill;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.runnables.items;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.ItemUtils;

src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java

@@ -2,9 +2,8 @@ package com.gmail.nossr50.runnables.items;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.mcMMO;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.runnables.party;
 
 import com.gmail.nossr50.config.Config;
-import com.neetgames.mcmmo.party.Party;
 import com.gmail.nossr50.mcMMO;
+import com.neetgames.mcmmo.party.Party;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 

src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.runnables.skills;
 
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.util.player.NotificationManager;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 
 public class AbilityCooldownTask extends BukkitRunnable {

src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables.skills;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.EventUtils;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.skills.ParticleEffectUtils;
 import com.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.runnables.skills;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.scheduler.BukkitRunnable;
 

src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java

@@ -1,8 +1,7 @@
 package com.gmail.nossr50.runnables.skills;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
-import com.neetgames.mcmmo.skill.RootSkill;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 
 public class ExperienceBarHideTask extends BukkitRunnable {

src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.runnables.skills;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.util.player.NotificationManager;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 
 

src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java

@@ -2,9 +2,9 @@ package com.gmail.nossr50.runnables.skills;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.util.player.NotificationManager;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 
 public class ToolLowerTask extends BukkitRunnable {

src/main/java/com/gmail/nossr50/skills/SkillManager.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.skills;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

@@ -4,7 +4,6 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.BlockLocationHistory;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
@@ -17,6 +16,7 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LightningStrike;

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@@ -2,13 +2,13 @@ package com.gmail.nossr50.skills.alchemy;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.text.StringUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.List;

src/main/java/com/gmail/nossr50/skills/archery/Archery.java

@@ -3,13 +3,12 @@ package com.gmail.nossr50.skills.archery;
 import com.gmail.nossr50.api.ItemSpawnReason;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.skills.RankUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.skills.archery;
 
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;

src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.skills.axes;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -13,6 +12,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.*;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent.DamageModifier;

src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.skills.child;
 
-import com.gmail.nossr50.datatypes.skills.CoreSkills;
 import com.gmail.nossr50.mcMMO;
 import com.neetgames.mcmmo.exceptions.UnknownSkillException;
 import com.neetgames.mcmmo.skill.RootSkill;

src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.skills.crossbows;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
@@ -8,6 +7,7 @@ import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.skills.archery.Archery;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.RankUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.apache.commons.lang.math.RandomUtils;
 import org.bukkit.Location;
 import org.bukkit.World;

src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.skills.excavation;
 
 import com.gmail.nossr50.api.ItemSpawnReason;
 import com.gmail.nossr50.config.Config;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -7,7 +7,6 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.treasure.FishingTreasureConfig;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.treasure.*;
@@ -25,6 +24,7 @@ import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -7,7 +7,6 @@ import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.datatypes.BlockSnapshot;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.meta.RecentlyReplantedCropMeta;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -27,6 +26,7 @@ import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.StringUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -17,6 +16,7 @@ import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.apache.commons.lang.math.RandomUtils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -4,7 +4,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -23,6 +22,7 @@ import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.StringUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -23,6 +22,7 @@ import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.StringUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;

src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.skills.smelting;
 
 import com.gmail.nossr50.config.Config;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.skills.SkillManager;
@@ -9,6 +8,7 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.block.Furnace;
 import org.bukkit.event.inventory.FurnaceBurnEvent;
 import org.bukkit.event.inventory.FurnaceSmeltEvent;

src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.skills.swords;
 
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -15,6 +14,7 @@ import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -4,7 +4,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.taming.CallOfTheWildType;
@@ -25,6 +24,7 @@ import com.gmail.nossr50.util.skills.SkillActivationType;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.StringUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;

src/main/java/com/gmail/nossr50/skills/tridents/TridentsManager.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.skills.tridents;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.skills.SkillManager;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 
 public class TridentsManager extends SkillManager {
     public TridentsManager(OnlineMMOPlayer mmoPlayer) {

src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.skills.unarmed;
 import com.gmail.nossr50.api.ItemSpawnReason;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -18,6 +17,7 @@ import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Item;

src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -18,6 +17,7 @@ import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillActivationType;
 import com.gmail.nossr50.util.skills.SkillUtils;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/com/gmail/nossr50/util/ChimaeraWing.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.util;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.items.ChimaeraWingWarmup;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/main/java/com/gmail/nossr50/util/EventUtils.java

@@ -1,8 +1,6 @@
 package com.gmail.nossr50.util;
 
 import com.gmail.nossr50.config.Config;
-import com.neetgames.mcmmo.party.Party;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
@@ -32,8 +30,9 @@ import com.gmail.nossr50.events.skills.unarmed.McMMOPlayerDisarmEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.player.NotificationManager;
-import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.CombatUtils;
+import com.neetgames.mcmmo.party.Party;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Entity;

src/main/java/com/gmail/nossr50/util/HolidayManager.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.util;
 import com.gmail.nossr50.commands.skills.AprilCommand;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.StringUtils;
 import com.google.common.collect.ImmutableList;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
 import org.bukkit.Statistic;

src/main/java/com/gmail/nossr50/util/Misc.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.util;
 
 import com.gmail.nossr50.api.ItemSpawnReason;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.events.items.McMMOItemSpawnEvent;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
 import com.google.common.collect.ImmutableSet;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;

src/main/java/com/gmail/nossr50/util/Permissions.java

@@ -7,7 +7,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.mcMMO;
-import com.neetgames.mcmmo.skill.RootSkill;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.World;

src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.util.commands;
 
 import com.gmail.nossr50.config.Config;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -10,6 +9,7 @@ import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.text.StringUtils;
 import com.google.common.collect.ImmutableList;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java

@@ -2,12 +2,9 @@ package com.gmail.nossr50.util.experience;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.CoreSkills;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.player.PlayerLevelUtils;
 import com.gmail.nossr50.util.text.StringUtils;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
-import com.neetgames.mcmmo.skill.RootSkill;
 import org.bukkit.Bukkit;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;

src/main/java/com/gmail/nossr50/util/experience/ExperienceUtils.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.util.experience;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java

@@ -3,12 +3,12 @@ package com.gmail.nossr50.util.experience;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.datatypes.skills.CoreSkills;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.skills.ExperienceBarHideTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.NotificationManager;
-import com.neetgames.mcmmo.skill.*;
+import com.neetgames.mcmmo.skill.SkillBossBarSetting;
+import com.neetgames.mcmmo.skill.SkillBossBarState;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/com/gmail/nossr50/util/input/AbilityActivationProcessor.java

@@ -2,8 +2,6 @@ package com.gmail.nossr50.util.input;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.util.Misc;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -17,7 +15,9 @@ import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.NotificationManager;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/com/gmail/nossr50/util/input/SuperSkillManagerImpl.java

@@ -4,7 +4,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.neetgames.mcmmo.player.MMOPlayerDataImpl;
 import com.gmail.nossr50.datatypes.skills.AbilityToolType;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -19,6 +18,7 @@ import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
+import com.neetgames.mcmmo.player.MMOPlayerDataImpl;
 import com.neetgames.mcmmo.player.SuperSkillManager;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/gmail/nossr50/util/player/NotificationManager.java

@@ -6,19 +6,17 @@ import com.gmail.nossr50.datatypes.LevelUpBroadcastPredicate;
 import com.gmail.nossr50.datatypes.PowerLevelUpBroadcastPredicate;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.notifications.SensitiveCommandType;
-import com.gmail.nossr50.datatypes.skills.CoreSkills;
-import com.gmail.nossr50.util.Misc;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.events.skills.McMMOPlayerNotificationEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import com.gmail.nossr50.util.text.McMMOMessageType;
 import com.gmail.nossr50.util.text.TextComponentFactory;
-import com.neetgames.mcmmo.skill.RootSkill;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.MessageType;
 import net.kyori.adventure.identity.Identity;

src/main/java/com/gmail/nossr50/util/player/PartyUtils.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.util.player;
 
 import com.gmail.nossr50.config.Config;
-import com.neetgames.mcmmo.party.Party;
 import com.gmail.nossr50.party.PartyFeature;
+import com.neetgames.mcmmo.party.Party;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;

src/main/java/com/gmail/nossr50/util/player/PlayerLevelUtils.java

@@ -1,9 +1,7 @@
 package com.gmail.nossr50.util.player;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import com.neetgames.mcmmo.skill.RootSkill;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.jetbrains.annotations.NotNull;
 
 public class PlayerLevelUtils {

src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.util.scoreboards;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;

src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java

@@ -2,7 +2,6 @@ package com.gmail.nossr50.util.scoreboards;
 
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.database.PlayerStat;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -15,6 +14,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.child.FamilyTree;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager.SidebarType;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.apache.commons.lang.Validate;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -4,7 +4,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.meta.OldName;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
@@ -24,6 +23,7 @@ import com.gmail.nossr50.util.compat.layers.persistentdata.AbstractPersistentDat
 import com.gmail.nossr50.util.compat.layers.persistentdata.MobMetaFlagType;
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.google.common.collect.ImmutableMap;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;

src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java

@@ -5,7 +5,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.events.skills.SkillActivationPerkEvent;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;

src/main/java/com/gmail/nossr50/util/skills/RankUtils.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.util.skills;
 
 import com.gmail.nossr50.config.RankConfig;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -9,6 +8,7 @@ import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.listeners.InteractionManager;
 import com.gmail.nossr50.runnables.skills.SkillUnlockNotificationTask;
 import com.gmail.nossr50.util.Permissions;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -4,7 +4,6 @@ import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
@@ -16,6 +15,7 @@ import com.gmail.nossr50.util.compat.layers.persistentdata.AbstractPersistentDat
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.text.StringUtils;
 import com.neetgames.mcmmo.exceptions.UnexpectedValueException;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.neetgames.mcmmo.skill.SkillBossBarState;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

src/main/java/com/gmail/nossr50/util/skills/SmeltingTracker.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.util.skills;
 
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.Permissions;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;

src/main/java/com/gmail/nossr50/util/text/StringUtils.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.util.text;
 
-import com.gmail.nossr50.party.PartyFeature;
 import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.party.PartyFeature;
 import org.bukkit.Material;
 import org.bukkit.block.data.Ageable;
 import org.bukkit.block.data.BlockData;

src/main/java/com/gmail/nossr50/util/text/TextComponentFactory.java

@@ -4,18 +4,16 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.RankConfig;
 import com.gmail.nossr50.datatypes.json.McMMOUrl;
 import com.gmail.nossr50.datatypes.json.McMMOWebLinks;
-import com.gmail.nossr50.datatypes.skills.CoreSkills;
-import com.gmail.nossr50.util.Misc;
-import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.listeners.InteractionManager;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.RankUtils;
-import com.neetgames.mcmmo.skill.RootSkill;
+import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.MessageType;
 import net.kyori.adventure.identity.Identity;