diff --git a/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/LoggablePlayerAction.java b/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/LoggablePlayerAction.java index 1be31a577..f97a23340 100644 --- a/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/LoggablePlayerAction.java +++ b/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/LoggablePlayerAction.java @@ -5,6 +5,7 @@ import com.untamedears.jukealert.model.Snitch; import com.untamedears.jukealert.model.actions.ActionCacheState; import com.untamedears.jukealert.model.actions.LoggedActionPersistence; import com.untamedears.jukealert.util.JAUtility; +import java.time.format.DateTimeFormatter; import java.util.UUID; import java.util.concurrent.CompletableFuture; import net.md_5.bungee.api.chat.TextComponent; @@ -78,7 +79,8 @@ public abstract class LoggablePlayerAction extends PlayerAction implements Logga if (referenceLoc != snitch.getLocation()) { comp.addExtra(String.format("%s%s ", ChatColor.YELLOW, referenceLocText)); } - comp.addExtra(new TextComponent(ChatColor.AQUA + getFormattedTime())); + // Example: 2011-12-03T10:15:30 + comp.addExtra(new TextComponent(ChatColor.AQUA + getFormattedTime(DateTimeFormatter.ISO_LOCAL_DATE_TIME))); } return comp; } @@ -89,7 +91,8 @@ public abstract class LoggablePlayerAction extends PlayerAction implements Logga item = new ItemStack(Material.STONE); } ItemUtils.addLore(item, String.format("%sPlayer: %s", ChatColor.GOLD, getPlayerName()), - String.format("%sTime: %s", ChatColor.LIGHT_PURPLE,getFormattedTime())); + // Example: Tue, 3 Jun 2008 11:05:30 GMT + String.format("%sTime: %s", ChatColor.LIGHT_PURPLE, getFormattedTime(DateTimeFormatter.RFC_1123_DATE_TIME))); ItemUtils.setDisplayName(item, ChatColor.GOLD + getGUIName()); } diff --git a/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/PlayerAction.java b/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/PlayerAction.java index 285ff255f..c0a1811ae 100644 --- a/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/PlayerAction.java +++ b/plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/PlayerAction.java @@ -1,16 +1,14 @@ package com.untamedears.jukealert.model.actions.abstr; import com.untamedears.jukealert.model.Snitch; -import java.time.LocalDateTime; +import java.time.Instant; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.UUID; +import org.jetbrains.annotations.NotNull; import vg.civcraft.mc.namelayer.NameAPI; public abstract class PlayerAction extends SnitchAction { - - private static final DateTimeFormatter timeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME; - protected final UUID player; public PlayerAction(long time, Snitch snitch, UUID player) { @@ -30,8 +28,10 @@ public abstract class PlayerAction extends SnitchAction { return true; } - protected String getFormattedTime() { - return timeFormatter.format(LocalDateTime.ofEpochSecond(time / 1000, 0, ZoneOffset.UTC)); + protected String getFormattedTime( + final @NotNull DateTimeFormatter formatter + ) { + return formatter.format(Instant.ofEpochMilli(this.time).atOffset(ZoneOffset.UTC)); } public String getPlayerName() {