mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-05 16:30:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply decimal formatter to double value placeholders

Browse Source
This commit is contained in:
Aurora Lahtela 2022-09-01 08:23:47 +03:00
parent 6f6b4f149f
commit d1cd5a3b74
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java
View File

@ -158,10 +158,10 @@ public class PlayerPlaceHolders implements Placeholders {
);
placeholders.register("player_activity_index",
player -> player.getActivityIndex(
player -> decimals.apply(player.getActivityIndex(
now(),
config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD)
).getValue()
).getValue())
);
placeholders.register("player_activity_group",
player -> player.getActivityIndex(
@ -209,6 +209,7 @@ public class PlayerPlaceHolders implements Placeholders {
}
private void registerKillPlaceholders(PlanPlaceholders placeholders) {
Formatter<Double> decimals = formatters.decimals();
placeholders.register("player_player_caused_deaths",
player -> PlayerVersusMutator.forContainer(player).toPlayerDeathCount()
);
@ -219,10 +220,10 @@ public class PlayerPlaceHolders implements Placeholders {
player -> PlayerVersusMutator.forContainer(player).toMobDeathCount()
);
placeholders.register("player_kdr",
player -> PlayerVersusMutator.forContainer(player).toKillDeathRatio()
player -> decimals.apply(PlayerVersusMutator.forContainer(player).toKillDeathRatio())
);
placeholders.register("player_mob_kdr",
player -> PlayerVersusMutator.forContainer(player).toMobKillDeathRatio()
player -> decimals.apply(PlayerVersusMutator.forContainer(player).toMobKillDeathRatio())
);
for (int i = 1; i <= 10; i++) {
final int index = i;

6
Plan/common/src/main/java/com/djrapitops/plan/placeholder/ServerPlaceHolders.java
View File

@ -184,13 +184,13 @@ public class ServerPlaceHolders implements Placeholders {
parameters -> database.query(TPSQueries.minFreeDisk(monthAgo(), now(), getServerUUID(parameters))));
placeholders.registerStatic("server_average_free_disk_day",
parameters -> database.query(TPSQueries.averageFreeDisk(dayAgo(), now(), getServerUUID(parameters))));
parameters -> formatters.byteSizeLong().apply(database.query(TPSQueries.averageFreeDisk(dayAgo(), now(), getServerUUID(parameters)))));
placeholders.registerStatic("server_average_free_disk_week",
parameters -> database.query(TPSQueries.averageFreeDisk(weekAgo(), now(), getServerUUID(parameters))));
parameters -> formatters.byteSizeLong().apply(database.query(TPSQueries.averageFreeDisk(weekAgo(), now(), getServerUUID(parameters)))));
placeholders.registerStatic("server_average_free_disk_month",
parameters -> database.query(TPSQueries.averageFreeDisk(monthAgo(), now(), getServerUUID(parameters))));
parameters -> formatters.byteSizeLong().apply(database.query(TPSQueries.averageFreeDisk(monthAgo(), now(), getServerUUID(parameters)))));
placeholders.registerStatic("server_name",
() -> serverInfo.getServer().getName());