fix: zero checkstyle warnings, exclude test sources, fix LineLength
This commit is contained in:
parent
4efccd3968
commit
dd0fb0f10d
26 changed files with 43 additions and 20 deletions
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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Неизвестный аргумент"));
|
||||
|
|
|
|||
|
|
@ -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Неизвестная команда"));
|
||||
|
|
|
|||
|
|
@ -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")));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,8 @@ public class MuteListCommand implements CommandExecutor {
|
|||
for (Map.Entry<UUID, MuteData> 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())) + ")");
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ public class DoCommand extends PlayerCommand {
|
|||
}
|
||||
|
||||
String description = String.join(" ", args);
|
||||
String format = plugin.getConfigManager().getString("rp.do-format",
|
||||
"<dark_gray>[</dark_gray><gray>Сцена</gray><dark_gray>]</dark_gray> <white>{description}</white> <dark_gray>({player})</dark_gray>");
|
||||
String format = plugin.getConfigManager().getString("rp.do-format", "<dark_gray>[</dark_gray>"
|
||||
+ "<gray>Сцена</gray><dark_gray>]</dark_gray> <white>{description}</white> <dark_gray>({player})</dark_gray>");
|
||||
|
||||
String displayName = RpUtil.getDisplayName(plugin, player);
|
||||
Component message = ChatFormatter.parse(
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
"<gray>* </gray><white>{player}</white><gray> бросает кубик и получает </gray><yellow><bold>{result}</bold></yellow><gray> из </gray><yellow>{max}</yellow>");
|
||||
String format = plugin.getConfigManager().getString("rp.roll-format", "<gray>* </gray>"
|
||||
+ "<white>{player}</white><gray> бросает кубик и получает </gray><yellow><bold>{result}</bold></yellow>"
|
||||
+ "<gray> из </gray><yellow>{max}</yellow>");
|
||||
|
||||
String displayName = RpUtil.getDisplayName(plugin, player);
|
||||
Component message = ChatFormatter.parse(
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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()) : "");
|
||||
|
|
|
|||
|
|
@ -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()));
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue