trueog/Statistics-PAPI
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36 from PlaceholderAPI/add-server-version

Browse Source
This commit is contained in:
Gabriel Dumitru authored and GitHub committed 2022-10-06 19:50:46 +03:00
2 parents 06a17464ec d8ec42a7e5
commit ae4a6eb7bf
3 files changed
+95 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/extendedclip/papi/expansion/mcstatistics/ServerVersion.java
+53
View File
@@ -0,0 +1,53 @@
package com.extendedclip.papi.expansion.mcstatistics;
import com.google.common.primitives.Ints;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Statistic;
import org.bukkit.entity.EntityType;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Class for detecting server version for legacy support :(
* @author Matt
*/
public final class ServerVersion {
private static final int CURRENT_VERSION = getCurrentVersion();
private static final int LATEST_VERSION = 1_19_2;
public static final String AS_STRING = Bukkit.getBukkitVersion().split("-")[0];
public static final boolean IS_LEGACY = CURRENT_VERSION < 1_13_0;
/**
* {@link org.bukkit.OfflinePlayer#getStatistic(Statistic)} was added in 1.15
* @see org.bukkit.OfflinePlayer#getStatistic(Statistic, Material)
* @see org.bukkit.OfflinePlayer#getStatistic(Statistic, EntityType)
*/
public static final boolean SUPPORT_OFFLINE_PLAYERS = CURRENT_VERSION >= 1_15_0;
public static final boolean IS_LATEST = CURRENT_VERSION >= LATEST_VERSION;
private static int getCurrentVersion() {
// No need to cache since will only run once
final Matcher matcher = Pattern.compile("(?<version>\\d+\\.\\d+)(?<patch>\\.\\d+)?").matcher(AS_STRING);
final StringBuilder stringBuilder = new StringBuilder();
if (matcher.find()) {
stringBuilder.append(matcher.group("version").replace(".", ""));
final String patch = matcher.group("patch");
if (patch == null) stringBuilder.append("0");
else stringBuilder.append(patch.replace(".", ""));
}
//noinspection UnstableApiUsage
final Integer version = Ints.tryParse(stringBuilder.toString());
// Should never fail
if (version == null) throw new IllegalArgumentException("Could not retrieve server version!");
return version;
}
}
src/main/java/com/extendedclip/papi/expansion/mcstatistics/StatisticsExpansion.java
+23 -35
View File
@@ -27,14 +27,11 @@ import com.google.common.collect.ListMultimap;
import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.expansion.Cacheable;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.Statistic;
import org.bukkit.entity.EntityType;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -44,10 +41,7 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
private final ListMultimap<Statistic, Material> ignoredMaterials = ArrayListMultimap.create();
private final String VERSION = getClass().getPackage().getImplementationVersion();
private final boolean isLegacy = !Enums.getIfPresent(Material.class, "TURTLE_HELMET").isPresent();
public static final String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0];
private final boolean supportOfflinePlayers = Enums.getIfPresent(Material.class, "BEEHIVE").isPresent();
@Override
public String getAuthor() {
return "clip";
@@ -70,13 +64,10 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
return "";
}
if (!supportOfflinePlayers && !player.isOnline()) {
if (!ServerVersion.SUPPORT_OFFLINE_PLAYERS && !player.isOnline()) {
return "";
}
final int secondsPlayed = StatisticsUtils.getSecondsPlayed(player, isLegacy, supportOfflinePlayers);
final int secondsSinceLastDeath = StatisticsUtils.getSecondsSinceLastDeath(player, isLegacy, supportOfflinePlayers);
switch (identifier.toLowerCase()) {
case "mine_block": {
return calculateTotal(player, Statistic.MINE_BLOCK);
@@ -98,82 +89,79 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
* Time played
*/
case "time_played": {
return StatisticsUtils.formatTime(secondsPlayed);
return StatisticsUtils.formatTime(StatisticsUtils.getSecondsPlayed(player));
}
case "time_played:seconds": {
//return seconds != 0 ? Long.toString(TimeUnit.MINUTES.toSeconds(1) - seconds) : "0";
return Integer.toString(secondsPlayed % 60);
return Integer.toString(StatisticsUtils.getSecondsPlayed(player) % 60);
}
case "time_played:minutes": {
//return minutes != 0 ? Long.toString(TimeUnit.HOURS.toMinutes(1) - minutes) : "0";
return Long.toString(TimeUnit.SECONDS.toMinutes(secondsPlayed) % 60);
return Long.toString(TimeUnit.SECONDS.toMinutes(StatisticsUtils.getSecondsPlayed(player)) % 60);
}
case "time_played:hours": {
//return hours != 0 ? Long.toString(TimeUnit.DAYS.toHours(1) - hours) : "0";
return Long.toString(TimeUnit.SECONDS.toHours(secondsPlayed) % 24);
return Long.toString(TimeUnit.SECONDS.toHours(StatisticsUtils.getSecondsPlayed(player)) % 24);
}
case "seconds_played": {
return Integer.toString(secondsPlayed);
return Integer.toString(StatisticsUtils.getSecondsPlayed(player));
}
case "minutes_played": {
return Long.toString(TimeUnit.SECONDS.toMinutes(secondsPlayed));
return Long.toString(TimeUnit.SECONDS.toMinutes(StatisticsUtils.getSecondsPlayed(player)));
}
case "hours_played": {
return Long.toString(TimeUnit.SECONDS.toHours(secondsPlayed));
return Long.toString(TimeUnit.SECONDS.toHours(StatisticsUtils.getSecondsPlayed(player)));
}
case "time_played:days":
case "days_played": {
return Long.toString(TimeUnit.SECONDS.toDays(secondsPlayed));
return Long.toString(TimeUnit.SECONDS.toDays(StatisticsUtils.getSecondsPlayed(player)));
}
/*
* Time since last death
*/
case "time_since_death": {
return StatisticsUtils.formatTime(secondsSinceLastDeath);
return StatisticsUtils.formatTime(StatisticsUtils.getSecondsSinceLastDeath(player));
}
case "seconds_since_death": {
return Integer.toString(secondsSinceLastDeath);
return Integer.toString(StatisticsUtils.getSecondsSinceLastDeath(player));
}
case "minutes_since_death": {
return Long.toString(TimeUnit.SECONDS.toMinutes(secondsSinceLastDeath));
return Long.toString(TimeUnit.SECONDS.toMinutes(StatisticsUtils.getSecondsSinceLastDeath(player)));
}
case "hours_since_death": {
return Long.toString(TimeUnit.SECONDS.toHours(secondsSinceLastDeath));
return Long.toString(TimeUnit.SECONDS.toHours(StatisticsUtils.getSecondsSinceLastDeath(player)));
}
case "days_since_death": {
return Long.toString(TimeUnit.SECONDS.toDays(secondsSinceLastDeath));
return Long.toString(TimeUnit.SECONDS.toDays(StatisticsUtils.getSecondsSinceLastDeath(player)));
}
}
final int splitterIndex = identifier.indexOf(':');
// %statistic_<Statistic>%
if (splitterIndex == -1) {
return StatisticsUtils.getStatistic(player, identifier, supportOfflinePlayers);
return StatisticsUtils.getStatistic(player, identifier);
}
final String statisticIdentifier = identifier.substring(0, splitterIndex).toUpperCase();
final String types = identifier.substring(splitterIndex + 1).toUpperCase();
if (types.trim().isEmpty()) {
return StatisticsUtils.getStatistic(player, statisticIdentifier, supportOfflinePlayers);
return StatisticsUtils.getStatistic(player, statisticIdentifier);
}
final Optional<Statistic> statisticOptional = Enums.getIfPresent(Statistic.class, statisticIdentifier);
if (!statisticOptional.isPresent()) {
return "Unknown statistic '" + statisticIdentifier + "', check https://helpch.at/docs/" + SERVER_VERSION + "/org/bukkit/Statistic.html for more info";
return "Unknown statistic '" + statisticIdentifier + "', check " + StatisticsUtils.JAVADOC_BASE_LINK + "/org/bukkit/Statistic.html for more info";
}
final Statistic statistic = statisticOptional.get();
@@ -190,7 +178,7 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
}
try {
return Integer.toString(supportOfflinePlayers ? player.getStatistic(statistic, material.get()) : player.getPlayer().getStatistic(statistic, material.get()));
return Integer.toString(ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(statistic, material.get()) : player.getPlayer().getStatistic(statistic, material.get()));
} catch (IllegalArgumentException e) {
errorLog("Could not get the statistic '" + statistic.name() + "' for '" + material.get().name() + "'", e);
return "Could not get the statistic '" + statistic.name() + "' for '" + material.get().name() + "'";
@@ -205,7 +193,7 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
}
try {
return Integer.toString(supportOfflinePlayers ? player.getStatistic(statistic, entityType.get()) : player.getPlayer().getStatistic(statistic, entityType.get()));
return Integer.toString(ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(statistic, entityType.get()) : player.getPlayer().getStatistic(statistic, entityType.get()));
} catch (IllegalArgumentException e) {
errorLog("Could not get the statistic '" + statistic.name() + "' for '" + entityType.get().name() + "'", e);
return "Could not get the statistic '" + statistic.name() + "' for '" + entityType.get().name() + "'";
@@ -232,7 +220,7 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
}
try {
total.addAndGet(supportOfflinePlayers ? player.getStatistic(statistic, material.get()) : player.getPlayer().getStatistic(statistic, material.get()));
total.addAndGet(ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(statistic, material.get()) : player.getPlayer().getStatistic(statistic, material.get()));
} catch (IllegalArgumentException e) {
errorLog("Could not get the statistic '" + statistic.name() + "' for '" + material.get().name() + "'", e);
break;
@@ -251,7 +239,7 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
}
try {
total.addAndGet(supportOfflinePlayers ? player.getStatistic(statistic, entityType.get()) : player.getPlayer().getStatistic(statistic, entityType.get()));
total.addAndGet(ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(statistic, entityType.get()) : player.getPlayer().getStatistic(statistic, entityType.get()));
} catch (IllegalArgumentException e) {
errorLog("Could not get the statistic '" + statistic.name() + "' for '" + entityType.get().name() + "'", e);
break;
@@ -281,7 +269,7 @@ public class StatisticsExpansion extends PlaceholderExpansion implements Cacheab
}
try {
total.addAndGet(supportOfflinePlayers ? player.getStatistic(statistic, material) : player.getPlayer().getStatistic(statistic, material));
total.addAndGet(ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(statistic, material) : player.getPlayer().getStatistic(statistic, material));
} catch (IllegalArgumentException ignored) {
ignoredMaterials.put(statistic, material);
}
src/main/java/com/extendedclip/papi/expansion/mcstatistics/StatisticsUtils.java
+19 -14
View File
@@ -26,38 +26,43 @@ import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.Statistic;
import java.time.Duration;
import java.util.StringJoiner;
public class StatisticsUtils {
public static int getSecondsPlayed(final OfflinePlayer player, final boolean isLegacy, final boolean supportOfflinePlayers) {
if(supportOfflinePlayers) return player.getStatistic(Statistic.PLAY_ONE_MINUTE) / 20;
return isLegacy ? player.getPlayer().getStatistic(Statistic.valueOf("PLAY_ONE_TICK")) / 20 : player.getPlayer().getStatistic(Statistic.PLAY_ONE_MINUTE) / 20;
private static final Statistic SECONDS_PLAYED_STATISTIC = ServerVersion.IS_LEGACY ? Statistic.valueOf("PLAY_ONE_TICK") : Statistic.PLAY_ONE_MINUTE;
private static final Statistic SECONDS_SINCE_LAST_DEATH_STATISTIC = ServerVersion.IS_LEGACY ? Statistic.valueOf("TIME_SINCE_DEATH") : Statistic.TIME_SINCE_DEATH;
public static final String JAVADOC_BASE_LINK = ServerVersion.IS_LATEST ? "https://hub.spigotmc.org/javadocs/spigot" : "https://docs.docdex.helpch.at/" + ServerVersion.AS_STRING;
public static int getSecondsPlayed(final OfflinePlayer player) {
return (ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(SECONDS_PLAYED_STATISTIC) : player.getPlayer().getStatistic(SECONDS_PLAYED_STATISTIC)) / 20;
}
public static int getSecondsSinceLastDeath(final OfflinePlayer player, final boolean isLegacy, final boolean supportOfflinePlayers) {
if(supportOfflinePlayers) return player.getStatistic(Statistic.TIME_SINCE_DEATH) / 20;
return isLegacy ? player.getPlayer().getStatistic(Statistic.valueOf("TIME_SINCE_DEATH")) / 20 : player.getPlayer().getStatistic(Statistic.TIME_SINCE_DEATH) / 20;
public static int getSecondsSinceLastDeath(final OfflinePlayer player) {
return (ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(SECONDS_SINCE_LAST_DEATH_STATISTIC) : player.getPlayer().getStatistic(SECONDS_SINCE_LAST_DEATH_STATISTIC)) / 20;
}
@SuppressWarnings("Guava")
public static String getStatistic(final OfflinePlayer player, final String identifier, final boolean supportOfflinePlayers) {
public static String getStatistic(final OfflinePlayer player, final String identifier) {
final Optional<Statistic> optional = Enums.getIfPresent(Statistic.class, identifier.toUpperCase());
if(!supportOfflinePlayers && !player.isOnline()) {
if(!ServerVersion.SUPPORT_OFFLINE_PLAYERS && !player.isOnline()) {
return "Cannot get statistic, player is offline";
}
if (!optional.isPresent()) {
return "Unknown statistic '" + identifier + "', check https://helpch.at/docs/" + StatisticsExpansion.SERVER_VERSION + "/org/bukkit/Statistic.html for more info";
return "Unknown statistic '" + identifier + "', check " + JAVADOC_BASE_LINK + "/org/bukkit/Statistic.html for more info";
}
if (optional.get().getType() != Statistic.Type.UNTYPED) {
return "The statistic '" + identifier + "' require an argument, check https://helpch.at/docs/" + StatisticsExpansion.SERVER_VERSION + "/org/bukkit/Statistic.Type.html for more info" ;
final Statistic statistic = optional.get();
if (statistic.getType() != Statistic.Type.UNTYPED) {
return "The statistic '" + identifier + "' require an argument, check " + JAVADOC_BASE_LINK + "/org/bukkit/Statistic.Type.html for more info" ;
}
int statistic = supportOfflinePlayers ? player.getStatistic(optional.get()) : player.getPlayer().getStatistic(optional.get());
return Integer.toString(statistic);
int value = ServerVersion.SUPPORT_OFFLINE_PLAYERS ? player.getStatistic(statistic) : player.getPlayer().getStatistic(statistic);
return Integer.toString(value);
}
public static boolean isItem(final Material material, final boolean isLegacy) {