CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 08:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve time formatting in snitch logs

Browse Source 
This switches the how timestamps are rendered in snitch logs from "2011-12-03T10:15:30" to "Tue, 3 Jun 2008 11:05:30 GMT". It retains the old format for chat outputs for compaction and mod-parsing reasons.
This commit is contained in:
Alexander
2024-02-20 07:56:30 +00:00
parent f929bcce63
commit c19b8fceb6
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/LoggablePlayerAction.java
View File

@@ -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());
}

12
plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/abstr/PlayerAction.java
View File

@@ -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() {