EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-24 14:16:45 +01:00
Code Issues Projects Releases Wiki Activity

On third thought, Dirty types are pointless

Browse Source
This commit is contained in:
nossr50 2021-03-30 11:36:20 -07:00
parent b57458a08a
commit ac4bad5194
4 changed files with 52 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/datatypes/experience/OnlineExperienceProcessor.java
View File

@ -20,7 +20,6 @@ import com.neetgames.mcmmo.experience.ExperienceProcessor;
import com.neetgames.mcmmo.experience.XPGainReason; import com.neetgames.mcmmo.experience.XPGainReason;
import com.neetgames.mcmmo.experience.XPGainSource; import com.neetgames.mcmmo.experience.XPGainSource;
import com.neetgames.mcmmo.party.Party; import com.neetgames.mcmmo.party.Party;
import com.neetgames.mcmmo.player.MMOPlayer;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -43,7 +42,7 @@ public class OnlineExperienceProcessor implements ExperienceProcessor {
public int getPowerLevel() { public int getPowerLevel() {
int powerLevel = 0; int powerLevel = 0;
Map<PrimarySkillType, Integer> primarySkillTypeLevelMap = mmoPlayerData.getDirtySkillLevelMap().unwrapMap(); Map<PrimarySkillType, Integer> primarySkillTypeLevelMap = mmoPlayerData.getSkillLevelMap();
for (PrimarySkillType primarySkillType : primarySkillTypeLevelMap.keySet()) { for (PrimarySkillType primarySkillType : primarySkillTypeLevelMap.keySet()) {
powerLevel += primarySkillTypeLevelMap.get(primarySkillType); powerLevel += primarySkillTypeLevelMap.get(primarySkillType);

4
src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
View File

@ -138,8 +138,8 @@ public class McMMOPlayer extends PlayerProfile implements OnlineMMOPlayer, Ident
* If in the future someone wants to remove this, don't forget to also remove what is in the PrimarySkillType enum. - bm01 * If in the future someone wants to remove this, don't forget to also remove what is in the PrimarySkillType enum. - bm01
*/ */
try { try {
for (CoreRootSkill coreRootSkill : PrimarySkillType.getCoreRootSkills()) { for (PrimarySkillType primarySkillType : PrimarySkillType.getCoreRootSkills()) {
skillManagers.put(coreRootSkill, coreRootSkill.getSkillManagerClass().getConstructor(McMMOPlayer.class).newInstance(this)); skillManagers.put(primarySkillType, coreRootSkill.getSkillManagerClass().getConstructor(McMMOPlayer.class).newInstance(this));
} }
} }
catch (Exception e) { catch (Exception e) {

122
src/main/java/com/gmail/nossr50/datatypes/player/PlayerData.java
View File

@ -11,12 +11,6 @@ import com.google.common.collect.ImmutableMap;
import com.neetgames.mcmmo.UniqueDataType; import com.neetgames.mcmmo.UniqueDataType;
import com.neetgames.mcmmo.exceptions.UnexpectedValueException; import com.neetgames.mcmmo.exceptions.UnexpectedValueException;
import com.neetgames.mcmmo.skill.SkillBossBarState; import com.neetgames.mcmmo.skill.SkillBossBarState;
import com.neetgames.neetlib.dirtydata.DirtyData;
import com.neetgames.neetlib.dirtydata.DirtyMap;
import com.neetgames.neetlib.mutableprimitives.MutableBoolean;
import com.neetgames.neetlib.mutableprimitives.MutableInteger;
import com.neetgames.neetlib.mutableprimitives.MutableLong;
import com.neetgames.neetlib.mutableprimitives.MutableString;
import org.apache.commons.lang.NullArgumentException; import org.apache.commons.lang.NullArgumentException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -28,28 +22,28 @@ import java.util.UUID;
public class PlayerData { public class PlayerData {
private final @NotNull MutableBoolean dirtyFlag; //Dirty values in this class will change this flag as needed
/* Player Stuff */ /* Player Stuff */
private final @NotNull DirtyData<MutableString> playerName; private @NotNull String playerName;
private final @Nullable UUID playerUUID; private final @Nullable UUID playerUUID;
/* Records */ /* Records */
private final DirtyData<MutableLong> lastLogin; private long lastLogin;
/* Skill Data */ /* Skill Data */
private final @NotNull DirtyMap<PrimarySkillType, Integer> skillLevelValues; private final @NotNull Map<PrimarySkillType, Integer> skillLevelValues;
private final @NotNull DirtyMap<PrimarySkillType, Float> skillExperienceValues; private final @NotNull Map<PrimarySkillType, Float> skillExperienceValues;
private final @NotNull DirtyMap<SuperAbilityType, Integer> abilityDeactivationTimestamps; // Ability & Cooldown private final @NotNull Map<SuperAbilityType, Integer> abilityDeactivationTimestamps; // Ability & Cooldown
private final @NotNull DirtyMap<UniqueDataType, Integer> uniquePlayerData; //Misc data that doesn't fit into other categories (chimaera wing, etc..) private final @NotNull Map<UniqueDataType, Integer> uniquePlayerData; //Misc data that doesn't fit into other categories (chimaera wing, etc..)
private final @NotNull DirtyMap<PrimarySkillType, SkillBossBarState> barStateMap; private final @NotNull Map<PrimarySkillType, SkillBossBarState> barStateMap;
/* Special Flags */ /* Special Flags */
private final @NotNull DirtyData<MutableBoolean> partyChatSpying; private boolean partyChatSpying;
private final @NotNull DirtyData<MutableBoolean> leaderBoardExclusion; private boolean leaderBoardExclusion;
/* Scoreboards */ /* Scoreboards */
private final @NotNull DirtyData<MutableInteger> scoreboardTipsShown; private int scoreboardTipsShown;
private int lastUpdateHash;
/** /**
* Create new persistent player data for a player * Create new persistent player data for a player
@ -63,16 +57,15 @@ public class PlayerData {
/* /*
* New Data * New Data
*/ */
this.dirtyFlag = new MutableBoolean(false); //Set this one first
this.playerUUID = playerUUID; this.playerUUID = playerUUID;
this.playerName = new DirtyData<>(new MutableString(playerName), dirtyFlag); this.playerName = playerName;
this.skillLevelValues = new DirtyMap<>(new HashMap<>(), dirtyFlag); this.skillLevelValues = new HashMap<>();
this.skillExperienceValues = new DirtyMap<>(new HashMap<>(), dirtyFlag); this.skillExperienceValues = new HashMap<>();
this.abilityDeactivationTimestamps = new DirtyMap<>(new HashMap<>(), dirtyFlag); this.abilityDeactivationTimestamps = new HashMap<>();
this.uniquePlayerData = new DirtyMap<>(new EnumMap<>(UniqueDataType.class), dirtyFlag); this.uniquePlayerData = new EnumMap<>(UniqueDataType.class);
this.scoreboardTipsShown = new DirtyData<>(new MutableInteger(0), dirtyFlag); this.scoreboardTipsShown = 0;
for(SuperAbilityType superSkill : SuperAbilityType.values()) { for(SuperAbilityType superSkill : SuperAbilityType.values()) {
abilityDeactivationTimestamps.put(superSkill, 0); abilityDeactivationTimestamps.put(superSkill, 0);
@ -92,11 +85,13 @@ public class PlayerData {
//Unique Player Data //Unique Player Data
this.uniquePlayerData.put(UniqueDataType.CHIMAERA_WING_DATS, 0); this.uniquePlayerData.put(UniqueDataType.CHIMAERA_WING_DATS, 0);
this.partyChatSpying = new DirtyData<>(new MutableBoolean(false), dirtyFlag); this.partyChatSpying = false;
this.barStateMap = new DirtyMap<>(MMOExperienceBarManager.generateDefaultBarStateMap(), dirtyFlag); this.barStateMap = MMOExperienceBarManager.generateDefaultBarStateMap();
this.lastLogin = new DirtyData<>(new MutableLong(0), dirtyFlag); //Value of 0 will represent that the user hasn't been seen online this.lastLogin = 0L; //Value of 0 will represent that the user hasn't been seen online
this.leaderBoardExclusion = new DirtyData<>(new MutableBoolean(false), dirtyFlag); this.leaderBoardExclusion = false;
this.lastUpdateHash = hashCode();
} }
/** /**
@ -129,29 +124,27 @@ public class PlayerData {
/* /*
* Skills Data * Skills Data
*/ */
this.dirtyFlag = new MutableBoolean(false); //Set this one first
validateRootSkillMap(skillLevelValues); validateRootSkillMap(skillLevelValues);
this.skillLevelValues = new DirtyMap<>(skillLevelValues, dirtyFlag); this.skillLevelValues = skillLevelValues;
validateRootSkillMap(skillExperienceValues); validateRootSkillMap(skillExperienceValues);
this.skillExperienceValues = new DirtyMap<>(skillExperienceValues, dirtyFlag); this.skillExperienceValues = skillExperienceValues;
validateSuperSkillMap(abilityDeactivationTimestamps); validateSuperSkillMap(abilityDeactivationTimestamps);
this.abilityDeactivationTimestamps = new DirtyMap<>(abilityDeactivationTimestamps, dirtyFlag); this.abilityDeactivationTimestamps = abilityDeactivationTimestamps;
this.uniquePlayerData = new DirtyMap<>(uniquePlayerData, dirtyFlag); this.uniquePlayerData = uniquePlayerData;
this.scoreboardTipsShown = new DirtyData<>(new MutableInteger(scoreboardTipsShown), dirtyFlag); this.scoreboardTipsShown = scoreboardTipsShown;
this.playerUUID = playerUUID; this.playerUUID = playerUUID;
this.playerName = new DirtyData<>(new MutableString(playerName), dirtyFlag); this.playerName = playerName;
this.barStateMap = new DirtyMap<>(barStateMap, dirtyFlag); this.barStateMap = barStateMap;
this.partyChatSpying = new DirtyData<>(new MutableBoolean(partyChatSpying), dirtyFlag); this.partyChatSpying = partyChatSpying;
this.lastLogin = new DirtyData<>(new MutableLong(lastLogin), dirtyFlag); this.lastLogin = lastLogin;
this.leaderBoardExclusion = new DirtyData<>(new MutableBoolean(leaderBoardExclusion), dirtyFlag); this.leaderBoardExclusion = leaderBoardExclusion;
} }
/** /**
@ -204,30 +197,31 @@ public class PlayerData {
return 0; return 0;
} }
public boolean isDirtyProfile() { public boolean isProfileDirty() {
return dirtyFlag.getImmutableCopy(); return lastUpdateHash != hashCode();
} }
//TODO: T&C this needs to be called or pointless save operations won't be avoided
public void resetDirtyFlag() { public void resetDirtyFlag() {
dirtyFlag.setBoolean(false); lastUpdateHash = hashCode();
} }
public @NotNull String getPlayerName() { public @NotNull String getPlayerName() {
return playerName.getData().getImmutableCopy(); return playerName;
} }
public @NotNull UUID getPlayerUUID() { public @NotNull UUID getPlayerUUID() {
return playerUUID; return playerUUID;
} }
public boolean isPartyChatSpying() { return partyChatSpying.getData().getImmutableCopy(); } public boolean isPartyChatSpying() { return partyChatSpying; }
public void togglePartyChatSpying() { public void togglePartyChatSpying() {
partyChatSpying.getData().setBoolean(!partyChatSpying.getData().getImmutableCopy()); partyChatSpying = !partyChatSpying;
} }
public void setPartyChatSpying(boolean bool) { public void setPartyChatSpying(boolean bool) {
this.partyChatSpying.getData().setBoolean(bool); this.partyChatSpying = bool;
} }
/* /*
@ -235,11 +229,11 @@ public class PlayerData {
*/ */
public int getScoreboardTipsShown() { public int getScoreboardTipsShown() {
return scoreboardTipsShown.getData(false).getImmutableCopy(); return scoreboardTipsShown;
} }
public void setScoreboardTipsShown(int newValue) { public void setScoreboardTipsShown(int newValue) {
scoreboardTipsShown.getData(true).setInt(newValue); this.scoreboardTipsShown = newValue;
} }
public int getChimaeraWingDATS() { public int getChimaeraWingDATS() {
@ -273,22 +267,6 @@ public class PlayerData {
return barStateMap; return barStateMap;
} }
public @NotNull DirtyMap<PrimarySkillType, SkillBossBarState> getDirtyBarStateMap() {
return barStateMap;
}
public @NotNull DirtyMap<PrimarySkillType, Integer> getDirtySkillLevelMap() {
return skillLevelValues;
}
public @NotNull DirtyMap<PrimarySkillType, Float> getDirtyExperienceValueMap() {
return skillExperienceValues;
}
public @NotNull DirtyData<MutableBoolean> getDirtyPartyChatSpying() {
return partyChatSpying;
}
public @NotNull Map<PrimarySkillType, Integer> getSkillLevelsMap() { public @NotNull Map<PrimarySkillType, Integer> getSkillLevelsMap() {
return skillLevelValues; return skillLevelValues;
} }
@ -305,24 +283,20 @@ public class PlayerData {
return uniquePlayerData; return uniquePlayerData;
} }
public void setDirtyProfile() {
this.dirtyFlag.setBoolean(true);
}
public long getLastLogin() { public long getLastLogin() {
return lastLogin.getData().getImmutableCopy(); return lastLogin;
} }
public void setLastLogin(long newValue) { public void setLastLogin(long newValue) {
lastLogin.getData().setLong(newValue); this.lastLogin = newValue;
} }
public boolean isLeaderBoardExcluded() { public boolean isLeaderBoardExcluded() {
return leaderBoardExclusion.getData().getImmutableCopy(); return leaderBoardExclusion;
} }
public void setLeaderBoardExclusion(boolean bool) { public void setLeaderBoardExclusion(boolean bool) {
leaderBoardExclusion.getData(true).setBoolean(bool); this.leaderBoardExclusion = bool;
} }
public @NotNull ImmutableMap<PrimarySkillType, Integer> copyPrimarySkillLevelsMap() { public @NotNull ImmutableMap<PrimarySkillType, Integer> copyPrimarySkillLevelsMap() {

2
src/main/java/com/gmail/nossr50/util/player/PlayerSaveHandler.java
View File

@ -44,7 +44,7 @@ public class PlayerSaveHandler {
public void save(@NotNull PlayerData playerData, boolean useSync) { public void save(@NotNull PlayerData playerData, boolean useSync) {
//TODO: We no longer check if a profile is loaded or not as it should never be unloaded if a save operation is being called, need to double check this to be true //TODO: We no longer check if a profile is loaded or not as it should never be unloaded if a save operation is being called, need to double check this to be true
if(!playerData.isDirtyProfile()) { if(!playerData.isProfileDirty()) {
return; //Don't save data that hasn't changed return; //Don't save data that hasn't changed
} }