From c3e4a1b483a3d32cffcab14440610e083fc2c1e4 Mon Sep 17 00:00:00 2001
From: BRanulf <a@162.com>
Date: Mon, 23 Jun 2025 14:01:09 +0800
Subject: [PATCH] qwq

---
 build.gradle                                  |    2 +
 gradle.properties                             |    2 +-
 .../playertime/LocalizationManager.java       |   84 +-
 .../com/example/playertime/ModConfig.java     |   90 +-
 .../com/example/playertime/PlayerTimeMod.java |  233 ++--
 .../example/playertime/PlayerTimeTracker.java |  471 ++++---
 .../com/example/playertime/WebServer.java     |  548 +++-----
 .../playertime/api/OnlinePlayersResponse.java |   19 +
 .../playertime/api/PlayerCountResponse.java   |   18 +
 .../playertime/api/PlayerStatsResponse.java   |   28 +
 .../playertime/api/ServerStatusResponse.java  |   37 +
 .../playertime/api/WhitelistResponse.java     |   18 +
 .../assets/playertime/lang/en_us.json         |   27 +-
 .../assets/playertime/lang/zh_cn.json         |   29 +-
 .../assets/playertime/web/css/style.css       | 1231 +++++++++--------
 .../assets/playertime/web/index.html          |  339 +++--
 .../resources/assets/playertime/web/js/app.js |  621 +++++----
 src/main/resources/playertime.accesswideners  |    1 +
 18 files changed, 2130 insertions(+), 1668 deletions(-)
 create mode 100644 src/main/java/com/example/playertime/api/OnlinePlayersResponse.java
 create mode 100644 src/main/java/com/example/playertime/api/PlayerCountResponse.java
 create mode 100644 src/main/java/com/example/playertime/api/PlayerStatsResponse.java
 create mode 100644 src/main/java/com/example/playertime/api/ServerStatusResponse.java
 create mode 100644 src/main/java/com/example/playertime/api/WhitelistResponse.java
 create mode 100644 src/main/resources/playertime.accesswideners

diff --git a/build.gradle b/build.gradle
index a0b80f2..45341dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,3 +92,5 @@ publishing {
         // retrieving dependencies.
     }
 }
+
+
diff --git a/gradle.properties b/gradle.properties
index 60a45aa..ea2e8a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
 loader_version=0.16.10
 # Mod Properties
-mod_version=1.14.514.134
+mod_version=1.14.514.141
 maven_group=org.example1
 archives_base_name=ServerPlayerOnlineTracker
 # Dependencies
diff --git a/src/main/java/com/example/playertime/LocalizationManager.java b/src/main/java/com/example/playertime/LocalizationManager.java
index d8105c9..4f08fda 100644
--- a/src/main/java/com/example/playertime/LocalizationManager.java
+++ b/src/main/java/com/example/playertime/LocalizationManager.java
@@ -12,39 +12,45 @@ import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
 
-// 这个是gemini写的
+// 这个是gemini写的 (保留原注释，但代码已根据需求调整)
 public class LocalizationManager {
     private final Map<String, String> translations = new HashMap<>();
-    private final String defaultLanguage = "zh_cn";
+    private final String defaultLanguage = "zh_cn"; // 默认语言代码
 
     public LocalizationManager(String languageCode) {
-        loadLanguage(languageCode);
-        if (!languageCode.equals(defaultLanguage)) {
+        // 尝试加载用户配置的语言
+        loadLanguage(languageCode, false);
+        // 如果配置的语言不是默认语言，加载默认语言作为备用
+        if (!languageCode.equalsIgnoreCase(defaultLanguage)) {
             loadLanguage(defaultLanguage, true);
         }
+        // 如果配置的语言和默认语言都没加载成功，或者配置的语言文件不完整，确保默认语言至少被加载
+        if (translations.isEmpty() && !languageCode.equalsIgnoreCase(defaultLanguage)) {
+            PlayerTimeMod.LOGGER.warn("[PlayerTime] 未能加载配置的语言文件({})或默认语言文件({})，Mod将使用原始键。", languageCode, defaultLanguage);
+        } else if (translations.isEmpty() && languageCode.equalsIgnoreCase(defaultLanguage)) {
+            PlayerTimeMod.LOGGER.warn("[PlayerTime] 未能加载默认语言文件({})，Mod将使用原始键。", defaultLanguage);
+        }
     }
 
-    private void loadLanguage(String languageCode) {
-        loadLanguage(languageCode, false);
-    }
-
-
     private void loadLanguage(String languageCode, boolean isFallback) {
-        String resourcePath = String.format("assets/playertime/lang/%s.json", languageCode);
-        try (InputStream is = FabricLoader.getInstance().getModContainer("playertime")
-                .flatMap(container -> container.findPath(resourcePath))
-                .map(path -> {
-                    try {
-                        return path.toUri().toURL().openStream();
-                    } catch (Exception e) {
-                        return null;
-                    }
-                })
-                .orElse(null)) {
+        String resourcePath = String.format("assets/playertime/lang/%s.json", languageCode.toLowerCase()); // 确保小写
+        try {
+            // 使用 FabricLoader 获取 Mod 资源
+            InputStream is = FabricLoader.getInstance().getModContainer("playertime")
+                    .flatMap(container -> container.findPath(resourcePath))
+                    .map(path -> {
+                        try {
+                            return path.toUri().toURL().openStream();
+                        } catch (Exception e) {
+                            // 查找路径或打开流失败
+                            return null;
+                        }
+                    })
+                    .orElse(null); // 如果找不到路径或打开失败，返回 null
 
             if (is == null) {
                 if (!isFallback) {
-                    PlayerTimeMod.LOGGER.warn("[PlayerTime] Language file not found for code: {}", languageCode);
+                    PlayerTimeMod.LOGGER.warn("[PlayerTime] 未找到语言文件: {}", resourcePath);
                 }
                 return;
             }
@@ -52,33 +58,51 @@ public class LocalizationManager {
             try (InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                 JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
                 json.entrySet().forEach(entry -> {
-                    // Only add if not already present (fallback won't overwrite primary)
-                    if (!translations.containsKey(entry.getKey())) {
-                        translations.put(entry.getKey(), entry.getValue().getAsString());
-                    } else if (!isFallback) {
-                        // If loading primary, overwrite fallback
+                    // 如果是加载备用语言，只有当主语言没有该键时才添加
+                    // 如果是加载主语言，则覆盖备用语言中的同名键
+                    if (!translations.containsKey(entry.getKey()) || !isFallback) {
                         translations.put(entry.getKey(), entry.getValue().getAsString());
                     }
                 });
-                PlayerTimeMod.LOGGER.info("[PlayerTime] Loaded {} language strings for code: {}", translations.size(), languageCode);
+                PlayerTimeMod.LOGGER.info("[PlayerTime] 已加载 {} 语言字符串 ({}): {}", translations.size(), isFallback ? "备用" : "主要", languageCode);
             }
 
         } catch (Exception e) {
-            PlayerTimeMod.LOGGER.error("[PlayerTime] Failed to load language file for code: {}", languageCode, e);
+            PlayerTimeMod.LOGGER.error("[PlayerTime] 加载语言文件失败 ({}): {}", languageCode, resourcePath, e);
         }
     }
 
+    /**
+     * 根据键获取本地化字符串。如果找不到键，返回键本身。
+     * @param key 本地化键
+     * @return 本地化字符串或原始键
+     */
     public String getString(String key) {
         return translations.getOrDefault(key, key);
     }
 
+    /**
+     * 根据键获取本地化字符串，并使用参数格式化。如果找不到键，返回原始键。
+     * @param key 本地化键
+     * @param args 格式化参数
+     * @return 格式化后的本地化字符串或原始键
+     */
     public String getString(String key, Object... args) {
         String pattern = getString(key);
         try {
+            // MessageFormat 可以处理 {0}, {1} 等占位符
             return MessageFormat.format(pattern, args);
         } catch (IllegalArgumentException e) {
-            PlayerTimeMod.LOGGER.error("[PlayerTime] Failed to format localization string for key: {}", key, e);
-            return pattern;
+            PlayerTimeMod.LOGGER.error("[PlayerTime] 格式化本地化字符串失败 (键: {})", key, e);
+            return pattern; // 格式化失败时返回原始模式
         }
     }
+
+    /**
+     * 获取所有本地化字符串的映射。主要用于 Web API。
+     * @return 包含所有本地化键值对的 Map
+     */
+    public Map<String, String> getAllStrings() {
+        return new HashMap<>(translations); // 返回副本，防止外部修改
+    }
 }
diff --git a/src/main/java/com/example/playertime/ModConfig.java b/src/main/java/com/example/playertime/ModConfig.java
index e98d1c4..4a9a5bf 100644
--- a/src/main/java/com/example/playertime/ModConfig.java
+++ b/src/main/java/com/example/playertime/ModConfig.java
@@ -7,18 +7,23 @@ import java.nio.file.*;
 public class ModConfig {
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     private final Path configPath;
+
+    // 配置项
     private int webPort = 60048;
     private String language = "zh_cn";
+    private boolean whitelistOnly = true; // 默认只记录白名单玩家
+    private int saveIntervalMinutes = 5; // 默认每5分钟保存一次
 
     public ModConfig(Path configDir) {
         this.configPath = configDir.resolve("playertime-config.json");
         loadConfig();
     }
 
+    // 加载配置
     private void loadConfig() {
         if (!Files.exists(configPath)) {
-            PlayerTimeMod.LOGGER.info("[在线时间] 配置文件未找到，正在创建默认配置");
-            saveConfig();
+            PlayerTimeMod.LOGGER.info("[在线时间] 配置文件未找到，正在创建默认配置: {}", configPath);
+            saveConfig(); // 创建默认配置并保存
             return;
         }
 
@@ -26,29 +31,68 @@ public class ModConfig {
             JsonElement jsonElement = JsonParser.parseReader(reader);
 
             if (jsonElement == null || !jsonElement.isJsonObject()) {
-                PlayerTimeMod.LOGGER.warn("[在线时间] 配置文件为空或格式错误，正在使用默认配置并覆盖");
-                saveConfig();
+                PlayerTimeMod.LOGGER.warn("[在线时间] 配置文件为空或格式错误，正在使用默认配置并覆盖: {}", configPath);
+                saveConfig(); // 使用默认配置并覆盖
                 return;
             }
 
             JsonObject json = jsonElement.getAsJsonObject();
 
-            if (json.has("webPort")) {
+            // 读取 webPort
+            if (json.has("webPort") && json.get("webPort").isJsonPrimitive() && json.get("webPort").getAsJsonPrimitive().isNumber()) {
                 webPort = json.get("webPort").getAsInt();
+                if (webPort < 1 || webPort > 65535) {
+                    PlayerTimeMod.LOGGER.warn("[在线时间] 配置文件中的 webPort ({}) 无效，使用默认值 {}", webPort, 60048);
+                    webPort = 60048;
+                }
             } else {
-                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少webPort字段，添加默认值'%s'并保存", webPort);
-                saveConfig();
-            }
-            if (json.has("language")) {
-                language = json.get("language").getAsString();
-            } else {
-                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少language字段，添加默认值'%s'并保存", language);
-                saveConfig();
+                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少或 webPort 格式错误，使用默认值 {}", webPort);
+                // 不立即保存，等待所有字段读取完毕再决定是否保存
             }
 
+            // 读取 language
+            if (json.has("language") && json.get("language").isJsonPrimitive() && json.get("language").getAsJsonPrimitive().isString()) {
+                language = json.get("language").getAsString();
+            } else {
+                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少或 language 格式错误，使用默认值 {}", language);
+            }
+
+            // 读取 whitelistOnly
+            if (json.has("whitelistOnly") && json.get("whitelistOnly").isJsonPrimitive() && json.get("whitelistOnly").getAsJsonPrimitive().isBoolean()) {
+                whitelistOnly = json.get("whitelistOnly").getAsBoolean();
+            } else {
+                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少或 whitelistOnly 格式错误，使用默认值 {}", whitelistOnly);
+            }
+
+            // 读取 saveIntervalMinutes
+            if (json.has("saveIntervalMinutes") && json.get("saveIntervalMinutes").isJsonPrimitive() && json.get("saveIntervalMinutes").getAsJsonPrimitive().isNumber()) {
+                saveIntervalMinutes = json.get("saveIntervalMinutes").getAsInt();
+                if (saveIntervalMinutes < 0) {
+                    PlayerTimeMod.LOGGER.warn("[在线时间] 配置文件中的 saveIntervalMinutes ({}) 无效，使用默认值 {}", saveIntervalMinutes, 5);
+                    saveIntervalMinutes = 5;
+                }
+            } else {
+                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少或 saveIntervalMinutes 格式错误，使用默认值 {}", saveIntervalMinutes);
+            }
+
+            // 检查是否有新字段需要添加到配置文件
+            if (!json.has("webPort") || !json.has("language") || !json.has("whitelistOnly") || !json.has("saveIntervalMinutes")) {
+                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件缺少部分字段，正在添加并保存。");
+                saveConfig(); // 保存以添加新字段
+            } else {
+                PlayerTimeMod.LOGGER.info("[在线时间] 配置文件加载成功: {}", configPath);
+            }
+
+
+        } catch (IOException e) {
+            PlayerTimeMod.LOGGER.error("[在线时间] 无法读取配置文件 {}，使用默认配置", configPath, e);
+            saveConfig(); // 发生IO错误，尝试保存默认配置
+        } catch (JsonParseException e) {
+            PlayerTimeMod.LOGGER.error("[在线时间] 配置文件 {} 格式错误，使用默认配置", configPath, e);
+            saveConfig(); // 发生JSON解析错误，尝试保存默认配置
         } catch (Exception e) {
-            PlayerTimeMod.LOGGER.error("[在线时间] 加载配置文件失败，使用默认配置", e);
-            saveConfig();
+            PlayerTimeMod.LOGGER.error("[在线时间] 加载配置文件 {} 时发生未知错误，使用默认配置", configPath, e);
+            saveConfig(); // 发生未知错误，尝试保存默认配置
         }
     }
 
@@ -57,15 +101,17 @@ public class ModConfig {
         JsonObject json = new JsonObject();
         json.addProperty("webPort", webPort);
         json.addProperty("language", language);
+        json.addProperty("whitelistOnly", whitelistOnly);
+        json.addProperty("saveIntervalMinutes", saveIntervalMinutes);
 
         try {
             Files.createDirectories(configPath.getParent());
             try (Writer writer = Files.newBufferedWriter(configPath)) {
                 GSON.toJson(json, writer);
             }
-            PlayerTimeMod.LOGGER.info("[在线时间] 配置已成功保存");
+            PlayerTimeMod.LOGGER.info("[在线时间] 配置已成功保存到 {}", configPath);
         } catch (Exception e) {
-            PlayerTimeMod.LOGGER.error("[在线时间] 保存配置失败", e);
+            PlayerTimeMod.LOGGER.error("[在线时间] 保存配置失败到 {}", configPath, e);
         }
     }
 
@@ -78,4 +124,14 @@ public class ModConfig {
     public String getLanguage() {
         return language;
     }
+
+    // 获取是否只记录白名单
+    public boolean isWhitelistOnly() {
+        return whitelistOnly;
+    }
+
+    // 获取保存间隔（分钟）
+    public int getSaveIntervalMinutes() {
+        return saveIntervalMinutes;
+    }
 }
diff --git a/src/main/java/com/example/playertime/PlayerTimeMod.java b/src/main/java/com/example/playertime/PlayerTimeMod.java
index e08ee01..2e53ded 100644
--- a/src/main/java/com/example/playertime/PlayerTimeMod.java
+++ b/src/main/java/com/example/playertime/PlayerTimeMod.java
@@ -14,6 +14,7 @@ import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,9 +28,9 @@ import java.net.URL;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class PlayerTimeMod implements ModInitializer {
@@ -40,70 +41,103 @@ public class PlayerTimeMod implements ModInitializer {
     public static LocalizationManager localizationManager;
 
     private static final String RSS_FEED_URL = "https://git.branulf.top/Branulf/ServerPlayerOnlineTracker/releases.rss";
-    private static final ExecutorService updateCheckExecutor = Executors.newSingleThreadExecutor();
-
+    private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2); // One for update check, one for saving
 
     @Override
     public void onInitialize() {
-        config = new ModConfig(FabricLoader.getInstance().getConfigDir());
-        localizationManager = new LocalizationManager(config.getLanguage());
-
         try {
-            LOGGER.info("[在线时间] 初始化 玩家在线时长视奸Mod");
+            LOGGER.info("[在线时间] 初始化 玩家在线时长视奸Mod...");
 
+            // 加载配置
+            config = new ModConfig(FabricLoader.getInstance().getConfigDir());
+            // 初始化本地化管理器
+            localizationManager = new LocalizationManager(config.getLanguage());
+
+            // 检查更新
             checkForUpdates();
 
+            // 服务器启动中事件
             ServerLifecycleEvents.SERVER_STARTING.register(server -> {
-                timeTracker = new PlayerTimeTracker(server);
+                LOGGER.info("[在线时间] 服务器启动中...");
+                timeTracker = new PlayerTimeTracker(server, config);
                 try {
                     webServer = new WebServer(timeTracker, config.getWebPort(), server);
                     webServer.start();
-                    LOGGER.info("[在线时间] Web服务器在端口 " + config.getWebPort() + "启动");
+                    LOGGER.info("[在线时间] Web服务器在端口 {} 启动", config.getWebPort());
                 } catch (Exception e) {
                     LOGGER.error("[在线时间] 无法启动Web服务器", e);
                 }
             });
 
+            // 服务器已启动事件
             ServerLifecycleEvents.SERVER_STARTED.register(server -> {
+                LOGGER.info("[在线时间] 服务器已启动.");
                 if (timeTracker != null) {
                     timeTracker.loadData();
+                    // 启动定时保存任务
+                    int saveInterval = config.getSaveIntervalMinutes();
+                    if (saveInterval > 0) {
+                        scheduler.scheduleAtFixedRate(timeTracker::saveAll, saveInterval, saveInterval, TimeUnit.MINUTES);
+                        LOGGER.info("[在线时间] 已安排每 {} 分钟定时保存玩家数据", saveInterval);
+                    } else {
+                        LOGGER.warn("[在线时间] 配置的保存间隔为 {} 分钟，定时保存已禁用。", saveInterval);
+                    }
                 } else {
                     LOGGER.error("[在线时间] PlayerTimeTracker 未在 SERVER_STARTING 阶段成功初始化!");
                 }
             });
 
-
+            // 玩家加入事件
             ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
                 if (timeTracker != null) {
-                    timeTracker.onPlayerJoin(handler.player);
+                    // 根据配置决定是否跟踪该玩家
+                    if (!config.isWhitelistOnly() || server.getPlayerManager().isWhitelisted(handler.player.getGameProfile())) {
+                        timeTracker.onPlayerJoin(handler.player);
+                    } else {
+                        LOGGER.debug("[在线时间] 玩家 {} ({}) 不在白名单，且配置为仅记录白名单玩家，跳过跟踪。", handler.player.getName().getString(), handler.player.getUuid());
+                    }
                 }
             });
 
+            // 玩家离开事件
             ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
                 if (timeTracker != null) {
-                    timeTracker.onPlayerLeave(handler.player);
+                    if (timeTracker.isPlayerTracked(handler.player.getUuid())) {
+                        timeTracker.onPlayerLeave(handler.player);
+                    } else {
+                        LOGGER.debug("[在线时间] 玩家 {} ({}) 未被跟踪，跳过离开事件处理。", handler.player.getName().getString(), handler.player.getUuid());
+                    }
                 }
             });
 
+            // 服务器停止事件
             ServerLifecycleEvents.SERVER_STOPPING.register(server -> {
-                LOGGER.info("[在线时间] 服务器停止 - 正在保存数据");
-
-                if (webServer != null) {
-                    webServer.stop();
-                }
+                LOGGER.info("[在线时间] 服务器停止中 - 正在保存数据...");
                 if (timeTracker != null) {
                     for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList()) {
-                        timeTracker.onPlayerLeave(player);
+                        if (timeTracker.isPlayerTracked(player.getUuid())) {
+                            timeTracker.onPlayerLeave(player);
+                        }
                     }
                     timeTracker.saveAll();
                 }
-                updateCheckExecutor.shutdownNow();
+
+                if (webServer != null) {
+                    webServer.stop();
+                    LOGGER.info("[在线时间] Web服务器已停止.");
+                }
+
+                scheduler.shutdownNow();
+                LOGGER.info("[在线时间] 定时任务已关闭.");
+
+                LOGGER.info("[在线时间] 数据保存完成，Mod 已停止.");
             });
 
         } catch (Exception e) {
             LOGGER.error("[在线时间] Mod初始化失败", e);
             throw new RuntimeException("[在线时间] Mod初始化失败 ", e);
         }
+
         registerCommands();
     }
 
@@ -119,11 +153,12 @@ public class PlayerTimeMod implements ModInitializer {
         return localizationManager;
     }
 
-    public static void registerCommands() {
+    // 注册命令
+    private void registerCommands() {
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
             dispatcher.register(CommandManager.literal("onlineTime")
-                    .requires(source -> source.hasPermissionLevel(0))
-                    .executes(context -> showOnlineTime(context.getSource(), 1))
+                    .requires(source -> source.hasPermissionLevel(0)) // 任何玩家都可以使用
+                    .executes(context -> showOnlineTime(context.getSource(), 1)) // 默认显示第一页
                     .then(CommandManager.argument("page", IntegerArgumentType.integer(1))
                             .executes(context -> showOnlineTime(
                                     context.getSource(),
@@ -131,136 +166,94 @@ public class PlayerTimeMod implements ModInitializer {
                             ))
                     )
             );
+            LOGGER.info("[在线时间] 已注册命令 /onlineTime");
         });
     }
 
-    private static int showOnlineTime(ServerCommandSource source, int requestedPage) {
+    // 显示在线时间
+    private int showOnlineTime(ServerCommandSource source, int requestedPage) {
         ServerPlayerEntity player = source.getPlayer();
-        if (player == null) return 0;
-
+        if (player == null) {
+            source.sendMessage(Text.literal(localizationManager.getString("playertime.command.error.player_only")).formatted(Formatting.RED));
+            return 0;
+        }
 
         Util.getMainWorkerExecutor().execute(() -> {
             PlayerTimeTracker tracker = getTimeTracker();
-            if (tracker != null) {
-                Map<String, String> stats = tracker.getWhitelistedPlayerStats();
-
-                List<String> sorted = stats.entrySet().stream()
-                        .sorted((a, b) -> comparePlayTime(a.getValue(), b.getValue()))
-                        .map(entry -> formatPlayerTime(entry.getKey(), entry.getValue()))
-                        .collect(Collectors.toList());
-
-                sendPaginatedMessage(player, sorted, requestedPage);
-            } else {
-                player.sendMessage(Text.literal(localizationManager.getString("playertime.command.error.not_initialized")), false);
+            if (tracker == null) {
+                player.sendMessage(Text.literal(localizationManager.getString("playertime.command.error.not_initialized")).formatted(Formatting.RED), false);
+                return;
             }
-        });
 
+            List<PlayerTimeTracker.PlayerTimeStatsWithNames> statsList = tracker.getSortedPlayerStats();
+
+            sendPaginatedMessage(player, statsList, requestedPage);
+        });
 
         return 1;
     }
 
-    private static int comparePlayTime(String a, String b) {
-        try {
-            int firstColon = a.indexOf(':');
-            int firstPipe = a.indexOf('|');
-            String timeA;
-            if (firstColon > 0) {
-                timeA = (firstPipe > firstColon && firstPipe != -1) ? a.substring(firstColon + 1, firstPipe).trim() : a.substring(firstColon + 1).trim();
-            } else {
-                timeA = a.trim();
-            }
-
-
-            int firstColonB = b.indexOf(':');
-            int firstPipeB = b.indexOf('|');
-            String timeB;
-            if (firstColonB > 0) {
-                timeB = (firstPipeB > firstColonB && firstPipeB != -1) ? b.substring(firstColonB + 1, firstPipeB).trim() : b.substring(firstColonB + 1).trim();
-            } else {
-                timeB = b.trim();
-            }
-
-
-            return Long.compare(parseTimeToSeconds(timeB), parseTimeToSeconds(timeA)); // Descending order
-        } catch (Exception e) {
-            LOGGER.error("Error comparing play times: {} vs {}", a, b, e);
-            return 0;
-        }
-    }
-
-
-    private static long parseTimeToSeconds(String timeStr) {
-        long seconds = 0;
-        if (timeStr == null || timeStr.trim().isEmpty()) {
-            return 0;
-        }
-
-        String[] parts = timeStr.trim().split("\\s+");
-        for (String part : parts) {
-            if (part.endsWith("h")) {
-                try {
-                    seconds += Integer.parseInt(part.substring(0, part.length() - 1)) * 3600;
-                } catch (NumberFormatException ignored) {}
-            } else if (part.endsWith("m")) {
-                try {
-                    seconds += Integer.parseInt(part.substring(0, part.length() - 1)) * 60;
-                } catch (NumberFormatException ignored) {}
-            }
-        }
-        return seconds;
-    }
-
-    private static String formatPlayerTime(String name, String timeStr) {
-        return String.format("§e%s§r: %s", name, timeStr);
-    }
-
-
-    private static void sendPaginatedMessage(ServerPlayerEntity player, List<String> lines, int page) {
+    // 发送分页消息
+    private void sendPaginatedMessage(ServerPlayerEntity player, List<PlayerTimeTracker.PlayerTimeStatsWithNames> statsList, int requestedPage) {
         int pageSize = 10;
-        int totalPages = (lines.size() + pageSize - 1) / pageSize;
-        page = Math.max(1, Math.min(page, totalPages));
+        int totalEntries = statsList.size();
+        int totalPages = (totalEntries + pageSize - 1) / pageSize;
+        int currentPage = Math.max(1, Math.min(requestedPage, Math.max(1, totalPages)));
 
-        int from = (page - 1) * pageSize;
-        int to = Math.min(from + pageSize, lines.size());
+        int fromIndex = (currentPage - 1) * pageSize;
+        int toIndex = Math.min(fromIndex + pageSize, totalEntries);
 
-        player.sendMessage(Text.literal(localizationManager.getString("playertime.command.title", page, totalPages)), false);
+        player.sendMessage(Text.literal(localizationManager.getString("playertime.command.title", currentPage, Math.max(1, totalPages))).formatted(Formatting.GOLD), false);
 
-        if (lines.isEmpty()) {
-            player.sendMessage(Text.literal(localizationManager.getString("playertime.command.empty_stats")), false);
+        if (statsList.isEmpty()) {
+            player.sendMessage(Text.literal(localizationManager.getString("playertime.command.empty_stats")).formatted(Formatting.GRAY), false);
             return;
         }
 
-        for (int i = from; i < to; i++) {
-            player.sendMessage(Text.literal(lines.get(i)), false);
+        for (int i = fromIndex; i < toIndex; i++) {
+            PlayerTimeTracker.PlayerTimeStatsWithNames stats = statsList.get(i);
+            String formattedStats = localizationManager.getString(
+                    "playertime.stats.format",
+                    PlayerTimeTracker.formatTime(stats.getTotalTime()),
+                    PlayerTimeTracker.formatTime(stats.last30Days),
+                    PlayerTimeTracker.formatTime(stats.last7Days)
+            );
+            player.sendMessage(Text.literal(String.format("§e%s§r: %s", stats.playerName, formattedStats)), false);
         }
 
         MutableText footer = Text.literal("");
-        if (page > 1) {
-            int finalPage = page;
+        if (currentPage > 1) {
             footer.append(Text.literal(localizationManager.getString("playertime.command.prev_page"))
                     .styled(style -> style.withClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
-                            "/onlineTime " + (finalPage - 1)
-                    )))
-                    .append(" "));
+                            "/onlineTime " + (currentPage - 1)
+                    )).withColor(Formatting.GREEN)));
         }
 
-        footer.append(Text.literal(localizationManager.getString("playertime.command.total_players", lines.size())));
+        if (currentPage > 1 && currentPage < totalPages) {
+            footer.append(" ");
+        }
+        footer.append(Text.literal(localizationManager.getString("playertime.command.total_players", totalEntries)).formatted(Formatting.GRAY));
 
-        if (page < totalPages) {
-            int finalPage1 = page;
-            footer.append(" ").append(Text.literal(localizationManager.getString("playertime.command.next_page"))
+
+        if (currentPage < totalPages) {
+            if (currentPage > 1 || totalEntries > 0) {
+                footer.append(" ");
+            }
+            footer.append(Text.literal(localizationManager.getString("playertime.command.next_page"))
                     .styled(style -> style.withClickEvent(new ClickEvent(
                             ClickEvent.Action.RUN_COMMAND,
-                            "/onlineTime " + (finalPage1 + 1)
-                    ))));
+                            "/onlineTime " + (currentPage + 1)
+                    )).withColor(Formatting.GREEN)));
         }
 
         player.sendMessage(footer, false);
     }
 
