Skip to content

Add support for entity and material game statistics types #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
Dec 20, 2025
Merged

Add support for entity and material game statistics types #653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 139 additions & 17 deletions src/main/java/org/mvplugins/multiverse/inventories/share/Sharables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.advancement.AdvancementProgress;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
import org.mvplugins.multiverse.core.economy.MVEconomist;
import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
Expand Down Expand Up @@ -820,13 +821,59 @@ public boolean updatePlayer(Player player, ProfileData profile) {
new SharableHandler<>() {
@Override
public void updateProfile(ProfileData profile, Player player) {
Map<String, Integer> playerStats = new HashMap<>();
Map<String, Object> 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);
switch (stat.getType()) {
case UNTYPED -> {
int val = player.getStatistic(stat);
if (val != 0) {
playerStats.put(stat.name(), val);
}
}
case ITEM -> {
Map<String, Integer> itemStats = new HashMap<>();
for (Material mat : Material.values()) {
if (!mat.isItem()) {
continue;
}
int val = player.getStatistic(stat, mat);
if (val != 0) {
itemStats.put(mat.getKey().toString(), val);
}
}
if (!itemStats.isEmpty()) {
playerStats.put(stat.name(), itemStats);
}
}
case BLOCK -> {
Map<String, Integer> blockStats = new HashMap<>();
for (Material mat : Material.values()) {
if (!mat.isBlock()) {
continue;
}
int val = player.getStatistic(stat, mat);
if (val != 0) {
playerStats.put(mat.getKey().toString(), val);
}
}
if (!blockStats.isEmpty()) {
playerStats.put(stat.name(), blockStats);
}
}
case ENTITY -> {
Map<String, Integer> entityStats = new HashMap<>();
for (EntityType entityType : EntityType.values()) {
if (entityType == EntityType.UNKNOWN) {
continue;
}
int val = player.getStatistic(stat, entityType);
if (val != 0) {
entityStats.put(entityType.getKey().toString(), val);
}
}
if (!entityStats.isEmpty()) {
playerStats.put(stat.name(), entityStats);
}
}
}
}
Expand All @@ -835,24 +882,99 @@ public void updateProfile(ProfileData profile, Player player) {

@Override
public boolean updatePlayer(Player player, ProfileData profile) {
Map<String, Integer> playerStats = profile.get(GAME_STATISTICS);
Map<String, Object> playerStats = profile.get(GAME_STATISTICS);
boolean hasData = true;
if (playerStats == null) {
// Set all to 0
for (Statistic stat : Statistic.values()) {
if (stat.getType() == Statistic.Type.UNTYPED) {
player.setStatistic(stat, 0);
}
}
return false;
playerStats = Collections.emptyMap();
hasData = false;
}

for (Statistic stat : Statistic.values()) {
if (stat.getType() == Statistic.Type.UNTYPED) {
player.setStatistic(stat, playerStats.getOrDefault(stat.name(), 0));
Object value = playerStats.get(stat.name());
switch (stat.getType()) {
case UNTYPED -> {
if (value == null) {
player.setStatistic(stat, 0);
break;
}
if (!(value instanceof Integer intValue)) {
Logging.warning("Invalid statistic value for " + stat.name() + ": " + value);
break;
}
Try.run(() -> player.setStatistic(stat, intValue))
.onFailure(ex -> Logging.warning("Failed to set statistic " + stat.name() +
": " + ex.getMessage()));
}
case ITEM -> {
if (value == null) {
value = Collections.emptyMap();
}
if (!(value instanceof Map itemMap)) {
Logging.warning("Invalid statistic value for " + stat.name() + ": " + value);
break;
}
for (Material mat : Material.values()) {
if (!mat.isItem()) {
continue;
}
Object matValue = itemMap.getOrDefault(mat.getKey().toString(), 0);
if (!(matValue instanceof Integer intValue)) {
Logging.warning("Invalid statistic value for " + stat.name() + " and item " + mat.name() + ": " + matValue);
continue;
}
Try.run(() -> player.setStatistic(stat, mat, intValue))
.onFailure(ex -> Logging.warning("Failed to set statistic " + stat.name() +
" for item " + mat.name() + ": " + ex.getMessage()));
}
}
case BLOCK -> {
if (value == null) {
value = Collections.emptyMap();
}
if (!(value instanceof Map blockMap)) {
Logging.warning("Invalid statistic value for " + stat.name() + ": " + value);
break;
}
for (Material mat : Material.values()) {
if (!mat.isBlock()) {
continue;
}
Object matValue = blockMap.getOrDefault(mat.getKey().toString(), 0);
if (!(matValue instanceof Integer intValue)) {
Logging.warning("Invalid statistic value for " + stat.name() + " and block " + mat.name() + ": " + matValue);
continue;
}
Try.run(() -> player.setStatistic(stat, mat, intValue))
.onFailure(ex -> Logging.warning("Failed to set statistic " + stat.name() +
" for block " + mat.name() + ": " + ex.getMessage()));
}
}
case ENTITY -> {
if (value == null) {
value = Collections.emptyMap();
}
if (!(value instanceof Map entityMap)) {
Logging.warning("Invalid statistic value for " + stat.name() + ": " + value);
break;
}
for (EntityType entityType : EntityType.values()) {
if (entityType == EntityType.UNKNOWN) {
continue;
}
Object entityValue = entityMap.getOrDefault(entityType.getKey().toString(), 0);
if (!(entityValue instanceof Integer intValue)) {
Logging.warning("Invalid statistic value for " + stat.name() + " and entity " + entityType.name() + ": " + entityValue);
continue;
}
Try.run(() -> player.setStatistic(stat, entityType, intValue))
.onFailure(ex -> Logging.warning("Failed to set statistic " + stat.name() +
" for entity " + entityType.name() + ": " + ex.getMessage()));
}
}
}
}

return true;
return hasData;
}
}).defaultSerializer(new ProfileEntry(false, "game_statistics")).altName("game_stats").optional().build();

Expand Down
Loading