diff --git a/bin/main/com/loki/lochat/commands/admin/broadcast/DiscordCommand.class b/bin/main/com/loki/lochat/commands/admin/broadcast/DiscordCommand.class index 5dd5f3f..942d77d 100644 Binary files a/bin/main/com/loki/lochat/commands/admin/broadcast/DiscordCommand.class and b/bin/main/com/loki/lochat/commands/admin/broadcast/DiscordCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.class b/bin/main/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.class index a154be1..9d88c7e 100644 Binary files a/bin/main/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.class and b/bin/main/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/admin/system/LoChatCommand.class b/bin/main/com/loki/lochat/commands/admin/system/LoChatCommand.class index c161c8d..70ef80e 100644 Binary files a/bin/main/com/loki/lochat/commands/admin/system/LoChatCommand.class and b/bin/main/com/loki/lochat/commands/admin/system/LoChatCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/chat/GlobalChatCommand.class b/bin/main/com/loki/lochat/commands/chat/GlobalChatCommand.class index 1e98fbe..0ccd172 100644 Binary files a/bin/main/com/loki/lochat/commands/chat/GlobalChatCommand.class and b/bin/main/com/loki/lochat/commands/chat/GlobalChatCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.class b/bin/main/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.class index 1d0036f..572cae3 100644 Binary files a/bin/main/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.class and b/bin/main/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/nick/PlayerInfoCommand.class b/bin/main/com/loki/lochat/commands/nick/PlayerInfoCommand.class index 6ecc6d9..3690566 100644 Binary files a/bin/main/com/loki/lochat/commands/nick/PlayerInfoCommand.class and b/bin/main/com/loki/lochat/commands/nick/PlayerInfoCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/rp/DoCommand.class b/bin/main/com/loki/lochat/commands/rp/DoCommand.class index 4b0aff2..31124a5 100644 Binary files a/bin/main/com/loki/lochat/commands/rp/DoCommand.class and b/bin/main/com/loki/lochat/commands/rp/DoCommand.class differ diff --git a/bin/main/com/loki/lochat/commands/rp/RollCommand.class b/bin/main/com/loki/lochat/commands/rp/RollCommand.class index 62870fc..203e02d 100644 Binary files a/bin/main/com/loki/lochat/commands/rp/RollCommand.class and b/bin/main/com/loki/lochat/commands/rp/RollCommand.class differ diff --git a/bin/main/com/loki/lochat/gradient/data/GradientDataManager.class b/bin/main/com/loki/lochat/gradient/data/GradientDataManager.class index 05f3c6f..2eab80e 100644 Binary files a/bin/main/com/loki/lochat/gradient/data/GradientDataManager.class and b/bin/main/com/loki/lochat/gradient/data/GradientDataManager.class differ diff --git a/bin/main/com/loki/lochat/managers/commands/PlaceholderProcessor.class b/bin/main/com/loki/lochat/managers/commands/PlaceholderProcessor.class index 0d91b96..05443ea 100644 Binary files a/bin/main/com/loki/lochat/managers/commands/PlaceholderProcessor.class and b/bin/main/com/loki/lochat/managers/commands/PlaceholderProcessor.class differ diff --git a/bin/main/com/loki/lochat/utils/platform/AdventureManager.class b/bin/main/com/loki/lochat/utils/platform/AdventureManager.class index 7540656..7c63996 100644 Binary files a/bin/main/com/loki/lochat/utils/platform/AdventureManager.class and b/bin/main/com/loki/lochat/utils/platform/AdventureManager.class differ diff --git a/build.gradle.kts b/build.gradle.kts index f4e3f96..99769f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ checkstyle { configFile = file("config/checkstyle/checkstyle.xml") isIgnoreFailures = false maxErrors = 0 - maxWarnings = 200 + maxWarnings = 0 } java { diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 6595e25..a1802f6 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -8,12 +8,16 @@ + + + + - + diff --git a/src/main/java/com/loki/lochat/commands/admin/broadcast/DiscordCommand.java b/src/main/java/com/loki/lochat/commands/admin/broadcast/DiscordCommand.java index 24ee704..5421172 100644 --- a/src/main/java/com/loki/lochat/commands/admin/broadcast/DiscordCommand.java +++ b/src/main/java/com/loki/lochat/commands/admin/broadcast/DiscordCommand.java @@ -35,7 +35,8 @@ public class DiscordCommand implements CommandExecutor, TabCompleter { return true; } switch (args[0].toLowerCase()) { - case "status" -> sender.sendMessage(ChatFormatter.parse(discord.isEnabled() ? "⚖C9Discord ẲE9включён" : "⚖C9Discord &#CF6679отключён")); + case "status" -> sender.sendMessage(ChatFormatter.parse( + discord.isEnabled() ? "⚖C9Discord ẲE9включён" : "⚖C9Discord &#CF6679отключён")); case "reload" -> { try { discord.reload(); diff --git a/src/main/java/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.java b/src/main/java/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.java index 0506450..e7c57cb 100644 --- a/src/main/java/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.java +++ b/src/main/java/com/loki/lochat/commands/admin/chat/ClearChatConfigCommand.java @@ -50,7 +50,8 @@ public class ClearChatConfigCommand implements CommandExecutor, TabCompleter { sender.sendMessage(ChatFormatter.parse("⚖C9Сообщение установлено: &f" + msg)); } case "status" -> { - sender.sendMessage(ChatFormatter.parse("&#B798A8Включено: " + (plugin.getConfigManager().isClearChatMessageEnabled() ? "ẲE9да" : "&#CF6679нет"))); + sender.sendMessage(ChatFormatter.parse("&#B798A8Включено: " + + (plugin.getConfigManager().isClearChatMessageEnabled() ? "ẲE9да" : "&#CF6679нет"))); sender.sendMessage(ChatFormatter.parse("&#B798A8Текст: &f" + plugin.getConfigManager().getClearChatMessage())); } default -> sender.sendMessage(ChatFormatter.parse("&#CF6679Неизвестный аргумент")); diff --git a/src/main/java/com/loki/lochat/commands/admin/system/LoChatCommand.java b/src/main/java/com/loki/lochat/commands/admin/system/LoChatCommand.java index d771d53..201c792 100644 --- a/src/main/java/com/loki/lochat/commands/admin/system/LoChatCommand.java +++ b/src/main/java/com/loki/lochat/commands/admin/system/LoChatCommand.java @@ -45,7 +45,8 @@ public class LoChatCommand implements CommandExecutor, TabCompleter { } else { var cmds = plugin.getCustomCommandManager().getCommands(); sender.sendMessage(ChatFormatter.parse("&#B798A8Кастомные команды ⚖C9(" + cmds.size() + "⚖C9):")); - cmds.values().forEach(c -> sender.sendMessage(ChatFormatter.parse("ẲE9/" + c.name() + " &#B798A8(" + c.type() + ")"))); + cmds.values().forEach(c -> sender.sendMessage( + ChatFormatter.parse("ẲE9/" + c.name() + " &#B798A8(" + c.type() + ")"))); } } default -> sender.sendMessage(ChatFormatter.parse("&#CF6679Неизвестная команда")); diff --git a/src/main/java/com/loki/lochat/commands/chat/GlobalChatCommand.java b/src/main/java/com/loki/lochat/commands/chat/GlobalChatCommand.java index b4be2e2..76c071e 100644 --- a/src/main/java/com/loki/lochat/commands/chat/GlobalChatCommand.java +++ b/src/main/java/com/loki/lochat/commands/chat/GlobalChatCommand.java @@ -33,7 +33,8 @@ public class GlobalChatCommand implements CommandExecutor { if (command.getName().equalsIgnoreCase("globalchat")) { if (args.length > 0 && args[0].equalsIgnoreCase("toggle")) { boolean enabled = chatService.toggleGlobalChat(player.getUniqueId()); - player.sendMessage(ChatFormatter.parse(plugin.getMessageConfig().get(enabled ? "global.toggled-on" : "global.toggled-off"))); + player.sendMessage(ChatFormatter.parse( + plugin.getMessageConfig().get(enabled ? "global.toggled-on" : "global.toggled-off"))); } else { player.sendMessage(ChatFormatter.parse(plugin.getMessageConfig().getInvalidUsage("/globalchat toggle"))); } diff --git a/src/main/java/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.java b/src/main/java/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.java index ce8f184..6966cc6 100644 --- a/src/main/java/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.java +++ b/src/main/java/com/loki/lochat/commands/moderation/mute/MuteHistoryCommand.java @@ -56,12 +56,15 @@ public class MuteHistoryCommand implements CommandExecutor, TabCompleter { return true; } - sender.sendMessage("ẲE9▬▬▬▬▬ &#B798A8История мутов ⚖C9" + args[0] + " ⚖C9(" + history.size() + "⚖C9) ẲE9▬▬▬▬▬"); + sender.sendMessage("ẲE9▬▬▬▬▬ &#B798A8История мутов ⚖C9" + args[0] + + " ⚖C9(" + history.size() + "⚖C9) ẲE9▬▬▬▬▬"); int idx = 1; for (int i = history.size() - 1; i >= 0 && idx <= 10; i--, idx++) { MuteData.MuteHistoryEntry e = history.get(i); String status = e.unmuted ? "⚖C9Размучен" : (e.duration == 0 ? "&#CF6679Активен (навсегда)" : - System.currentTimeMillis() > e.mutedAt + e.duration ? "&#B798A8Истёк" : "&#CF6679Активен (" + muteService.formatTime(e.mutedAt + e.duration - System.currentTimeMillis()) + ")"); + System.currentTimeMillis() > e.mutedAt + e.duration ? "&#B798A8Истёк" + : "&#CF6679Активен (" + muteService.formatTime( + e.mutedAt + e.duration - System.currentTimeMillis()) + ")"); sender.sendMessage("⚖C9" + idx + ". &f" + fmt.format(new Date(e.mutedAt)) + " &#B798A8— " + status); sender.sendMessage(" &#B798A8Длительность: &f" + (e.duration == 0 ? "навсегда" : muteService.formatTime(e.duration))); sender.sendMessage(" &#B798A8Причина: &f" + (e.reason != null ? e.reason : "—") + " &#B798A8Выдал: ẲE9" + e.mutedBy); diff --git a/src/main/java/com/loki/lochat/commands/moderation/mute/MuteListCommand.java b/src/main/java/com/loki/lochat/commands/moderation/mute/MuteListCommand.java index 341f62e..1b722af 100644 --- a/src/main/java/com/loki/lochat/commands/moderation/mute/MuteListCommand.java +++ b/src/main/java/com/loki/lochat/commands/moderation/mute/MuteListCommand.java @@ -44,7 +44,8 @@ public class MuteListCommand implements CommandExecutor { for (Map.Entry e : mutes.entrySet()) { MuteData d = e.getValue(); String name = d.getPlayerName() != null ? d.getPlayerName() : Bukkit.getOfflinePlayer(e.getKey()).getName(); - String time = d.isPermanent() ? "&#CF6679навсегда" : "ẲE9" + muteService.formatTime(d.getEndTime() - System.currentTimeMillis()); + String time = d.isPermanent() ? "&#CF6679навсегда" + : "ẲE9" + muteService.formatTime(d.getEndTime() - System.currentTimeMillis()); sender.sendMessage("⚖C9" + i + ". &f" + name + " &#B798A8— " + time); sender.sendMessage(" &#B798A8Причина: &f" + (d.getReason() != null ? d.getReason() : "—")); sender.sendMessage(" &#B798A8Выдал: ẲE9" + d.getMutedBy() + " &#B798A8(" + fmt.format(new Date(d.getMutedAt())) + ")"); diff --git a/src/main/java/com/loki/lochat/commands/nick/PlayerInfoCommand.java b/src/main/java/com/loki/lochat/commands/nick/PlayerInfoCommand.java index 86ddbab..5ff34a3 100644 --- a/src/main/java/com/loki/lochat/commands/nick/PlayerInfoCommand.java +++ b/src/main/java/com/loki/lochat/commands/nick/PlayerInfoCommand.java @@ -86,7 +86,8 @@ public class PlayerInfoCommand implements CommandExecutor, TabCompleter { String tag = w.silent ? "&#B798A8[тихий] " : ""; String reason = w.reason != null ? w.reason : "—"; long t = w.time; - sender.sendMessage(ChatFormatter.parse(tag + "⚖C9• &7" + formatTime(t) + " &#B798A8от ẲE9" + w.moderator + "⚖C9: &f" + reason)); + sender.sendMessage(ChatFormatter.parse( + tag + "⚖C9• &7" + formatTime(t) + " &#B798A8от ẲE9" + w.moderator + "⚖C9: &f" + reason)); } BanRecord ban = punishmentService.getActiveBan(uuid); diff --git a/src/main/java/com/loki/lochat/commands/rp/DoCommand.java b/src/main/java/com/loki/lochat/commands/rp/DoCommand.java index 890bd38..99cf0b4 100644 --- a/src/main/java/com/loki/lochat/commands/rp/DoCommand.java +++ b/src/main/java/com/loki/lochat/commands/rp/DoCommand.java @@ -47,8 +47,8 @@ public class DoCommand extends PlayerCommand { } String description = String.join(" ", args); - String format = plugin.getConfigManager().getString("rp.do-format", - "[Сцена] {description} ({player})"); + String format = plugin.getConfigManager().getString("rp.do-format", "[" + + "Сцена] {description} ({player})"); String displayName = RpUtil.getDisplayName(plugin, player); Component message = ChatFormatter.parse( diff --git a/src/main/java/com/loki/lochat/commands/rp/RollCommand.java b/src/main/java/com/loki/lochat/commands/rp/RollCommand.java index d24157b..a870190 100644 --- a/src/main/java/com/loki/lochat/commands/rp/RollCommand.java +++ b/src/main/java/com/loki/lochat/commands/rp/RollCommand.java @@ -62,8 +62,9 @@ public class RollCommand extends PlayerCommand { int result = RANDOM.nextInt(max) + 1; // 1..max включительно - String format = plugin.getConfigManager().getString("rp.roll-format", - "* {player} бросает кубик и получает {result} из {max}"); + String format = plugin.getConfigManager().getString("rp.roll-format", "* " + + "{player} бросает кубик и получает {result}" + + " из {max}"); String displayName = RpUtil.getDisplayName(plugin, player); Component message = ChatFormatter.parse( diff --git a/src/main/java/com/loki/lochat/config/MessagesConfig.java b/src/main/java/com/loki/lochat/config/MessagesConfig.java index c2e792e..46a4803 100644 --- a/src/main/java/com/loki/lochat/config/MessagesConfig.java +++ b/src/main/java/com/loki/lochat/config/MessagesConfig.java @@ -96,7 +96,8 @@ public class MessagesConfig extends BaseConfig { } public String getMuteTimeHelp() { - return getConfig().getString("commands.mute.time_help", "⚖C9Время: ẲE91d⚖C9, ẲE92h⚖C9, ẲE930m⚖C9, ẲE960s⚖C9, ẲE9perm"); + return getConfig().getString("commands.mute.time_help", + "⚖C9Время: ẲE91d⚖C9, ẲE92h⚖C9, ẲE930m⚖C9, ẲE960s⚖C9, ẲE9perm"); } public String getMuteSilentHelp() { @@ -192,7 +193,8 @@ public class MessagesConfig extends BaseConfig { } public String getSilentWarnStaff() { - return getConfig().getString("moderation.silent_warn_staff", "&#B798A8[⚖C9ТИХИЙ ВАРН&#B798A8] ẲE9{player}⚖C9: &#B798A8{reason}"); + return getConfig().getString("moderation.silent_warn_staff", + "&#B798A8[⚖C9ТИХИЙ ВАРН&#B798A8] ẲE9{player}⚖C9: &#B798A8{reason}"); } public String getBanUsage() { diff --git a/src/main/java/com/loki/lochat/gradient/data/GradientDataManager.java b/src/main/java/com/loki/lochat/gradient/data/GradientDataManager.java index 0ae28ec..3cb5b6d 100644 --- a/src/main/java/com/loki/lochat/gradient/data/GradientDataManager.java +++ b/src/main/java/com/loki/lochat/gradient/data/GradientDataManager.java @@ -101,7 +101,8 @@ public class GradientDataManager { if (useSqlite && sqliteConnection != null) { try (PreparedStatement stmt = sqliteConnection.prepareStatement( - "SELECT prefix, colors, color_enabled, prefix_enabled, prefix_purchased, last_color_change, last_prefix_change FROM gradient_data WHERE uuid = ?")) { + "SELECT prefix, colors, color_enabled, prefix_enabled, " + + "prefix_purchased, last_color_change, last_prefix_change FROM gradient_data WHERE uuid = ?")) { stmt.setString(1, uuid.toString()); ResultSet rs = stmt.executeQuery(); if (rs.next()) { @@ -132,7 +133,9 @@ public class GradientDataManager { if (useSqlite && sqliteConnection != null) { try (PreparedStatement stmt = sqliteConnection.prepareStatement( - "INSERT OR REPLACE INTO gradient_data (uuid, prefix, colors, color_enabled, prefix_enabled, prefix_purchased, last_color_change, last_prefix_change) VALUES (?, ?, ?, ?, ?, ?, ?, ?)")) { + "INSERT OR REPLACE INTO gradient_data " + + "(uuid, prefix, colors, color_enabled, prefix_enabled, " + + "prefix_purchased, last_color_change, last_prefix_change) VALUES (?, ?, ?, ?, ?, ?, ?, ?)")) { stmt.setString(1, uuid.toString()); stmt.setString(2, data.getPrefix()); stmt.setString(3, data.hasColors() ? String.join(",", data.getColors()) : ""); diff --git a/src/main/java/com/loki/lochat/managers/commands/PlaceholderProcessor.java b/src/main/java/com/loki/lochat/managers/commands/PlaceholderProcessor.java index 3b0e7ff..3274815 100644 --- a/src/main/java/com/loki/lochat/managers/commands/PlaceholderProcessor.java +++ b/src/main/java/com/loki/lochat/managers/commands/PlaceholderProcessor.java @@ -12,7 +12,9 @@ public class PlaceholderProcessor { // Базовые плейсхолдеры result = result.replace("{player}", player.getName()); - result = result.replace("{displayname}", net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText().serialize(player.displayName())); + result = result.replace("{displayname}", + net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText() + .serialize(player.displayName())); result = result.replace("{world}", player.getWorld().getName()); result = result.replace("{x}", String.valueOf(player.getLocation().getBlockX())); result = result.replace("{y}", String.valueOf(player.getLocation().getBlockY())); diff --git a/src/main/java/com/loki/lochat/utils/platform/AdventureManager.java b/src/main/java/com/loki/lochat/utils/platform/AdventureManager.java index f6ade84..c860ebe 100644 --- a/src/main/java/com/loki/lochat/utils/platform/AdventureManager.java +++ b/src/main/java/com/loki/lochat/utils/platform/AdventureManager.java @@ -50,7 +50,9 @@ public class AdventureManager { try { // Используем Adventure API Object senderAudience = audiences.getClass().getMethod("sender", CommandSender.class).invoke(audiences, sender); - senderAudience.getClass().getMethod("sendMessage", Class.forName("net.kyori.adventure.text.Component")).invoke(senderAudience, message); + senderAudience.getClass() + .getMethod("sendMessage", Class.forName("net.kyori.adventure.text.Component")) + .invoke(senderAudience, message); return; } catch (Exception e) { // Fallback на legacy