Wire up XP bar settings

This commit is contained in:
nossr50
2019-05-13 05:25:40 -07:00
parent 59c8d16374
commit 591c9e67a3
7 changed files with 44 additions and 59 deletions

View File

@@ -3,6 +3,7 @@ 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.mcMMO;
import com.gmail.nossr50.runnables.skills.ExperienceBarHideTask;
import org.bukkit.plugin.Plugin;
@@ -26,7 +27,7 @@ public class ExperienceBarManager {
}
public void updateExperienceBar(PrimarySkillType primarySkillType, Plugin plugin) {
if (!ExperienceConfig.getInstance().isExperienceBarsEnabled() || !ExperienceConfig.getInstance().isExperienceBarEnabled(primarySkillType))
if (!mcMMO.getConfigManager().getConfigLeveling().isEnableXPBars() || !mcMMO.getConfigManager().getConfigLeveling().getXPBarToggle(primarySkillType))
return;
//Init Bar

View File

@@ -4,6 +4,7 @@ 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.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.StringUtils;
import org.bukkit.Server;
import org.bukkit.boss.BarColor;
@@ -55,7 +56,7 @@ public class ExperienceBarWrapper {
private String getTitleTemplate() {
//If they are using extra details
if (ExperienceConfig.getInstance().getAddExtraDetails())
if (mcMMO.getConfigManager().getConfigLeveling().isMoreDetailedXPBars())
return LocaleLoader.getString("XPBar.Complex.Template", LocaleLoader.getString("XPBar." + niceSkillName, getLevel()), getCurrentXP(), getMaxXP(), getPowerLevel(), getPercentageOfLevel());
return LocaleLoader.getString("XPBar." + niceSkillName, getLevel(), getCurrentXP(), getMaxXP(), getPowerLevel(), getPercentageOfLevel());
@@ -120,7 +121,7 @@ public class ExperienceBarWrapper {
bossBar.setProgress(v);
//Every time progress updates we need to check for a title update
if (getLevel() != lastLevelUpdated || ExperienceConfig.getInstance().getDoExperienceBarsAlwaysUpdateTitle()) {
if (getLevel() != lastLevelUpdated || mcMMO.getConfigManager().getConfigLeveling().isMoreDetailedXPBars()) {
updateTitle();
lastLevelUpdated = getLevel();
}
@@ -148,7 +149,9 @@ public class ExperienceBarWrapper {
}*/
private void createBossBar() {
bossBar = mcMMOPlayer.getPlayer().getServer().createBossBar(title, ExperienceConfig.getInstance().getExperienceBarColor(primarySkillType), ExperienceConfig.getInstance().getExperienceBarStyle(primarySkillType));
bossBar = mcMMOPlayer.getPlayer().getServer().createBossBar(title,
mcMMO.getConfigManager().getConfigLeveling().getXPBarColor(primarySkillType),
mcMMO.getConfigManager().getConfigLeveling().getXPBarStyle(primarySkillType));
bossBar.addPlayer(mcMMOPlayer.getPlayer());
}
}