Refactoring a bunch of stuff, more refactoring to come

2025-08-03 21:15:28 +02:00 · 2020-08-17 21:15:27 -07:00
parent 0e9e1f5133
commit daada1a643
161 changed files with 1934 additions and 2575 deletions
--- a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java
@@ -2,9 +2,6 @@ package com.gmail.nossr50.runnables;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.scheduler.BukkitRunnable;

 public class SaveTimerTask extends BukkitRunnable {
@@ -13,11 +10,12 @@ public class SaveTimerTask extends BukkitRunnable {
        // All player data will be saved periodically through this
        int count = 1;

-        for (McMMOPlayer mcMMOPlayer : UserManager.getPlayers()) {
-            new PlayerProfileSaveTask(mcMMOPlayer.getProfile(), false).runTaskLaterAsynchronously(mcMMO.p, count);
+        //TODO: write a more efficient bulk save
+        for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) {
+            mcMMO.getUserManager().saveUserWithDelay(mmoPlayer.getPersistentPlayerData(), false, count);
            count++;
        }

-        PartyManager.saveParties();
+        mcMMO.getPartyManager().saveParties();
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/commands/NotifySquelchReminderTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/commands/NotifySquelchReminderTask.java
@@ -1,7 +1,6 @@
 package com.gmail.nossr50.runnables.commands;

 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -11,9 +10,9 @@ public class NotifySquelchReminderTask extends BukkitRunnable {
    @Override
    public void run() {
        for (Player player : Bukkit.getOnlinePlayers()) {
-            if(UserManager.getPlayer(player) != null)
+            if(mcMMO.getUserManager().getPlayer(player) != null)
            {
-                if(!UserManager.getPlayer(player).useChatNotifications())
+                if(!mcMMO.getUserManager().getPlayer(player).useChatNotifications())
                {
                    player.sendMessage(LocaleLoader.getString("Reminder.Squelched"));
                }
--- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java
@@ -9,7 +9,6 @@ import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitRunnable;

@@ -27,11 +26,11 @@ public class FormulaConversionTask extends BukkitRunnable {
        int convertedUsers = 0;
        long startMillis = System.currentTimeMillis();
        for (String playerName : mcMMO.getDatabaseManager().getStoredUsers()) {
-            McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+            McMMOPlayer mmoPlayer = mcMMO.getUserManager().getOfflinePlayer(playerName);
            PlayerProfile profile;

-            // 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) {
+            // If the mmoPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
+            if (mmoPlayer == null) {
                profile = mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false);

                if (!profile.isLoaded()) {
@@ -44,7 +43,7 @@ public class FormulaConversionTask extends BukkitRunnable {
                profile.scheduleAsyncSave();
            }
            else {
-                profile = mcMMOPlayer.getProfile();
+                profile = mmoPlayer;
                editValues(profile);
            }
            convertedUsers++;
--- a/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java
+++ b/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java
@@ -13,10 +13,10 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;

 public class ChimaeraWingWarmup extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;

-    public ChimaeraWingWarmup(McMMOPlayer mcMMOPlayer) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public ChimaeraWingWarmup(McMMOPlayer mmoPlayer) {
+        this.mmoPlayer = mmoPlayer;
    }

    @Override
@@ -25,12 +25,12 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
    }

    private void checkChimaeraWingTeleport() {
-        Player player = mcMMOPlayer.getPlayer();
-        Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation();
+        Player player = mmoPlayer.getPlayer();
+        Location previousLocation = mmoPlayer.getTeleportCommenceLocation();

        if (player.getLocation().distanceSquared(previousLocation) > 1.0 || !player.getInventory().containsAtLeast(ChimaeraWing.getChimaeraWing(0), 1)) {
            player.sendMessage(LocaleLoader.getString("Teleport.Cancelled"));
-            mcMMOPlayer.setTeleportCommenceLocation(null);
+            mmoPlayer.setTeleportCommenceLocation(null);
            return;
        }

@@ -41,7 +41,7 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
            return;
        }

-        long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
+        long recentlyHurt = mmoPlayer.getRecentlyHurtTimestamp();
        int hurtCooldown = Config.getInstance().getChimaeraRecentlyHurtCooldown();

        if (hurtCooldown > 0) {
--- a/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java
+++ b/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables.items;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -14,25 +13,25 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

 public class TeleportationWarmup extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final McMMOPlayer mcMMOTarget;

-    public TeleportationWarmup(McMMOPlayer mcMMOPlayer, McMMOPlayer mcMMOTarget) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public TeleportationWarmup(McMMOPlayer mmoPlayer, McMMOPlayer mcMMOTarget) {
+        this.mmoPlayer = mmoPlayer;
        this.mcMMOTarget = mcMMOTarget;
    }

    @Override
    public void run() {
-        Player teleportingPlayer = mcMMOPlayer.getPlayer();
+        Player teleportingPlayer = mmoPlayer.getPlayer();
        Player targetPlayer = mcMMOTarget.getPlayer();
-        Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation();
-        Location newLocation = mcMMOPlayer.getPlayer().getLocation();
-        long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
+        Location previousLocation = mmoPlayer.getTeleportCommenceLocation();
+        Location newLocation = mmoPlayer.getPlayer().getLocation();
+        long recentlyHurt = mmoPlayer.getRecentlyHurtTimestamp();

-        mcMMOPlayer.setTeleportCommenceLocation(null);
+        mmoPlayer.setTeleportCommenceLocation(null);

-        if (!PartyManager.inSameParty(teleportingPlayer, targetPlayer)) {
+        if (!mcMMO.getPartyManager().inSameParty(teleportingPlayer, targetPlayer)) {
            teleportingPlayer.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetPlayer.getName()));
            return;
        }
--- a/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables.party;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.scheduler.BukkitRunnable;

@@ -23,7 +22,7 @@ public class PartyAutoKickTask extends BukkitRunnable {

        long currentTime = System.currentTimeMillis();

-        for (Party party : PartyManager.getParties()) {
+        for (Party party : mcMMO.getPartyManager().getParties()) {
            for (UUID memberUniqueId : party.getMembers().keySet()) {
                OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberUniqueId);
                boolean isProcessed = processedPlayers.contains(memberUniqueId);
@@ -39,7 +38,7 @@ public class PartyAutoKickTask extends BukkitRunnable {
        }

        for (Entry<OfflinePlayer, Party> entry : toRemove.entrySet()) {
-            PartyManager.removeFromParty(entry.getKey(), entry.getValue());
+            mcMMO.getPartyManager().removeFromParty(entry.getKey(), entry.getValue());
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java
@@ -34,17 +34,17 @@ public class PartyChatTask extends BukkitRunnable {
            message = message.replaceFirst(Pattern.quote(displayName), ChatColor.GOLD + Matcher.quoteReplacement(displayName) + ChatColor.RESET);
        }

-        for (Player member : party.getOnlineMembers()) {
+        for (Player member : party.getPartyMembers()) {
            member.sendMessage(message);
        }

        if (party.getAlly() != null) {
-            for (Player member : party.getAlly().getOnlineMembers()) {
+            for (Player member : party.getAlly().getPartyMembers()) {
                String allyPrefix = LocaleLoader.formatString(Config.getInstance().getPartyChatPrefixAlly());
                member.sendMessage(allyPrefix + message);
            }
        }

-        plugin.getServer().getConsoleSender().sendMessage(ChatColor.stripColor("[mcMMO] [P]<" + party.getName() + ">" + message));
+        plugin.getServer().getConsoleSender().sendMessage(ChatColor.stripColor("[mcMMO] [P]<" + party.getPartyName() + ">" + message));
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java
@@ -1,14 +1,13 @@
 package com.gmail.nossr50.runnables.player;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.scheduler.BukkitRunnable;

 public class ClearRegisteredXPGainTask extends BukkitRunnable {
    @Override
    public void run() {
-        for (McMMOPlayer mcMMOPlayer : UserManager.getPlayers()) {
-            mcMMOPlayer.getProfile().purgeExpiredXpGains();
+        for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) {
+            mmoPlayer.purgeExpiredXpGains();
        }
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/player/PersistentPlayerDataSaveTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/player/PersistentPlayerDataSaveTask.java
@@ -0,0 +1,18 @@
+package com.gmail.nossr50.runnables.player;
+
+import com.gmail.nossr50.datatypes.player.MMODataSnapshot;
+import com.gmail.nossr50.mcMMO;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class PersistentPlayerDataSaveTask extends BukkitRunnable {
+    private final MMODataSnapshot dataSnapshot;
+
+    public PersistentPlayerDataSaveTask(MMODataSnapshot dataSnapshot) {
+        this.dataSnapshot = dataSnapshot;
+    }
+
+    @Override
+    public void run() {
+        mcMMO.getDatabaseManager().saveUser(dataSnapshot);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java
@@ -8,7 +8,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.commands.McScoreboardKeepTask;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -72,10 +71,10 @@ public class PlayerProfileLoadingTask extends BukkitRunnable {
    }

    private class ApplySuccessfulProfile extends BukkitRunnable {
-        private final McMMOPlayer mcMMOPlayer;
+        private final McMMOPlayer mmoPlayer;

-        private ApplySuccessfulProfile(McMMOPlayer mcMMOPlayer) {
-            this.mcMMOPlayer = mcMMOPlayer;
+        private ApplySuccessfulProfile(McMMOPlayer mmoPlayer) {
+            this.mmoPlayer = mmoPlayer;
        }

        // Synchronized task
@@ -87,9 +86,9 @@ public class PlayerProfileLoadingTask extends BukkitRunnable {
                return;
            }

-            mcMMOPlayer.setupPartyData();
-            UserManager.track(mcMMOPlayer);
-            mcMMOPlayer.actualizeRespawnATS();
+            mmoPlayer.setupPartyData();
+            mcMMO.getUserManager().track(mmoPlayer);
+            mmoPlayer.actualizeRespawnATS();

            if (Config.getInstance().getScoreboardsEnabled()) {
                ScoreboardManager.setupPlayer(player);
--- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java
@@ -1,19 +0,0 @@
-package com.gmail.nossr50.runnables.player;
-
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
-import org.bukkit.scheduler.BukkitRunnable;
-
-public class PlayerProfileSaveTask extends BukkitRunnable {
-    private final PlayerProfile playerProfile;
-    private final boolean isSync;
-
-    public PlayerProfileSaveTask(PlayerProfile playerProfile, boolean isSync) {
-        this.playerProfile = playerProfile;
-        this.isSync = isSync;
-    }
-
-    @Override
-    public void run() {
-        playerProfile.save(isSync);
-    }
-}
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java
@@ -7,23 +7,23 @@ import com.gmail.nossr50.util.player.NotificationManager;
 import org.bukkit.scheduler.BukkitRunnable;

 public class AbilityCooldownTask extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final SuperAbilityType ability;

-    public AbilityCooldownTask(McMMOPlayer mcMMOPlayer, SuperAbilityType ability) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public AbilityCooldownTask(McMMOPlayer mmoPlayer, SuperAbilityType ability) {
+        this.mmoPlayer = mmoPlayer;
        this.ability = ability;
    }

    @Override
    public void run() {
-        if (!mcMMOPlayer.getPlayer().isOnline() || mcMMOPlayer.getSuperAbilityManager().getAbilityInformed(ability)) {
+        if (!mmoPlayer.getPlayer().isOnline() || mmoPlayer.getSuperAbilityManager().getAbilityInformed(ability)) {
            return;
        }

-        mcMMOPlayer.getSuperAbilityManager().setAbilityInformed(ability, true);
+        mmoPlayer.getSuperAbilityManager().setAbilityInformed(ability, true);

-        NotificationManager.sendPlayerInformation(mcMMOPlayer.getPlayer(), NotificationType.ABILITY_REFRESHED, ability.getAbilityRefresh());
-        //mcMMOPlayer.getPlayer().sendMessage(ability.getAbilityRefresh());
+        NotificationManager.sendPlayerInformation(mmoPlayer.getPlayer(), NotificationType.ABILITY_REFRESHED, ability.getAbilityRefresh());
+        //mmoPlayer.getPlayer().sendMessage(ability.getAbilityRefresh());
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java
@@ -18,21 +18,21 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

 public class AbilityDisableTask extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final SuperAbilityType ability;

-    public AbilityDisableTask(McMMOPlayer mcMMOPlayer, SuperAbilityType ability) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public AbilityDisableTask(McMMOPlayer mmoPlayer, SuperAbilityType ability) {
+        this.mmoPlayer = mmoPlayer;
        this.ability = ability;
    }

    @Override
    public void run() {
-        if (!mcMMOPlayer.getSuperAbilityManager().getAbilityMode(ability)) {
+        if (!mmoPlayer.getSuperAbilityManager().getAbilityMode(ability)) {
            return;
        }

-        Player player = mcMMOPlayer.getPlayer();
+        Player player = mmoPlayer.getPlayer();

        switch (ability) {
            case SUPER_BREAKER:
@@ -52,12 +52,12 @@ public class AbilityDisableTask extends BukkitRunnable {

        EventUtils.callAbilityDeactivateEvent(player, ability);

-        mcMMOPlayer.getSuperAbilityManager().setAbilityMode(ability, false);
-        mcMMOPlayer.getSuperAbilityManager().setAbilityInformed(ability, false);
+        mmoPlayer.getSuperAbilityManager().setAbilityMode(ability, false);
+        mmoPlayer.getSuperAbilityManager().setAbilityInformed(ability, false);

        ParticleEffectUtils.playAbilityDisabledEffect(player);

-        if (mcMMOPlayer.useChatNotifications()) {
+        if (mmoPlayer.hasSkillChatNotifications()) {
            //player.sendMessage(ability.getAbilityOff());
            NotificationManager.sendPlayerInformation(player, NotificationType.ABILITY_OFF, ability.getAbilityOff());
        }
@@ -65,7 +65,7 @@ public class AbilityDisableTask extends BukkitRunnable {
        if (AdvancedConfig.getInstance().sendAbilityNotificationToOtherPlayers()) {
            SkillUtils.sendSkillMessage(player, NotificationType.SUPER_ABILITY_ALERT_OTHERS, ability.getAbilityPlayerOff());
        }
-        new AbilityCooldownTask(mcMMOPlayer, ability).runTaskLater(mcMMO.p, PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TICK_CONVERSION_FACTOR);
+        new AbilityCooldownTask(mmoPlayer, ability).runTaskLater(mcMMO.p, PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TICK_CONVERSION_FACTOR);
    }

    private void resendChunkRadiusAt(Player player) {
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java
@@ -9,7 +9,6 @@ import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
@@ -40,9 +39,9 @@ public class AlchemyBrewTask extends BukkitRunnable {
        if (player != null
                && !Misc.isNPCEntityExcludingVillagers(player)
                && Permissions.isSubSkillEnabled(player, SubSkillType.ALCHEMY_CATALYSIS)
-                && UserManager.getPlayer(player) != null) {
+                && mcMMO.getUserManager().getPlayer(player) != null) {

-            double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, PrimarySkillType.ALCHEMY));
+            double catalysis = mcMMO.getUserManager().getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, PrimarySkillType.ALCHEMY));

            McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
            mcMMO.p.getServer().getPluginManager().callEvent(event);
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java
@@ -8,15 +8,15 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.scheduler.BukkitRunnable;

 public class AwardCombatXpTask extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final double baseXp;
    private final PrimarySkillType primarySkillType;
    private final LivingEntity target;
    private final XPGainReason xpGainReason;
    private final double baseHealth;

-    public AwardCombatXpTask(McMMOPlayer mcMMOPlayer, PrimarySkillType primarySkillType, double baseXp, LivingEntity target, XPGainReason xpGainReason) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public AwardCombatXpTask(McMMOPlayer mmoPlayer, PrimarySkillType primarySkillType, double baseXp, LivingEntity target, XPGainReason xpGainReason) {
+        this.mmoPlayer = mmoPlayer;
        this.primarySkillType = primarySkillType;
        this.baseXp = baseXp;
        this.target = target;
@@ -39,6 +39,6 @@ public class AwardCombatXpTask extends BukkitRunnable {
            damage += health;
        }

-        mcMMOPlayer.beginXpGain(primarySkillType, (int) (damage * baseXp), xpGainReason, XPGainSource.SELF);
+        mmoPlayer.beginXpGain(primarySkillType, (int) (damage * baseXp), xpGainReason, XPGainSource.SELF);
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/skills/DelayedHerbalismXPCheckTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/DelayedHerbalismXPCheckTask.java
@@ -8,16 +8,16 @@ import java.util.ArrayList;

 public class DelayedHerbalismXPCheckTask extends BukkitRunnable {

-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final ArrayList<BlockSnapshot> chorusBlocks;

-    public DelayedHerbalismXPCheckTask(McMMOPlayer mcMMOPlayer, ArrayList<BlockSnapshot> chorusBlocks) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public DelayedHerbalismXPCheckTask(McMMOPlayer mmoPlayer, ArrayList<BlockSnapshot> chorusBlocks) {
+        this.mmoPlayer = mmoPlayer;
        this.chorusBlocks = chorusBlocks;
    }

    @Override
    public void run() {
-        mcMMOPlayer.getHerbalismManager().awardXPForBlockSnapshots(chorusBlocks);
+        mmoPlayer.getHerbalismManager().awardXPForBlockSnapshots(chorusBlocks);
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java
@@ -2,18 +2,18 @@ package com.gmail.nossr50.runnables.skills;

 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.util.experience.ExperienceBarManager;
+import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
 import org.bukkit.scheduler.BukkitRunnable;

 public class ExperienceBarHideTask extends BukkitRunnable {
-    public final McMMOPlayer mcMMOPlayer;
+    public final McMMOPlayer mmoPlayer;
    public final PrimarySkillType primarySkillType;
-    public final ExperienceBarManager experienceBarManagerRef;
+    public final MMOExperienceBarManager MMOExperienceBarManagerRef;

-    public ExperienceBarHideTask(ExperienceBarManager experienceBarManagerRef, McMMOPlayer mcMMOPlayer, PrimarySkillType primarySkillType)
+    public ExperienceBarHideTask(MMOExperienceBarManager MMOExperienceBarManagerRef, McMMOPlayer mmoPlayer, PrimarySkillType primarySkillType)
    {
-        this.experienceBarManagerRef = experienceBarManagerRef;
-        this.mcMMOPlayer = mcMMOPlayer;
+        this.MMOExperienceBarManagerRef = MMOExperienceBarManagerRef;
+        this.mmoPlayer = mmoPlayer;
        this.primarySkillType = primarySkillType;
    }

@@ -30,10 +30,10 @@ public class ExperienceBarHideTask extends BukkitRunnable {
     */
    @Override
    public void run() {
-        if(experienceBarManagerRef == null || mcMMOPlayer == null)
+        if(MMOExperienceBarManagerRef == null || mmoPlayer == null)
            return;

-        experienceBarManagerRef.hideExperienceBar(primarySkillType);
-        experienceBarManagerRef.clearTask(primarySkillType);
+        MMOExperienceBarManagerRef.hideExperienceBar(primarySkillType);
+        MMOExperienceBarManagerRef.clearTask(primarySkillType);
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java
@@ -7,18 +7,18 @@ import org.bukkit.scheduler.BukkitRunnable;


 public class SkillUnlockNotificationTask extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final SubSkillType subSkillType;
    private final int rank;
    /**
     * Notify a player about a newly unlocked subskill
-     * @param mcMMOPlayer target player
+     * @param mmoPlayer target player
     * @param subSkillType the subskill that they just unlocked
     * @param rank the rank of the subskill
     */
-    public SkillUnlockNotificationTask(McMMOPlayer mcMMOPlayer, SubSkillType subSkillType, int rank)
+    public SkillUnlockNotificationTask(McMMOPlayer mmoPlayer, SubSkillType subSkillType, int rank)
    {
-        this.mcMMOPlayer = mcMMOPlayer;
+        this.mmoPlayer = mmoPlayer;
        this.subSkillType = subSkillType;
        this.rank = rank;
    }
@@ -35,7 +35,7 @@ public class SkillUnlockNotificationTask extends BukkitRunnable {
     */
    @Override
    public void run() {
-        //mcMMOPlayer.getPlayer().sendTitle(subSkillType.getLocaleName(), "Rank "+rank, 7, 20, 7);
-        NotificationManager.sendPlayerUnlockNotification(mcMMOPlayer, subSkillType);
+        //mmoPlayer.getPlayer().sendTitle(subSkillType.getLocaleName(), "Rank "+rank, 7, 20, 7);
+        NotificationManager.sendPlayerUnlockNotification(mmoPlayer, subSkillType);
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java
@@ -8,24 +8,24 @@ import com.gmail.nossr50.util.player.NotificationManager;
 import org.bukkit.scheduler.BukkitRunnable;

 public class ToolLowerTask extends BukkitRunnable {
-    private final McMMOPlayer mcMMOPlayer;
+    private final McMMOPlayer mmoPlayer;
    private final AbilityToolType tool;

-    public ToolLowerTask(McMMOPlayer mcMMOPlayer, AbilityToolType abilityToolType) {
-        this.mcMMOPlayer = mcMMOPlayer;
+    public ToolLowerTask(McMMOPlayer mmoPlayer, AbilityToolType abilityToolType) {
+        this.mmoPlayer = mmoPlayer;
        this.tool = abilityToolType;
    }

    @Override
    public void run() {
-        if (!mcMMOPlayer.getSuperAbilityManager().isAbilityToolPrimed(tool)) {
+        if (!mmoPlayer.getSuperAbilityManager().isAbilityToolPrimed(tool)) {
            return;
        }

-        mcMMOPlayer.getSuperAbilityManager().setAbilityToolPrime(tool, false);
+        mmoPlayer.getSuperAbilityManager().setAbilityToolPrime(tool, false);

        if (Config.getInstance().getAbilityMessagesEnabled()) {
-            NotificationManager.sendPlayerInformation(mcMMOPlayer.getPlayer(), NotificationType.TOOL, tool.getLowerToolLocaleKey());
+            NotificationManager.sendPlayerInformation(mmoPlayer.getPlayer(), NotificationType.TOOL, tool.getLowerToolLocaleKey());
        }
    }
 }