diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/DeathsTable.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/DeathsTable.java index b41ef5182..3c7045e6a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/DeathsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/DeathsTable.java @@ -12,7 +12,6 @@ import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plan.utilities.html.icon.Family; import com.djrapitops.plan.utilities.html.icon.Icon; -import java.util.Collections; import java.util.List; /** @@ -33,14 +32,12 @@ public class DeathsTable extends TableContainer { private void addValues(List playerPlayerDeaths) { playerPlayerDeaths.sort(new DateHolderRecentComparator()); - Collections.reverse(playerPlayerDeaths); - Formatter timestamp = Formatters.year(); int i = 0; DataCache dataCache = DataCache.getInstance(); for (PlayerDeath death : playerPlayerDeaths) { - if (i >= 20) { + if (i >= 40) { break; } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/GeoInfoTable.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/GeoInfoTable.java index e5e8c1968..7200a5b79 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/GeoInfoTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/GeoInfoTable.java @@ -10,6 +10,7 @@ import com.djrapitops.plan.data.store.mutators.formatting.Formatter; import com.djrapitops.plan.data.store.mutators.formatting.Formatters; import com.djrapitops.plan.data.store.objects.DateHolder; import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator; import java.util.List; @@ -31,6 +32,8 @@ public class GeoInfoTable extends TableContainer { } private void addValues(List geoInfo) { + geoInfo.sort(new DateHolderRecentComparator()); + boolean displayIP = Settings.DISPLAY_PLAYER_IPS.isTrue(); Formatter formatter = Formatters.year(); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTable.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTable.java index 25c4a1255..051ac999c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTable.java @@ -7,12 +7,11 @@ import com.djrapitops.plan.data.store.mutators.formatting.Formatter; import com.djrapitops.plan.data.store.mutators.formatting.Formatters; import com.djrapitops.plan.data.store.objects.DateHolder; import com.djrapitops.plan.system.cache.DataCache; -import com.djrapitops.plan.utilities.comparators.PlayerKillComparator; +import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator; import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plan.utilities.html.icon.Family; import com.djrapitops.plan.utilities.html.icon.Icon; -import java.util.Collections; import java.util.List; /** @@ -32,15 +31,13 @@ public class KillsTable extends TableContainer { } private void addValues(List playerKills) { - playerKills.sort(new PlayerKillComparator()); - Collections.reverse(playerKills); - + playerKills.sort(new DateHolderRecentComparator()); Formatter timestamp = Formatters.year(); int i = 0; DataCache dataCache = DataCache.getInstance(); for (PlayerKill kill : playerKills) { - if (i >= 20) { + if (i >= 40) { break; } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTable.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTable.java index 01b922011..e264a6ba8 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/NicknameTable.java @@ -9,6 +9,7 @@ import com.djrapitops.plan.data.store.mutators.formatting.Formatter; import com.djrapitops.plan.data.store.mutators.formatting.Formatters; import com.djrapitops.plan.data.store.objects.DateHolder; import com.djrapitops.plan.data.store.objects.Nickname; +import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator; import com.djrapitops.plan.utilities.html.HtmlUtils; import java.util.List; @@ -33,6 +34,8 @@ public class NicknameTable extends TableContainer { } private void addValues(List nicknames, Map serverNames) { + nicknames.sort(new DateHolderRecentComparator()); + Formatter formatter = Formatters.year(); for (Nickname nickname : nicknames) { UUID serverUUID = nickname.getServerUUID(); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayerSessionTable.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayerSessionTable.java index 635152790..3be287b0a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayerSessionTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayerSessionTable.java @@ -3,12 +3,15 @@ package com.djrapitops.plan.utilities.html.tables; import com.djrapitops.plan.api.PlanAPI; import com.djrapitops.plan.data.container.Session; import com.djrapitops.plan.data.element.TableContainer; +import com.djrapitops.plan.data.store.containers.DataContainer; +import com.djrapitops.plan.data.store.keys.PlayerKeys; import com.djrapitops.plan.data.store.keys.SessionKeys; import com.djrapitops.plan.data.store.mutators.formatting.Formatters; import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.utilities.analysis.AnalysisUtils; import com.djrapitops.plan.utilities.html.Html; +import java.util.ArrayList; import java.util.List; /** @@ -21,6 +24,13 @@ public class PlayerSessionTable extends TableContainer { private final String playerName; private final List sessions; + public static PlayerSessionTable forContainer(DataContainer container) { + return new PlayerSessionTable( + container.getValue(PlayerKeys.NAME).orElse("Unknown"), + container.getValue(PlayerKeys.SESSIONS).orElse(new ArrayList<>()) + ); + } + public PlayerSessionTable(String playerName, List sessions) { super("Player", "Start", "Length", "World"); this.playerName = playerName;