From 49744acc590d73f3faf80db5b722a5fa198d3b4c Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Tue, 10 Mar 2026 17:12:23 +0100 Subject: [PATCH] fix --- README.md | 2 +- settings.gradle.kts | 4 +-- .../lochat/commands/custom/MeCommand.java | 20 +++++++++----- .../lochat/commands/custom/SoundsCommand.java | 7 ++--- .../lochat/commands/custom/StatsCommand.java | 27 +++++++++++++------ 5 files changed, 38 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 4f93ba9..805c061 100644 --- a/README.md +++ b/README.md @@ -346,7 +346,7 @@ Proprietary - Все права защищены - [Codeberg Repository](https://codeberg.org/loki5512344/Lochat) - [Issues](https://codeberg.org/loki5512344/Lochat/issues) -- [Releases](https://codeberg.org/loki5512344/Lochat/releases) + --- diff --git a/settings.gradle.kts b/settings.gradle.kts index 4243e4f..8ddce0c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1 @@ -rootProject.name = "LoNetwork" - -include("lohub") +rootProject.name = "LoChat" diff --git a/src/main/java/com/loki/lochat/commands/custom/MeCommand.java b/src/main/java/com/loki/lochat/commands/custom/MeCommand.java index 0365f2f..8c097e6 100644 --- a/src/main/java/com/loki/lochat/commands/custom/MeCommand.java +++ b/src/main/java/com/loki/lochat/commands/custom/MeCommand.java @@ -1,6 +1,7 @@ package com.loki.lochat.commands.custom; import com.loki.lochat.LoChat; +import com.loki.lochat.api.service.MuteService; import com.loki.lochat.utils.ChatFormatter; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -37,19 +38,24 @@ public class MeCommand implements CommandExecutor { return true; } - // Проверяем мут - if (plugin.getMuteService() != null && plugin.getMuteService().isMuted(player.getUniqueId())) { - String muteMessage = plugin.getMessagesConfig().getString("mute.you-muted", - "Вы замучены!"); - player.sendMessage(ChatFormatter.parse(muteMessage)); - return true; + // Проверяем мут через LoChat + if (plugin.getServiceRegistry() != null) { + try { + MuteService muteService = plugin.getServiceRegistry().get(MuteService.class); + if (muteService.isMuted(player.getUniqueId())) { + player.sendMessage(ChatFormatter.parse("Вы замучены!")); + return true; + } + } catch (Exception e) { + // Сервис не зарегистрирован, продолжаем + } } // Собираем действие из аргументов String action = String.join(" ", args); // Получаем отображаемое имя игрока (с градиентом если есть) - String displayName = player.getDisplayName(); + String displayName = player.getName(); if (plugin.getGradientModule() != null) { displayName = plugin.getGradientModule().getFormattedName(player); } diff --git a/src/main/java/com/loki/lochat/commands/custom/SoundsCommand.java b/src/main/java/com/loki/lochat/commands/custom/SoundsCommand.java index 98ae9d0..713b8f9 100644 --- a/src/main/java/com/loki/lochat/commands/custom/SoundsCommand.java +++ b/src/main/java/com/loki/lochat/commands/custom/SoundsCommand.java @@ -27,7 +27,8 @@ public class SoundsCommand implements CommandExecutor { } String playerUUID = player.getUniqueId().toString(); - boolean currentState = plugin.getPlayerData().getBoolean("players." + playerUUID + ".settings.sounds-enabled", true); + // Используем конфиг плагина для хранения настроек + boolean currentState = plugin.getConfig().getBoolean("player-settings." + playerUUID + ".sounds-enabled", true); if (args.length == 0) { // Показать текущее состояние @@ -71,8 +72,8 @@ public class SoundsCommand implements CommandExecutor { } // Сохраняем настройку - plugin.getPlayerData().set("players." + playerUUID + ".settings.sounds-enabled", newState); - plugin.savePlayerData(); + plugin.getConfig().set("player-settings." + playerUUID + ".sounds-enabled", newState); + plugin.saveConfig(); return true; } diff --git a/src/main/java/com/loki/lochat/commands/custom/StatsCommand.java b/src/main/java/com/loki/lochat/commands/custom/StatsCommand.java index 98bacc2..74e4bea 100644 --- a/src/main/java/com/loki/lochat/commands/custom/StatsCommand.java +++ b/src/main/java/com/loki/lochat/commands/custom/StatsCommand.java @@ -1,6 +1,7 @@ package com.loki.lochat.commands.custom; import com.loki.lochat.LoChat; +import com.loki.lochat.api.service.MuteService; import com.loki.lochat.utils.ChatFormatter; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -45,10 +46,11 @@ public class StatsCommand implements CommandExecutor { } private void showPlayerStats(CommandSender sender, Player target) { - // Получаем статистику игрока из конфига или базы данных - int messagesSent = plugin.getPlayerData().getInt("players." + target.getUniqueId() + ".messages-sent", 0); - int commandsUsed = plugin.getPlayerData().getInt("players." + target.getUniqueId() + ".commands-used", 0); - long playtime = plugin.getPlayerData().getLong("players." + target.getUniqueId() + ".total-playtime", 0); + // Получаем статистику игрока из конфига + String uuid = target.getUniqueId().toString(); + int messagesSent = plugin.getConfig().getInt("player-stats." + uuid + ".messages-sent", 0); + int commandsUsed = plugin.getConfig().getInt("player-stats." + uuid + ".commands-used", 0); + long playtime = plugin.getConfig().getLong("player-stats." + uuid + ".total-playtime", 0); String playtimeFormatted = formatTime(playtime); @@ -66,8 +68,8 @@ public class StatsCommand implements CommandExecutor { private void showServerStats(CommandSender sender) { // Получаем общую статистику сервера - int totalMessages = plugin.getStatisticsData().getInt("global.total-messages", 0); - int messagesToday = plugin.getStatisticsData().getInt("global.messages-today", 0); + int totalMessages = plugin.getConfig().getInt("server-stats.total-messages", 0); + int messagesToday = plugin.getConfig().getInt("server-stats.messages-today", 0); int onlinePlayers = Bukkit.getOnlinePlayers().size(); int maxPlayers = Bukkit.getMaxPlayers(); @@ -100,8 +102,17 @@ public class StatsCommand implements CommandExecutor { } private int getActiveMutesCount() { - return plugin.getMuteData().getConfigurationSection("active-mutes") != null ? - plugin.getMuteData().getConfigurationSection("active-mutes").getKeys(false).size() : 0; + // Получаем количество активных мутов через LoChat + if (plugin.getServiceRegistry() != null) { + try { + MuteService muteService = plugin.getServiceRegistry().get(MuteService.class); + return (int) Bukkit.getOnlinePlayers().stream() + .filter(p -> muteService.isMuted(p.getUniqueId())) + .count(); + } catch (Exception e) { + } + } + return 0; } private double getCurrentTPS() {