+
+    // 检查更新
     private void checkForUpdates() {
-        updateCheckExecutor.submit(() -> {
+        scheduler.submit(() -> {
             try {
                 Optional<ModContainer> modContainer = FabricLoader.getInstance().getModContainer("playertime");
                 if (modContainer.isEmpty()) {
@@ -298,7 +291,7 @@ public class PlayerTimeMod implements ModInitializer {
                     LOGGER.warn("[在线时间] 下载链接: {}", latestVersionLink);
                     LOGGER.warn("==================================================");
                 } else {
-                    LOGGER.info("[在线时间] 当前已是最新版本(也有可能检查失败)。");
+                    LOGGER.info("[在线时间] 当前已是最新版本(或检查失败)。");
                 }
 
             } catch (javax.xml.parsers.ParserConfigurationException e) {
@@ -314,6 +307,7 @@ public class PlayerTimeMod implements ModInitializer {
     }
 
 
+    // 检查版本号是否比当前版本高
     private boolean isNewerVersion(String newVersion, String currentVersion) {
         if (newVersion == null || currentVersion == null || newVersion.isEmpty() || currentVersion.isEmpty()) {
             return false;
@@ -322,7 +316,6 @@ public class PlayerTimeMod implements ModInitializer {
         String cleanNewVersion = newVersion.toLowerCase().startsWith("v") ? newVersion.substring(1) : newVersion;
         String cleanCurrentVersion = currentVersion.toLowerCase().startsWith("v") ? currentVersion.substring(1) : currentVersion;
 
-
         String[] newParts = cleanNewVersion.split("\\.");
         String[] currentParts = cleanCurrentVersion.split("\\.");
 
@@ -343,9 +336,7 @@ public class PlayerTimeMod implements ModInitializer {
         return false;
     }
 
-    /**
-     * Parses a string part of a version into an integer, returning 0 if parsing fails.
-     */
+    // 尝试将字符串转换为整数，如果转换失败则返回0
     private int parseIntOrZero(String s) {
         try {
             return Integer.parseInt(s);
diff --git a/src/main/java/com/example/playertime/PlayerTimeTracker.java b/src/main/java/com/example/playertime/PlayerTimeTracker.java
index 5906888..1b76e97 100644
--- a/src/main/java/com/example/playertime/PlayerTimeTracker.java
+++ b/src/main/java/com/example/playertime/PlayerTimeTracker.java
@@ -3,52 +3,56 @@ package com.example.playertime;
 import com.google.gson.*;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Uuids;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 public class PlayerTimeTracker {
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     private final MinecraftServer server;
     private final Path dataFile;
-    private final ExecutorService executor = Executors.newSingleThreadExecutor();
     private final Map<UUID, PlayerTimeData> playerData = new ConcurrentHashMap<>();
+    private final ModConfig config;
 
-    public PlayerTimeTracker(MinecraftServer server) {
+    public PlayerTimeTracker(MinecraftServer server, ModConfig config) {
         this.server = server;
+        this.config = config;
         this.dataFile = server.getRunDirectory().resolve("player_time_data.json");
-        // loadData();
     }
 
     public void loadData() {
         if (!Files.exists(dataFile)) {
-            PlayerTimeMod.LOGGER.info("[在线时间] 数据文件未找到，跳过加载");
+            PlayerTimeMod.LOGGER.info("[在线时间] 数据文件未找到 ({})，跳过加载。", dataFile);
             return;
         }
 
-        try (Reader reader = Files.newBufferedReader(dataFile)) {
+        try (Reader reader = Files.newBufferedReader(dataFile, StandardCharsets.UTF_8)) {
             JsonElement jsonElement = JsonParser.parseReader(reader);
 
             if (jsonElement == null || !jsonElement.isJsonObject()) {
-                PlayerTimeMod.LOGGER.warn("[在线时间] 数据文件为空或格式错误，跳过加载");
+                PlayerTimeMod.LOGGER.warn("[在线时间] 数据文件 ({}) 为空或格式错误，跳过加载。", dataFile);
                 return;
             }
 
             JsonObject root = jsonElement.getAsJsonObject();
             int resetCount = 0;
+            int loadedCount = 0;
 
             for (Map.Entry<String, JsonElement> entry : root.entrySet()) {
                 try {
                     UUID uuid = UUID.fromString(entry.getKey());
                     PlayerTimeData data = GSON.fromJson(entry.getValue(), PlayerTimeData.class);
 
+                    // 检查并重置上次登录时间，防止服务器崩溃导致时间计算错误
                     if (data.lastLogin > 0) {
                         PlayerTimeMod.LOGGER.warn(
                                 "[在线时间] 在数据加载过程中发现玩家（UUID：{}）的最后登录时间大于0（{}）。将其重置为0。",
@@ -59,214 +63,239 @@ public class PlayerTimeTracker {
                     }
 
                     playerData.put(uuid, data);
+                    loadedCount++;
                 } catch (IllegalArgumentException e) {
-                    PlayerTimeMod.LOGGER.error("[在线时间] I数据文件中的 UUID 格式无效: " + entry.getKey(), e);
+                    PlayerTimeMod.LOGGER.error("[在线时间] 数据文件中的 UUID 格式无效: " + entry.getKey(), e);
                 } catch (JsonParseException e) {
                     PlayerTimeMod.LOGGER.error("[在线时间] 解析玩家数据失败(UUID: " + entry.getKey() + ")", e);
                 }
             }
-            PlayerTimeMod.LOGGER.info("[在线时间] 成功加载了 {} 名玩家的数据，重置了 {} 名玩家的上次登录时间", playerData.size(), resetCount);
+            PlayerTimeMod.LOGGER.info("[在线时间] 成功加载了 {} 名玩家的数据，重置了 {} 名玩家的上次登录时间。", loadedCount, resetCount);
 
         } catch (IOException e) {
-            PlayerTimeMod.LOGGER.error("[在线时间] 无法读取玩家在线时间数据文件", e);
+            PlayerTimeMod.LOGGER.error("[在线时间] 无法读取玩家在线时间数据文件 ({})", dataFile, e);
         } catch (JsonParseException e) {
-            PlayerTimeMod.LOGGER.error("[在线时间] 玩家在线时间数据文件格式错误", e);
+            PlayerTimeMod.LOGGER.error("[在线时间] 玩家在线时间数据文件 ({}) 格式错误", dataFile, e);
         } catch (Exception e) {
             PlayerTimeMod.LOGGER.error("[在线时间] 加载玩家在线时间数据时发生未知错误", e);
         }
     }
 
-
     public void onPlayerJoin(ServerPlayerEntity player) {
-        PlayerTimeData data = playerData.computeIfAbsent(player.getUuid(), uuid -> new PlayerTimeData());
+        UUID uuid = player.getUuid();
+        // 检查配置是否白名单
+        if (config.isWhitelistOnly() && !server.getPlayerManager().isWhitelisted(player.getGameProfile())) {
+            PlayerTimeMod.LOGGER.debug("[在线时间] 玩家 {} ({}) 不在白名单，且配置为仅记录白名单玩家，跳过加入处理。", player.getName().getString(), uuid);
+            return;
+        }
+
+        PlayerTimeData data = playerData.computeIfAbsent(uuid, k -> {
+            PlayerTimeMod.LOGGER.info("[在线时间] 为新玩家 {} ({}) 创建数据。", player.getName().getString(), uuid);
+            return new PlayerTimeData();
+        });
+
+        // 记录本次登录的开始时间
         data.lastLogin = Instant.now().getEpochSecond();
-        PlayerTimeMod.LOGGER.info("[在线时间] 玩家 {} 加入, 开始计时", player.getName().getString());
+        PlayerTimeMod.LOGGER.info("[在线时间] 玩家 {} ({}) 加入, 开始计时。", player.getName().getString(), uuid);
     }
 
     public void onPlayerLeave(ServerPlayerEntity player) {
-        PlayerTimeData data = playerData.get(player.getUuid());
+        UUID uuid = player.getUuid();
+        PlayerTimeData data = playerData.get(uuid);
+
+        // 防幽灵
         if (data != null && data.lastLogin > 0) {
             long now = Instant.now().getEpochSecond();
             long sessionTime = now - data.lastLogin;
 
             if (sessionTime > 0) {
                 data.totalTime += sessionTime;
-
                 data.rolling30Days.addPlayTime(now, sessionTime);
                 data.rolling7Days.addPlayTime(now, sessionTime);
 
-                PlayerTimeMod.LOGGER.info("[在线时间] 玩家 {} 离开, 会话时间 {} 秒, 总计时间 {}",
-                        player.getName().getString(), sessionTime, data.totalTime);
+                PlayerTimeMod.LOGGER.info("[在线时间] 玩家 {} ({}) 离开, 会话时间 {} 秒, 总计时间 {} 秒。",
+                        player.getName().getString(), uuid, sessionTime, data.totalTime);
             } else {
-                PlayerTimeMod.LOGGER.warn("[在线时间] 玩家 {} 离开, 但计算出的会话时间不正常 ({}), 可能是由于时间同步问题或快速重新连接导致",
-                        player.getName().getString(), sessionTime);
+                // 防其他因素
+                PlayerTimeMod.LOGGER.warn("[在线时间] 玩家 {} ({}) 离开, 但计算出的会话时间不正常 ({}), 跳过时间累加。",
+                        player.getName().getString(), uuid, sessionTime);
             }
 
+            // 标记离线
             data.lastLogin = 0;
-            saveAsync(player.getUuid());
         } else {
-            PlayerTimeMod.LOGGER.warn("[在线时间] 玩家 {} 已离开，但上次登录时间为0或数据不存在，跳过会话时间计算。", player.getName().getString());
+            PlayerTimeMod.LOGGER.debug("[在线时间] 玩家 {} ({}) 离开，但数据不存在或上次登录时间为0，跳过会话时间计算。", player.getName().getString(), uuid);
         }
     }
 
-    public PlayerTimeStats getPlayerStats(UUID uuid) {
-        PlayerTimeData data = playerData.get(uuid);
-        if (data == null) {
-            return null;
-        }
-
-        long now = Instant.now().getEpochSecond();
-        PlayerTimeStats stats = new PlayerTimeStats();
-        stats.totalTime = data.totalTime;
-
-        if (data.lastLogin > 0 && server.getPlayerManager().getPlayer(uuid) != null) {
-            long currentSessionTime = now - data.lastLogin;
-            if (currentSessionTime > 0) {
-                stats.totalTime += currentSessionTime;
-            }
-        }
-
-        stats.last30Days = data.rolling30Days.getTotalTime(now);
-        stats.last7Days = data.rolling7Days.getTotalTime(now);
-
-        return stats;
+    public boolean isPlayerTracked(UUID uuid) {
+        return playerData.containsKey(uuid);
     }
 
-    public Map<String, String> getWhitelistedPlayerStats() {
-        Map<String, String> stats = new LinkedHashMap<>();
+
+    public List<PlayerTimeStatsWithNames> getSortedPlayerStats() {
         long now = Instant.now().getEpochSecond();
+        List<PlayerTimeStatsWithNames> statsList = new ArrayList<>();
 
-        Set<UUID> whitelistUuids = new HashSet<>();
-        if (server != null && server.getPlayerManager() != null && server.getUserCache() != null) {
-            for (String name : server.getPlayerManager().getWhitelist().getNames()) {
-                server.getUserCache().findByName(name).ifPresent(profile -> {
-                    whitelistUuids.add(profile.getId());
-                });
-            }
-        } else {
-            PlayerTimeMod.LOGGER.error("[在线时间] 尝试获取白名单玩家统计时 UserCache 或 PlayerManager 不可用!");
-            return stats;
-        }
-
-
-        playerData.forEach((uuid, data) -> {
-            if (whitelistUuids.contains(uuid)) {
-                String playerName = getPlayerName(uuid);
-                long totalTime = data.totalTime;
-
-                if (data.lastLogin > 0 && server.getPlayerManager().getPlayer(uuid) != null) {
-                    long currentSessionTime = now - data.lastLogin;
-                    if (currentSessionTime > 0) {
-                        totalTime += currentSessionTime;
-                    }
+        // 获取白名单 UUID 集合 (如果需要过滤)
+        Set<UUID> whitelistUuids;
+        if (config.isWhitelistOnly()) {
+            whitelistUuids = new HashSet<>();
+            if (server != null && server.getPlayerManager() != null && server.getUserCache() != null) {
+                for (String name : server.getPlayerManager().getWhitelist().getNames()) {
+                    server.getUserCache().findByName(name).ifPresent(profile -> {
+                        whitelistUuids.add(profile.getId());
+                    });
                 }
-
-                long last30DaysTime = data.rolling30Days.getTotalTime(now);
-                long last7DaysTime = data.rolling7Days.getTotalTime(now);
-                stats.put(playerName, PlayerTimeMod.getLocalizationManager().getString(
-                        "playertime.stats.format",
-                        formatTime(totalTime),
-                        formatTime(last30DaysTime),
-                        formatTime(last7DaysTime)
-                ));
+            } else {
+                PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 或 PlayerManager 不可用，无法获取白名单列表进行过滤!");
+                // 异常处理，返回空列表
+                return Collections.emptyList();
             }
-        });
+        } else {
+            whitelistUuids = null;
+        }
 
-        return stats;
+        for (Map.Entry<UUID, PlayerTimeData> entry : playerData.entrySet()) {
+            UUID uuid = entry.getKey();
+            PlayerTimeData data = entry.getValue();
+
+            // 是不是白名单玩家
+            if (config.isWhitelistOnly() && (whitelistUuids == null || !whitelistUuids.contains(uuid))) {
+                continue;
+            }
+
+            // 计算当前总时间
+            long currentTotalTime = data.totalTime;
+            // 只有当玩家在线时才计算当前会话时间
+            if (data.lastLogin > 0 && server.getPlayerManager().getPlayer(uuid) != null) {
+                long currentSessionTime = now - data.lastLogin;
+                if (currentSessionTime > 0) {
+                    currentTotalTime += currentSessionTime;
+                }
+            }
+
+            // 获取滚动时间
+            long last30DaysTime = data.rolling30Days.getTotalTime(now);
+            long last7DaysTime = data.rolling7Days.getTotalTime(now);
+
+            // 获取玩家名称
+            String playerName = getPlayerName(uuid);
+
+            statsList.add(new PlayerTimeStatsWithNames(uuid, playerName, currentTotalTime, last30DaysTime, last7DaysTime));
+        }
+
+        // 按总时排序
+        statsList.sort(Comparator.comparingLong(PlayerTimeStatsWithNames::getTotalTime).reversed());
+
+        return statsList;
     }
 
     public String getPlayerName(UUID uuid) {
+        // 尝试获取在线玩家名称
         ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
         if (player != null) {
             return player.getName().getString();
         }
 
+        // 尝试从 UserCache 获取名称，主要用于离线服务器
         if (server != null && server.getUserCache() != null) {
             Optional<GameProfile> profile = server.getUserCache().getByUuid(uuid);
             if (profile.isPresent()) {
                 return profile.get().getName();
             }
         } else {
-            PlayerTimeMod.LOGGER.warn("[在线时间] 尝试通过 UUID 获取玩家名称时 UserCache 不可用: {}", uuid);
+            PlayerTimeMod.LOGGER.debug("[在线时间] 尝试通过 UUID 获取玩家名称时 UserCache 不可用: {}", uuid);
         }
 
-
-        return "Unknown";
+        return uuid.toString();
     }
 
     public void saveAll() {
         PlayerTimeMod.LOGGER.info("[在线时间] 开始保存所有玩家数据...");
+        long now = Instant.now().getEpochSecond();
         JsonObject root = new JsonObject();
-        playerData.forEach((uuid, data) -> {
+        int savedCount = 0;
+
+        for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList()) {
+            UUID uuid = player.getUuid();
+            PlayerTimeData data = playerData.get(uuid);
+            // 只有被跟踪且没标记离线
+            if (data != null && data.lastLogin > 0) {
+                long sessionTime = now - data.lastLogin;
+                if (sessionTime > 0) {
+                    data.totalTime += sessionTime;
+                    data.rolling30Days.addPlayTime(now, sessionTime);
+                    data.rolling7Days.addPlayTime(now, sessionTime);
+                    // 更新 lastLogin 到当前时间，防止炸鱼
+                    data.lastLogin = now;
+                    PlayerTimeMod.LOGGER.debug("[在线时间] 定时保存：更新玩家 {} ({}) 会话时间 {} 秒。", player.getName().getString(), uuid, sessionTime);
+                } else {
+                    PlayerTimeMod.LOGGER.debug("[在线时间] 定时保存：玩家 {} ({}) 会话时间不正常 ({})，跳过更新。", player.getName().getString(), uuid, sessionTime);
+                }
+            }
+        }
+
+        // 遍历所有玩家数据进行保存
+        for (Map.Entry<UUID, PlayerTimeData> entry : playerData.entrySet()) {
+            UUID uuid = entry.getKey();
+            PlayerTimeData data = entry.getValue();
+
+            boolean isWhitelisted = false;
+            if (server != null && server.getPlayerManager() != null) {
+                // 优先检查在线玩家
+                ServerPlayerEntity onlinePlayer = server.getPlayerManager().getPlayer(uuid);
+                if (onlinePlayer != null) {
+                    isWhitelisted = server.getPlayerManager().isWhitelisted(onlinePlayer.getGameProfile());
+                } else if (server.getUserCache() != null) {
+                    // 检查离线玩家是否在白名单
+                    Optional<GameProfile> profile = server.getUserCache().getByUuid(uuid);
+                    if (profile.isPresent()) {
+                        isWhitelisted = server.getPlayerManager().isWhitelisted(profile.get());
+                    }
+                }
+            } else {
+                PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 或 PlayerManager 不可用，无法在保存时检查白名单状态。");
+                // 如果无法检查白名单，且配置为只记录白名单，则跳过保存此玩家数据
+                if (config.isWhitelistOnly()) {
+                    PlayerTimeMod.LOGGER.debug("[在线时间] 无法检查白名单状态，且配置为仅记录白名单，跳过保存玩家 {} ({}) 的数据。", getPlayerName(uuid), uuid);
+                    continue;
+                }
+            }
+
+
+            if (config.isWhitelistOnly() && !isWhitelisted) {
+                PlayerTimeMod.LOGGER.debug("[在线时间] 配置为仅记录白名单，跳过保存非白名单玩家 {} ({}) 的数据。", getPlayerName(uuid), uuid);
+                continue;
+            }
+
             root.add(uuid.toString(), GSON.toJsonTree(data));
-        });
+            savedCount++;
+        }
+
 
         try {
-            Files.createDirectories(dataFile.getParent());
-            try (Writer writer = Files.newBufferedWriter(dataFile)) {
+            Path dataDir = dataFile.getParent();
+
+            if (dataDir != null) {
+                Files.createDirectories(dataDir);
+            } else {
+                PlayerTimeMod.LOGGER.debug("[在线时间] 数据文件 {} 位于根目录，跳过创建父目录。", dataFile);
+            }
+
+            Path tempFile = dataFile.resolveSibling(dataFile.getFileName().toString() + ".tmp");
+
+            try (Writer writer = Files.newBufferedWriter(tempFile, StandardCharsets.UTF_8)) {
                 GSON.toJson(root, writer);
             }
-            PlayerTimeMod.LOGGER.info("[在线时间] 所有玩家数据已成功保存");
+            Files.move(tempFile, dataFile, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+
+            PlayerTimeMod.LOGGER.info("[在线时间] 所有玩家数据 ({}) 已成功保存，共 {} 条记录。", dataFile, savedCount);
         } catch (Exception e) {
-            PlayerTimeMod.LOGGER.error("[在线时间] 无法保存所有玩家在线时间数据", e);
+            PlayerTimeMod.LOGGER.error("[在线时间] 无法保存所有玩家在线时间数据到 {}", dataFile, e);
         }
     }
 
-    private void saveAsync(UUID uuid) {
-        executor.execute(() -> {
-            PlayerTimeData data = playerData.get(uuid);
-            if (data == null) {
-                return;
-            }
-
-            JsonObject root;
-            try {
-                if (Files.exists(dataFile)) {
-                    try (Reader reader = Files.newBufferedReader(dataFile)) {
-                        JsonElement jsonElement = JsonParser.parseReader(reader);
-                        if (jsonElement != null && jsonElement.isJsonObject()) {
-                            root = jsonElement.getAsJsonObject();
-                        } else {
-                            root = new JsonObject();
-                        }
-                    }
-                } else {
-                    root = new JsonObject();
-                }
-            } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 在异步保存期间无法读取数据文件，正在创建新对象", e);
-                root = new JsonObject();
-            }
-
-            root.add(uuid.toString(), GSON.toJsonTree(data));
-
-            try {
-                Files.createDirectories(dataFile.getParent());
-                try (Writer writer = Files.newBufferedWriter(dataFile)) {
-                    GSON.toJson(root, writer);
-                }
-            } catch (Exception e) {
-                String playerName = "UUID: " + uuid.toString();
-                try {
-                    if (server != null && server.getPlayerManager() != null) {
-                        ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
-                        if (player != null) {
-                            playerName = player.getName().getString();
-                        } else if (server.getUserCache() != null) {
-                            Optional<GameProfile> profile = server.getUserCache().getByUuid(uuid);
-                            if (profile.isPresent()) {
-                                playerName = profile.get().getName();
-                            }
-                        }
-                    }
-                } catch (Exception nameEx) {
-                }
-
-                PlayerTimeMod.LOGGER.error("[在线时间] 无法异步保存玩家的在线时间数据 " + playerName, e);
-            }
-        });
-    }
-
     public static String formatTime(long seconds) {
         if (seconds < 0) seconds = 0;
         long hours = seconds / 3600;
@@ -275,46 +304,56 @@ public class PlayerTimeTracker {
     }
 
     public static class PlayerTimeData {
-        long totalTime = 0;
-        long lastLogin = 0;
-        RollingTimeWindow rolling30Days = new RollingTimeWindow(30);
-        RollingTimeWindow rolling7Days = new RollingTimeWindow(7);
-    }
-
-    public static class PlayerTimeStats {
-        public long totalTime;
-        public long last30Days;
-        public long last7Days;
+        long totalTime = 0; // 总在线时间
+        long lastLogin = 0; // 上次登录时间戳
+        RollingTimeWindow rolling30Days = new RollingTimeWindow(30); // 最近30天
+        RollingTimeWindow rolling7Days = new RollingTimeWindow(7);   // 最近7天
     }
 
     private static class RollingTimeWindow {
         private final int days;
         private final List<TimeEntry> entries = new LinkedList<>();
 
+        @SuppressWarnings("unused")
+        private RollingTimeWindow() {
+            this.days = 0;
+        }
+
         public RollingTimeWindow(int days) {
             this.days = days;
         }
 
+
         public void addPlayTime(long timestamp, long seconds) {
             if (seconds <= 0) return;
             entries.add(new TimeEntry(timestamp, seconds));
             cleanUp(timestamp);
         }
 
+
         public long getTotalTime(long currentTime) {
             cleanUp(currentTime);
             return entries.stream().mapToLong(e -> e.seconds).sum();
         }
 
+
         private void cleanUp(long currentTime) {
             long cutoff = currentTime - (days * 24 * 3600L);
             entries.removeIf(entry -> entry.timestamp < cutoff);
         }
 
+
         private static class TimeEntry {
             final long timestamp;
             final long seconds;
 
+            // Gson 需要一个无参构造函数
+            @SuppressWarnings("unused")
+            private TimeEntry() {
+                this.timestamp = 0;
+                this.seconds = 0;
+            }
+
             TimeEntry(long timestamp, long seconds) {
                 this.timestamp = timestamp;
                 this.seconds = seconds;
@@ -322,6 +361,30 @@ public class PlayerTimeTracker {
         }
     }
 
+
+    public static class PlayerTimeStatsWithNames {
+        public UUID uuid;
+        public String playerName;
+        private long totalTime;
+        public long last30Days;
+        public long last7Days;
+
+        @SuppressWarnings("unused")
+        private PlayerTimeStatsWithNames() {}
+
+        public PlayerTimeStatsWithNames(UUID uuid, String playerName, long totalTime, long last30Days, long last7Days) {
+            this.uuid = uuid;
+            this.playerName = playerName;
+            this.totalTime = totalTime;
+            this.last30Days = last30Days;
+            this.last7Days = last7Days;
+        }
+
+        public long getTotalTime() {
+            return totalTime;
+        }
+    }
+
     public Map<UUID, PlayerTimeData> getPlayerData() {
         return Collections.unmodifiableMap(playerData);
     }
@@ -329,4 +392,104 @@ public class PlayerTimeTracker {
     public Path getDataFile() {
         return this.dataFile;
     }
+
+    public Map<String, List<Map<String, String>>> getOnlinePlayersCategorized() {
+        List<Map<String, String>> whitelisted = new ArrayList<>();
+        List<Map<String, String>> nonWhitelisted = new ArrayList<>();
+
+        PlayerManager playerManager = server.getPlayerManager();
+        Set<UUID> whitelistUuids = new HashSet<>();
+
+        if (server != null && server.getUserCache() != null) {
+            for (String name : playerManager.getWhitelist().getNames()) {
+                server.getUserCache().findByName(name).ifPresent(profile -> {
+                    whitelistUuids.add(profile.getId());
+                });
+            }
+        } else {
+            PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单UUID用于在线玩家分类。");
+        }
+
+        for (ServerPlayerEntity player : playerManager.getPlayerList()) {
+            Map<String, String> playerInfo = new HashMap<>();
+            playerInfo.put("name", player.getName().getString());
+            playerInfo.put("uuid", player.getUuid().toString());
+
+            if (whitelistUuids.contains(player.getUuid())) {
+                whitelisted.add(playerInfo);
+            } else {
+                nonWhitelisted.add(playerInfo);
+            }
+        }
+
+        Map<String, List<Map<String, String>>> result = new HashMap<>();
+        result.put("whitelisted", whitelisted);
+        result.put("non_whitelisted", nonWhitelisted);
+        return result;
+    }
+
+    public Map<String, Integer> getOnlinePlayerCounts() {
+        int total = 0;
+        int whitelisted = 0;
+        int nonWhitelisted = 0;
+
+        PlayerManager playerManager = server.getPlayerManager();
+        Set<UUID> whitelistUuids = new HashSet<>();
+
+        if (server != null && server.getUserCache() != null) {
+            for (String name : playerManager.getWhitelist().getNames()) {
+                server.getUserCache().findByName(name).ifPresent(profile -> {
+                    whitelistUuids.add(profile.getId());
+                });
+            }
+        } else {
+            PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单UUID用于玩家计数分类。");
+        }
+
+        for (ServerPlayerEntity player : playerManager.getPlayerList()) {
+            total++;
+            if (whitelistUuids.contains(player.getUuid())) {
+                whitelisted++;
+            } else {
+                nonWhitelisted++;
+            }
+        }
+
+        Map<String, Integer> result = new HashMap<>();
+        result.put("total", total);
+        result.put("whitelisted", whitelisted);
+        result.put("non_whitelisted", nonWhitelisted);
+        return result;
+    }
+
+    public List<Map<String, Object>> getWhitelistPlayers() {
+        List<Map<String, Object>> whitelist = new ArrayList<>();
+        PlayerManager playerManager = server.getPlayerManager();
+
+        if (server != null && server.getUserCache() != null) {
+            for (String name : playerManager.getWhitelist().getNames()) {
+                Map<String, Object> player = new HashMap<>();
+                player.put("name", name);
+
+                Optional<GameProfile> profile = server.getUserCache().findByName(name);
+                if (profile.isPresent()) {
+                    UUID uuid = profile.get().getId();
+                    player.put("uuid", uuid.toString());
+                    ServerPlayerEntity onlinePlayer = playerManager.getPlayer(uuid);
+                    player.put("online", onlinePlayer != null);
+                } else {
+                    UUID offlineUuid = Uuids.getOfflinePlayerUuid(name);
+                    player.put("uuid", offlineUuid.toString());
+                    ServerPlayerEntity onlinePlayer = playerManager.getPlayer(offlineUuid);
+                    player.put("online", onlinePlayer != null);
+                }
+
+                whitelist.add(player);
+            }
+        } else {
+            PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单列表。");
+        }
+
+        return whitelist;
+    }
 }
diff --git a/src/main/java/com/example/playertime/WebServer.java b/src/main/java/com/example/playertime/WebServer.java
index a51ff2c..5869f76 100644
--- a/src/main/java/com/example/playertime/WebServer.java
+++ b/src/main/java/com/example/playertime/WebServer.java
@@ -1,7 +1,6 @@
 package com.example.playertime;
 
 import com.google.gson.*;
-import com.mojang.authlib.GameProfile;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpExchange;
@@ -20,6 +19,12 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
+// 导入API类，别忘了
+import com.example.playertime.api.PlayerStatsResponse;
+import com.example.playertime.api.ServerStatusResponse;
+import com.example.playertime.api.OnlinePlayersResponse;
+import com.example.playertime.api.PlayerCountResponse;
+import com.example.playertime.api.WhitelistResponse;
 
 
 public class WebServer {
@@ -28,6 +33,7 @@ public class WebServer {
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     private final ExecutorService executor = Executors.newFixedThreadPool(4);
     private final MinecraftServer minecraftServer;
+
     private static final Map<String, String> MIME_TYPES = Map.ofEntries(
             Map.entry("html", "text/html"),
             Map.entry("css", "text/css"),
@@ -41,7 +47,8 @@ public class WebServer {
             Map.entry("woff", "application/font-woff"),
             Map.entry("woff2", "application/font-woff2"),
             Map.entry("ttf", "application/font-sfnt"),
-            Map.entry("eot", "application/vnd.ms-fontobject")
+            Map.entry("eot", "application/vnd.ms-fontobject"),
+            Map.entry("ico", "image/x-icon") // 添加 favicon.ico
     );
 
     public WebServer(PlayerTimeTracker timeTracker, int port, MinecraftServer minecraftServer) throws IOException {
@@ -54,11 +61,13 @@ public class WebServer {
         setupContexts();
     }
 
+    // 创建HTTP服务器
     private void setupContexts() {
+        // API: 获取玩家统计数据
         server.createContext("/api/stats", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
-                exchange.sendResponseHeaders(204, -1);
+                exchange.sendResponseHeaders(204, -1); // CORS 预检请求
                 return;
             }
 
@@ -68,17 +77,31 @@ public class WebServer {
             }
 
             try {
-                // 白名单
-                Map<String, String> stats = timeTracker.getWhitelistedPlayerStats();
-                String response = GSON.toJson(stats);
+                List<PlayerTimeTracker.PlayerTimeStatsWithNames> statsList = timeTracker.getSortedPlayerStats();
+
+                List<PlayerStatsResponse> responseList = statsList.stream()
+                        .map(stats -> new PlayerStatsResponse(
+                                stats.playerName,
+                                stats.uuid.toString(),
+                                stats.getTotalTime(),
+                                PlayerTimeTracker.formatTime(stats.getTotalTime()),
+                                stats.last30Days,
+                                PlayerTimeTracker.formatTime(stats.last30Days),
+                                stats.last7Days,
+                                PlayerTimeTracker.formatTime(stats.last7Days)
+                        ))
+                        .collect(Collectors.toList());
+
+                String response = GSON.toJson(responseList);
                 sendResponse(exchange, 200, response.getBytes(StandardCharsets.UTF_8), "application/json");
+                PlayerTimeMod.LOGGER.debug("[在线时间] API /api/stats 请求成功，返回 {} 条玩家数据。", responseList.size());
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 获取统计数据失败", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/stats 请求失败", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
 
-        // 语言文件内容
+        // API: 获取语言文件内容，不公开
         server.createContext("/api/lang", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
@@ -92,204 +115,17 @@ public class WebServer {
             }
 
             try {
-                String langCode = PlayerTimeMod.getConfig().getLanguage();
-                String resourcePath = String.format("assets/playertime/lang/%s.json", langCode);
-
-                String finalResourcePath1 = resourcePath;
-                InputStream is = FabricLoader.getInstance().getModContainer("playertime")
-                        .flatMap(container -> container.findPath(finalResourcePath1))
-                        .map(path -> {
-                            try {
-                                return path.toUri().toURL().openStream();
-                            } catch (Exception e) {
-                                return null;
-                            }
-                        })
-                        .orElse(null);
-
-                if (is == null) {
-                    langCode = "zh_cn";
-                    resourcePath = String.format("assets/playertime/lang/%s.json", langCode);
-                    String finalResourcePath = resourcePath;
-                    is = FabricLoader.getInstance().getModContainer("playertime")
-                            .flatMap(container -> container.findPath(finalResourcePath))
-                            .map(path -> {
-                                try {
-                                    return path.toUri().toURL().openStream();
-                                } catch (Exception e) {
-                                    return null;
-                                }
-                            })
-                            .orElse(null);
-
-                    if (is == null) {
-                        PlayerTimeMod.LOGGER.error("[在线时间] 默认语言文件（zh_cn.json）未找到！");
-                        sendResponse(exchange, 500, "Language file not found");
-                        return;
-                    }
-                    PlayerTimeMod.LOGGER.warn("[在线时间] 配置的语言文件({}.json)未找到，正在使用默认(zh_cn.json)。", PlayerTimeMod.getConfig().getLanguage());
-                }
-
-                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-                byte[] data = new byte[1024];
-                int nRead;
-                while ((nRead = is.read(data, 0, data.length)) != -1) {
-                    buffer.write(data, 0, nRead);
-                }
-                buffer.flush();
-                is.close();
-
-                sendResponse(exchange, 200, buffer.toByteArray(), "application/json");
-                PlayerTimeMod.LOGGER.debug("[在线时间] 提供的语言文件: {}", resourcePath);
-
-            } catch (IOException e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 无法读取语言文件", e);
-                sendResponse(exchange, 500, "Error reading language file");
+                Map<String, String> langMap = PlayerTimeMod.getLocalizationManager().getAllStrings();
+                String response = GSON.toJson(langMap);
+                sendResponse(exchange, 200, response.getBytes(StandardCharsets.UTF_8), "application/json");
+                PlayerTimeMod.LOGGER.debug("[在线时间] API /api/lang 请求成功，返回 {} 条语言字符串。", langMap.size());
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 处理语言请求时发生未知错误", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/lang 请求失败", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
 
-
-        // 静态文件服务
-        server.createContext("/", exchange -> {
-            try {
-                String requestPath = exchange.getRequestURI().getPath();
-                String resourceFileName;
-
-                if (requestPath.equals("/")) {
-                    resourceFileName = "index.html";
-                } else {
-                    int lastSlash = requestPath.lastIndexOf('/');
-                    resourceFileName = requestPath.substring(lastSlash + 1);
-                }
-                String resourcePath = "assets/playertime/web" + requestPath;
-                if (requestPath.equals("/")) {
-                    resourcePath += resourceFileName;
-                }
-
-
-                String finalResourcePath = resourcePath;
-                InputStream is = FabricLoader.getInstance().getModContainer("playertime")
-                        .flatMap(container -> container.findPath(finalResourcePath))
-                        .map(p -> {
-                            try {
-                                return p.toUri().toURL().openStream();
-                            } catch (Exception e) {
-                                return null;
-                            }
-                        })
-                        .orElse(null);
-
-
-                if (is == null) {
-                    PlayerTimeMod.LOGGER.warn("[在线时间] 找不到静态资源： {}", resourcePath);
-                    sendResponse(exchange, 404, "Not Found");
-                    return;
-                }
-
-                // 确定内容类型，一层保险
-                String extension = "";
-                int dotIndex = resourceFileName.lastIndexOf('.');
-                if (dotIndex > 0 && dotIndex < resourceFileName.length() - 1) {
-                    extension = resourceFileName.substring(dotIndex + 1).toLowerCase();
-                }
-                String contentType = MIME_TYPES.getOrDefault(extension, "application/octet-stream");
-
-                // 读取文件内容
-                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-                byte[] data = new byte[1024];
-                int nRead;
-                while ((nRead = is.read(data, 0, data.length)) != -1) {
-                    buffer.write(data, 0, nRead);
-                }
-                buffer.flush();
-                is.close();
-
-                sendResponse(exchange, 200, buffer.toByteArray(), contentType);
-                PlayerTimeMod.LOGGER.debug("[在线时间] 提供静态文件： {}", resourcePath);
-
-            } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 无法提供静态资源", e);
-                sendResponse(exchange, 500, "Internal Server Error");
-            }
-        });
-
-
-        // 没啥用了 (根据注释，这个API可能不再使用，但保留并增加健壮性)
-        server.createContext("/api/widget-data", exchange -> {
-            handleCors(exchange);
-            if ("OPTIONS".equals(exchange.getRequestMethod())) {
-                exchange.sendResponseHeaders(204, -1);
-                return;
-            }
-
-
-            if (!"GET".equals(exchange.getRequestMethod())) {
-                sendResponse(exchange, 405, "Method Not Allowed");
-                return;
-            }
-
-
-            try {
-                MinecraftServer server = minecraftServer;
-                PlayerManager playerManager = server.getPlayerManager();
-
-                JsonObject response = new JsonObject();
-                response.addProperty("onlineCount", playerManager.getCurrentPlayerCount());
-
-                JsonArray whitelistPlayers = new JsonArray();
-
-                Set<UUID> whitelistUuids = new HashSet<>();
-                if (server != null && server.getUserCache() != null) {
-                    for (String name : playerManager.getWhitelist().getNames()) {
-                        server.getUserCache().findByName(name).ifPresent(profile -> {
-                            whitelistUuids.add(profile.getId());
-                        });
-                    }
-                } else {
-                    PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单UUID用于 widget-data");
-                }
-
-
-                for (ServerPlayerEntity player : playerManager.getPlayerList()) {
-                    UUID uuid = player.getUuid();
-                    if (whitelistUuids.contains(uuid)) {
-                        PlayerTimeTracker.PlayerTimeStats stats = timeTracker.getPlayerStats(uuid);
-                        if (stats != null) {
-                            JsonObject playerJson = new JsonObject();
-                            playerJson.addProperty("name", player.getName().getString());
-                            playerJson.addProperty("time", PlayerTimeTracker.formatTime(stats.totalTime));
-                            whitelistPlayers.add(playerJson);
-                        }
-                    }
-                }
-                response.add("whitelistPlayers", whitelistPlayers);
-
-                JsonArray topPlayers = new JsonArray();
-                timeTracker.getPlayerData().entrySet().stream()
-                        .filter(entry -> whitelistUuids.contains(entry.getKey()))
-                        .sorted((a, b) -> Long.compare(b.getValue().totalTime, a.getValue().totalTime))
-                        .limit(3)
-                        .forEach(entry -> {
-                            JsonObject playerJson = new JsonObject();
-                            playerJson.addProperty("name", timeTracker.getPlayerName(entry.getKey()));
-                            playerJson.addProperty("time", PlayerTimeTracker.formatTime(entry.getValue().totalTime)); // formatTime doesn't need localization
-                            topPlayers.add(playerJson);
-                        });
-
-                response.add("topPlayers", topPlayers);
-                response.addProperty("timestamp", System.currentTimeMillis());
-
-                sendResponse(exchange, 200, GSON.toJson(response).getBytes(StandardCharsets.UTF_8), "application/json");
-            } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 获取小部件数据失败", e);
-                sendResponse(exchange, 500, "Internal Server Error");
-            }
-        });
-
-        // 在线玩家列表
+        // API: 获取在线玩家列表
         server.createContext("/api/online-players", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
@@ -303,50 +139,17 @@ public class WebServer {
             }
 
             try {
-                PlayerManager playerManager = minecraftServer.getPlayerManager();
-                JsonObject response = new JsonObject();
-
-                // 获取白名单玩家UUID集合
-                Set<UUID> whitelistUuids = new HashSet<>();
-                if (minecraftServer != null && minecraftServer.getUserCache() != null) {
-                    for (String name : playerManager.getWhitelist().getNames()) {
-                        minecraftServer.getUserCache().findByName(name).ifPresent(profile -> {
-                            whitelistUuids.add(profile.getId());
-                        });
-                    }
-                } else {
-                    PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单UUID用于 online-players");
-                }
-
-
-                // 分类玩家
-                JsonArray whitelistedPlayers = new JsonArray();
-                JsonArray nonWhitelistedPlayers = new JsonArray();
-
-                for (ServerPlayerEntity player : playerManager.getPlayerList()) {
-                    UUID uuid = player.getUuid();
-                    JsonObject playerJson = new JsonObject();
-                    playerJson.addProperty("name", player.getName().getString());
-                    playerJson.addProperty("uuid", uuid.toString());
-
-                    if (whitelistUuids.contains(uuid)) {
-                        whitelistedPlayers.add(playerJson);
-                    } else {
-                        nonWhitelistedPlayers.add(playerJson);
-                    }
-                }
-
-                response.add("whitelisted", whitelistedPlayers);
-                response.add("non_whitelisted", nonWhitelistedPlayers);
-
+                Map<String, List<Map<String, String>>> onlinePlayers = timeTracker.getOnlinePlayersCategorized();
+                OnlinePlayersResponse response = new OnlinePlayersResponse(onlinePlayers.get("whitelisted"), onlinePlayers.get("non_whitelisted"));
                 sendResponse(exchange, 200, GSON.toJson(response).getBytes(StandardCharsets.UTF_8), "application/json");
+                PlayerTimeMod.LOGGER.debug("[在线时间] API /api/online-players 请求成功。");
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 获取在线玩家列表失败", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/online-players 请求失败", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
 
-        // 玩家计数
+        // API: 获取在线玩家数量
         server.createContext("/api/player-count", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
@@ -360,46 +163,17 @@ public class WebServer {
             }
 
             try {
-                PlayerManager playerManager = minecraftServer.getPlayerManager();
-                JsonObject response = new JsonObject();
-
-                // 获取白名单玩家UUID集合
-                Set<UUID> whitelistUuids = new HashSet<>();
-                if (minecraftServer != null && minecraftServer.getUserCache() != null) {
-                    for (String name : playerManager.getWhitelist().getNames()) {
-                        minecraftServer.getUserCache().findByName(name).ifPresent(profile -> {
-                            whitelistUuids.add(profile.getId());
-                        });
-                    }
-                } else {
-                    PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单UUID用于 player-count");
-                }
-
-
-                // 分类计数
-                int whitelistedCount = 0;
-                int nonWhitelistedCount = 0;
-
-                for (ServerPlayerEntity player : playerManager.getPlayerList()) {
-                    if (whitelistUuids.contains(player.getUuid())) {
-                        whitelistedCount++;
-                    } else {
-                        nonWhitelistedCount++;
-                    }
-                }
-
-                response.addProperty("total", playerManager.getCurrentPlayerCount());
-                response.addProperty("whitelisted", whitelistedCount);
-                response.addProperty("non_whitelisted", nonWhitelistedCount);
-
+                Map<String, Integer> counts = timeTracker.getOnlinePlayerCounts();
+                PlayerCountResponse response = new PlayerCountResponse(counts.get("total"), counts.get("whitelisted"), counts.get("non_whitelisted"));
                 sendResponse(exchange, 200, GSON.toJson(response).getBytes(StandardCharsets.UTF_8), "application/json");
+                PlayerTimeMod.LOGGER.debug("[在线时间] API /api/player-count 请求成功。");
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 获取玩家数量失败", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/player-count 请求失败", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
 
-        // 白名单玩家
+        // API: 获取白名单列表
         server.createContext("/api/whitelist", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
@@ -413,39 +187,20 @@ public class WebServer {
             }
 
             try {
-                PlayerManager playerManager = minecraftServer.getPlayerManager();
-                JsonArray whitelist = new JsonArray();
-
-                if (minecraftServer != null && minecraftServer.getUserCache() != null) {
-                    for (String name : playerManager.getWhitelist().getNames()) {
-                        JsonObject player = new JsonObject();
-                        player.addProperty("name", name);
-
-                        Optional<GameProfile> profile = minecraftServer.getUserCache().findByName(name);
-                        if (profile.isPresent()) {
-                            player.addProperty("uuid", profile.get().getId().toString());
-
-                            ServerPlayerEntity onlinePlayer = playerManager.getPlayer(profile.get().getId());
-                            player.addProperty("online", onlinePlayer != null);
-                        } else {
-                            player.addProperty("online", false);
-                        }
-
-                        whitelist.add(player);
-                    }
-                } else {
-                    PlayerTimeMod.LOGGER.warn("[在线时间] UserCache 不可用，无法获取白名单列表");
-                }
-
-
-                sendResponse(exchange, 200, GSON.toJson(whitelist).getBytes(StandardCharsets.UTF_8), "application/json");
+                List<Map<String, Object>> whitelist = timeTracker.getWhitelistPlayers();
+                List<WhitelistResponse> responseList = whitelist.stream()
+                        .map(map -> new WhitelistResponse((String)map.get("name"), (String)map.get("uuid"), (Boolean)map.get("online")))
+                        .collect(Collectors.toList());
+                sendResponse(exchange, 200, GSON.toJson(responseList).getBytes(StandardCharsets.UTF_8), "application/json");
+                PlayerTimeMod.LOGGER.debug("[在线时间] API /api/whitelist 请求成功，返回 {} 条白名单记录。", responseList.size());
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 获取白名单失败", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/whitelist 请求失败", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
 
-        // 服务器状态
+
+        // API: 获取服务器状态
         server.createContext("/api/server-status", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
@@ -460,73 +215,67 @@ public class WebServer {
 
             try {
                 Runtime runtime = Runtime.getRuntime();
-                JsonObject status = new JsonObject();
+                ServerStatusResponse status = new ServerStatusResponse();
 
                 long maxMemory = runtime.maxMemory();
                 long totalMemory = runtime.totalMemory();
                 long freeMemory = runtime.freeMemory();
                 long usedMemory = totalMemory - freeMemory;
 
-                JsonObject memory = new JsonObject();
-                memory.addProperty("max", maxMemory);
-                memory.addProperty("total", totalMemory);
-                memory.addProperty("used", usedMemory);
-                memory.addProperty("free", freeMemory);
-                memory.addProperty("usage_percentage", (double) usedMemory / maxMemory * 100);
-                status.add("memory", memory);
+                status.memory.max = maxMemory;
+                status.memory.total = totalMemory;
+                status.memory.used = usedMemory;
+                status.memory.free = freeMemory;
+                status.memory.usage_percentage = (double) usedMemory / maxMemory * 100;
 
-                status.addProperty("available_processors", runtime.availableProcessors());
+                status.available_processors = runtime.availableProcessors();
 
-                long uptime = ManagementFactory.getRuntimeMXBean().getUptime();
-                status.addProperty("uptime", uptime);
-                status.addProperty("uptime_formatted", formatUptime(uptime)); // formatUptime doesn't need localization
+                long uptimeMillis = ManagementFactory.getRuntimeMXBean().getUptime();
+                status.uptime = uptimeMillis / 1000; // 秒
+                status.uptime_formatted = formatUptime(uptimeMillis);
 
-                File diskPartition = new File(".");
-                long totalSpace = diskPartition.getTotalSpace();
-                long freeSpace = diskPartition.getFreeSpace();
-                long usableSpace = diskPartition.getUsableSpace();
-
-                JsonObject disk = new JsonObject();
-                disk.addProperty("total", totalSpace);
-                disk.addProperty("free", freeSpace);
-                disk.addProperty("usable", usableSpace);
-                disk.addProperty("usage_percentage", (double) (totalSpace - freeSpace) / totalSpace * 100);
-                status.add("disk", disk);
-
-                JsonObject serverInfo = new JsonObject();
-                serverInfo.addProperty("version", minecraftServer.getVersion());
-                serverInfo.addProperty("player_count", minecraftServer.getCurrentPlayerCount());
-                serverInfo.addProperty("max_players", minecraftServer.getMaxPlayerCount());
-
-                serverInfo.addProperty("average_tick_time_ms", minecraftServer.getAverageTickTime());
-
-                long[] tickTimes = minecraftServer.getTickTimes();
-                if (tickTimes != null && tickTimes.length > 0) {
-                    double recentAvgTickTime = Arrays.stream(tickTimes).average().orElse(0) / 1000000.0;
-                    serverInfo.addProperty("recent_avg_tick_time_ms", recentAvgTickTime);
-
-                    JsonArray recentTicks = new JsonArray();
-                    int sampleCount = Math.min(10, tickTimes.length);
-                    for (int i = 0; i < sampleCount; i++) {
-                        recentTicks.add(tickTimes[i] / 1000000.0);
-                    }
-                    serverInfo.add("recent_tick_samples_ms", recentTicks);
+                try {
+                    File diskPartition = new File(".");
+                    status.disk.total = diskPartition.getTotalSpace();
+                    status.disk.free = diskPartition.getFreeSpace();
+                    status.disk.usable = diskPartition.getUsableSpace();
+                    status.disk.usage_percentage = (double) (status.disk.total - status.disk.free) / status.disk.total * 100;
+                } catch (Exception e) {
+                    PlayerTimeMod.LOGGER.warn("[在线时间] 无法获取磁盘信息", e);
+                }
+
+
+                status.server.version = minecraftServer.getVersion();
+                status.server.player_count = minecraftServer.getCurrentPlayerCount();
+                status.server.max_players = minecraftServer.getMaxPlayerCount();
+                status.server.motd = minecraftServer.getServerMotd();
+
+                status.server.average_tick_time_ms = minecraftServer.getAverageTickTime();
+                long[] tickTimes = minecraftServer.getTickTimes();
+                if (tickTimes != null && tickTimes.length > 0) {
+                    long[] recentTicksCopy = Arrays.copyOf(tickTimes, tickTimes.length);
+                    status.server.recent_tick_samples_ms = Arrays.stream(recentTicksCopy)
+                            .mapToDouble(tick -> tick / 1000000.0)
+                            .boxed()
+                            .collect(Collectors.toList());
+                } else {
+                    status.server.recent_tick_samples_ms = Collections.emptyList();
                 }
 
-                status.add("server", serverInfo);
 
                 sendResponse(exchange, 200, GSON.toJson(status).getBytes(StandardCharsets.UTF_8), "application/json");
+                PlayerTimeMod.LOGGER.debug("[在线时间] API /api/server-status 请求成功。");
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 无法获取服务器状态", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/server-status 请求失败", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
 
-        // 原始数据文件
+        // API: 获取原始玩家数据文件内容，建议最好别公开
         server.createContext("/api/playerdata", exchange -> {
             handleCors(exchange);
             if ("OPTIONS".equals(exchange.getRequestMethod())) {
-                exchange.sendResponseHeaders(204, -1); // 204 No Content
+                exchange.sendResponseHeaders(204, -1);
                 return;
             }
 
@@ -553,7 +302,86 @@ public class WebServer {
                 PlayerTimeMod.LOGGER.error("[在线时间] 读取玩家数据文件时出错", e);
                 sendResponse(exchange, 500, "Error reading data file");
             } catch (Exception e) {
-                PlayerTimeMod.LOGGER.error("[在线时间] 处理玩家数据文件请求时发生未知错误", e);
+                PlayerTimeMod.LOGGER.error("[在线时间] 处理 /api/playerdata 请求时发生未知错误", e);
+                sendResponse(exchange, 500, "Internal Server Error");
+            }
+        });
+
+
+        // 静态文件服务
+        server.createContext("/", exchange -> {
+            try {
+                String requestPath = exchange.getRequestURI().getPath();
+                String resourcePath = "assets/playertime/web" + requestPath;
+
+                if (requestPath.equals("/")) {
+                    resourcePath += "index.html";
+                }
+
+                if (resourcePath.contains("..")) {
+                    sendResponse(exchange, 403, "Forbidden");
+                    return;
+                }
+
+                String finalResourcePath = resourcePath;
+                InputStream is = FabricLoader.getInstance().getModContainer("playertime")
+                        .flatMap(container -> container.findPath(finalResourcePath))
+                        .map(p -> {
+                            try {
+                                return p.toUri().toURL().openStream();
+                            } catch (Exception e) {
+                                return null;
+                            }
+                        })
+                        .orElse(null);
+
+
+                if (is == null) {
+                    if (!requestPath.equals("/") && !requestPath.contains(".")) {
+                        PlayerTimeMod.LOGGER.debug("[在线时间] 找不到静态资源：{}，尝试提供 index.html 作为 fallback。", resourcePath);
+                        resourcePath = "assets/playertime/web/index.html";
+                        String finalResourcePath1 = resourcePath;
+                        is = FabricLoader.getInstance().getModContainer("playertime")
+                                .flatMap(container -> container.findPath(finalResourcePath1))
+                                .map(p -> {
+                                    try {
+                                        return p.toUri().toURL().openStream();
+                                    } catch (Exception e) {
+                                        return null;
+                                    }
+                                })
+                                .orElse(null);
+                    }
+
+                    if (is == null) {
+                        PlayerTimeMod.LOGGER.warn("[在线时间] 找不到静态资源： {}", finalResourcePath);
+                        sendResponse(exchange, 404, "Not Found");
+                        return;
+                    }
+                }
+
+                String fileName = Paths.get(resourcePath).getFileName().toString();
+                String extension = "";
+                int dotIndex = fileName.lastIndexOf('.');
+                if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
+                    extension = fileName.substring(dotIndex + 1).toLowerCase();
+                }
+                String contentType = MIME_TYPES.getOrDefault(extension, "application/octet-stream");
+
+                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+                byte[] data = new byte[4096];
+                int nRead;
+                while ((nRead = is.read(data, 0, data.length)) != -1) {
+                    buffer.write(data, 0, nRead);
+                }
+                buffer.flush();
+                is.close();
+
+                sendResponse(exchange, 200, buffer.toByteArray(), contentType);
+                PlayerTimeMod.LOGGER.debug("[在线时间] 提供静态文件： {}", resourcePath);
+
+            } catch (Exception e) {
+                PlayerTimeMod.LOGGER.error("[在线时间] 无法提供静态资源", e);
                 sendResponse(exchange, 500, "Internal Server Error");
             }
         });
@@ -562,12 +390,14 @@ public class WebServer {
         server.setExecutor(executor);
     }
 
+    // 跨域处理
     private void handleCors(HttpExchange exchange) {
         exchange.getResponseHeaders().add("Access-Control-Allow-Origin", "*");
         exchange.getResponseHeaders().add("Access-Control-Allow-Methods", "GET, OPTIONS");
         exchange.getResponseHeaders().add("Access-Control-Allow-Headers", "Content-Type");
     }
 
+    // 发送响应
     private void sendResponse(HttpExchange exchange, int code, String response) throws IOException {
         sendResponse(exchange, code, response.getBytes(StandardCharsets.UTF_8), "text/plain");
     }
@@ -580,16 +410,26 @@ public class WebServer {
         }
     }
 
+    // 启动
     public void start() {
         server.start();
     }
 
+    // 停止
     public void stop() {
-        server.stop(0);
+        server.stop(3);
         executor.shutdown();
+        try {
+            if (!executor.awaitTermination(5, TimeUnit.SECONDS)) {
+                executor.shutdownNow(); // 强制关闭
+            }
+        } catch (InterruptedException e) {
+            executor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
     }
 
-
+    // 格式化时间
     private String formatUptime(long millis) {
         long seconds = millis / 1000;
         long days = seconds / 86400;
@@ -599,6 +439,12 @@ public class WebServer {
         long minutes = seconds / 60;
         seconds %= 60;
 
-        return String.format("%d天 %02d小时 %02d分钟 %02d秒", days, hours, minutes, seconds);
+        StringBuilder sb = new StringBuilder();
+        if (days > 0) sb.append(days).append("天 ");
+        if (hours > 0 || days > 0) sb.append(String.format("%02d小时 ", hours));
+        if (minutes > 0 || hours > 0 || days > 0) sb.append(String.format("%02d分钟 ", minutes));
+        sb.append(String.format("%02d秒", seconds));
+
+        return sb.toString().trim();
     }
 }
diff --git a/src/main/java/com/example/playertime/api/OnlinePlayersResponse.java b/src/main/java/com/example/playertime/api/OnlinePlayersResponse.java
new file mode 100644
index 0000000..3e135c8
--- /dev/null
+++ b/src/main/java/com/example/playertime/api/OnlinePlayersResponse.java
@@ -0,0 +1,19 @@
+package com.example.playertime.api;
+
+import java.util.List;
+import java.util.Map;
+
+// 用于 /api/online-players 接口返回的在线玩家列表数据结构
+public class OnlinePlayersResponse {
+    public List<Map<String, String>> whitelisted;
+    public List<Map<String, String>> non_whitelisted;
+
+    // Gson 需要一个无参构造函数
+    @SuppressWarnings("unused")
+    private OnlinePlayersResponse() {}
+
+    public OnlinePlayersResponse(List<Map<String, String>> whitelisted, List<Map<String, String>> non_whitelisted) {
+        this.whitelisted = whitelisted;
+        this.non_whitelisted = non_whitelisted;
+    }
+}
diff --git a/src/main/java/com/example/playertime/api/PlayerCountResponse.java b/src/main/java/com/example/playertime/api/PlayerCountResponse.java
new file mode 100644
index 0000000..5eef9eb
--- /dev/null
+++ b/src/main/java/com/example/playertime/api/PlayerCountResponse.java
@@ -0,0 +1,18 @@
+package com.example.playertime.api;
+
+// 用于 /api/player-count 接口返回的玩家数量数据结构
+public class PlayerCountResponse {
+    public int total;
+    public int whitelisted;
+    public int non_whitelisted;
+
+    // Gson 需要一个无参构造函数
+    @SuppressWarnings("unused")
+    private PlayerCountResponse() {}
+
+    public PlayerCountResponse(int total, int whitelisted, int non_whitelisted) {
+        this.total = total;
+        this.whitelisted = whitelisted;
+        this.non_whitelisted = non_whitelisted;
+    }
+}
diff --git a/src/main/java/com/example/playertime/api/PlayerStatsResponse.java b/src/main/java/com/example/playertime/api/PlayerStatsResponse.java
new file mode 100644
index 0000000..afb950b
--- /dev/null
+++ b/src/main/java/com/example/playertime/api/PlayerStatsResponse.java
@@ -0,0 +1,28 @@
+package com.example.playertime.api;
+
+// 用于 /api/stats 接口返回的玩家统计数据结构
+public class PlayerStatsResponse {
+    public String playerName;
+    public String uuid;
+    public long totalTimeSeconds; // 总时长（秒）
+    public String totalTimeFormatted; // 总时长（格式化字符串）
+    public long last30DaysSeconds; // 30天时长（秒）
+    public String last30DaysFormatted; // 30天时长（格式化字符串）
+    public long last7DaysSeconds; // 7天时长（秒）
+    public String last7DaysFormatted; // 7天时长（格式化字符串）
+
+    // Gson 需要一个无参构造函数
+    @SuppressWarnings("unused")
+    private PlayerStatsResponse() {}
+
+    public PlayerStatsResponse(String playerName, String uuid, long totalTimeSeconds, String totalTimeFormatted, long last30DaysSeconds, String last30DaysFormatted, long last7DaysSeconds, String last7DaysFormatted) {
+        this.playerName = playerName;
+        this.uuid = uuid;
+        this.totalTimeSeconds = totalTimeSeconds;
+        this.totalTimeFormatted = totalTimeFormatted;
+        this.last30DaysSeconds = last30DaysSeconds;
+        this.last30DaysFormatted = last30DaysFormatted;
+        this.last7DaysSeconds = last7DaysSeconds;
+        this.last7DaysFormatted = last7DaysFormatted;
+    }
+}
diff --git a/src/main/java/com/example/playertime/api/ServerStatusResponse.java b/src/main/java/com/example/playertime/api/ServerStatusResponse.java
new file mode 100644
index 0000000..acaa47b
--- /dev/null
+++ b/src/main/java/com/example/playertime/api/ServerStatusResponse.java
@@ -0,0 +1,37 @@
+package com.example.playertime.api;
+
+import java.util.List;
+
+// 用于 /api/server-status 接口返回的服务器状态数据结构
+public class ServerStatusResponse {
+    public MemoryStats memory = new MemoryStats();
+    public DiskStats disk = new DiskStats();
+    public int available_processors;
+    public long uptime; // 秒
+    public String uptime_formatted;
+    public ServerInfo server = new ServerInfo();
+
+    public static class MemoryStats {
+        public long max; // 字节
+        public long total; // 字节
+        public long used; // 字节
+        public long free; // 字节
+        public double usage_percentage;
+    }
+
+    public static class DiskStats {
+        public long total; // 字节
+        public long free; // 字节
+        public long usable; // 字节
+        public double usage_percentage;
+    }
+
+    public static class ServerInfo {
+        public String version;
+        public String motd;
+        public int player_count;
+        public int max_players;
+        public double average_tick_time_ms; // 平均 MSPT
+        public List<Double> recent_tick_samples_ms; // 最近 Tick 样本 (毫秒)
+    }
+}
diff --git a/src/main/java/com/example/playertime/api/WhitelistResponse.java b/src/main/java/com/example/playertime/api/WhitelistResponse.java
new file mode 100644
index 0000000..53fc6a8
--- /dev/null
+++ b/src/main/java/com/example/playertime/api/WhitelistResponse.java
@@ -0,0 +1,18 @@
+package com.example.playertime.api;
+
+// 用于 /api/whitelist 接口返回的白名单列表数据结构
+public class WhitelistResponse {
+    public String name;
+    public String uuid;
+    public boolean online;
+
+    // Gson 需要一个无参构造函数
+    @SuppressWarnings("unused")
+    private WhitelistResponse() {}
+
+    public WhitelistResponse(String name, String uuid, boolean online) {
+        this.name = name;
+        this.uuid = uuid;
+        this.online = online;
+    }
+}
diff --git a/src/main/resources/assets/playertime/lang/en_us.json b/src/main/resources/assets/playertime/lang/en_us.json
index 2715902..190f47b 100644
--- a/src/main/resources/assets/playertime/lang/en_us.json
+++ b/src/main/resources/assets/playertime/lang/en_us.json
@@ -7,6 +7,9 @@
   "playertime.stats.total": "Total Time",
   "playertime.stats.30day": "Last 30 Days",
   "playertime.stats.7day": "Last 7 Days",
+  "playertime.command.empty_stats": "No player online time data available.",
+  "playertime.command.error.not_initialized": "Player Time Mod is not fully initialized, please try again later.",
+  "playertime.command.error.player_only": "This command can only be executed by a player.",
 
   "playertime.web.title": "Player online and status statistics",
   "playertime.web.warning": "Data tracking starts from the mod installation time and does not include any data before installation.",
@@ -27,6 +30,17 @@
   "playertime.web.server_status.memory_percent": "Usage",
   "playertime.web.server_status.performance": "Real-time Performance",
   "playertime.web.server_status.uptime": "Server Uptime",
+  "playertime.web.server_status.disk_usage": "Disk Usage",
+  "playertime.web.server_status.disk_used": "Used",
+  "playertime.web.server_status.disk_free": "Free",
+  "playertime.web.server_status.disk_percent": "Usage",
+  "playertime.web.server_status.processors": "Processors",
+  "playertime.web.server_status.server_version": "Server Version",
+  "playertime.web.server_status.player_count": "Online Players",
+  "playertime.web.server_status.disk_total": "Total",
+  "playertime.web.server_status.motd": "MOTD",
+  "playertime.web.server_status.not_available": "N/A",
+
 
   "playertime.web.stats_table.title": "Player Online Time (Whitelist)",
   "playertime.web.stats_table.info": "Only tracks and displays whitelisted players.",
@@ -35,22 +49,17 @@
   "playertime.web.stats_table.header.last_30_days": "Last 30 Days",
   "playertime.web.stats_table.header.last_7_days": "Last 7 Days",
   "playertime.web.stats_table.empty": "No player data available",
+
   "playertime.web.chart.memory_used": "Used",
   "playertime.web.chart.memory_free": "Free",
   "playertime.web.chart.tps": "TPS",
   "playertime.web.chart.mspt": "MSPT",
+  "playertime.web.chart.disk_used": "Used",
+  "playertime.web.chart.disk_free": "Free",
 
   "playertime.web.refresh_button": "Refresh",
 
   "playertime.web.error.load_failed": "Failed to load data, check console",
 
-  "playertime.web.server_status.disk_usage": "Disk Usage",
-  "playertime.web.server_status.disk_used": "Used",
-  "playertime.web.server_status.disk_free": "Free",
-  "playertime.web.server_status.disk_percent": "Usage",
-  "playertime.web.server_status.processors": "Processors",
-  "playertime.web.server_status.server_version": "Server Version",
-  "playertime.web.server_status.disk_total": "Total",
-  "playertime.web.chart.disk_used": "Used",
-  "playertime.web.chart.disk_free": "Free"
+  "playertime.web.footer.license": "This project is open source under the GPL3 license"
 }
diff --git a/src/main/resources/assets/playertime/lang/zh_cn.json b/src/main/resources/assets/playertime/lang/zh_cn.json
index 2ede6e0..b038040 100644
--- a/src/main/resources/assets/playertime/lang/zh_cn.json
+++ b/src/main/resources/assets/playertime/lang/zh_cn.json
@@ -7,6 +7,10 @@
   "playertime.stats.total": "总时长",
   "playertime.stats.30day": "30天",
   "playertime.stats.7day": "7天",
+  "playertime.command.empty_stats": "暂无玩家在线时间数据。",
+  "playertime.command.error.not_initialized": "在线时间Mod未完全初始化，请稍后再试。",
+  "playertime.command.error.player_only": "此命令只能由玩家执行。",
+
 
   "playertime.web.title": "玩家在线及状态统计",
   "playertime.web.warning": "数据统计时间开始于此MOD安装时间，不包含安装之前的所有数据",
@@ -27,6 +31,17 @@
   "playertime.web.server_status.memory_percent": "使用率",
   "playertime.web.server_status.performance": "实时性能",
   "playertime.web.server_status.uptime": "服务器运行时间",
+  "playertime.web.server_status.disk_usage": "磁盘使用",
+  "playertime.web.server_status.disk_used": "已用",
+  "playertime.web.server_status.disk_free": "可用",
+  "playertime.web.server_status.disk_percent": "使用率",
+  "playertime.web.server_status.processors": "处理器核心",
+  "playertime.web.server_status.server_version": "服务器版本",
+  "playertime.web.server_status.player_count": "在线玩家",
+  "playertime.web.server_status.disk_total": "总量",
+  "playertime.web.server_status.motd": "MOTD",
+  "playertime.web.server_status.not_available": "N/A",
+
 
   "playertime.web.stats_table.title": "玩家在线时长 (白名单)",
   "playertime.web.stats_table.info": "仅跟踪和显示列入白名单的玩家",
@@ -35,22 +50,18 @@
   "playertime.web.stats_table.header.last_30_days": "最近 30 天",
   "playertime.web.stats_table.header.last_7_days": "最近 7 天",
   "playertime.web.stats_table.empty": "暂无玩家数据",
+
   "playertime.web.chart.memory_used": "已使用",
   "playertime.web.chart.memory_free": "未使用",
   "playertime.web.chart.tps": "TPS",
   "playertime.web.chart.mspt": "MSPT",
+  "playertime.web.chart.disk_used": "已用",
+  "playertime.web.chart.disk_free": "可用",
+
 
   "playertime.web.refresh_button": "刷新数据",
 
   "playertime.web.error.load_failed": "加载数据失败，请检查控制台",
 
-  "playertime.web.server_status.disk_usage": "磁盘使用",
-  "playertime.web.server_status.disk_used": "已用",
-  "playertime.web.server_status.disk_free": "可用",
-  "playertime.web.server_status.disk_percent": "使用率",
-  "playertime.web.server_status.processors": "处理器核心",
-  "playertime.web.server_status.server_version": "服务器版本",
-  "playertime.web.server_status.disk_total": "总量",
-  "playertime.web.chart.disk_used": "已用",
-  "playertime.web.chart.disk_free": "可用"
+  "playertime.web.footer.license": "本项目基于 GPL3许可证 开源"
 }
diff --git a/src/main/resources/assets/playertime/web/css/style.css b/src/main/resources/assets/playertime/web/css/style.css
index d5211c5..cbad783 100644
--- a/src/main/resources/assets/playertime/web/css/style.css
+++ b/src/main/resources/assets/playertime/web/css/style.css
@@ -1,3 +1,4 @@
+
 :root {
   --primary-color: #4361ee;
   --primary-hover: #3a56d4;
@@ -5,14 +6,37 @@
   --bg-color: #f8f9fa;
   --card-bg: #ffffff;
   --border-color: #e9ecef;
-  --shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
   --hover-bg: #f1f3f5;
-  --even-row: #f8f9fa;
+  --success-color: #4CAF50;
+  --warning-color: #FFC107;
+  --danger-color: #FF5722;
+
+  --accent-blue: #4361ee;
+  --accent-green: #4CAF50;
+  --accent-purple: #9c27b0;
+  --accent-orange: #FF9800;
+
+
+  --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
+  --shadow-md: 0 4px 6px rgba(0, 0, 0, 0.08);
+  --shadow-lg: 0 10px 15px rgba(0, 0, 0, 0.1);
+
+
+  --radius-sm: 4px;
+  --radius-md: 8px;
+  --radius-lg: 12px;
+  --radius-xl: 16px;
+  --radius-full: 999px;
+
+
+  --spacing-xs: 4px;
+  --spacing-sm: 8px;
+  --spacing-md: 16px;
+  --spacing-lg: 24px;
+  --spacing-xl: 32px;
+
+
   --transition: all 0.3s ease;
-  --status-card-bg: #ffffff;
-  --status-card-text: #2b2d42;
-  --primary-color-c: #3252df;
-  --warning-text-color: #ff0800;
 }
 
 [data-theme="dark"] {
@@ -22,117 +46,82 @@
   --bg-color: #121212;
   --card-bg: #1e1e1e;
   --border-color: #333;
-  --shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
   --hover-bg: #2d2d2d;
-  --even-row: #252525;
-  --status-card-bg: #252525;
-  --status-card-text: #f8f9fa;
-  --primary-color-c: #5878fa;
-  --warning-text-color: #ff423c;
+  --success-color: #66BB6A;
+  --warning-color: #FFEE58;
+  --danger-color: #FF8A65;
+}
+
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
 }
 
 body {
-  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-  margin: 0;
-  padding: 0;
+  font-family: 'Segoe UI', 'Microsoft YaHei', sans-serif;
   background-color: var(--bg-color);
   color: var(--text-color);
+  line-height: 1.6;
   transition: var(--transition);
+}
+
+.app-container {
+  display: flex;
+  flex-direction: column;
   min-height: 100vh;
-}
-
-.container {
-  max-width: 1200px;
+  max-width: 1400px;
   margin: 0 auto;
-  padding: 2rem 1.5rem;
 }
 
-.header {
+.navbar {
+  background-color: var(--card-bg);
+  box-shadow: var(--shadow-md);
+  padding: var(--spacing-md) 0;
+  position: sticky;
+  top: 0;
+  z-index: 100;
+}
+
+.navbar-content {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 2rem;
+  max-width: 1400px;
+  margin: 0 auto;
+  padding: 0 var(--spacing-lg);
+  border-radius: 0 0 var(--radius-lg) var(--radius-lg);
 }
 
-h1 {
-  color: var(--primary-color-c);
-  margin: 0;
-  font-size: 2rem;
+.app-title {
+  font-size: 1.5rem;
   font-weight: 600;
-}
-
-.controls {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 1.5rem;
-  flex-wrap: wrap;
-  gap: 1rem;
-}
-
-.info-note {
+  color: var(--primary-color);
   margin: 0;
-  color: var(--text-color);
-  opacity: 0.8;
-  font-size: 0.9rem;
-}
-
-button {
-  transition: var(--transition);
-  cursor: pointer;
-  border: none;
-  border-radius: 8px;
-  font-weight: 500;
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.refresh-btn {
-  background-color: var(--primary-color);
-  color: white;
-  padding: 0.75rem 1.25rem;
-  font-size: 1rem;
-}
-
-.refresh-btn:hover {
-  background-color: var(--primary-hover);
-  transform: translateY(-1px);
-}
-
-.refresh-btn:active {
-  transform: translateY(0);
-}
-
-.refresh-btn i {
-  transition: transform 0.5s ease;
-}
-
-.refresh-btn.loading i {
-  transform: rotate(360deg);
 }
 
 .theme-toggle {
   background: transparent;
   color: var(--text-color);
-  font-size: 1.25rem;
-  padding: 0.5rem;
-  position: relative;
-  width: 3rem;
-  height: 3rem;
+  border: none;
+  cursor: pointer;
+  width: 40px;
+  height: 40px;
   border-radius: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
+  transition: var(--transition);
 }
 
 .theme-toggle:hover {
   background-color: var(--hover-bg);
 }
 
-.theme-toggle i {
+.theme-icon {
   position: absolute;
   transition: opacity 0.3s ease, transform 0.3s ease;
+  font-size: 1.2rem;
 }
 
 .theme-toggle .fa-moon {
@@ -150,30 +139,389 @@ button {
   transform: scale(0.8);
 }
 
-.stats-container {
+.main-content {
+  flex: 1;
+  padding: var(--spacing-lg);
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-lg);
+}
+
+.dashboard-section {
   background-color: var(--card-bg);
-  border-radius: 12px;
-  box-shadow: var(--shadow);
+  border-radius: var(--radius-xl);
+  box-shadow: var(--shadow-md);
   overflow: hidden;
   transition: var(--transition);
 }
 
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--spacing-md) var(--spacing-lg);
+  border-bottom: 1px solid var(--border-color);
+}
+
+.section-header h2 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: var(--text-color);
+  margin: 0;
+}
+
+.uptime-display {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+  font-size: 0.9rem;
+  color: var(--text-color);
+  opacity: 0.8;
+}
+
+.notification {
+  padding: var(--spacing-md) var(--spacing-lg);
+  border-radius: var(--radius-md);
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+  font-size: 0.9rem;
+}
+
+.notification.warning {
+  background-color: rgba(255, 193, 7, 0.1);
+  color: var(--warning-color);
+  border-left: 4px solid var(--warning-color);
+}
+
+.stats-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+  gap: var(--spacing-md);
+  padding: var(--spacing-lg);
+}
+
+.stat-card {
+  background-color: var(--card-bg);
+  border-radius: var(--radius-lg);
+  padding: var(--spacing-lg);
+  transition: var(--transition);
+  display: flex;
+  flex-direction: column;
+  border: 1px solid var(--border-color);
+}
+
+.stat-card.accent-blue {
+  border-top: 4px solid var(--accent-blue);
+}
+
+.stat-card.accent-green {
+  border-top: 4px solid var(--accent-green);
+}
+
+.stat-card.accent-purple {
+  border-top: 4px solid var(--accent-purple);
+}
+
+.stat-header {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+  margin-bottom: var(--spacing-md);
+}
+
+.stat-header i {
+  color: var(--primary-color);
+  font-size: 1.2rem;
+}
+
+.stat-header h3 {
+  font-size: 1rem;
+  font-weight: 600;
+  margin: 0;
+}
+
+.stat-content {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-md);
+}
+
+.stat-icon {
+  width: 48px;
+  height: 48px;
+  border-radius: var(--radius-md);
+  background-color: rgba(67, 97, 238, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--primary-color);
+  font-size: 1.5rem;
+}
+
+.stat-value {
+  font-size: 2rem;
+  font-weight: 700;
+  line-height: 1;
+}
+
+.stat-label {
+  font-size: 0.9rem;
+  color: var(--text-color);
+  opacity: 0.8;
+}
+
+.player-lists-container {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  gap: var(--spacing-md);
+  padding: 0 var(--spacing-lg) var(--spacing-lg);
+}
+
+.player-list-card {
+  background-color: var(--card-bg);
+  border-radius: var(--radius-lg);
+  border: 1px solid var(--border-color);
+  overflow: hidden;
+}
+
+.player-list-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--spacing-md) var(--spacing-lg);
+  background-color: rgba(0, 0, 0, 0.02);
+  border-bottom: 1px solid var(--border-color);
+}
+
+.player-list-header h3 {
+  font-size: 1rem;
+  font-weight: 600;
+  margin: 0;
+}
+
+.player-count-badge {
+  background-color: var(--primary-color);
+  color: white;
+  font-size: 0.75rem;
+  font-weight: 600;
+  padding: 2px 8px;
+  border-radius: 12px;
+}
+
+.player-list {
+  list-style: none;
+  max-height: 300px;
+  overflow-y: auto;
+  padding: 0;
+  margin: 0;
+}
+
+.player-list li {
+  padding: var(--spacing-sm) var(--spacing-lg);
+  border-bottom: 1px solid var(--border-color);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  transition: var(--transition);
+}
+
+.player-list li:last-child {
+  border-bottom: none;
+}
+
+.player-list li:hover {
+  background-color: var(--hover-bg);
+}
+
+.player-name {
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+}
+
+.player-name::before {
+  content: "";
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background-color: var(--success-color);
+}
+
+.server-stats-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  gap: var(--spacing-md);
+  padding: 0 var(--spacing-lg) var(--spacing-md);
+}
+
+.performance-card {
+  background-color: var(--card-bg);
+  border-radius: var(--radius-lg);
+  border: 1px solid var(--border-color);
+  margin: 0 var(--spacing-lg) var(--spacing-lg);
+  padding: var(--spacing-lg);
+}
+
+.performance-content {
+  display: flex;
+  flex-direction: column;
+}
+
+.performance-metrics {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+  gap: var(--spacing-md);
+  margin-bottom: var(--spacing-lg);
+}
+
+.metric-card {
+  background-color: rgba(0, 0, 0, 0.03);
+  border-radius: var(--radius-md);
+  padding: var(--spacing-md);
+  text-align: center;
+}
+
+.metric-label {
+  font-size: 0.9rem;
+  color: var(--text-color);
+  opacity: 0.8;
+  display: block;
+  margin-bottom: 4px;
+}
+
+.metric-value {
+  font-size: 1.5rem;
+  font-weight: 700;
+}
+
+.chart-container {
+  position: relative;
+  height: 250px;
+  width: 100%;
+}
+
+.server-info {
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-sm);
+}
+
+.info-item {
+  display: flex;
+  justify-content: space-between;
+  padding: var(--spacing-sm) 0;
+  border-bottom: 1px solid var(--border-color);
+}
+
+.info-item:last-child {
+  border-bottom: none;
+}
+
+.info-item span:first-child {
+  font-weight: 500;
+}
+
+.info-item span:last-child {
+  color: var(--primary-color);
+  font-weight: 600;
+}
+
+.memory-stats {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: var(--spacing-sm);
+}
+
+.memory-stat {
+  font-size: 0.9rem;
+  display: flex;
+  justify-content: space-between;
+}
+
+.section-actions {
+  display: flex;
+  gap: var(--spacing-sm);
+}
+
+.fluent-button {
+  border: none;
+  border-radius: var(--radius-md);
+  padding: 8px 16px;
+  font-weight: 500;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  transition: var(--transition);
+}
+
+.fluent-button.primary {
+  background-color: var(--primary-color);
+  color: white;
+}
+
+.fluent-button.primary:hover {
+  background-color: var(--primary-hover);
+  transform: translateY(-2px);
+}
+
+.fluent-button.floating {
+  width: 56px;
+  height: 56px;
+  border-radius: 50%;
+  box-shadow: var(--shadow-lg);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  position: fixed;
+  bottom: 30px;
+  right: 30px;
+  z-index: 1000;
+}
+
+.fluent-button.floating:hover {
+  transform: scale(1.1) translateY(-2px);
+  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
+}
+
+.info-note {
+  padding: 0 var(--spacing-lg) var(--spacing-md);
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+  font-size: 0.9rem;
+  color: var(--text-color);
+  opacity: 0.8;
+}
+
+.table-container {
+  padding: 0 var(--spacing-lg) var(--spacing-lg);
+  overflow-x: auto;
+}
+
 table {
   width: 100%;
   border-collapse: collapse;
-}
-
-th, td {
-  padding: 1rem 1.5rem;
-  text-align: left;
-  border-bottom: 1px solid var(--border-color);
-  transition: var(--transition);
+  border-radius: var(--radius-md);
+  overflow: hidden;
+  box-shadow: var(--shadow-sm);
 }
 
 th {
   background-color: var(--primary-color);
   color: white;
-  font-weight: 500;
+  padding: var(--spacing-md) var(--spacing-lg);
+  text-align: left;
+  font-weight: 600;
+}
+
+td {
+  padding: var(--spacing-md) var(--spacing-lg);
+  border-bottom: 1px solid var(--border-color);
 }
 
 tr {
@@ -184,8 +532,38 @@ tr:hover {
   background-color: var(--hover-bg);
 }
 
-tr:nth-child(even) {
-  background-color: var(--even-row);
+tbody tr:nth-child(even) {
+  background-color: rgba(0, 0, 0, 0.02);
+}
+
+.footer {
+  background-color: var(--card-bg);
+  padding: var(--spacing-lg) 0;
+  margin-top: auto;
+  border-top: 1px solid var(--border-color);
+}
+
+.footer-content {
+  max-width: 1400px;
+  margin: 0 auto;
+  padding: 0 var(--spacing-lg);
+  border-radius: var(--radius-lg) var(--radius-lg) 0 0;
+}
+
+.license-info {
+  text-align: center;
+  color: var(--text-color);
+  opacity: 0.8;
+  font-size: 0.85rem;
+}
+
+.footer a {
+  color: var(--primary-color);
+  text-decoration: none;
+}
+
+.footer a:hover {
+  text-decoration: underline;
 }
 
 @keyframes fadeIn {
@@ -198,516 +576,231 @@ tbody tr {
   opacity: 0;
 }
 
-tbody tr:nth-child(1) { animation-delay: 0.05s; }
-tbody tr:nth-child(2) { animation-delay: 0.1s; }
-tbody tr:nth-child(3) { animation-delay: 0.15s; }
-tbody tr:nth-child(4) { animation-delay: 0.2s; }
-tbody tr:nth-child(5) { animation-delay: 0.25s; }
-tbody tr:nth-child(6) { animation-delay: 0.3s; }
-tbody tr:nth-child(7) { animation-delay: 0.35s; }
-tbody tr:nth-child(8) { animation-delay: 0.4s; }
-tbody tr:nth-child(9) { animation-delay: 0.45s; }
-tbody tr:nth-child(10) { animation-delay: 0.5s; }
+@media (min-width: 992px) {
 
-@media (max-width: 768px) {
-  .container {
-    padding: 1.5rem 1rem;
-  }
-
-  th, td {
-    padding: 0.75rem 1rem;
-  }
-
-  table {
-    display: block;
-    overflow-x: auto;
-  }
-}
-
-.status-cards {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-  gap: 1.5rem;
-  margin-bottom: 2rem;
-}
-
-.status-card {
-  background-color: var(--status-card-bg);
-  color: var(--status-card-text);
-  border-radius: 12px;
-  padding: 1.5rem;
-  box-shadow: var(--shadow);
-  transition: var(--transition);
-}
-
-.status-card h3 {
-  margin-top: 0;
-  margin-bottom: 1rem;
-  color: var(--primary-color-c);
-  font-size: 1.1rem;
-}
-
-.online-count {
-  font-size: 2rem;
-  font-weight: 600;
-  color: var(--status-card-text);
-}
-
-.online-players,
-.top-players {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.online-players li,
-.top-players li {
-  padding: 0.5rem 0;
-  border-bottom: 1px solid var(--border-color);
-  display: flex;
-  justify-content: space-between;
-}
-
-.online-players li:last-child,
-.top-players li:last-child {
-  border-bottom: none;
-}
-
-.player-name {
-  font-weight: 500;
-}
-
-.player-time {
-  color: var(--primary-color-c);
-  opacity: 0.8;
-}
-
-.warning {
-  color: var(--warning-text-color);
-  margin: 0;
-}
-
-@media (max-width: 600px) and (orientation: portrait) {
-  .container {
-    padding: 1rem 0.75rem;
-  }
-
-  h1 {
-    font-size: 1.5rem;
-  }
-
-  .header {
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 1rem;
-    margin-bottom: 1.5rem;
-  }
-
-  .status-cards {
-    grid-template-columns: 1fr;
-    gap: 1rem;
-  }
-
-  .status-card {
-    padding: 1rem;
-  }
-
-  .online-count {
-    font-size: 1.75rem;
-  }
-
-  table {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch;
-  }
-
-  th, td {
-    padding: 0.5rem;
-    font-size: 0.85rem;
-    white-space: nowrap;
-  }
-
-  .controls {
-    flex-direction: column;
+  .performance-content {
+    flex-direction: row;
     align-items: flex-start;
   }
 
-  .refresh-btn {
-    width: 100%;
-    justify-content: center;
-    padding: 0.5rem;
-  }
-
-  .warning {
-    font-size: 0.85rem;
-    margin-bottom: 0.5rem;
-  }
-
-  th:nth-child(1), td:nth-child(1) {
-    min-width: 100px;
-  }
-
-  th:nth-child(2), td:nth-child(2),
-  th:nth-child(3), td:nth-child(3),
-  th:nth-child(4), td:nth-child(4) {
-    min-width: 80px;
-  }
-}
-
-@media (max-width: 400px) {
-  .container {
-    padding: 1rem 0.5rem;
-  }
-
-  h1 {
-    font-size: 1.3rem;
-  }
-
-  .status-card h3 {
-    font-size: 1rem;
-  }
-
-  .player-name, .player-time {
-    font-size: 0.9rem;
-  }
-}
-
-.loading-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0,0,0,0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 1000;
-  display: none;
-}
-
-.loading-overlay.active {
-  display: flex;
-}
-
-.loading-spinner {
-  width: 50px;
-  height: 50px;
-  border: 5px solid rgba(255,255,255,0.3);
-  border-radius: 50%;
-  border-top-color: var(--primary-color);
-  animation: spin 1s ease-in-out infinite;
-}
-
-@keyframes spin {
-  to { transform: rotate(360deg); }
-}
-
-.license-footer {
-  margin-top: 3rem;
-  padding: 1.5rem 0;
-  text-align: center;
-  color: var(--text-color);
-  opacity: 0.8;
-  font-size: 0.85rem;
-  border-top: 1px solid var(--border-color);
-}
-
-.license-footer a {
-  color: var(--primary-color-c);
-  text-decoration: none;
-}
-
-.license-footer a:hover {
-  text-decoration: underline;
-}
-
-@media (max-width: 768px) {
-  .license-footer {
-    margin-top: 2rem;
-    padding: 1rem 0;
-    font-size: 0.8rem;
-  }
-}
-
-.player-counts {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-
-.count-item {
-  display: flex;
-  justify-content: space-between;
-}
-
-.count-label {
-  font-weight: 500;
-}
-
-.count-value {
-  color: var(--primary-color-c);
-}
-
-.player-lists {
-  display: flex;
-  gap: 20px;
-}
-
-.player-list {
-  flex: 1;
-}
-
-.player-list h4 {
-  margin-bottom: 8px;
-  color: var(--primary-color-c);
-}
-
-.status-section {
-  margin: 2rem 0;
-}
-
-.status-grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 20px;
-  margin-top: 1rem;
-}
-
-@media (max-width: 768px) {
-  .status-grid {
-    grid-template-columns: 1fr;
-  }
-
-  .player-lists {
-    flex-direction: column;
-  }
-}
-
-.status-item {
-  background: var(--card-bg);
-  padding: 1rem;
-  border-radius: 8px;
-  box-shadow: var(--shadow);
-}
-
-.status-item h3 {
-  margin-top: 0;
-  color: var(--primary-color-c);
-}
-
-.memory-stats, .performance-stats {
-  margin-top: 1rem;
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 8px;
-}
-
-.memory-stats div, .performance-stats div {
-  font-size: 0.9rem;
-}
-
-canvas {
-  max-height: 300px;
-  width: 100% !important;
-}
-
-.error-message {
-  position: fixed;
-  top: 20px;
-  left: 50%;
-  transform: translateX(-50%);
-  background: #ff4444;
-  color: white;
-  padding: 10px 20px;
-  border-radius: 5px;
-  opacity: 0;
-  transition: opacity 0.3s;
-  z-index: 1000;
-}
-
-.error-message.show {
-  opacity: 1;
-}
-
-.performance-metrics {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 15px;
-  margin-bottom: 15px;
-}
-
-.metric {
-  background: var(--card-bg);
-  padding: 10px;
-  border-radius: 8px;
-  box-shadow: var(--shadow);
-}
-
-.metric-label {
-  font-weight: bold;
-  display: block;
-  margin-bottom: 5px;
-  color: var(--primary-color-c);
-}
-
-.metric-value {
-  font-size: 1.5rem;
-  font-family: monospace;
-}
-
-@media (max-width: 600px) {
   .performance-metrics {
-    grid-template-columns: 1fr;
+    flex: 0 0 200px;
+    margin-right: var(--spacing-lg);
+    margin-bottom: 0;
+  }
+
+  .chart-container {
+    flex: 1;
+    height: 200px;
   }
 }
 
-
-.chart-container {
-  display: flex;
-  flex-direction: column;
-  gap: 15px;
-}
-
-.chart-wrapper {
-  position: relative;
-  height: 300px; /* 固定高度 */
-  width: 100%;
-}
-
-.metric-display {
-  display: flex;
-  gap: 20px;
-  justify-content: center;
-}
-
-.metric {
-  background: var(--card-bg);
-  padding: 12px 20px;
-  border-radius: 8px;
-  box-shadow: var(--shadow);
-  min-width: 120px;
-  text-align: center;
-}
-
-.metric-label {
-  font-weight: bold;
-  display: block;
-  margin-bottom: 5px;
-  color: var(--primary-color-c);
-  font-size: 0.9rem;
-}
-
-.metric-value {
-  font-size: 1.8rem;
-  font-family: monospace;
-  font-weight: bold;
-}
-
-@media (max-width: 768px) {
-  .chart-wrapper {
-    height: 250px;
+@media (max-width: 992px) {
+  .main-content {
+    padding: var(--spacing-md);
   }
 
-  .metric-display {
+  .navbar-content {
+    padding: 0 var(--spacing-md);
+  }
+
+  .performance-content {
     flex-direction: column;
-    gap: 10px;
   }
 
-  .metric {
-    padding: 10px 15px;
+  .performance-metrics {
+    width: 100%;
+    margin-bottom: var(--spacing-lg);
   }
 }
 
-.server-info-stats div {
-  padding: 5px 0;
-  border-bottom: 1px solid var(--border-color);
-}
-
-.server-info-stats div:last-child {
-  border-bottom: none;
-}
-
-.status-grid {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-  gap: 20px;
-  margin-top: 1rem;
-}
-
 @media (max-width: 768px) {
-  .status-grid {
+  .stats-grid,
+  .player-lists-container,
+  .server-stats-grid {
     grid-template-columns: 1fr;
   }
-}
 
-.floating-refresh-btn {
-  position: fixed;
-  bottom: 30px;
-  right: 30px;
-  z-index: 1000;
-  transition: transform 0.3s ease;
-}
+  .section-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: var(--spacing-sm);
+  }
 
-.refresh-btn.floating {
-  width: 56px;
-  height: 56px;
-  border-radius: 50%;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.2);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-}
+  .section-actions {
+    width: 100%;
+    justify-content: flex-end;
+  }
 
-.refresh-btn.floating i {
-  font-size: 1.5rem;
-}
-
-.refresh-btn.floating:hover {
-  transform: scale(1.1);
-  box-shadow: 0 6px 25px rgba(0, 0, 0, 0.3);
-}
-
-.refresh-btn.floating.loading i {
-  transition: transform 0.5s ease;
-}
-
-@keyframes spin {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(360deg); }
-}
-
-@media (max-width: 768px) {
-  .floating-refresh-btn {
+  .fluent-button.floating {
+    width: 48px;
+    height: 48px;
     bottom: 20px;
     right: 20px;
   }
-
-  .refresh-btn.floating {
-    width: 50px;
-    height: 50px;
-  }
 }
 
 @media (max-width: 480px) {
-  .floating-refresh-btn {
-    bottom: 15px;
-    right: 15px;
+  .stat-content {
+    flex-direction: column;
+    align-items: flex-start;
   }
 
-  .refresh-btn.floating {
-    width: 44px;
-    height: 44px;
+  .stat-icon {
+    margin-bottom: var(--spacing-sm);
   }
 
-  .refresh-btn.floating i {
+  .stat-value {
+    font-size: 1.8rem;
+  }
+
+  .performance-metrics {
+    grid-template-columns: 1fr;
+  }
+
+  .metric-value {
     font-size: 1.3rem;
   }
 }
 
+@media (max-width: 768px) {
+  .main-content {
+    padding: 12px;
+  }
+
+  .stats-grid,
+  .player-lists-container,
+  .server-stats-grid {
+    grid-template-columns: 1fr;
+    gap: 12px;
+  }
+
+  .stat-card {
+    padding: 16px;
+    min-height: auto;
+  }
+
+  .stat-icon {
+    width: 40px;
+    height: 40px;
+    font-size: 1.2rem;
+  }
+
+  .stat-value {
+    font-size: 1.8rem;
+  }
+
+  .player-list-card {
+    margin-bottom: 16px;
+  }
+
+  .performance-card {
+    padding: 16px;
+  }
+
+  .chart-container {
+    height: 180px;
+  }
+
+  .metric-card {
+    padding: 12px;
+  }
+
+  .metric-value {
+    font-size: 1.3rem;
+  }
+
+  .table-container {
+    overflow-x: auto;
+    padding: 0 8px 16px;
+  }
+
+  table {
+    min-width: 600px;
+    font-size: 0.85rem;
+  }
+
+  th, td {
+    padding: 12px 10px;
+  }
+
+  .fluent-button.primary {
+    padding: 10px 14px;
+    font-size: 0.9rem;
+  }
+
+  .fluent-button.floating {
+    width: 50px;
+    height: 50px;
+    bottom: 20px;
+    right: 20px;
+  }
+
+  .section-header {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 8px;
+  }
+
+  .uptime-display {
+    align-self: flex-end;
+  }
+
+  .navbar-content {
+    padding: 0 12px;
+  }
+
+  .app-title {
+    font-size: 1.3rem;
+  }
+
+  .notification {
+    padding: 12px;
+    font-size: 0.85rem;
+  }
+}
 
 
+@media (max-width: 480px) {
+  .stat-value {
+    font-size: 1.6rem;
+  }
 
+  .stat-label {
+    font-size: 0.8rem;
+  }
+
+  .player-list li {
+    padding: 10px 12px;
+  }
+
+  .memory-stats {
+    grid-template-columns: 1fr;
+  }
+
+  .info-item {
+    font-size: 0.85rem;
+  }
+
+  .metric-card {
+    padding: 10px;
+  }
+
+  .footer {
+    padding: 16px 0;
+  }
+
+  .license-info {
+    font-size: 0.8rem;
+  }
+}
+
+button, .player-list li {
+  min-height: 44px;
+}
+
+:root {
+}
+
+[data-theme="dark"] {
+}
diff --git a/src/main/resources/assets/playertime/web/index.html b/src/main/resources/assets/playertime/web/index.html
index 18e3611..9b1b6db 100644
--- a/src/main/resources/assets/playertime/web/index.html
+++ b/src/main/resources/assets/playertime/web/index.html
@@ -1,156 +1,263 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh_cn" data-theme="light">
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
   <title data-lang-key="playertime.web.title">玩家在线及状态统计</title>
   <link rel="stylesheet" href="css/style.css">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
   <link rel="icon" href="favicon.ico" type="image/x-icon">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
   <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/chartjs-adapter-date-fns/dist/chartjs-adapter-date-fns.bundle.min.js"></script>
 </head>
 <body>
-<div class="container">
-  <div class="header">
-    <h1 data-lang-key="playertime.web.title">玩家在线时间统计</h1>
-
-    <button id="theme-toggle" class="theme-toggle" aria-label="切换主题">
-      <i class="fas fa-moon"></i>
-      <i class="fas fa-sun"></i>
-    </button>
-  </div>
-  <div class="warning" data-lang-key="playertime.web.warning">数据统计时间开始于此MOD安装时间，不包含安装之前的所有数据</div>
-  <br>
-
-  <!--  在线列表-->
-  <div class="status-cards">
-    <div class="status-card">
-      <h3 data-lang-key="playertime.web.status.online_players">在线玩家</h3>
-      <div class="player-counts">
-        <div class="count-item">
-          <span class="count-label" data-lang-key="playertime.web.status.total">总数:</span>
-          <span class="count-value" id="total-count">0</span>
-        </div>
-        <div class="count-item">
-          <span class="count-label" data-lang-key="playertime.web.status.players">玩家:</span>
-          <span class="count-value" id="whitelist-count">0</span>
-        </div>
-        <div class="count-item">
-          <span class="count-label" data-lang-key="playertime.web.status.non_players">假人:</span>
-          <span class="count-value" id="non-whitelist-count">0</span>
-        </div>
+<div class="app-container">
+  <!-- 顶部导航栏 -->
+  <nav class="navbar">
+    <div class="navbar-content">
+      <div class="navbar-left">
+        <h1 class="app-title" data-lang-key="playertime.web.title">玩家在线时间统计</h1>
+      </div>
+      <div class="navbar-right">
+        <button id="theme-toggle" class="theme-toggle" aria-label="切换主题">
+          <i class="fas fa-moon theme-icon"></i>
+          <i class="fas fa-sun theme-icon"></i>
+        </button>
       </div>
     </div>
-    <div class="status-card">
-      <h3 data-lang-key="playertime.web.status.online_list">在线玩家列表</h3>
-      <div class="player-lists">
-        <div class="player-list">
-          <h4 data-lang-key="playertime.web.status.online_list.players">玩家</h4>
-          <ul class="online-players" id="whitelist-players"></ul>
-        </div>
-        <div class="player-list">
-          <h4 data-lang-key="playertime.web.status.online_list.non_players">假人</h4>
-          <ul class="online-players" id="non-whitelist-players"></ul>
-        </div>
-      </div>
+  </nav>
+
+  <div class="main-content">
+    <!-- 警告信息 -->
+    <div class="notification warning" data-lang-key="playertime.web.warning">
+      <i class="fas fa-exclamation-circle"></i>
+      <span>数据统计时间开始于此MOD安装时间，不包含安装之前的所有数据</span>
     </div>
-  </div>
 
-  <!--  服务器状态-->
-  <div class="status-section">
-    <h2 data-lang-key="playertime.web.server_status.title">服务器状态</h2>
-    <div class="status-grid">
-      <div class="status-item">
-        <h3 data-lang-key="playertime.web.server_status.memory_usage">内存使用</h3>
-        <canvas id="memory-chart"></canvas>
-        <div class="memory-stats">
-          <div><span data-lang-key="playertime.web.server_status.memory_used">已用</span>: <span id="memory-used">0</span> MB</div>
-          <div><span data-lang-key="playertime.web.server_status.memory_free">可用</span>: <span id="memory-free">0</span> MB</div>
-          <div><span data-lang-key="playertime.web.server_status.memory_percent">使用率</span>: <span id="memory-percent">0</span>%</div>
+    <!-- 在线玩家卡片 -->
+    <section class="dashboard-section">
+      <div class="section-header">
+        <h2>在线状态</h2>
+      </div>
+
+      <div class="stats-grid">
+        <!-- 玩家计数卡片 -->
+        <div class="stat-card accent-blue">
+          <div class="stat-icon">
+            <i class="fas fa-users"></i>
+          </div>
+          <div class="stat-content">
+            <div class="stat-value" id="total-count">0</div>
+            <div class="stat-label" data-lang-key="playertime.web.status.total">总数</div>
+          </div>
+        </div>
+
+        <div class="stat-card accent-green">
+          <div class="stat-icon">
+            <i class="fas fa-user"></i>
+          </div>
+          <div class="stat-content">
+            <div class="stat-value" id="whitelist-count">0</div>
+            <div class="stat-label" data-lang-key="playertime.web.status.players">玩家</div>
+          </div>
+        </div>
+
+        <div class="stat-card accent-purple">
+          <div class="stat-icon">
+            <i class="fas fa-robot"></i>
+          </div>
+          <div class="stat-content">
+            <div class="stat-value" id="non-whitelist-count">0</div>
+            <div class="stat-label" data-lang-key="playertime.web.status.non_players">假人</div>
+          </div>
         </div>
       </div>
 
-      <div class="status-item">
-        <h3 data-lang-key="playertime.web.server_status.performance">实时性能</h3>
-        <div class="chart-container">
-          <div class="metric-display">
-            <div class="metric">
-              <span class="metric-label" data-lang-key="playertime.web.chart.tps">TPS:</span>
+      <!-- 在线玩家列表 -->
+      <div class="player-lists-container">
+        <div class="player-list-card">
+          <div class="player-list-header">
+            <h3 data-lang-key="playertime.web.status.online_list.players">玩家</h3>
+            <span class="player-count-badge" id="whitelist-count-badge">0</span>
+          </div>
+          <ul class="player-list" id="whitelist-players"></ul>
+        </div>
+
+        <div class="player-list-card">
+          <div class="player-list-header">
+            <h3 data-lang-key="playertime.web.status.online_list.non_players">假人</h3>
+            <span class="player-count-badge" id="non-whitelist-count-badge">0</span>
+          </div>
+          <ul class="player-list" id="non-whitelist-players"></ul>
+        </div>
+      </div>
+    </section>
+
+    <!-- 服务器状态 -->
+    <section class="dashboard-section">
+      <div class="section-header">
+        <h2 data-lang-key="playertime.web.server_status.title">服务器状态</h2>
+        <div class="uptime-display">
+          <i class="fas fa-clock"></i>
+          <span id="uptime">加载中...</span>
+        </div>
+      </div>
+
+      <div class="server-stats-grid">
+        <!-- 内存使用 -->
+        <div class="stat-card">
+          <div class="stat-header">
+            <i class="fas fa-memory"></i>
+            <h3 data-lang-key="playertime.web.server_status.memory_usage">内存使用</h3>
+          </div>
+          <div class="chart-wrapper">
+            <canvas id="memory-chart"></canvas>
+          </div>
+          <div class="memory-stats">
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.memory_used">已用</span>
+              <span id="memory-used">0</span> MB
+            </div>
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.memory_free">可用</span>
+              <span id="memory-free">0</span> MB
+            </div>
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.memory_percent">使用率</span>
+              <span id="memory-percent">0</span>%
+            </div>
+          </div>
+        </div>
+
+        <!-- 磁盘使用 -->
+        <div class="stat-card">
+          <div class="stat-header">
+            <i class="fas fa-hard-drive"></i>
+            <h3 data-lang-key="playertime.web.server_status.disk_usage">磁盘使用</h3>
+          </div>
+          <div class="chart-wrapper">
+            <canvas id="disk-chart"></canvas>
+          </div>
+          <div class="memory-stats">
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.disk_total">总量</span>
+              <span id="disk-total">0</span> GB
+            </div>
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.disk_used">已用</span>
+              <span id="disk-used">0</span> GB
+            </div>
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.disk_free">可用</span>
+              <span id="disk-free">0</span> GB
+            </div>
+            <div class="memory-stat">
+              <span data-lang-key="playertime.web.server_status.disk_percent">使用率</span>
+              <span id="disk-percent">0</span>%
+            </div>
+          </div>
+        </div>
+
+        <!-- 服务器信息 -->
+        <div class="stat-card">
+          <div class="stat-header">
+            <i class="fas fa-server"></i>
+            <h3 data-lang-key="playertime.web.server_status.server_info">服务器信息</h3>
+          </div>
+          <div class="server-info">
+            <div class="info-item">
+              <span data-lang-key="playertime.web.server_status.server_version">服务器版本</span>
+              <span id="server-version">未知</span>
+            </div>
+            <div class="info-item">
+              <span data-lang-key="playertime.web.server_status.processors">处理器核心</span>
+              <span id="processors">0</span>
+            </div>
+            <div class="info-item">
+              <span data-lang-key="playertime.web.server_status.player_count">在线玩家</span>
+              <span id="server-player-count">0</span>/<span id="server-max-players">0</span>
+            </div>
+            <div class="info-item">
+              <span data-lang-key="playertime.web.server_status.motd">MOTD</span>
+              <span id="server-motd">未知</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 实时性能卡片（单独一行） -->
+      <div class="performance-card">
+        <div class="stat-header">
+          <i class="fas fa-tachometer-alt"></i>
+          <h3 data-lang-key="playertime.web.server_status.performance">实时性能</h3>
+        </div>
+        <div class="performance-content">
+          <div class="performance-metrics">
+            <div class="metric-card">
+              <span class="metric-label" data-lang-key="playertime.web.chart.tps">TPS</span>
               <span class="metric-value" id="tps-value">0.0</span>
             </div>
-            <div class="metric">
-              <span class="metric-label" data-lang-key="playertime.web.chart.mspt">MSPT:</span>
+            <div class="metric-card">
+              <span class="metric-label" data-lang-key="playertime.web.chart.mspt">MSPT</span>
               <span class="metric-value" id="mspt-value">0.0</span>
             </div>
           </div>
-          <div class="chart-wrapper">
+          <div class="chart-container">
             <canvas id="performance-chart"></canvas>
           </div>
         </div>
       </div>
+    </section>
 
-      <div class="status-item">
-        <h3 data-lang-key="playertime.web.server_status.disk_usage">磁盘使用</h3>
-        <canvas id="disk-chart"></canvas>
-        <div class="memory-stats">
-          <div><span data-lang-key="playertime.web.server_status.disk_total">总量</span>: <span id="disk-total">0</span> GB</div>
-          <div><span data-lang-key="playertime.web.server_status.disk_used">已用</span>: <span id="disk-used">0</span> GB</div>
-          <div><span data-lang-key="playertime.web.server_status.disk_free">可用</span>: <span id="disk-free">0</span> GB</div>
-          <div><span data-lang-key="playertime.web.server_status.disk_percent">使用率</span>: <span id="disk-percent">0</span>%</div>
+    <!-- 玩家在线时长 -->
+    <section class="dashboard-section">
+      <div class="section-header">
+        <h2 data-lang-key="playertime.web.stats_table.title">玩家在线时长 (白名单)</h2>
+        <div class="section-actions">
+          <button id="refresh-btn" class="fluent-button primary">
+            <i class="fas fa-sync-alt"></i>
+            <span data-lang-key="playertime.web.refresh_button">刷新数据</span>
+          </button>
         </div>
       </div>
 
-      <div class="status-item">
-        <h3 data-lang-key="playertime.web.server_status.server_info">服务器信息</h3>
-        <div class="server-info-stats">
-          <div><span data-lang-key="playertime.web.server_status.server_version">服务器版本</span>: <span id="server-version">未知</span></div>
-          <div><span data-lang-key="playertime.web.server_status.processors">处理器核心</span>: <span id="processors">0</span></div>
-          <div><span data-lang-key="playertime.web.server_status.player_count">在线玩家</span>: <span id="server-player-count">0</span>/<span id="server-max-players">0</span></div>
-        </div>
+      <div class="info-note">
+        <i class="fas fa-info-circle"></i>
+        <span data-lang-key="playertime.web.stats_table.info">仅跟踪和显示列入白名单的玩家</span>
       </div>
 
+      <div class="table-container">
+        <table id="stats-table">
+          <thead>
+          <tr>
+            <th data-lang-key="playertime.web.stats_table.header.player">玩家</th>
+            <th data-lang-key="playertime.web.stats_table.header.total_time">总计时间</th>
+            <th data-lang-key="playertime.web.stats_table.header.last_30_days">最近 30 天</th>
+            <th data-lang-key="playertime.web.stats_table.header.last_7_days">最近 7 天</th>
+          </tr>
+          </thead>
+          <tbody></tbody>
+        </table>
+      </div>
+    </section>
+  </div>
+
+  <footer class="footer">
+    <div class="footer-content">
+      <div class="license-info">
+        <p data-lang-key="playertime.web.footer.license">本项目基于 GPL3许可证 开源</p>
+        <p>Copyright © 2025 <a href="https://git.branulf.top/BRanulf" target="_blank">BRanulf</a></p>
+      </div>
     </div>
-  </div>
-  <div class="status-item full-width">
-    <h3 data-lang-key="playertime.web.server_status.uptime">服务器运行时间</h3>
-    <p id="uptime">加载中...</p>
-  </div>
-
-  <!-- 在线时长 -->
-  <h2 data-lang-key="playertime.web.stats_table.title">玩家在线时长 (白名单)</h2>
-  <div class="controls">
-    <button id="refresh-btn" class="refresh-btn">
-      <i class="fas fa-sync-alt"></i>
-      <span data-lang-key="playertime.web.refresh_button">刷新数据</span>
-    </button>
-    <p class="info-note" data-lang-key="playertime.web.stats_table.info">仅跟踪和显示列入白名单的玩家</p>
-  </div>
-  <div class="stats-container">
-    <table id="stats-table">
-      <thead>
-      <tr>
-        <th data-lang-key="playertime.web.stats_table.header.player">玩家</th>
-        <th data-lang-key="playertime.web.stats_table.header.total_time">总计时间</th>
-        <th data-lang-key="playertime.web.stats_table.header.last_30_days">最近 30 天</th>
-        <th data-lang-key="playertime.web.stats_table.header.last_7_days">最近 7 天</th>
-      </tr>
-      </thead>
-      <tbody></tbody>
-    </table>
-  </div>
+  </footer>
 </div>
-<script src="js/app.js"></script>
-<footer class="license-footer">
-  <div class="license-info">
-    <p>本项目基于 GPL3许可证 开源</p>
-    <p>Copyright © 2025 <a href="https://git.branulf.top/BRanulf" target="_blank">BRanulf</a></p>
-  </div>
-</footer>
+
 <div class="floating-refresh-btn">
-  <button id="floating-refresh-btn" class="refresh-btn floating" title="刷新数据">
+  <button id="floating-refresh-btn" class="fluent-button primary floating" title="刷新数据">
     <i class="fas fa-sync-alt"></i>
   </button>
 </div>
+
+<script src="js/app.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/assets/playertime/web/js/app.js b/src/main/resources/assets/playertime/web/js/app.js
index 1f280c9..c3c0167 100644
--- a/src/main/resources/assets/playertime/web/js/app.js
+++ b/src/main/resources/assets/playertime/web/js/app.js
@@ -1,15 +1,14 @@
 document.addEventListener('DOMContentLoaded', function() {
     // 初始化变量
-    const tpsHistory = Array(30).fill(20);
-    const msptHistory = Array(30).fill(50);
+    const tpsHistory = Array(60).fill(20);
+    const msptHistory = Array(60).fill(0);
+    const performanceLabels = Array(60).fill('');
     let memoryChart = null;
     let performanceChart = null;
-    let lang = {};
     let diskChart = null;
-    const floatingRefreshBtn = document.getElementById('floating-refresh-btn');
+    let lang = {};
 
-
-    // 获取语言
+    // DOM元素
     const elements = {
         refreshBtn: document.getElementById('refresh-btn'),
         themeToggle: document.getElementById('theme-toggle'),
@@ -23,25 +22,36 @@ document.addEventListener('DOMContentLoaded', function() {
         memoryUsed: document.getElementById('memory-used'),
         memoryFree: document.getElementById('memory-free'),
         memoryPercent: document.getElementById('memory-percent'),
-        avgTick: document.getElementById('avg-tick'),
+        diskTotal: document.getElementById('disk-total'),
+        diskUsed: document.getElementById('disk-used'),
+        diskFree: document.getElementById('disk-free'),
+        diskPercent: document.getElementById('disk-percent'),
+        processors: document.getElementById('processors'),
+        serverVersion: document.getElementById('server-version'),
+        serverPlayerCount: document.getElementById('server-player-count'),
+        serverMaxPlayers: document.getElementById('server-max-players'),
+        serverMotd: document.getElementById('server-motd'),
         uptime: document.getElementById('uptime'),
         tpsValue: document.getElementById('tps-value'),
-        msptValue: document.getElementById('mspt-value')
+        msptValue: document.getElementById('mspt-value'),
+        floatingRefreshBtn: document.getElementById('floating-refresh-btn')
     };
 
+    // 加载保存的主题
     const savedTheme = localStorage.getItem('theme') || 'light';
     document.documentElement.setAttribute('data-theme', savedTheme);
 
-    // 加载语言
+    // 初始设置：加载语言，初始化图表，加载数据，设置刷新间隔
     loadLanguage().then(() => {
         translatePage();
         initCharts();
         loadAllData();
-        // 定时刷新
+        // 设置定期刷新（每10秒一次），后续加入配置文件
         const refreshInterval = setInterval(loadAllData, 10000);
+        console.log('数据刷新间隔设置为10秒。');
     }).catch(error => {
-        console.error('Failed to load language or initial data:', error);
-        showError('Failed to load language or initial data.');
+        console.error('加载语言或初始数据失败:', error);
+        showError('加载语言或初始数据失败。请检查控制台。');
     });
 
     if (elements.themeToggle) {
@@ -52,18 +62,24 @@ document.addEventListener('DOMContentLoaded', function() {
         elements.refreshBtn.addEventListener('click', handleRefresh);
     }
 
+    if (elements.floatingRefreshBtn) {
+        elements.floatingRefreshBtn.addEventListener('click', handleRefresh);
+    }
+
 
-    // 后端加载语言
     async function loadLanguage() {
         try {
             const response = await fetch('/api/lang');
-            if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+            if (!response.ok) {
+                const errorText = await response.text();
+                console.error(`获取/api/lang时HTTP错误! 状态: ${response.status}, 内容: ${errorText}`);
+                throw new Error(`HTTP错误! 状态: ${response.status}`);
+            }
             lang = await response.json();
-            console.log('Language file loaded.');
+            console.log('语言文件加载成功。');
         } catch (error) {
-            console.error('Failed to load language file:', error);
+            console.error('无法从/api/lang加载语言文件:', error);
             lang = {};
-            throw error;
         }
     }
 
@@ -77,11 +93,27 @@ document.addEventListener('DOMContentLoaded', function() {
                     element.textContent = lang[key];
                 }
             } else {
-                console.warn(`Missing translation key: ${key}`);
             }
         });
+        // 加载语言后更新图表标签
+        if (memoryChart) {
+            memoryChart.data.labels = [getLangString('playertime.web.chart.memory_used'), getLangString('playertime.web.chart.memory_free')];
+            memoryChart.update();
+        }
+        if (performanceChart) {
+            performanceChart.data.datasets[0].label = getLangString('playertime.web.chart.tps');
+            performanceChart.data.datasets[1].label = getLangString('playertime.web.chart.mspt');
+            if (performanceChart.options.scales.y.title) performanceChart.options.scales.y.title.text = getLangString('playertime.web.chart.tps');
+            if (performanceChart.options.scales.y1.title) performanceChart.options.scales.y1.title.text = getLangString('playertime.web.chart.mspt');
+            performanceChart.update();
+        }
+        if (diskChart) {
+            diskChart.data.labels = [getLangString('playertime.web.chart.disk_used'), getLangString('playertime.web.chart.disk_free')];
+            diskChart.update();
+        }
     }
 
+    // 获取语言字符串
     function getLangString(key, ...args) {
         const pattern = lang[key] || key;
         try {
@@ -91,188 +123,13 @@ document.addEventListener('DOMContentLoaded', function() {
             });
             return result;
         } catch (e) {
-            console.error(`Failed to format string for key: ${key}`, e);
+            console.error(`格式化键的字符串失败: ${key}`, e);
             return pattern;
         }
     }
 
-    if (floatingRefreshBtn) {
-        floatingRefreshBtn.addEventListener('click', function() {
-            if (this.classList.contains('loading')) return;
-
-            this.classList.add('loading');
-            loadAllData().finally(() => {
-                setTimeout(() => {
-                    this.classList.remove('loading');
-                }, 500);
-            });
-        });
-    }
-
-    // window.addEventListener('scroll', function() {
-    //     if (!floatingRefreshBtn) return;
-    //
-    //     if (window.scrollY > 100) {
-    //         floatingRefreshBtn.style.transform = 'scale(1)';
-    //     } else {
-    //         floatingRefreshBtn.style.transform = 'scale(0.9)';
-    //     }
-    // });
-
-
-    // 图表
-    function initCharts() {
-        const memoryCtx = document.getElementById('memory-chart')?.getContext('2d');
-        if (memoryCtx) {
-            memoryChart = new Chart(memoryCtx, {
-                type: 'doughnut',
-                data: {
-                    labels: [getLangString('playertime.web.chart.memory_used'), getLangString('playertime.web.chart.memory_free')],
-                    datasets: [{
-                        data: [0, 100],
-                        backgroundColor: ['#4361ee', '#e9ecef']
-                    }]
-                },
-                options: {
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    plugins: {
-                        legend: {
-                            position: 'top',
-                        }
-                    }
-                }
-            });
-        }
-
-        const perfCtx = document.getElementById('performance-chart')?.getContext('2d');
-        if (perfCtx) {
-            performanceChart = new Chart(perfCtx, {
-                type: 'line',
-                data: {
-                    labels: Array(30).fill(''),
-                    datasets: [
-                        {
-                            label: getLangString('playertime.web.chart.tps'),
-                            data: tpsHistory,
-                            borderColor: '#4CAF50',
-                            backgroundColor: 'rgba(76, 175, 80, 0.1)',
-                            borderWidth: 2,
-                            pointRadius: 3,
-                            pointHoverRadius: 5,
-                            tension: 0.3,
-                            yAxisID: 'y'
-                        },
-                        {
-                            label: getLangString('playertime.web.chart.mspt'),
-                            data: msptHistory,
-                            borderColor: '#FF5722',
-                            backgroundColor: 'rgba(255, 87, 34, 0.1)',
-                            borderWidth: 2,
-                            pointRadius: 3,
-                            pointHoverRadius: 5,
-                            tension: 0.3,
-                            yAxisID: 'y1'
-                        }
-                    ]
-                },
-                options: {
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    animation: {
-                        duration: 500
-                    },
-                    plugins: {
-                        legend: {
-                            position: 'top',
-                            labels: {
-                                boxWidth: 12,
-                                padding: 20,
-                                font: {
-                                    size: 12
-                                }
-                            }
-                        },
-                        tooltip: {
-                            mode: 'index',
-                            intersect: false,
-                            bodySpacing: 8
-                        }
-                    },
-                    scales: {
-                        x: {
-                            grid: {
-                                display: false
-                            },
-                            ticks: {
-                                maxRotation: 0,
-                                autoSkip: true,
-                                maxTicksLimit: 10
-                            }
-                        },
-                        y: {
-                            type: 'linear',
-                            display: true,
-                            position: 'left',
-                            title: {
-                                display: true,
-                                text: getLangString('playertime.web.chart.tps'),
-                                font: {
-                                    weight: 'bold'
-                                }
-                            },
-                            min: 0,
-                            max: 20,
-                            grid: {
-                                color: 'rgba(0, 0, 0, 0.05)'
-                            }
-                        },
-                        y1: {
-                            type: 'linear',
-                            display: true,
-                            position: 'right',
-                            title: {
-                                display: true,
-                                text: getLangString('playertime.web.chart.mspt'),
-                                font: {
-                                    weight: 'bold'
-                                }
-                            },
-                            min: 0,
-                            grid: {
-                                drawOnChartArea: false
-                            }
-                        }
-                    }
-                }
-            });
-        }
-
-        const diskCtx = document.getElementById('disk-chart')?.getContext('2d');
-        if (diskCtx) {
-            diskChart = new Chart(diskCtx, {
-                type: 'doughnut',
-                data: {
-                    labels: [getLangString('playertime.web.chart.disk_used'),
-                        getLangString('playertime.web.chart.disk_free')],
-                    datasets: [{
-                        data: [0, 100],
-                        backgroundColor: ['#4361ee', '#e9ecef']
-                    }]
-                },
-                options: {
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    plugins: {
-                        legend: {
-                            position: 'top',
-                        }
-                    }
-                }
-            });
-        }
-    }
 
+    // 切换主题
     function toggleTheme() {
         const currentTheme = document.documentElement.getAttribute('data-theme');
         const newTheme = currentTheme === 'light' ? 'dark' : 'light';
@@ -280,8 +137,11 @@ document.addEventListener('DOMContentLoaded', function() {
         localStorage.setItem('theme', newTheme);
     }
 
+
+    // 防呆
     function handleRefresh() {
         if (this.classList.contains('loading')) return;
+
         this.classList.add('loading');
         loadAllData().finally(() => {
             setTimeout(() => {
@@ -290,6 +150,7 @@ document.addEventListener('DOMContentLoaded', function() {
         });
     }
 
+
     async function loadAllData() {
         try {
             const [statsData, onlinePlayersData, playerCountsData, serverStatusData] = await Promise.all([
@@ -313,8 +174,8 @@ document.addEventListener('DOMContentLoaded', function() {
     async function fetchData(url) {
         const response = await fetch(url);
         if (!response.ok) {
-            const errorBody = await response.text().catch(() => 'Unknown Error');
-            throw new Error(`HTTP error! status: ${response.status}, URL: ${url}, Body: ${errorBody}`);
+            const errorBody = await response.text().catch(() => '未知错误');
+            throw new Error(`HTTP错误! 状态: ${response.status}, URL: ${url}, 内容: ${errorBody}`);
         }
         return response.json();
     }
@@ -323,6 +184,7 @@ document.addEventListener('DOMContentLoaded', function() {
         if (!elements.statsTableBody || !elements.statsTableHeader) return;
 
         elements.statsTableBody.innerHTML = '';
+
         const headers = elements.statsTableHeader.querySelectorAll('th[data-lang-key]');
         headers.forEach(th => {
             const key = th.getAttribute('data-lang-key');
@@ -331,41 +193,7 @@ document.addEventListener('DOMContentLoaded', function() {
             }
         });
 
-
-        const sortedPlayers = Object.entries(data)
-            .map(([name, statString]) => {
-                const stats = {};
-                statString.split(" | ").forEach(part => {
-                    const firstColonIndex = part.indexOf(':');
-                    if (firstColonIndex > 0) {
-                        const label = part.substring(0, firstColonIndex).trim();
-                        const value = part.substring(firstColonIndex + 1).trim();
-                        stats[label] = value;
-                    } else {
-                        console.warn(`Could not parse stat part: ${part}`);
-                    }
-                });
-
-                const internalStats = {};
-                const formatParts = getLangString('playertime.stats.format').split(" | ").map(p => p.split(":")[0].trim());
-
-                if (formatParts.length >= 3) {
-                    internalStats.totalTime = stats[formatParts[0]];
-                    internalStats['30Days'] = stats[formatParts[1]];
-                    internalStats['7Days'] = stats[formatParts[2]];
-                } else {
-                    console.error("Unexpected format string structure:", getLangString('playertime.stats.format'));
-                    internalStats.totalTime = statString.split(" | ")[0]?.split(": ")[1] || "0h 00m";
-                    internalStats['30Days'] = statString.split(" | ")[1]?.split(": ")[1] || "0h 00m";
-                    internalStats['7Days'] = statString.split(" | ")[2]?.split(": ")[1] || "0h 00m";
-                }
-
-
-                return { name, stats: internalStats };
-            })
-            .sort((a, b) => parseTimeToSeconds(b.stats.totalTime) - parseTimeToSeconds(a.stats.totalTime));
-
-        if (sortedPlayers.length === 0) {
+        if (!Array.isArray(data) || data.length === 0) {
             const row = elements.statsTableBody.insertRow();
             const cell = row.insertCell(0);
             cell.colSpan = 4;
@@ -375,16 +203,16 @@ document.addEventListener('DOMContentLoaded', function() {
             return;
         }
 
-
-        sortedPlayers.forEach(player => {
+        data.forEach(player => {
             const row = elements.statsTableBody.insertRow();
-            row.insertCell(0).textContent = player.name;
-            row.insertCell(1).textContent = player.stats.totalTime;
-            row.insertCell(2).textContent = player.stats['30Days'];
-            row.insertCell(3).textContent = player.stats['7Days'];
+            row.insertCell(0).textContent = player.playerName;
+            row.insertCell(1).textContent = player.totalTimeFormatted;
+            row.insertCell(2).textContent = player.last30DaysFormatted;
+            row.insertCell(3).textContent = player.last7DaysFormatted;
         });
     }
 
+    // 更新在线玩家列表
     function updateOnlinePlayers(data) {
         if (!elements.whitelistPlayers || !elements.nonWhitelistPlayers) return;
 
@@ -405,16 +233,21 @@ document.addEventListener('DOMContentLoaded', function() {
         updateList(elements.nonWhitelistPlayers, data.non_whitelisted, 'playertime.web.status.online_list.empty_non_players');
     }
 
+    // 更新在线玩家计数
     function updatePlayerCounts(data) {
         if (elements.totalCount) elements.totalCount.textContent = data.total || 0;
         if (elements.whitelistCount) elements.whitelistCount.textContent = data.whitelisted || 0;
         if (elements.nonWhitelistCount) elements.nonWhitelistCount.textContent = data.non_whitelisted || 0;
+
+        document.getElementById('whitelist-count-badge').textContent = data.whitelisted || 0;
+        document.getElementById('non-whitelist-count-badge').textContent = data.non_whitelisted || 0;
     }
 
+    // 更新服务器状态信息和图表
     function updateServerStatus(data) {
         if (data.memory) {
             const usedMB = Math.round(data.memory.used / (1024 * 1024));
-            const freeMB = Math.round((data.memory.max - data.memory.used) / (1024 * 1024));
+            const freeMB = Math.round(data.memory.free / (1024 * 1024));
             const percent = Math.round(data.memory.usage_percentage);
 
             if (memoryChart) {
@@ -428,83 +261,285 @@ document.addEventListener('DOMContentLoaded', function() {
             if (elements.memoryPercent) elements.memoryPercent.textContent = percent;
         }
 
+        // 更新性能统计和图表（TPS/MSPT）
         if (data.server) {
-            const tps = Math.min(20, 1000 / (data.server.average_tick_time_ms || 50)).toFixed(1);
-            const mspt = data.server.average_tick_time_ms.toFixed(1);
+            const mspt = data.server.average_tick_time_ms || 0;
+            const tps = Math.min(20, 1000 / (mspt || 1)).toFixed(1);
 
             if (elements.tpsValue) elements.tpsValue.textContent = tps;
-            if (elements.msptValue) elements.msptValue.textContent = mspt;
+            if (elements.msptValue) elements.msptValue.textContent = mspt.toFixed(1);
 
             if (performanceChart) {
                 tpsHistory.shift();
                 tpsHistory.push(parseFloat(tps));
                 msptHistory.shift();
-                msptHistory.push(parseFloat(mspt));
-
-                performanceChart.data.datasets[0].label = getLangString('playertime.web.chart.tps');
-                performanceChart.data.datasets[1].label = getLangString('playertime.web.chart.mspt');
-                if (performanceChart.options.scales.y.title) performanceChart.options.scales.y.title.text = getLangString('playertime.web.chart.tps');
-                if (performanceChart.options.scales.y1.title) performanceChart.options.scales.y1.title.text = getLangString('playertime.web.chart.mspt');
-
-
+                msptHistory.push(mspt);
                 performanceChart.data.datasets[0].data = tpsHistory;
                 performanceChart.data.datasets[1].data = msptHistory;
 
                 performanceChart.update('none');
 
-                setMetricColor(elements.tpsValue, tps, 15, 10, false);
-                setMetricColor(elements.msptValue, mspt, 50, 100, true);
+                setMetricColor(elements.tpsValue, parseFloat(tps), 18, 15, false);
+                setMetricColor(elements.msptValue, mspt, 50, 60, true);
             }
-
-
         }
 
-        if (data.disk) {
+        // 更新磁盘统计和图表
+        if (data.disk && data.disk.total > 0) {
             const totalGB = Math.round(data.disk.total / (1024 * 1024 * 1024));
-            const usedGB = Math.round(data.disk.used / (1024 * 1024 * 1024));
+            const usedGB = Math.round((data.disk.total - data.disk.free) / (1024 * 1024 * 1024));
             const freeGB = Math.round(data.disk.free / (1024 * 1024 * 1024));
             const percent = Math.round(data.disk.usage_percentage);
 
             if (diskChart) {
                 diskChart.data.datasets[0].data = [usedGB, freeGB];
+                diskChart.data.labels = [getLangString('playertime.web.chart.disk_used'), getLangString('playertime.web.chart.disk_free')];
                 diskChart.update();
             }
 
-            document.getElementById('disk-total').textContent = totalGB;
-            document.getElementById('disk-used').textContent = usedGB;
-            document.getElementById('disk-free').textContent = freeGB;
-            document.getElementById('disk-percent').textContent = percent;
-        }
-
-        // 新增服务器信息
-        if (data.available_processors) {
-            document.getElementById('processors').textContent = data.available_processors;
+            if (elements.diskTotal) elements.diskTotal.textContent = totalGB;
+            if (elements.diskUsed) elements.diskUsed.textContent = usedGB;
+            if (elements.diskFree) elements.diskFree.textContent = freeGB;
+            if (elements.diskPercent) elements.diskPercent.textContent = percent;
+        } else if (data.disk && data.disk.total === 0) {
+            if (elements.diskTotal) elements.diskTotal.textContent = getLangString('playertime.web.server_status.not_available') || 'N/A';
+            if (elements.diskUsed) elements.diskUsed.textContent = getLangString('playertime.web.server_status.not_available') || 'N/A';
+            if (elements.diskFree) elements.diskFree.textContent = getLangString('playertime.web.server_status.not_available') || 'N/A';
+            if (elements.diskPercent) elements.diskPercent.textContent = getLangString('playertime.web.server_status.not_available') || 'N/A';
+            if (diskChart) {
+                diskChart.data.datasets[0].data = [1, 0];
+                diskChart.data.labels = [getLangString('playertime.web.server_status.not_available') || 'N/A', ''];
+                diskChart.update();
+            }
         }
 
+        // 更新服务器信息
+        if (elements.processors) elements.processors.textContent = data.available_processors || 0;
         if (data.server) {
-            document.getElementById('server-version').textContent = data.server.version;
-            document.getElementById('server-player-count').textContent = data.server.player_count;
-            document.getElementById('server-max-players').textContent = data.server.max_players;
+            if (elements.serverVersion) elements.serverVersion.textContent = data.server.version || '未知';
+            if (elements.serverPlayerCount) elements.serverPlayerCount.textContent = data.server.player_count || 0;
+            if (elements.serverMaxPlayers) elements.serverMaxPlayers.textContent = data.server.max_players || 0;
+            if (elements.serverMotd) elements.serverMotd.textContent = data.server.motd || '未知';
         }
 
-        if (elements.uptime) elements.uptime.textContent = data.uptime_formatted || '0';
+        // 更新运行时间
+        if (elements.uptime) elements.uptime.textContent = data.uptime_formatted || '加载中...';
     }
 
-    function parseTimeToSeconds(timeStr) {
-        if (!timeStr) return 0;
-        const parts = timeStr.match(/(\d+h)?\s*(\d+m)?/);
-        let seconds = 0;
-        if (parts) {
-            if (parts[1]) { // hour
-                seconds += parseInt(parts[1].replace('h', '')) * 3600;
-            }
-            if (parts[2]) { // min
-                seconds += parseInt(parts[2].replace('m', '')) * 60;
-            }
+
+    function initCharts() {
+        // 内存图表
+        const memoryCtx = document.getElementById('memory-chart')?.getContext('2d');
+        if (memoryCtx) {
+            memoryChart = new Chart(memoryCtx, {
+                type: 'doughnut',
+                data: {
+                    labels: [getLangString('playertime.web.chart.memory_used'), getLangString('playertime.web.chart.memory_free')],
+                    datasets: [{
+                        data: [0, 100],
+                        backgroundColor: ['#4361ee', '#e9ecef'],
+                        borderColor: [
+                            getComputedStyle(document.documentElement).getPropertyValue('--card-bg').trim(),
+                            getComputedStyle(document.documentElement).getPropertyValue('--card-bg').trim()
+                        ],
+                        borderWidth: 2
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    plugins: {
+                        legend: {
+                            position: 'top',
+                            labels: {
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            }
+                        },
+                        tooltip: {
+                            callbacks: {
+                                label: function(context) {
+                                    const label = context.label || '';
+                                    const value = context.raw;
+                                    return `${label}: ${value} MB`;
+                                }
+                            }
+                        }
+                    }
+                }
+            });
         }
-        return seconds;
-    }
 
+        // 性能图表（TPS/MSPT）
+        const perfCtx = document.getElementById('performance-chart')?.getContext('2d');
+        if (perfCtx) {
+            performanceChart = new Chart(perfCtx, {
+                type: 'line',
+                data: {
+                    labels: performanceLabels,
+                    datasets: [
+                        {
+                            label: getLangString('playertime.web.chart.tps'),
+                            data: tpsHistory,
+                            borderColor: '#4CAF50',
+                            backgroundColor: 'rgba(76, 175, 80, 0.1)',
+                            borderWidth: 2,
+                            pointRadius: 2,
+                            pointHoverRadius: 4,
+                            tension: 0.3,
+                            yAxisID: 'y'
+                        },
+                        {
+                            label: getLangString('playertime.web.chart.mspt'),
+                            data: msptHistory,
+                            borderColor: '#FF5722',
+                            backgroundColor: 'rgba(255, 87, 34, 0.1)',
+                            borderWidth: 2,
+                            pointRadius: 2,
+                            pointHoverRadius: 4,
+                            tension: 0.3,
+                            yAxisID: 'y1'
+                        }
+                    ]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    animation: {
+                        duration: 500
+                    },
+                    plugins: {
+                        legend: {
+                            position: 'top',
+                            labels: {
+                                boxWidth: 12,
+                                padding: 20,
+                                font: {
+                                    size: 12
+                                },
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            }
+                        },
+                        tooltip: {
+                            mode: 'index',
+                            intersect: false,
+                            bodySpacing: 8,
+                            callbacks: {
+                                label: function(context) {
+                                    let label = context.dataset.label || '';
+                                    if (label) {
+                                        label += ': ';
+                                    }
+                                    if (context.dataset.yAxisID === 'y') {
+                                        label += context.raw.toFixed(1);
+                                    } else {
+                                        label += context.raw.toFixed(1) + ' ms';
+                                    }
+                                    return label;
+                                }
+                            }
+                        }
+                    },
+                    scales: {
+                        x: {
+                            grid: {
+                                display: false,
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--border-color').trim()
+                            },
+                            ticks: {
+                                display: false
+                            }
+                        },
+                        y: {
+                            type: 'linear',
+                            display: true,
+                            position: 'left',
+                            title: {
+                                display: true,
+                                text: getLangString('playertime.web.chart.tps'),
+                                font: {
+                                    weight: 'bold',
+                                    color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                                },
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            },
+                            min: 0,
+                            max: 20,
+                            grid: {
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--border-color').trim()
+                            },
+                            ticks: {
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            }
+                        },
+                        y1: {
+                            type: 'linear',
+                            display: true,
+                            position: 'right',
+                            title: {
+                                display: true,
+                                text: getLangString('playertime.web.chart.mspt'),
+                                font: {
+                                    weight: 'bold',
+                                    color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                                },
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            },
+                            min: 0,
+                            suggestedMax: 100,
+                            grid: {
+                                drawOnChartArea: false,
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--border-color').trim()
+                            },
+                            ticks: {
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        // 磁盘图表
+        const diskCtx = document.getElementById('disk-chart')?.getContext('2d');
+        if (diskCtx) {
+            diskChart = new Chart(diskCtx, {
+                type: 'doughnut',
+                data: {
+                    labels: [getLangString('playertime.web.chart.disk_used'), getLangString('playertime.web.chart.disk_free')],
+                    datasets: [{
+                        data: [0, 100],
+                        backgroundColor: ['#4361ee', '#e9ecef'],
+                        borderColor: [
+                            getComputedStyle(document.documentElement).getPropertyValue('--card-bg').trim(),
+                            getComputedStyle(document.documentElement).getPropertyValue('--card-bg').trim()
+                        ],
+                        borderWidth: 2
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    plugins: {
+                        legend: {
+                            position: 'top',
+                            labels: {
+                                color: getComputedStyle(document.documentElement).getPropertyValue('--text-color').trim()
+                            }
+                        },
+                        tooltip: {
+                            callbacks: {
+                                label: function(context) {
+                                    const label = context.label || '';
+                                    const value = context.raw;
+                                    return `${label}: ${value} GB`;
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
+    }
 
     function showError(message) {
         const errorEl = document.createElement('div');
@@ -527,24 +562,28 @@ document.addEventListener('DOMContentLoaded', function() {
         const numValue = parseFloat(value);
         let color = '';
 
-        if (reverse) {
+        const successColor = getComputedStyle(document.documentElement).getPropertyValue('--success-color').trim();
+        const warningColor = getComputedStyle(document.documentElement).getPropertyValue('--warning-color').trim();
+        const dangerColor = getComputedStyle(document.documentElement).getPropertyValue('--danger-color').trim();
+
+        if (reverse) { // 值越低越好（例如MSPT）
             if (numValue <= goodThreshold) {
-                color = '#4CAF50'; // Green
+                color = successColor;
             } else if (numValue <= badThreshold) {
-                color = '#FFC107'; // Yellow
+                color = warningColor;
             } else {
-                color = '#FF5722'; // Red
+                color = dangerColor;
             }
-        } else {
+        } else { // 值越高越好（例如TPS）
             if (numValue >= goodThreshold) {
-                color = '#4CAF50'; // Green
+                color = successColor;
             } else if (numValue >= badThreshold) {
-                color = '#FFC107'; // Yellow
+                color = warningColor;
             } else {
-                color = '#FF5722'; // Red
+                color = dangerColor;
             }
         }
+
         element.style.color = color;
     }
-
 });
diff --git a/src/main/resources/playertime.accesswideners b/src/main/resources/playertime.accesswideners
new file mode 100644
index 0000000..3283c19
--- /dev/null
+++ b/src/main/resources/playertime.accesswideners
@@ -0,0 +1 @@
+public field net/minecraft/server/MinecraftServer workerExecutor Ljava/util/concurrent/Executor;