Skip to content

Commit

Permalink
add advancement and game stats sharables
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicegamer7
nicegamer7 committed May 13, 2020
1 parent d16b73e commit 5f77886
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 52 deletions.
10 changes: 5 additions & 5 deletions src/main/java/com/onarandombox/multiverseinventories/share/SharableSerializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
public interface SharableSerializer<T> {

/**
* This deserializes the data for a Sharable. You must be expecting the type of data coming in in order to process
* this. That type will generally be the type that this serializes as with {@link #serialize(Object)}.
* This deserializes the data for a Sharable. You must be expecting the type of data coming in in order to process
* this. That type will generally be the type that this serializes as with {@link #serialize(Object)}.
*
* @param obj The incoming (serialized) data to be deserialized.
* @return The data represented by the Sharable this object represents in deserialized form.
*/
T deserialize(Object obj);

/**
* This serializes the data for a Sharable. The output is an Object but what you return is up to you, however,
* this is limited by the constraints of the persistence method. Generally, returning a String is the safest way
* to serialize your data. Most boxed primitives are accepted as well as Lists of boxed primitives and
* This serializes the data for a Sharable. The output is an Object but what you return is up to you, however,
* this is limited by the constraints of the persistence method. Generally, returning a String is the safest way
* to serialize your data. Most boxed primitives are accepted as well as Lists of boxed primitives and
* Map<String, Object>.
*
* @param t The value of the data represented by the Sharable.
Expand Down
106 changes: 59 additions & 47 deletions src/main/java/com/onarandombox/multiverseinventories/share/Sharables.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ public static void setPlayerSpawnLocation(Player player, Location spawnLocation)
/**
* Sharing Advancements.
*/
public static final Sharable<HashSet> ADVANCEMENTS = new Sharable.Builder<HashSet>("advancements", HashSet.class,
new SharableHandler<HashSet>() {
public static final Sharable<String[]> ADVANCEMENTS = new Sharable.Builder<String[]>("advancements", String[].class,
new SharableHandler<String[]>() {
@Override
public void updateProfile(PlayerProfile profile, Player player) {
HashSet<String> completedAdvancements = new HashSet<>();
Expand All @@ -693,13 +693,14 @@ public void updateProfile(PlayerProfile profile, Player player) {
completedAdvancements.addAll(awardedCriteria);
}

profile.set(ADVANCEMENTS, completedAdvancements);
profile.set(ADVANCEMENTS, completedAdvancements.toArray(new String[completedAdvancements.size()]));
}

@Override
public boolean updatePlayer(Player player, PlayerProfile profile) {
HashSet<String> completedAdvancements = profile.get(ADVANCEMENTS);
completedAdvancements = (completedAdvancements != null) ? completedAdvancements : new HashSet<>();
String[] advancements = profile.get(ADVANCEMENTS);
HashSet<String> processedAdvancements = new HashSet<>();
HashSet<String> completedAdvancements = (advancements != null) ? new HashSet<>(Arrays.asList(advancements)) : new HashSet<>();
Iterator<Advancement> advancementIterator = inventories.getServer().advancementIterator();

while (advancementIterator.hasNext()) {
Expand All @@ -709,53 +710,64 @@ public boolean updatePlayer(Player player, PlayerProfile profile) {
// the set of Advancements to grant
Set<String> intersection = new HashSet<>(advancement.getCriteria());

revoke.removeAll(processedAdvancements);
revoke.removeAll(completedAdvancements);
intersection.removeAll(processedAdvancements);
intersection.retainAll(completedAdvancements);
// completedAdvancements.removeAll(intersection);
// above line was an attempt at efficiency

for (String criteria: revoke) player.getAdvancementProgress(advancement).revokeCriteria(criteria);
for (String criteria: intersection) player.getAdvancementProgress(advancement).awardCriteria(criteria);
for (String criteria: revoke) {
processedAdvancements.add(criteria);
completedAdvancements.remove(criteria);
player.getAdvancementProgress(advancement).revokeCriteria(criteria);
}
for (String criteria: intersection) {
processedAdvancements.add(criteria);
completedAdvancements.remove(criteria);
player.getAdvancementProgress(advancement).awardCriteria(criteria);
}

// here's the idea: revoke all (criteria \ completedAdvancements), grant (criteria intersect completedAdvancements)
// also, we don't need to grant/revoke anything in processedAdvancements since they've already been granted/revoked!
}
return advancements != null;
}
}).serializer(new ProfileEntry(false, "advancements"), new StringArraySerializer())
.altName("achievements").build();

// here's the idea: revoke all (criteria - completedAdvancements), grant (criteria intersect completedAdvancements)
/**
* Sharing Statistics.
*/
public static final Sharable<HashMap> GAME_STATISTICS = new Sharable.Builder<HashMap>("game_statistics", HashMap.class,
new SharableHandler<HashMap>() {
@Override
public void updateProfile(PlayerProfile profile, Player player) {
HashMap<String, Integer> playerStats = new HashMap<>();
for (Statistic stat: Statistic.values()) {
if (stat.getType() == Statistic.Type.UNTYPED) {
int val = player.getStatistic(stat);
// no need to save values of 0, that's the default!
if (val != 0) playerStats.put(stat.name(), val);
}
}
return !completedAdvancements.isEmpty();
profile.set(GAME_STATISTICS, playerStats);
}

@Override
public boolean updatePlayer(Player player, PlayerProfile profile) {
HashMap<String, Integer> playerStats = profile.get(GAME_STATISTICS);
for (Statistic stat : Statistic.values()) {
if (stat.getType() == Statistic.Type.UNTYPED) player.setStatistic(stat, 0);
}
if (playerStats == null) {
return false;
}
for (String stringStat : playerStats.keySet()) {
Statistic stat = Statistic.valueOf(stringStat);
if (stat.getType() == Statistic.Type.UNTYPED) player.setStatistic(stat, playerStats.get(stat.name()));
}
return true;
}
}).defaultSerializer(new ProfileEntry(false, "advancements")).altName("achievements").build();

// /**
// * Sharing Statistics.
// */
// public static final Sharable<HashMap> GAME_STATISTICS = new Sharable.Builder<HashMap>("game_statistics", HashMap.class,
// new SharableHandler<HashMap>() {
// @Override
// public void updateProfile(PlayerProfile profile, Player player) {
// HashMap<String, Integer> playerStats = new HashMap<>();
// for (Statistic stat: Statistic.values()) {
// if (stat.getType() == Statistic.Type.UNTYPED) {
// int val = player.getStatistic(stat);
// if (val != 0) playerStats.put(stat.name(), val);
// }
// }
// profile.set(GAME_STATISTICS, playerStats);
// }
//
// @Override
// public boolean updatePlayer(Player player, PlayerProfile profile) {
// HashMap<String, Integer> playerStats = profile.get(GAME_STATISTICS);
// for (Statistic stat : Statistic.values()) {
// if (stat.getType() == Statistic.Type.UNTYPED) player.setStatistic(stat, 0);
// }
// if (playerStats == null) {
// return false;
// }
// for (String stringStat : playerStats.keySet()) {
// Statistic stat = Statistic.valueOf(stringStat);
// if (stat.getType() == Statistic.Type.UNTYPED) player.setStatistic(stat, playerStats.get(stat.name()));
// }
// return true;
// }
// }).defaultSerializer(new ProfileEntry(false, "game_statistics")).altName("game_stats").build();
}).defaultSerializer(new ProfileEntry(false, "game_statistics")).altName("game_stats").build();

/**
* Grouping for inventory sharables.
Expand Down Expand Up @@ -801,7 +813,7 @@ public boolean updatePlayer(Player player, PlayerProfile profile) {
public static final SharableGroup ALL_DEFAULT = new SharableGroup("all", fromSharables(HEALTH, ECONOMY,
FOOD_LEVEL, SATURATION, EXHAUSTION, EXPERIENCE, TOTAL_EXPERIENCE, LEVEL, INVENTORY, ARMOR, BED_SPAWN,
MAXIMUM_AIR, REMAINING_AIR, FALL_DISTANCE, FIRE_TICKS, POTIONS, LAST_LOCATION, ENDER_CHEST, OFF_HAND,
ADVANCEMENTS),
ADVANCEMENTS, GAME_STATISTICS),
"*", "everything");


Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/onarandombox/multiverseinventories/share/StringArraySerializer.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.onarandombox.multiverseinventories.share;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class StringArraySerializer implements SharableSerializer<String[]> {
@Override
public String[] deserialize(Object obj) {
List<?> list = (List<?>) obj;
List<String> resultList = new ArrayList<>(list.size());
for (Object o : list) {
if (o instanceof String) {
resultList.add((String) o);
}
}
return resultList.toArray(new String[resultList.size()]);
}

@Override
public Object serialize(String[] strings) {
return Arrays.asList(strings);
}
}

0 comments on commit 5f77886

Please sign in to comment.