A lot of spaghetti relating to player state has been moved into new managers

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

@@ -2,7 +2,7 @@ package com.gmail.nossr50.util;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.MobHealthbarType;
+import com.gmail.nossr50.datatypes.MobHealthBarType;
 import com.gmail.nossr50.datatypes.meta.OldName;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.MobHealthDisplayUpdaterTask;
@@ -90,7 +90,7 @@ public final class MobHealthbarUtils {
         }
     }
 
-    private static String createHealthDisplay(MobHealthbarType mobHealthbarType, LivingEntity entity, double damage) {
+    private static String createHealthDisplay(MobHealthBarType mobHealthbarType, LivingEntity entity, double damage) {
         double maxHealth = entity.getMaxHealth();
         double currentHealth = Math.max(entity.getHealth() - damage, 0);
         double healthPercentage = (currentHealth / maxHealth) * 100.0D;

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

@@ -0,0 +1,202 @@
+package com.gmail.nossr50.util.experience;
+
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.datatypes.dirtydata.DirtyDataMap;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.runnables.skills.ExperienceBarHideTask;
+import com.gmail.nossr50.util.player.NotificationManager;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+/**
+ * ExperienceBarManager handles displaying and updating mcMMO experience bars for players
+ * Each ExperienceBarManager only manages a single player
+ */
+public class MMOExperienceBarManager {
+    private final McMMOPlayer mmoPlayer;
+
+    int delaySeconds = 3;
+
+    private @NotNull final DirtyDataMap<PrimarySkillType, BarState> barStateMapRef;
+
+    private @NotNull EnumMap<PrimarySkillType, ExperienceBarWrapper> experienceBars;
+    private @NotNull EnumMap<PrimarySkillType, ExperienceBarHideTask> experienceBarHideTaskHashMap;
+
+
+    public MMOExperienceBarManager(@NotNull McMMOPlayer mmoPlayer, @NotNull DirtyDataMap<PrimarySkillType, BarState> barStateMapRef)
+    {
+        this.mmoPlayer = mmoPlayer;
+        this.barStateMapRef = barStateMapRef;
+
+        //Init maps
+        experienceBars = new EnumMap<>(PrimarySkillType.class);
+        experienceBarHideTaskHashMap = new EnumMap<>(PrimarySkillType.class);
+
+        init();
+    }
+
+    private void init() {
+        syncBarStates();
+    }
+
+    private void syncBarStates() {
+        for(Map.Entry<PrimarySkillType, BarState> entry : barStateMapRef.entrySet()) {
+            PrimarySkillType key = entry.getKey();
+            BarState barState = entry.getValue();
+
+            switch(barState) {
+                case NORMAL:
+                    break;
+                case ALWAYS_ON:
+                    xpBarSettingToggle(XPBarSettingTarget.SHOW, key);
+                case DISABLED:
+                    xpBarSettingToggle(XPBarSettingTarget.HIDE, key);
+            }
+        }
+    }
+
+    private void resetBarStateMap() {
+        barStateMapRef.putAll(generateDefaultBarStateMap());
+    }
+
+    public void updateExperienceBar(PrimarySkillType primarySkillType, Plugin plugin)
+    {
+        if(isBarDisabled(primarySkillType))
+            return;
+
+        //Init Bar
+        if(experienceBars.get(primarySkillType) == null)
+            experienceBars.put(primarySkillType, new ExperienceBarWrapper(primarySkillType, mmoPlayer.getPersistentPlayerData()));
+
+        //Get Bar
+        ExperienceBarWrapper experienceBarWrapper = experienceBars.get(primarySkillType);
+
+        //Update Progress
+        experienceBarWrapper.setProgress(mmoPlayer.getExperienceManager().getProgressInCurrentSkillLevel(primarySkillType));
+
+        //Show Bar
+        experienceBarWrapper.showExperienceBar();
+
+        //Setup Hide Bar Task
+        if(experienceBarHideTaskHashMap.get(primarySkillType) != null)
+        {
+            experienceBarHideTaskHashMap.get(primarySkillType).cancel();
+        }
+
+        scheduleHideTask(primarySkillType, plugin);
+    }
+
+    private boolean isBarDisabled(PrimarySkillType primarySkillType) {
+        return barStateMapRef.get(primarySkillType) == BarState.DISABLED
+                //Config checks
+                || !ExperienceConfig.getInstance().isExperienceBarsEnabled()
+                || !ExperienceConfig.getInstance().isExperienceBarEnabled(primarySkillType);
+    }
+
+    private boolean isBarAlwaysVisible(PrimarySkillType primarySkillType) {
+        return barStateMapRef.get(primarySkillType) == BarState.ALWAYS_ON;
+    }
+
+    private void scheduleHideTask(PrimarySkillType primarySkillType, Plugin plugin) {
+        if(isBarAlwaysVisible(primarySkillType))
+            return;
+
+        ExperienceBarHideTask experienceBarHideTask = new ExperienceBarHideTask(this, mmoPlayer, primarySkillType);
+        experienceBarHideTask.runTaskLater(plugin, 20* delaySeconds);
+        experienceBarHideTaskHashMap.put(primarySkillType, experienceBarHideTask);
+    }
+
+    public void hideExperienceBar(PrimarySkillType primarySkillType)
+    {
+        if(experienceBars.containsKey(primarySkillType))
+            experienceBars.get(primarySkillType).hideExperienceBar();
+    }
+
+    public void clearTask(PrimarySkillType primarySkillType)
+    {
+        experienceBarHideTaskHashMap.remove(primarySkillType);
+    }
+
+    public void disableAllBars() {
+        for(PrimarySkillType primarySkillType : PrimarySkillType.values()) {
+            xpBarSettingToggle(XPBarSettingTarget.HIDE, primarySkillType);
+        }
+
+        NotificationManager.sendPlayerInformationChatOnlyPrefixed(mmoPlayer.getPlayer(), "Commands.XPBar.DisableAll");
+    }
+
+    public void xpBarSettingToggle(@NotNull XPBarSettingTarget settingTarget, @Nullable PrimarySkillType skillType) {
+        switch(settingTarget) {
+            case SHOW:
+                barStateMapRef.put(skillType, BarState.ALWAYS_ON);
+
+                //Remove lingering tasks
+                if(experienceBarHideTaskHashMap.containsKey(skillType)) {
+                    experienceBarHideTaskHashMap.get(skillType).cancel();
+                }
+
+                updateExperienceBar(skillType, mcMMO.p);
+                break;
+            case HIDE:
+                barStateMapRef.put(skillType, BarState.DISABLED);
+
+                //Remove lingering tasks
+                if(experienceBarHideTaskHashMap.containsKey(skillType)) {
+                    experienceBarHideTaskHashMap.get(skillType).cancel();
+                }
+
+                hideExperienceBar(skillType);
+                break;
+            case RESET:
+                resetBarSettings();
+                break;
+        }
+
+        informPlayer(settingTarget, skillType);
+    }
+
+    private void resetBarSettings() {
+        barStateMapRef.putAll(generateDefaultBarStateMap());
+    }
+
+    private void informPlayer(@NotNull MMOExperienceBarManager.@NotNull XPBarSettingTarget settingTarget, @Nullable PrimarySkillType skillType) {
+        //Inform player of setting change
+        if(settingTarget != XPBarSettingTarget.RESET) {
+            NotificationManager.sendPlayerInformationChatOnlyPrefixed(mmoPlayer.getPlayer(), "Commands.XPBar.SettingChanged", skillType.getName(), settingTarget.toString());
+        } else {
+            NotificationManager.sendPlayerInformationChatOnlyPrefixed(mmoPlayer.getPlayer(), "Commands.XPBar.Reset");
+        }
+    }
+
+    public enum XPBarSettingTarget { SHOW, HIDE, RESET, DISABLE }
+
+    public enum BarState { NORMAL, ALWAYS_ON, DISABLED }
+
+    /*
+     * Utility Methods
+     */
+
+    public static EnumMap<PrimarySkillType, BarState> generateDefaultBarStateMap() {
+        EnumMap<PrimarySkillType, MMOExperienceBarManager.BarState> barStateMap = new EnumMap<>(PrimarySkillType.class);
+
+        setBarStateDefaults(barStateMap);
+
+        return barStateMap;
+    }
+
+    public static void setBarStateDefaults(EnumMap<PrimarySkillType, MMOExperienceBarManager.BarState> barStateHashMap) {
+        for(PrimarySkillType skillType : PrimarySkillType.values()) {
+            if(skillType.isChildSkill()) {
+                barStateHashMap.put(skillType, MMOExperienceBarManager.BarState.DISABLED);
+            } else {
+                barStateHashMap.put(skillType, MMOExperienceBarManager.BarState.NORMAL);
+            }
+        }
+    }
+}