EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 12:35:27 +02:00
Code Issues Projects Releases Wiki Activity

More work on Skill API migration

Browse Source
This commit is contained in:
nossr50
2020-12-17 16:22:22 -08:00
parent abcf6413f5
commit 573d9d014e
13 changed files with 273 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java
View File

@@ -1,13 +1,11 @@
package com.gmail.nossr50.util.experience;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.player.PersistentPlayerData;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
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.MMOPlayerData;
import com.neetgames.mcmmo.player.OnlineMMOPlayer;
import com.neetgames.mcmmo.skill.SkillIdentity;
import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarStyle;
import org.bukkit.boss.BossBar;
@@ -21,9 +19,9 @@ import java.util.List;
*/
public class ExperienceBarWrapper {
private final @NotNull PrimarySkillType primarySkillType; //Primary Skill
private final @NotNull SkillIdentity skillIdentity; //Primary Skill
private @NotNull BossBar bossBar;
protected final @NotNull MMOPlayerData mmoPlayerData;
protected final @NotNull OnlineMMOPlayer onlineMMOPlayer;
private int lastLevelUpdated;
/*
@@ -32,14 +30,14 @@ public class ExperienceBarWrapper {
protected String niceSkillName;
protected String title;
public ExperienceBarWrapper(@NotNull PrimarySkillType primarySkillType, @NotNull OnlineMMOPlayer mmoPlayer) {
this.mmoPlayerData = mmoPlayer.getMMOPlayerData();
this.primarySkillType = primarySkillType;
public ExperienceBarWrapper(@NotNull SkillIdentity skillIdentity, @NotNull OnlineMMOPlayer onlineMMOPlayer) {
this.onlineMMOPlayer = onlineMMOPlayer;
this.skillIdentity = skillIdentity;
title = "";
lastLevelUpdated = 0;
//These vars are stored to help reduce operations involving strings
niceSkillName = StringUtils.getCapitalized(primarySkillType.toString());
niceSkillName = StringUtils.getCapitalized(skillIdentity.toString());
//Create the bar
initBar();
@@ -58,7 +56,7 @@ public class ExperienceBarWrapper {
private String getTitleTemplate() {
//If they are using extra details
if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(persistentPlayerData, primarySkillType)) {
if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(onlineMMOPlayer, skillIdentity)) {
return LocaleLoader.getString("XPBar.Template.EarlyGameBoost");
} else if(ExperienceConfig.getInstance().getAddExtraDetails())
return LocaleLoader.getString("XPBar.Complex.Template", LocaleLoader.getString("XPBar."+niceSkillName, getLevel()), getCurrentXP(), getMaxXP(), getPowerLevel(), getPercentageOfLevel());
@@ -67,16 +65,16 @@ public class ExperienceBarWrapper {
}
private int getLevel() {
return persistentPlayerData.getSkillLevel(primarySkillType);
return onlineMMOPlayer.getSkillLevel(skillIdentity);
}
private int getCurrentXP() {
return mmoPlayer.getSkillXpLevel(primarySkillType);
return onlineMMOPlayer.getSkillExperience(skillIdentity);
}
private int getMaxXP() {
return mmoPlayer.getXpToLevel(primarySkillType);
return onlineMMOPlayer.getExperienceToNextLevel(skillIdentity);
}
private int getPowerLevel() { return mmoPlayer.getPowerLevel(); }
private int getPercentageOfLevel() { return (int) (mmoPlayer.getProgressInCurrentSkillLevel(primarySkillType) * 100); }
private int getPowerLevel() { return onlineMMOPlayer.getPowerLevel(); }
private int getPercentageOfLevel() { return (int) (onlineMMOPlayer.getProgressInCurrentSkillLevel(skillIdentity) * 100); }
public String getTitle() {
return bossBar.getTitle();
@@ -113,10 +111,10 @@ public class ExperienceBarWrapper {
bossBar.setProgress(v);
//Check player level
if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mmoPlayer, primarySkillType)) {
if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled() && PlayerLevelUtils.qualifiesForEarlyGameBoost(mmoPlayer, skillIdentity)) {
setColor(BarColor.YELLOW);
} else {
setColor(ExperienceConfig.getInstance().getExperienceBarColor(primarySkillType));
setColor(ExperienceConfig.getInstance().getExperienceBarColor(skillIdentity));
}
//Every time progress updates we need to check for a title update
@@ -156,7 +154,7 @@ public class ExperienceBarWrapper {
private void createBossBar()
{
bossBar = mmoPlayer.getPlayer().getServer().createBossBar(title, ExperienceConfig.getInstance().getExperienceBarColor(primarySkillType), ExperienceConfig.getInstance().getExperienceBarStyle(primarySkillType));
bossBar = mmoPlayer.getPlayer().getServer().createBossBar(title, ExperienceConfig.getInstance().getExperienceBarColor(skillIdentity), ExperienceConfig.getInstance().getExperienceBarStyle(skillIdentity));
bossBar.addPlayer(mmoPlayer.getPlayer());
}
}

78
src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java
View File

@@ -2,17 +2,18 @@ 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.CoreSkillConstants;
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 com.neetgames.mcmmo.skill.SkillBossBarSetting;
import com.neetgames.mcmmo.skill.SkillBossBarState;
import com.neetgames.mcmmo.skill.*;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
/**
@@ -24,20 +25,20 @@ public class MMOExperienceBarManager {
int delaySeconds = 3;
private @NotNull final Map<PrimarySkillType, SkillBossBarState> barStateMapRef;
private @NotNull final Map<SkillIdentity, SkillBossBarState> barStateMapRef;
private @NotNull final EnumMap<PrimarySkillType, ExperienceBarWrapper> experienceBars;
private @NotNull final EnumMap<PrimarySkillType, ExperienceBarHideTask> experienceBarHideTaskHashMap;
private @NotNull final HashMap<SkillIdentity, ExperienceBarWrapper> experienceBars;
private @NotNull final HashMap<SkillIdentity, ExperienceBarHideTask> experienceBarHideTaskHashMap;
public MMOExperienceBarManager(@NotNull McMMOPlayer mmoPlayer, @NotNull Map<PrimarySkillType, SkillBossBarState> barStateMapRef)
public MMOExperienceBarManager(@NotNull McMMOPlayer mmoPlayer, @NotNull Map<SkillIdentity, SkillBossBarState> barStateMapRef)
{
this.mmoPlayer = mmoPlayer;
this.barStateMapRef = barStateMapRef;
//Init maps
experienceBars = new EnumMap<>(PrimarySkillType.class);
experienceBarHideTaskHashMap = new EnumMap<>(PrimarySkillType.class);
experienceBars = new HashMap<>();
experienceBarHideTaskHashMap = new HashMap<>();
init();
}
@@ -47,8 +48,8 @@ public class MMOExperienceBarManager {
}
private void syncBarStates() {
for(Map.Entry<PrimarySkillType, SkillBossBarState> entry : barStateMapRef.entrySet()) {
PrimarySkillType key = entry.getKey();
for(Map.Entry<SkillIdentity, SkillBossBarState> entry : barStateMapRef.entrySet()) {
SkillIdentity key = entry.getKey();
SkillBossBarState barState = entry.getValue();
switch(barState) {
@@ -66,31 +67,31 @@ public class MMOExperienceBarManager {
barStateMapRef.putAll(generateDefaultBarStateMap());
}
public void updateExperienceBar(@NotNull PrimarySkillType primarySkillType, @NotNull Plugin plugin)
public void updateExperienceBar(@NotNull SkillIdentity skillIdentity, @NotNull Plugin plugin)
{
if(isBarDisabled(primarySkillType))
if(isBarDisabled(skillIdentity))
return;
//Init Bar
if(experienceBars.get(primarySkillType) == null)
experienceBars.put(primarySkillType, new ExperienceBarWrapper(primarySkillType, mmoPlayer.getPersistentPlayerData()));
if(experienceBars.get(skillIdentity) == null)
experienceBars.put(skillIdentity, new ExperienceBarWrapper(skillIdentity, mmoPlayer.getPersistentPlayerData()));
//Get Bar
ExperienceBarWrapper experienceBarWrapper = experienceBars.get(primarySkillType);
ExperienceBarWrapper experienceBarWrapper = experienceBars.get(skillIdentity);
//Update Progress
experienceBarWrapper.setProgress(mmoPlayer.getExperienceManager().getProgressInCurrentSkillLevel(primarySkillType));
experienceBarWrapper.setProgress(mmoPlayer.getExperienceManager().getProgressInCurrentSkillLevel(skillIdentity));
//Show Bar
experienceBarWrapper.showExperienceBar();
//Setup Hide Bar Task
if(experienceBarHideTaskHashMap.get(primarySkillType) != null)
if(experienceBarHideTaskHashMap.get(skillIdentity) != null)
{
experienceBarHideTaskHashMap.get(primarySkillType).cancel();
experienceBarHideTaskHashMap.get(skillIdentity).cancel();
}
scheduleHideTask(primarySkillType, plugin);
scheduleHideTask(skillIdentity, plugin);
}
private boolean isBarDisabled(PrimarySkillType primarySkillType) {
@@ -132,34 +133,34 @@ public class MMOExperienceBarManager {
NotificationManager.sendPlayerInformationChatOnlyPrefixed(mmoPlayer.getPlayer(), "Commands.XPBar.DisableAll");
}
public void xpBarSettingToggle(@NotNull SkillBossBarSetting skillBossBarSetting, @Nullable PrimarySkillType skillType) {
public void xpBarSettingToggle(@NotNull SkillBossBarSetting skillBossBarSetting, @Nullable SkillIdentity skillIdentity) {
switch(skillBossBarSetting) {
case SHOW:
barStateMapRef.put(skillType, SkillBossBarState.ALWAYS_ON);
barStateMapRef.put(skillIdentity, SkillBossBarState.ALWAYS_ON);
//Remove lingering tasks
if(experienceBarHideTaskHashMap.containsKey(skillType)) {
experienceBarHideTaskHashMap.get(skillType).cancel();
if(experienceBarHideTaskHashMap.containsKey(skillIdentity)) {
experienceBarHideTaskHashMap.get(skillIdentity).cancel();
}
updateExperienceBar(skillType, mcMMO.p);
updateExperienceBar(skillIdentity, mcMMO.p);
break;
case HIDE:
barStateMapRef.put(skillType, SkillBossBarState.DISABLED);
barStateMapRef.put(skillIdentity, SkillBossBarState.DISABLED);
//Remove lingering tasks
if(experienceBarHideTaskHashMap.containsKey(skillType)) {
experienceBarHideTaskHashMap.get(skillType).cancel();
if(experienceBarHideTaskHashMap.containsKey(skillIdentity)) {
experienceBarHideTaskHashMap.get(skillIdentity).cancel();
}
hideExperienceBar(skillType);
hideExperienceBar(skillIdentity);
break;
case RESET:
resetBarSettings();
break;
}
informPlayer(skillBossBarSetting, skillType);
informPlayer(skillBossBarSetting, skillIdentity);
}
private void resetBarSettings() {
@@ -175,24 +176,21 @@ public class MMOExperienceBarManager {
}
}
/*
* Utility Methods
*/
public static @NotNull EnumMap<PrimarySkillType, SkillBossBarState> generateDefaultBarStateMap() {
EnumMap<PrimarySkillType, SkillBossBarState> barStateMap = new EnumMap<>(PrimarySkillType.class);
public static @NotNull HashMap<SkillIdentity, SkillBossBarState> generateDefaultBarStateMap() {
HashMap<SkillIdentity, SkillBossBarState> barStateMap = new HashMap<>();
setBarStateDefaults(barStateMap);
return barStateMap;
}
public static void setBarStateDefaults(EnumMap<PrimarySkillType, SkillBossBarState> barStateHashMap) {
for(PrimarySkillType skillType : PrimarySkillType.values()) {
if(skillType.isChildSkill()) {
barStateHashMap.put(skillType, SkillBossBarState.DISABLED);
public static void setBarStateDefaults(HashMap<SkillIdentity, SkillBossBarState> barStateHashMap) {
for(RootSkill rootSkill : CoreSkillConstants.getImmutableCoreRootSkillSet()) {
if(CoreSkillConstants.isChildSkill(rootSkill.getSkillIdentity())) {
barStateHashMap.put(rootSkill.getSkillIdentity(), SkillBossBarState.DISABLED);
} else {
barStateHashMap.put(skillType, SkillBossBarState.NORMAL);
barStateHashMap.put(rootSkill.getSkillIdentity(), SkillBossBarState.NORMAL);
}
}
}

2
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java
View File

@@ -449,7 +449,7 @@ public class ScoreboardWrapper {
int currentXP = mmoPlayer.getExperienceManager().getSkillXpValue(targetSkill);
sidebarObjective.getScore(ScoreboardManager.LABEL_CURRENT_XP).setScore(currentXP);
sidebarObjective.getScore(ScoreboardManager.LABEL_REMAINING_XP).setScore(mmoPlayer.getExperienceManager().getXpToLevel(targetSkill) - currentXP);
sidebarObjective.getScore(ScoreboardManager.LABEL_REMAINING_XP).setScore(mmoPlayer.getExperienceManager().getExperienceToNextLevel(targetSkill) - currentXP);
}
else {
for (PrimarySkillType parentSkill : FamilyTree.getParents(targetSkill)) {