EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Generify the maps

Browse Source
This commit is contained in:
nossr50
2020-12-22 14:24:37 -08:00
parent b7f713a50f
commit 35be5bc17d
1 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/com/gmail/nossr50/datatypes/player/PersistentPlayerDataBuilder.java
View File

@@ -6,7 +6,12 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.experience.MMOExperienceBarManager; import com.gmail.nossr50.util.experience.MMOExperienceBarManager;
import com.neetgames.mcmmo.MobHealthBarType; import com.neetgames.mcmmo.MobHealthBarType;
import com.neetgames.mcmmo.UniqueDataType; import com.neetgames.mcmmo.UniqueDataType;
import com.neetgames.mcmmo.api.SkillRegister;
import com.neetgames.mcmmo.skill.RootSkill;
import com.neetgames.mcmmo.skill.SkillBossBarState; import com.neetgames.mcmmo.skill.SkillBossBarState;
import com.neetgames.mcmmo.skill.SkillIdentity;
import com.neetgames.mcmmo.skill.SuperSkill;
import it.unimi.dsi.fastutil.Hash;
import org.apache.commons.lang.NullArgumentException; import org.apache.commons.lang.NullArgumentException;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -14,6 +19,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
public class PersistentPlayerDataBuilder { public class PersistentPlayerDataBuilder {
@@ -29,11 +36,11 @@ public class PersistentPlayerDataBuilder {
private @Nullable MobHealthBarType mobHealthBarType; private @Nullable MobHealthBarType mobHealthBarType;
/* Skill Data */ /* Skill Data */
private @Nullable EnumMap<PrimarySkillType, Integer> skillLevelValues; private @Nullable Map<RootSkill, Integer> skillLevelValues;
private @Nullable EnumMap<PrimarySkillType, Float> skillExperienceValues; private @Nullable Map<RootSkill, Float> skillExperienceValues;
private @Nullable EnumMap<SuperAbilityType, Integer> abilityDeactivationTimestamps; // Ability & Cooldown private @Nullable Map<SuperSkill, Integer> abilityDeactivationTimestamps; // Ability & Cooldown
private @Nullable EnumMap<UniqueDataType, Integer> uniquePlayerData; //Misc data that doesn't fit into other categories (chimaera wing, etc..) private @Nullable Map<UniqueDataType, Integer> uniquePlayerData; //Misc data that doesn't fit into other categories (chimaera wing, etc..)
private @Nullable EnumMap<PrimarySkillType, SkillBossBarState> barStateMap; private @Nullable Map<RootSkill, SkillBossBarState> barStateMap;
/* Special Flags */ /* Special Flags */
private boolean partyChatSpying; private boolean partyChatSpying;
@@ -99,19 +106,19 @@ public class PersistentPlayerDataBuilder {
throw new NullArgumentException("mobHealthBarType"); throw new NullArgumentException("mobHealthBarType");
return new PersistentPlayerData(playerUUID, playerName, partyChatSpying, skillLevelValues, skillExperienceValues, abilityDeactivationTimestamps, uniquePlayerData, barStateMap, scoreboardTipsShown, mobHealthBarType, lastLogin, leaderBoardExemption); return new PersistentPlayerData(playerUUID, playerName, partyChatSpying, skillLevelValues, skillExperienceValues, abilityDeactivationTimestamps, uniquePlayerData, barStateMap, scoreboardTipsShown, lastLogin, leaderBoardExemption);
} }
private void validateBarStateMapEntries(@NotNull EnumMap<PrimarySkillType, SkillBossBarState> map) { private void validateBarStateMapEntries(@NotNull Map<RootSkill, SkillBossBarState> map) {
EnumMap<PrimarySkillType, SkillBossBarState> barMapDefaults = MMOExperienceBarManager.generateDefaultBarStateMap(); Map<RootSkill, SkillBossBarState> barMapDefaults = MMOExperienceBarManager.generateDefaultBarStateMap();
for(PrimarySkillType primarySkillType : PrimarySkillType.values()) { for(RootSkill key : mcMMO.p.getSkillRegister().getRootSkills()) {
map.putIfAbsent(primarySkillType, barMapDefaults.get(primarySkillType)); map.putIfAbsent(key, barMapDefaults.get(key));
} }
} }
private void validateExperienceValueMapEntries(@NotNull EnumMap<PrimarySkillType, Float> map) { private void validateExperienceValueMapEntries(@NotNull Map<RootSkill, Float> map) {
for(PrimarySkillType key : PrimarySkillType.values()) { for(RootSkill key : mcMMO.p.getSkillRegister().getRootSkills()) {
map.putIfAbsent(key, 0F); map.putIfAbsent(key, 0F);
if(map.get(key) < 0F) { if(map.get(key) < 0F) {
@@ -121,7 +128,7 @@ public class PersistentPlayerDataBuilder {
} }
} }
private void validateUniquePlayerDataMapEntries(@NotNull EnumMap<UniqueDataType, Integer> map) { private void validateUniquePlayerDataMapEntries(@NotNull Map<UniqueDataType, Integer> map) {
for(UniqueDataType key : UniqueDataType.values()) { for(UniqueDataType key : UniqueDataType.values()) {
map.putIfAbsent(key, 0); map.putIfAbsent(key, 0);
@@ -132,8 +139,8 @@ public class PersistentPlayerDataBuilder {
} }
} }
private void validateAbilityCooldownMapEntries(@NotNull EnumMap<SuperAbilityType, Integer> map) { private void validateAbilityCooldownMapEntries(@NotNull Map<SuperSkill, Integer> map) {
for(SuperAbilityType key : SuperAbilityType.values()) { for(SuperSkill key : mcMMO.p.getSkillRegister().getSuperSkills()) {
map.putIfAbsent(key, 0); map.putIfAbsent(key, 0);
if(map.get(key) < 0) { if(map.get(key) < 0) {
@@ -143,8 +150,8 @@ public class PersistentPlayerDataBuilder {
} }
} }
private void validateSkillLevelMapEntries(@NotNull EnumMap<PrimarySkillType, Integer> map) { private void validateSkillLevelMapEntries(@NotNull Map<RootSkill, Integer> map) {
for(PrimarySkillType key : PrimarySkillType.values()) { for(RootSkill key : mcMMO.p.getSkillRegister().getRootSkills()) {
map.putIfAbsent(key, 0); map.putIfAbsent(key, 0);
if(map.get(key) < 0) { if(map.get(key) < 0) {
@@ -181,43 +188,34 @@ public class PersistentPlayerDataBuilder {
return this; return this;
} }
public @Nullable MobHealthBarType getMobHealthBarType() { public @Nullable Map<RootSkill, Integer> getSkillLevelValues() {
return mobHealthBarType;
}
public @NotNull PersistentPlayerDataBuilder setMobHealthBarType(@NotNull MobHealthBarType mobHealthBarType) {
this.mobHealthBarType = mobHealthBarType;
return this;
}
public @Nullable EnumMap<PrimarySkillType, Integer> getSkillLevelValues() {
return skillLevelValues; return skillLevelValues;
} }
public @NotNull PersistentPlayerDataBuilder setSkillLevelValues(@NotNull EnumMap<PrimarySkillType, Integer> skillLevelValues) { public @NotNull PersistentPlayerDataBuilder setSkillLevelValues(@NotNull HashMap<RootSkill, Integer> skillLevelValues) {
this.skillLevelValues = skillLevelValues; this.skillLevelValues = skillLevelValues;
return this; return this;
} }
public @Nullable EnumMap<PrimarySkillType, Float> getSkillExperienceValues() { public @Nullable Map<RootSkill, Float> getSkillExperienceValues() {
return skillExperienceValues; return skillExperienceValues;
} }
public @NotNull PersistentPlayerDataBuilder setSkillExperienceValues(@NotNull EnumMap<PrimarySkillType, Float> skillExperienceValues) { public @NotNull PersistentPlayerDataBuilder setSkillExperienceValues(@NotNull HashMap<RootSkill, Float> skillExperienceValues) {
this.skillExperienceValues = skillExperienceValues; this.skillExperienceValues = skillExperienceValues;
return this; return this;
} }
public @Nullable EnumMap<SuperAbilityType, Integer> getAbilityDeactivationTimestamps() { public @Nullable Map<SuperSkill, Integer> getAbilityDeactivationTimestamps() {
return abilityDeactivationTimestamps; return abilityDeactivationTimestamps;
} }
public @NotNull PersistentPlayerDataBuilder setAbilityDeactivationTimestamps(@NotNull EnumMap<SuperAbilityType, Integer> abilityDeactivationTimestamps) { public @NotNull PersistentPlayerDataBuilder setAbilityDeactivationTimestamps(@NotNull HashMap<SuperSkill, Integer> abilityDeactivationTimestamps) {
this.abilityDeactivationTimestamps = abilityDeactivationTimestamps; this.abilityDeactivationTimestamps = abilityDeactivationTimestamps;
return this; return this;
} }
public @Nullable EnumMap<UniqueDataType, Integer> getUniquePlayerData() { public @Nullable Map<UniqueDataType, Integer> getUniquePlayerData() {
return uniquePlayerData; return uniquePlayerData;
} }
@@ -226,11 +224,11 @@ public class PersistentPlayerDataBuilder {
return this; return this;
} }
public @Nullable EnumMap<PrimarySkillType, SkillBossBarState> getBarStateMap() { public @Nullable Map<PrimarySkillType, SkillBossBarState> getBarStateMap() {
return barStateMap; return barStateMap;
} }
public @NotNull PersistentPlayerDataBuilder setBarStateMap(@NotNull EnumMap<PrimarySkillType, SkillBossBarState> barStateMap) { public @NotNull PersistentPlayerDataBuilder setBarStateMap(@NotNull Map<RootSkill, SkillBossBarState> barStateMap) {
this.barStateMap = barStateMap; this.barStateMap = barStateMap;
return this; return this;
} }