diff --git a/build-number.txt b/build-number.txt index 10d0a7a3..ea14c70b 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2516 \ No newline at end of file +2520 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java index 6ae42348..0f5b2d45 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -113,7 +113,11 @@ public class Bot extends SessionAdapter { public PlayersDatabasePlugin playersDatabase; public IPFilterPlugin ipFilter; - public Bot (Configuration.BotOption botOption, List bots, Configuration config) { + public Bot ( + final Configuration.BotOption botOption, + final List bots, + final Configuration config + ) { this.host = botOption.host; this.port = botOption.port; @@ -168,7 +172,7 @@ public class Bot extends SessionAdapter { this.playersDatabase = new PlayersDatabasePlugin(this); this.ipFilter = new IPFilterPlugin(this); - for (Listener listener : listeners) listener.loadedPlugins(this); + for (final Listener listener : listeners) listener.loadedPlugins(this); reconnect(); } @@ -176,7 +180,7 @@ public class Bot extends SessionAdapter { private void reconnect () { if (session != null) session = null; // does this do nothing? - for (Listener listener : listeners) { + for (final Listener listener : listeners) { listener.connecting(); } @@ -208,48 +212,48 @@ public class Bot extends SessionAdapter { } @Override - public void packetReceived (Session session, Packet packet) { - for (SessionListener listener : listeners) { + public void packetReceived (final Session session, final Packet packet) { + for (final SessionListener listener : listeners) { try { listener.packetReceived(session, packet); - } catch (Exception e) { + } catch (final Exception e) { logger.error(e); } } - if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundFinishConfigurationPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundLoginFinishedPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundCustomQueryPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundCookieRequestPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundTransferPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundStoreCookiePacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundLoginCompressionPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); + if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundFinishConfigurationPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundLoginFinishedPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundCustomQueryPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundCookieRequestPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundTransferPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundStoreCookiePacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundLoginCompressionPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundLoginFinishedPacket packet) { + private void packetReceived (final ClientboundLoginFinishedPacket packet) { profile = packet.getProfile(); session.setFlag(BuiltinFlags.CLIENT_TRANSFERRING, false); } - private void packetReceived (ClientboundLoginPacket ignoredPacket) { + private void packetReceived (final ClientboundLoginPacket ignoredPacket) { loggedIn = true; loginTime = System.currentTimeMillis(); - for (SessionListener listener : listeners) { + for (final SessionListener listener : listeners) { listener.connected(new ConnectedEvent(session)); } session.send(ServerboundPlayerLoadedPacket.INSTANCE); } - private void packetReceived (ClientboundCustomQueryPacket packet) { + private void packetReceived (final ClientboundCustomQueryPacket packet) { session.send(new ServerboundCustomQueryAnswerPacket(packet.getMessageId(), null)); } - private void packetReceived (ClientboundCustomPayloadPacket packet) { + private void packetReceived (final ClientboundCustomPayloadPacket packet) { if (!packet.getChannel().asString().equals("minecraft:register")) return; session.send( @@ -260,7 +264,7 @@ public class Bot extends SessionAdapter { ); } - private void packetReceived (ClientboundCookieRequestPacket packet) { + private void packetReceived (final ClientboundCookieRequestPacket packet) { session.send( new ServerboundCookieResponsePacket( packet.getKey(), @@ -269,11 +273,11 @@ public class Bot extends SessionAdapter { ); } - private void packetReceived (ClientboundStoreCookiePacket packet) { + private void packetReceived (final ClientboundStoreCookiePacket packet) { cookies.put(packet.getKey(), packet.getPayload()); } - private void packetReceived (ClientboundTransferPacket ignoredPacket) { + private void packetReceived (final ClientboundTransferPacket ignoredPacket) { this.isTransferring = true; session.disconnect(Component.translatable("disconnect.transfer")); @@ -281,7 +285,7 @@ public class Bot extends SessionAdapter { // we're not meant to send client information at finish configuration, // but if it works it works™ - private void packetReceived (ClientboundFinishConfigurationPacket ignoredPacket) { + private void packetReceived (final ClientboundFinishConfigurationPacket ignoredPacket) { // for voicechat session.send(new ServerboundCustomPayloadPacket( Key.key("minecraft:brand"), @@ -316,43 +320,43 @@ public class Bot extends SessionAdapter { // they actually implemented this, but at this commit: // https://github.com/GeyserMC/MCProtocolLib/commit/f8460356db2b92fbf7cb506757fe8f87a011a1f7#diff-a9066adbcb6d5503f5edefe3ec95465cf755f1585e02b732a6fa907afe7c7177R67-L103 // they removed it, for some reason - private void packetReceived (ClientboundLoginCompressionPacket packet) { + private void packetReceived (final ClientboundLoginCompressionPacket packet) { if (packet.getThreshold() < 0) { session.setCompression(null); } } @Override - public void packetSending (PacketSendingEvent packetSendingEvent) { - for (SessionListener listener : listeners) { + public void packetSending (final PacketSendingEvent packetSendingEvent) { + for (final SessionListener listener : listeners) { listener.packetSending(packetSendingEvent); } } @Override - public void packetSent (Session session, Packet packet) { - for (SessionListener listener : listeners) { + public void packetSent (final Session session, final Packet packet) { + for (final SessionListener listener : listeners) { listener.packetSent(session, packet); } } @Override - public void packetError (PacketErrorEvent packetErrorEvent) { - for (SessionListener listener : listeners) { + public void packetError (final PacketErrorEvent packetErrorEvent) { + for (final SessionListener listener : listeners) { listener.packetError(packetErrorEvent); } packetErrorEvent.setSuppress(true); // fixes the ohio sus exploit } @Override - public void disconnecting (DisconnectingEvent disconnectingEvent) { - for (SessionListener listener : listeners) { + public void disconnecting (final DisconnectingEvent disconnectingEvent) { + for (final SessionListener listener : listeners) { listener.disconnecting(disconnectingEvent); } } @Override - public void disconnected (DisconnectedEvent disconnectedEvent) { + public void disconnected (final DisconnectedEvent disconnectedEvent) { loggedIn = false; final Throwable cause = disconnectedEvent.getCause(); @@ -382,14 +386,14 @@ public class Bot extends SessionAdapter { executor.schedule(this::reconnect, reconnectDelay, TimeUnit.MILLISECONDS); } - for (SessionListener listener : listeners) { + for (final SessionListener listener : listeners) { listener.disconnected(disconnectedEvent); } } public String getServerString () { return getServerString(false); } - public String getServerString (boolean bypassHidden) { + public String getServerString (final boolean bypassHidden) { return options.hidden && !bypassHidden ? options.serverName : host + ":" + port; @@ -400,7 +404,7 @@ public class Bot extends SessionAdapter { Main.bots.remove(this); } - public void addListener (Listener listener) { + public void addListener (final Listener listener) { listeners.add(listener); } @@ -417,6 +421,6 @@ public class Bot extends SessionAdapter { public static class Listener extends SessionAdapter { public void connecting () { } - public void loadedPlugins (Bot bot) { } + public void loadedPlugins (final Bot bot) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java index 32f28f17..b3ec437d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Main.java +++ b/src/main/java/me/chayapak1/chomens_bot/Main.java @@ -51,7 +51,7 @@ public class Main { public static DiscordPlugin discord; public static IRCPlugin irc; - public static void main (String[] args) throws IOException { + public static void main (final String[] args) throws IOException { final Path configPath = Path.of("config.yml"); final Constructor constructor = new Constructor(Configuration.class, new LoaderOptions()); @@ -59,20 +59,20 @@ public class Main { if (!Files.exists(configPath)) { // creates config file from default-config.yml - InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("default-config.yml"); + final InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream("default-config.yml"); if (is == null) System.exit(1); - BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - StringBuilder stringBuilder = new StringBuilder(); + final BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + final StringBuilder stringBuilder = new StringBuilder(); while (reader.ready()) { - char character = (char) reader.read(); + final char character = (char) reader.read(); stringBuilder.append(character); } - String defaultConfig = stringBuilder.toString(); + final String defaultConfig = stringBuilder.toString(); // writes it - BufferedWriter configWriter = Files.newBufferedWriter(configPath); + final BufferedWriter configWriter = Files.newBufferedWriter(configPath); configWriter.write(defaultConfig); configWriter.close(); @@ -81,8 +81,8 @@ public class Main { System.exit(1); } - InputStream opt = Files.newInputStream(configPath); - BufferedReader reader = new BufferedReader(new InputStreamReader(opt)); + final InputStream opt = Files.newInputStream(configPath); + final BufferedReader reader = new BufferedReader(new InputStreamReader(opt)); config = yaml.load(reader); @@ -99,7 +99,7 @@ public class Main { HttpUtilities.getRequest(new URI(config.backup.address).toURL()); reachable = true; - } catch (Exception e) { + } catch (final Exception e) { reachable = false; } @@ -128,7 +128,7 @@ public class Main { try { final Configuration.BotOption[] botsOptions = config.bots; - for (Configuration.BotOption botOption : botsOptions) { + for (final Configuration.BotOption botOption : botsOptions) { final Bot bot = new Bot(botOption, bots, config); bots.add(bot); } @@ -141,8 +141,8 @@ public class Main { LoggerUtilities.log("Initialized all bots. Now connecting"); - for (Bot bot : bots) bot.connect(); - } catch (Exception e) { + for (final Bot bot : bots) bot.connect(); + } catch (final Exception e) { LoggerUtilities.error(e); System.exit(1); @@ -155,22 +155,22 @@ public class Main { if (Files.exists(stopReasonFilePath)) { try { reason = new String(Files.readAllBytes(stopReasonFilePath)).trim(); - } catch (IOException ignored) { } + } catch (final IOException ignored) { } } stop(0, reason, false); } // most of these are stolen from HBot - public static void stop (int exitCode) { stop(exitCode, null, null, true); } + public static void stop (final int exitCode) { stop(exitCode, null, null, true); } - public static void stop (int exitCode, String reason) { stop(exitCode, reason, null, true); } + public static void stop (final int exitCode, final String reason) { stop(exitCode, reason, null, true); } - public static void stop (int exitCode, String reason, String type) { stop(exitCode, reason, type, true); } + public static void stop (final int exitCode, final String reason, final String type) { stop(exitCode, reason, type, true); } - public static void stop (int exitCode, String reason, boolean callSystemExit) { stop(exitCode, reason, null, callSystemExit); } + public static void stop (final int exitCode, final String reason, final boolean callSystemExit) { stop(exitCode, reason, null, callSystemExit); } - public static void stop (int exitCode, String reason, String type, boolean callSystemExit) { + public static void stop (final int exitCode, final String reason, final String type, final boolean callSystemExit) { if (stopping) return; stopping = true; @@ -189,7 +189,7 @@ public class Main { if (database != null) database.stop(); - ArrayList copiedList; + final ArrayList copiedList; synchronized (bots) { copiedList = new ArrayList<>(bots); } @@ -202,7 +202,7 @@ public class Main { final boolean[] stoppedDiscord = new boolean[copiedList.size()]; int botIndex = 0; - for (Bot bot : copiedList) { + for (final Bot bot : copiedList) { try { if (discordEnabled) { final String channelId = Main.discord.servers.get(bot.getServerString(true)); @@ -217,7 +217,7 @@ public class Main { } bot.stop(); - } catch (Exception ignored) { } + } catch (final Exception ignored) { } botIndex++; } @@ -227,7 +227,7 @@ public class Main { try { if (!ArrayUtilities.isAllTrue(stoppedDiscord)) Thread.sleep(50); else break; - } catch (InterruptedException ignored) { } + } catch (final InterruptedException ignored) { } } discord.jda.shutdown(); diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java index 1eb509a6..9320f594 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java @@ -16,18 +16,18 @@ import java.util.List; public class KaboomChatParser implements ChatParser { private final Bot bot; - public KaboomChatParser (Bot bot) { + public KaboomChatParser (final Bot bot) { this.bot = bot; } @Override - public PlayerMessage parse (Component message) { + public PlayerMessage parse (final Component message) { if (message instanceof TextComponent) return parse((TextComponent) message); return null; } - public PlayerMessage parse (TextComponent message) { - List children = message.children(); + public PlayerMessage parse (final TextComponent message) { + final List children = message.children(); if (!message.content().isEmpty() || !message.style().isEmpty() || children.size() < 3) return null; @@ -66,7 +66,7 @@ public class KaboomChatParser implements ChatParser { return new PlayerMessage(sender, displayName, contents); } - private boolean isSeperatorAt (List children, int start) { + private boolean isSeperatorAt (final List children, final int start) { return ( children.get(start).equals(Component.text(":")) || children.get(start).equals(Component.text("§f:")) diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java index 90125439..87e826ee 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java @@ -27,17 +27,17 @@ public class MinecraftChatParser implements ChatParser { keys.add("chat.type.emote"); } - public MinecraftChatParser (Bot bot) { + public MinecraftChatParser (final Bot bot) { this.bot = bot; } @Override - public PlayerMessage parse (Component message) { + public PlayerMessage parse (final Component message) { if (message instanceof TranslatableComponent) return parse((TranslatableComponent) message); return null; } - public PlayerMessage parse (TranslatableComponent message) { + public PlayerMessage parse (final TranslatableComponent message) { final List args = message.arguments(); final String key = message.key(); if (args.size() < 2 || !keys.contains(key)) return null; @@ -45,11 +45,11 @@ public class MinecraftChatParser implements ChatParser { final Component senderComponent = args.getFirst().asComponent(); final Component contents = args.get(1).asComponent(); - PlayerEntry sender; + final PlayerEntry sender; final HoverEvent hoverEvent = senderComponent.hoverEvent(); if (hoverEvent != null && hoverEvent.action().equals(HoverEvent.Action.SHOW_ENTITY)) { - HoverEvent.ShowEntity entityInfo = (HoverEvent.ShowEntity) hoverEvent.value(); + final HoverEvent.ShowEntity entityInfo = (HoverEvent.ShowEntity) hoverEvent.value(); final UUID senderUUID = entityInfo.id(); sender = bot.players.getEntry(senderUUID); } else { diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java index 123ebad1..1f48a7b6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java @@ -17,18 +17,18 @@ import java.util.UUID; public class U203aChatParser implements ChatParser { private final Bot bot; - public U203aChatParser (Bot bot) { + public U203aChatParser (final Bot bot) { this.bot = bot; } @Override - public PlayerMessage parse (Component message) { + public PlayerMessage parse (final Component message) { if (message instanceof TranslatableComponent) return parse((TranslatableComponent) message); return null; } // very similar to MinecraftChatParser - public PlayerMessage parse (TranslatableComponent message) { + public PlayerMessage parse (final TranslatableComponent message) { final List args = message.arguments(); if (args.size() < 3 || (!message.key().equals("[%s] %s › %s") && !message.key().equals("%s %s › %s"))) return null; @@ -36,10 +36,10 @@ public class U203aChatParser implements ChatParser { final Component senderComponent = args.get(1).asComponent(); final Component contents = args.get(2).asComponent(); - PlayerEntry sender; + final PlayerEntry sender; final HoverEvent hoverEvent = senderComponent.hoverEvent(); if (hoverEvent != null && hoverEvent.action().equals(HoverEvent.Action.SHOW_ENTITY)) { - HoverEvent.ShowEntity entityInfo = (HoverEvent.ShowEntity) hoverEvent.value(); + final HoverEvent.ShowEntity entityInfo = (HoverEvent.ShowEntity) hoverEvent.value(); final UUID senderUUID = entityInfo.id(); sender = bot.players.getEntry(senderUUID); } else { diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Encryptor.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Encryptor.java index 7b669e39..284760e7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Encryptor.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Encryptor.java @@ -20,7 +20,7 @@ public class Encryptor { private static final int ITERATIONS = 65536; private static final int KEY_LENGTH = 256; - public static String encrypt (byte[] data, String password) throws Exception { + public static String encrypt (final byte[] data, final String password) throws Exception { final byte[] salt = generateRandomBytes(SALT_LENGTH); final SecretKey key = deriveKey(password, salt); @@ -39,7 +39,7 @@ public class Encryptor { return Ascii85.encode(combined); } - public static byte[] decrypt (String ascii85Data, String password) throws Exception { + public static byte[] decrypt (final String ascii85Data, final String password) throws Exception { final byte[] combined = Ascii85.decode(ascii85Data); final byte[] salt = new byte[SALT_LENGTH]; @@ -58,14 +58,14 @@ public class Encryptor { return cipher.doFinal(encrypted); } - private static SecretKey deriveKey (String password, byte[] salt) throws Exception { + private static SecretKey deriveKey (final String password, final byte[] salt) throws Exception { final SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256"); final KeySpec spec = new PBEKeySpec(password.toCharArray(), salt, ITERATIONS, KEY_LENGTH); final SecretKey tmp = factory.generateSecret(spec); return new SecretKeySpec(tmp.getEncoded(), "AES"); } - private static byte[] generateRandomBytes (int length) { + private static byte[] generateRandomBytes (final int length) { final byte[] bytes = new byte[length]; RANDOM.nextBytes(bytes); return bytes; diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java index 3afb69a4..89025c2f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/PacketHandler.java @@ -13,16 +13,16 @@ import java.util.concurrent.CompletableFuture; public class PacketHandler { private final Bot bot; - public PacketHandler (Bot bot) { + public PacketHandler (final Bot bot) { this.bot = bot; } - public void handlePacket (PlayerEntry player, Packet packet) { - if (packet instanceof ServerboundRunCoreCommandPacket t_packet) handlePacket(player, t_packet); - else if (packet instanceof ServerboundRunCommandPacket t_packet) handlePacket(player, t_packet); + public void handlePacket (final PlayerEntry player, final Packet packet) { + if (packet instanceof final ServerboundRunCoreCommandPacket t_packet) handlePacket(player, t_packet); + else if (packet instanceof final ServerboundRunCommandPacket t_packet) handlePacket(player, t_packet); } - private void handlePacket (PlayerEntry player, ServerboundRunCoreCommandPacket packet) { + private void handlePacket (final PlayerEntry player, final ServerboundRunCoreCommandPacket packet) { final CompletableFuture future = bot.core.runTracked(packet.command); if (future == null) { @@ -50,7 +50,7 @@ public class PacketHandler { }); } - private void handlePacket (PlayerEntry player, ServerboundRunCommandPacket packet) { + private void handlePacket (final PlayerEntry player, final ServerboundRunCommandPacket packet) { final String input = packet.input; // the input is raw, no prefix included final ChomeNSModCommandContext context = new ChomeNSModCommandContext( diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Types.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Types.java index c0811593..7cbf4ef7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Types.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Types.java @@ -8,25 +8,25 @@ import java.nio.charset.StandardCharsets; import java.util.UUID; public class Types { - public static UUID readUUID (ByteBuf buf) { + public static UUID readUUID (final ByteBuf buf) { final long mostSignificantBits = buf.readLong(); final long leastSignificantBits = buf.readLong(); return new UUID(mostSignificantBits, leastSignificantBits); } - public static void writeUUID (ByteBuf buf, UUID uuid) { + public static void writeUUID (final ByteBuf buf, final UUID uuid) { buf.writeLong(uuid.getMostSignificantBits()); buf.writeLong(uuid.getLeastSignificantBits()); } - public static void writeString (ByteBuf buf, String string) { + public static void writeString (final ByteBuf buf, final String string) { final byte[] bytes = string.getBytes(StandardCharsets.UTF_8); buf.writeInt(bytes.length); buf.writeBytes(bytes); } - public static String readString (ByteBuf buf) { + public static String readString (final ByteBuf buf) { final int length = buf.readInt(); final byte[] bytes = new byte[length]; @@ -35,17 +35,17 @@ public class Types { return new String(bytes, StandardCharsets.UTF_8); } - public static Component readComponent (ByteBuf buf) { + public static Component readComponent (final ByteBuf buf) { final String stringJSON = readString(buf); try { return GsonComponentSerializer.gson().deserialize(stringJSON); - } catch (Exception e) { + } catch (final Exception e) { return null; } } - public static void writeComponent (ByteBuf buf, Component component) { + public static void writeComponent (final ByteBuf buf, final Component component) { final String stringJSON = GsonComponentSerializer.gson().serialize(component); writeString(buf, stringJSON); diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundCoreOutputPacket.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundCoreOutputPacket.java index 3b690529..d10fbec0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundCoreOutputPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundCoreOutputPacket.java @@ -11,12 +11,12 @@ public class ClientboundCoreOutputPacket implements Packet { public final UUID runID; public final Component output; - public ClientboundCoreOutputPacket (UUID runID, Component output) { + public ClientboundCoreOutputPacket (final UUID runID, final Component output) { this.runID = runID; this.output = output; } - public ClientboundCoreOutputPacket (ByteBuf buf) { + public ClientboundCoreOutputPacket (final ByteBuf buf) { this.runID = Types.readUUID(buf); this.output = Types.readComponent(buf); } @@ -27,7 +27,7 @@ public class ClientboundCoreOutputPacket implements Packet { } @Override - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { Types.writeUUID(buf, this.runID); Types.writeComponent(buf, this.output); } diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundHandshakePacket.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundHandshakePacket.java index 2e4ac67e..41fb49f7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundHandshakePacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundHandshakePacket.java @@ -7,7 +7,7 @@ public class ClientboundHandshakePacket implements Packet { public ClientboundHandshakePacket () { } - public ClientboundHandshakePacket (ByteBuf buf) { + public ClientboundHandshakePacket (final ByteBuf buf) { } @Override @@ -16,6 +16,6 @@ public class ClientboundHandshakePacket implements Packet { } @Override - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { } } diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundMessagePacket.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundMessagePacket.java index 0f501608..55bfc01b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundMessagePacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/clientboundPackets/ClientboundMessagePacket.java @@ -8,11 +8,11 @@ import net.kyori.adventure.text.Component; public class ClientboundMessagePacket implements Packet { public final Component message; - public ClientboundMessagePacket (Component message) { + public ClientboundMessagePacket (final Component message) { this.message = message; } - public ClientboundMessagePacket (ByteBuf buf) { + public ClientboundMessagePacket (final ByteBuf buf) { this.message = Types.readComponent(buf); } @@ -22,7 +22,7 @@ public class ClientboundMessagePacket implements Packet { } @Override - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { Types.writeComponent(buf, this.message); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCommandPacket.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCommandPacket.java index 18a3810f..8e30e99d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCommandPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCommandPacket.java @@ -7,11 +7,11 @@ import me.chayapak1.chomens_bot.chomeNSMod.Types; public class ServerboundRunCommandPacket implements Packet { public final String input; - public ServerboundRunCommandPacket (String input) { + public ServerboundRunCommandPacket (final String input) { this.input = input; } - public ServerboundRunCommandPacket (ByteBuf buf) { + public ServerboundRunCommandPacket (final ByteBuf buf) { this.input = Types.readString(buf); } @@ -21,7 +21,7 @@ public class ServerboundRunCommandPacket implements Packet { } @Override - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { Types.writeString(buf, this.input); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCoreCommandPacket.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCoreCommandPacket.java index d798ec70..8ad58f61 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCoreCommandPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundRunCoreCommandPacket.java @@ -10,12 +10,12 @@ public class ServerboundRunCoreCommandPacket implements Packet { public final UUID runID; public final String command; - public ServerboundRunCoreCommandPacket (UUID runID, String command) { + public ServerboundRunCoreCommandPacket (final UUID runID, final String command) { this.runID = runID; this.command = command; } - public ServerboundRunCoreCommandPacket (ByteBuf buf) { + public ServerboundRunCoreCommandPacket (final ByteBuf buf) { this.runID = Types.readUUID(buf); this.command = Types.readString(buf); } @@ -26,7 +26,7 @@ public class ServerboundRunCoreCommandPacket implements Packet { } @Override - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { Types.writeUUID(buf, this.runID); Types.writeString(buf, this.command); } diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundSuccessfulHandshakePacket.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundSuccessfulHandshakePacket.java index 8d989b78..974ee911 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundSuccessfulHandshakePacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/serverboundPackets/ServerboundSuccessfulHandshakePacket.java @@ -7,7 +7,7 @@ public class ServerboundSuccessfulHandshakePacket implements Packet { public ServerboundSuccessfulHandshakePacket () { } - public ServerboundSuccessfulHandshakePacket (ByteBuf buf) { + public ServerboundSuccessfulHandshakePacket (final ByteBuf buf) { } @Override @@ -16,7 +16,7 @@ public class ServerboundSuccessfulHandshakePacket implements Packet { } @Override - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { } } diff --git a/src/main/java/me/chayapak1/chomens_bot/chunk/ChunkColumn.java b/src/main/java/me/chayapak1/chomens_bot/chunk/ChunkColumn.java index 69b0146c..35755507 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chunk/ChunkColumn.java +++ b/src/main/java/me/chayapak1/chomens_bot/chunk/ChunkColumn.java @@ -17,7 +17,7 @@ public class ChunkColumn { private final int minY; - public ChunkColumn (Bot bot, ChunkPos chunkPos, byte[] data, int worldHeight, int minY) { + public ChunkColumn (final Bot bot, final ChunkPos chunkPos, final byte[] data, final int worldHeight, final int minY) { this.bot = bot; this.pos = chunkPos; this.minY = minY; @@ -35,18 +35,18 @@ public class ChunkColumn { } } - public int getBlock (int x, int y, int z) { + public int getBlock (final int x, final int y, final int z) { if (chunks == null) return 0; - int yIndex = (y - minY) >> 4; + final int yIndex = (y - minY) >> 4; if (yIndex >= chunks.length) return 0; return chunks[yIndex].getBlock(x, y & 15, z); } - public void setBlock (int x, int y, int z, int id) { - int yIndex = (y - minY) >> 4; + public void setBlock (final int x, final int y, final int z, final int id) { + final int yIndex = (y - minY) >> 4; if (yIndex >= chunks.length) return; @@ -57,7 +57,7 @@ public class ChunkColumn { } chunks[yIndex].setBlock(x, y & 15, z, id); - } catch (Exception e) { + } catch (final Exception e) { // passing bot just for debugging? really? bot.logger.error( Component.translatable( diff --git a/src/main/java/me/chayapak1/chomens_bot/command/Command.java b/src/main/java/me/chayapak1/chomens_bot/command/Command.java index 98dfa44f..0f104822 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/Command.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/Command.java @@ -15,11 +15,11 @@ public abstract class Command { public ChatPacketType[] disallowedPacketTypes; public Command ( - String name, - String description, - String[] usages, - String[] aliases, - TrustLevel trustLevel + final String name, + final String description, + final String[] usages, + final String[] aliases, + final TrustLevel trustLevel ) { this.name = name; this.description = description; @@ -30,12 +30,12 @@ public abstract class Command { } public Command ( - String name, - String description, - String[] usages, - String[] aliases, - TrustLevel trustLevel, - boolean consoleOnly + final String name, + final String description, + final String[] usages, + final String[] aliases, + final TrustLevel trustLevel, + final boolean consoleOnly ) { this.name = name; this.description = description; @@ -46,13 +46,13 @@ public abstract class Command { } public Command ( - String name, - String description, - String[] usages, - String[] aliases, - TrustLevel trustLevel, - boolean consoleOnly, - ChatPacketType[] disallowedPacketTypes + final String name, + final String description, + final String[] usages, + final String[] aliases, + final TrustLevel trustLevel, + final boolean consoleOnly, + final ChatPacketType[] disallowedPacketTypes ) { this.name = name; this.description = description; diff --git a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java index 795f3b6b..dcfd69ca 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java @@ -29,7 +29,7 @@ public class CommandContext { public String[] fullArgs; public String[] args; - public CommandContext (Bot bot, String prefix, PlayerEntry sender, boolean inGame) { + public CommandContext (final Bot bot, final String prefix, final PlayerEntry sender, final boolean inGame) { this.bot = bot; this.prefix = prefix; this.sender = sender; @@ -38,18 +38,18 @@ public class CommandContext { public Component displayName () { return Component.empty(); } - public void sendOutput (Component component) { } + public void sendOutput (final Component component) { } // args parsing stuff private int argsPosition = 0; - public String getString (boolean greedy, boolean required) throws CommandException { return getString(greedy, required, "string"); } + public String getString (final boolean greedy, final boolean required) throws CommandException { return getString(greedy, required, "string"); } - public String getString (boolean greedy, boolean required, boolean returnLowerCase) throws CommandException { return getString(greedy, returnLowerCase, required, "string"); } + public String getString (final boolean greedy, final boolean required, final boolean returnLowerCase) throws CommandException { return getString(greedy, returnLowerCase, required, "string"); } - private String getString (boolean greedy, boolean required, String type) throws CommandException { return getString(greedy, false, required, type); } + private String getString (final boolean greedy, final boolean required, final String type) throws CommandException { return getString(greedy, false, required, type); } - private String getString (boolean greedy, boolean returnLowerCase, boolean required, String type) throws CommandException { + private String getString (final boolean greedy, final boolean returnLowerCase, final boolean required, final String type) throws CommandException { if (argsPosition >= args.length || args[argsPosition] == null) { if (required) { throw new CommandException( @@ -174,31 +174,31 @@ public class CommandContext { return getString(false, true, true, "action"); } - public Integer getInteger (boolean required) throws CommandException { + public Integer getInteger (final boolean required) throws CommandException { final String string = getString(false, required, "integer"); if (string.isEmpty()) return null; try { return Integer.parseInt(string); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new CommandException(Component.text("Invalid integer")); } } - public Long getLong (boolean required) throws CommandException { + public Long getLong (final boolean required) throws CommandException { final String string = getString(false, required, "long"); if (string.isEmpty()) return null; try { return Long.parseLong(string); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new CommandException(Component.text("Invalid long")); } } - public Double getDouble (boolean required, boolean allowInfinite) throws CommandException { + public Double getDouble (final boolean required, final boolean allowInfinite) throws CommandException { final String string = getString(false, required, "double"); if (string.isEmpty()) return null; @@ -208,12 +208,12 @@ public class CommandContext { if (!Double.isFinite(parsedDouble) && !allowInfinite) throw new NumberFormatException(); else return parsedDouble; - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new CommandException(Component.text("Invalid double")); } } - public Float getFloat (boolean required, boolean allowInfinite) throws CommandException { + public Float getFloat (final boolean required, final boolean allowInfinite) throws CommandException { final String string = getString(false, required, "float"); if (string.isEmpty()) return null; @@ -223,12 +223,12 @@ public class CommandContext { if (!Float.isFinite(parsedFloat) && !allowInfinite) throw new NumberFormatException(); else return parsedFloat; - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new CommandException(Component.text("Invalid float")); } } - public Boolean getBoolean (boolean required) throws CommandException { + public Boolean getBoolean (final boolean required) throws CommandException { final String string = getString(false, required, "boolean"); if (string.isEmpty()) return null; @@ -240,12 +240,12 @@ public class CommandContext { }; } - public > T getEnum (Class enumClass) throws CommandException { + public > T getEnum (final Class enumClass) throws CommandException { final String string = getString(false, true, enumClass.getSimpleName()); try { return Enum.valueOf(enumClass, string.toUpperCase()); - } catch (IllegalArgumentException | NullPointerException e) { + } catch (final IllegalArgumentException | NullPointerException e) { final T[] values = enumClass.getEnumConstants(); throw new CommandException( @@ -258,7 +258,7 @@ public class CommandContext { } } - public void checkOverloadArgs (int maximumArgs) throws CommandException { + public void checkOverloadArgs (final int maximumArgs) throws CommandException { final String joined = String.join(" ", args); final String quotesReplaced = joined.replaceAll("([\"'])(?:\\.|(?!\1).)*\1", "i"); diff --git a/src/main/java/me/chayapak1/chomens_bot/command/CommandException.java b/src/main/java/me/chayapak1/chomens_bot/command/CommandException.java index 611de627..e8b3bf3f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/CommandException.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/CommandException.java @@ -5,7 +5,7 @@ import net.kyori.adventure.text.Component; public class CommandException extends Exception { public final Component message; - public CommandException (Component message) { + public CommandException (final Component message) { this.message = message; } } diff --git a/src/main/java/me/chayapak1/chomens_bot/command/TrustLevel.java b/src/main/java/me/chayapak1/chomens_bot/command/TrustLevel.java index e969d095..bdd87977 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/TrustLevel.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/TrustLevel.java @@ -12,7 +12,7 @@ public enum TrustLevel { public final int level; public final Component component; - TrustLevel (int level, Component component) { + TrustLevel (final int level, final Component component) { this.level = level; this.component = component; } diff --git a/src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java index 3cb77971..52fccd80 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ChomeNSModCommandContext.java @@ -7,7 +7,7 @@ import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; public class ChomeNSModCommandContext extends CommandContext { - public ChomeNSModCommandContext (Bot bot, PlayerEntry sender) { + public ChomeNSModCommandContext (final Bot bot, final PlayerEntry sender) { super( bot, ".cbot ", // intentionally hardcoded @@ -17,7 +17,7 @@ public class ChomeNSModCommandContext extends CommandContext { } @Override - public void sendOutput (Component component) { + public void sendOutput (final Component component) { bot.chomeNSMod.send( sender, new ClientboundMessagePacket(component) diff --git a/src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java index 7fe9a1c4..fd64c74d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/ConsoleCommandContext.java @@ -9,13 +9,13 @@ import net.kyori.adventure.text.format.NamedTextColor; public class ConsoleCommandContext extends CommandContext { private final Bot bot; - public ConsoleCommandContext (Bot bot, String prefix) { + public ConsoleCommandContext (final Bot bot, final String prefix) { super(bot, prefix, bot.players.getBotEntry() /* real */, false); this.bot = bot; } @Override - public void sendOutput (Component component) { + public void sendOutput (final Component component) { bot.logger.log(LogType.COMMAND_OUTPUT, component); } diff --git a/src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java index 96b2ad4b..80c14e68 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/DiscordCommandContext.java @@ -22,7 +22,7 @@ public class DiscordCommandContext extends CommandContext { private final Bot bot; - public DiscordCommandContext (Bot bot, String prefix, MessageReceivedEvent event) { + public DiscordCommandContext (final Bot bot, final String prefix, final MessageReceivedEvent event) { super( bot, prefix, @@ -46,7 +46,7 @@ public class DiscordCommandContext extends CommandContext { } @Override - public void sendOutput (Component component) { + public void sendOutput (final Component component) { String output = ComponentUtilities.stringifyDiscordAnsi(component); if (output.length() > 2048) { diff --git a/src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java index cf385a36..ff50292a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/IRCCommandContext.java @@ -14,7 +14,7 @@ public class IRCCommandContext extends CommandContext { private final Bot bot; private final String nickName; - public IRCCommandContext (Bot bot, String prefix, String nickName) { + public IRCCommandContext (final Bot bot, final String prefix, final String nickName) { super( bot, prefix, @@ -38,7 +38,7 @@ public class IRCCommandContext extends CommandContext { } @Override - public void sendOutput (Component component) { + public void sendOutput (final Component component) { Main.irc.sendMessage(bot, ComponentUtilities.stringifyAnsi(component)); } diff --git a/src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java index 4ba1cdca..efcb4f59 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/contexts/PlayerCommandContext.java @@ -16,12 +16,12 @@ public class PlayerCommandContext extends CommandContext { private final Bot bot; public PlayerCommandContext ( - Bot bot, - String playerName, - String prefix, - String selector, - PlayerEntry sender, - ChatPacketType packetType + final Bot bot, + final String playerName, + final String prefix, + final String selector, + final PlayerEntry sender, + final ChatPacketType packetType ) { super(bot, prefix, sender, true); this.bot = bot; @@ -31,7 +31,7 @@ public class PlayerCommandContext extends CommandContext { } @Override - public void sendOutput (Component message) { + public void sendOutput (final Component message) { bot.chat.tellraw( Component.translatable( "%s", diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java index 0e42422f..fe3e7975 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java @@ -20,7 +20,7 @@ public class BotVisibilityCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/BruhifyCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/BruhifyCommand.java index 20724e35..e78eb571 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/BruhifyCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/BruhifyCommand.java @@ -19,7 +19,7 @@ public class BruhifyCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; bot.bruhify.bruhifyText = context.getString(true, false); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java index d6e0217f..d6e2ae02 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java @@ -26,7 +26,7 @@ public class ClearChatCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String name = context.getString(true, false); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatQueueCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatQueueCommand.java index c1748ffe..8e1b800e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatQueueCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatQueueCommand.java @@ -19,7 +19,7 @@ public class ClearChatQueueCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(0); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java index 3f88940d..5e5d5c4d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java @@ -26,7 +26,7 @@ public class CloopCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getAction(); @@ -61,7 +61,7 @@ public class CloopCommand extends Command { "Removed cloop %s", Component.text(cloop.command()).color(bot.colorPalette.string) ).color(bot.colorPalette.defaultColor); - } catch (IndexOutOfBoundsException | IllegalArgumentException | NullPointerException ignored) { + } catch (final IndexOutOfBoundsException | IllegalArgumentException | NullPointerException ignored) { throw new CommandException(Component.text("Invalid index")); } } @@ -77,7 +77,7 @@ public class CloopCommand extends Command { final List cloopsComponent = new ArrayList<>(); int index = 0; - for (CommandLoop command : bot.cloop.loops) { + for (final CommandLoop command : bot.cloop.loops) { cloopsComponent.add( Component.translatable( "%s › %s (%s %s)", diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java index e0ec3253..e3fe02e4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java @@ -37,7 +37,7 @@ public class CommandBlockCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; runCommand(bot, context, context.getString(true, true), null); @@ -45,7 +45,7 @@ public class CommandBlockCommand extends Command { return null; } - private void runCommand (Bot bot, CommandContext context, String command, PlayerEntry player) { + private void runCommand (final Bot bot, final CommandContext context, final String command, final PlayerEntry player) { final Matcher userMatcher = USER_PATTERN.matcher(command); final Matcher uuidMatcher = UUID_PATTERN.matcher(command); @@ -53,12 +53,12 @@ public class CommandBlockCommand extends Command { final boolean uuidFound = uuidMatcher.find(); if (userFound || uuidFound) { - Pattern pattern; + final Pattern pattern; if (userFound) pattern = Pattern.compile(userMatcher.group(1)); else pattern = Pattern.compile(uuidMatcher.group(1)); - for (PlayerEntry entry : bot.players.list) { + for (final PlayerEntry entry : bot.players.list) { final String username = entry.profile.getName(); final String uuid = entry.profile.getIdAsString(); @@ -85,7 +85,7 @@ public class CommandBlockCommand extends Command { } } } else if (command.contains("{username}") || command.contains("{uuid}")) { - for (PlayerEntry entry : bot.players.list) { + for (final PlayerEntry entry : bot.players.list) { final String username = entry.profile.getName(); final String uuid = entry.profile.getIdAsString(); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ConsoleCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ConsoleCommand.java index 4248f7ef..93e36b0d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ConsoleCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ConsoleCommand.java @@ -29,7 +29,7 @@ public class ConsoleCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getString(false, true, true); @@ -38,7 +38,7 @@ public class ConsoleCommand extends Command { case "server" -> { final List servers = new ArrayList<>(); - for (Bot eachBot : bot.bots) { + for (final Bot eachBot : bot.bots) { servers.add(eachBot.getServerString(true)); } @@ -62,7 +62,7 @@ public class ConsoleCommand extends Command { "Set the console server to %s", Component.text(Main.console.consoleServer) ).color(bot.colorPalette.defaultColor); - } catch (ArrayIndexOutOfBoundsException e) { + } catch (final ArrayIndexOutOfBoundsException e) { throw new CommandException(Component.text("Invalid server: " + server)); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CowsayCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CowsayCommand.java index d51650ae..ed2e8a37 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CowsayCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CowsayCommand.java @@ -19,7 +19,7 @@ public class CowsayCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final String message = context.getString(true, true); final CowExecutor cowExecutor = new CowExecutor(); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/EchoCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/EchoCommand.java index cfd0df42..e80e11bb 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EchoCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EchoCommand.java @@ -22,7 +22,7 @@ public class EchoCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; bot.chat.send(context.getString(true, true)); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/EndCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/EndCommand.java index ddfda992..621adf7e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EndCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EndCommand.java @@ -19,7 +19,7 @@ public class EndCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(0); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java index 52c41035..e52751f6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java @@ -26,7 +26,7 @@ public class EvalCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; if (!bot.eval.connected) throw new CommandException(Component.text("Eval server is not online")); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java index 094416c7..2c722086 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FilterCommand.java @@ -37,7 +37,7 @@ public class FilterCommand extends Command { // most of these codes are from cloop and greplog @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; boolean ignoreCase = false; @@ -79,7 +79,7 @@ public class FilterCommand extends Command { // try validating the regex try { Pattern.compile(player); - } catch (PatternSyntaxException e) { + } catch (final PatternSyntaxException e) { throw new CommandException( Component.translatable( "Failed to parse filter regex: %s", @@ -135,7 +135,7 @@ public class FilterCommand extends Command { final List filtersComponents = new ArrayList<>(); int index = 0; - for (FilteredPlayer player : PlayerFilterPlugin.localList) { + for (final FilteredPlayer player : PlayerFilterPlugin.localList) { Component options = Component.empty().color(NamedTextColor.DARK_GRAY); if (player.ignoreCase || player.regex) { diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java index c7443a8c..0cb21423 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java @@ -30,7 +30,7 @@ public class FindAltsCommand extends Command { } @Override - public Component execute (CommandContext context) throws Exception { + public Component execute (final CommandContext context) throws Exception { final Bot bot = context.bot; if (Main.database == null) @@ -42,7 +42,7 @@ public class FindAltsCommand extends Command { final boolean allServer = flag.equals("-allserver"); - String player; + final String player; if (allServer) { player = context.getString(true, true); @@ -79,7 +79,7 @@ public class FindAltsCommand extends Command { return null; } - private Component handle (Bot bot, String targetIP, boolean argumentIsIP, String player, boolean allServer) { + private Component handle (final Bot bot, final String targetIP, final boolean argumentIsIP, final String player, final boolean allServer) { final Map altsMap = bot.playersDatabase.findPlayerAlts(targetIP, allServer); final Component playerComponent = Component @@ -123,7 +123,7 @@ public class FindAltsCommand extends Command { .toList(); int i = 0; - for (String username : sorted) { + for (final String username : sorted) { component = component .append( Component diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/GrepLogCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/GrepLogCommand.java index 201625be..7ba64014 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/GrepLogCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/GrepLogCommand.java @@ -23,7 +23,7 @@ public class GrepLogCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; if (Main.discord == null || Main.discord.jda == null) { @@ -81,7 +81,7 @@ public class GrepLogCommand extends Command { thread = new Thread(() -> { try { bot.grepLog.search(context, input, finalIgnoreCase, finalRegex); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java index 5baf6437..fa2dad5d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java @@ -30,7 +30,7 @@ public class HelpCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final String commandName = context.getString(false, false); @@ -42,10 +42,10 @@ public class HelpCommand extends Command { } } - public Component getCommandList (CommandContext context) throws CommandException { + public Component getCommandList (final CommandContext context) throws CommandException { final List list = new ArrayList<>(); - for (TrustLevel level : TrustLevel.values()) { + for (final TrustLevel level : TrustLevel.values()) { list.addAll(getCommandListByTrustLevel(context, level)); } @@ -67,12 +67,12 @@ public class HelpCommand extends Command { .append(Component.join(JoinConfiguration.separator(Component.space()), list)); } - public List getCommandListByTrustLevel (CommandContext context, TrustLevel trustLevel) throws CommandException { + public List getCommandListByTrustLevel (final CommandContext context, final TrustLevel trustLevel) throws CommandException { final List list = new ArrayList<>(); - List commandNames = new ArrayList<>(); + final List commandNames = new ArrayList<>(); - for (Command command : CommandHandlerPlugin.COMMANDS) { + for (final Command command : CommandHandlerPlugin.COMMANDS) { if (command.trustLevel != trustLevel || (command.consoleOnly && !(context instanceof ConsoleCommandContext))) continue; @@ -81,7 +81,7 @@ public class HelpCommand extends Command { Collections.sort(commandNames); - for (String name : commandNames) { + for (final String name : commandNames) { list.add( Component .text(name) @@ -101,12 +101,12 @@ public class HelpCommand extends Command { return list; } - public Component getUsages (CommandContext context, String commandName) throws CommandException { + public Component getUsages (final CommandContext context, final String commandName) throws CommandException { final Bot bot = context.bot; final String prefix = context.prefix; - for (Command command : CommandHandlerPlugin.COMMANDS) { + for (final Command command : CommandHandlerPlugin.COMMANDS) { if ( !command.name.equalsIgnoreCase(commandName) && !Arrays.stream(command.aliases).toList().contains(commandName.toLowerCase()) @@ -136,7 +136,7 @@ public class HelpCommand extends Command { ) ); - for (String usage : command.usages) { + for (final String usage : command.usages) { Component usageComponent = Component.empty() .append(Component.text(prefix + actualCommandName).color(bot.colorPalette.secondary)) .append(Component.text(" ")); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java index 10d724db..c91945f4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java @@ -33,7 +33,7 @@ public class IPFilterCommand extends Command { // most of these codes are from cloop and greplog @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getAction(); @@ -95,7 +95,7 @@ public class IPFilterCommand extends Command { final List filtersComponents = new ArrayList<>(); int index = 0; - for (Map.Entry entry : IPFilterPlugin.localList.entrySet()) { + for (final Map.Entry entry : IPFilterPlugin.localList.entrySet()) { final String ip = entry.getKey(); final String reason = entry.getValue(); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java index 1ed1dc8f..4a3019e9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java @@ -41,7 +41,7 @@ public class InfoCommand extends Command { static { try (final InputStream input = ClassLoader.getSystemClassLoader().getResourceAsStream("application.properties")) { BUILD_INFO.load(input); - } catch (IOException ignored) { } + } catch (final IOException ignored) { } } public InfoCommand () { @@ -63,7 +63,7 @@ public class InfoCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -100,10 +100,10 @@ public class InfoCommand extends Command { final StringBuilder builder = new StringBuilder(); try { - RandomAccessFile file = new RandomAccessFile("/proc/cpuinfo", "r"); - FileChannel channel = file.getChannel(); + final RandomAccessFile file = new RandomAccessFile("/proc/cpuinfo", "r"); + final FileChannel channel = file.getChannel(); - ByteBuffer buffer = ByteBuffer.allocate(1024 * 1024); // 1 MB buffer + final ByteBuffer buffer = ByteBuffer.allocate(1024 * 1024); // 1 MB buffer long bytesRead = channel.read(buffer); while (bytesRead != -1) { @@ -119,7 +119,7 @@ public class InfoCommand extends Command { channel.close(); file.close(); - } catch (IOException ignored) { } + } catch (final IOException ignored) { } final TextColor color = bot.colorPalette.string; @@ -135,7 +135,7 @@ public class InfoCommand extends Command { try { localHost = InetAddress.getLocalHost(); - } catch (UnknownHostException ignored) { } + } catch (final UnknownHostException ignored) { } component = Component.translatable( """ diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java index 0db47800..e468c900 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java @@ -28,7 +28,7 @@ public class KickCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final Kick method = context.getEnum(Kick.class); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java index 66fdebc0..34d1b952 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java @@ -27,7 +27,7 @@ public class ListCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(0); final Bot bot = context.bot; @@ -36,7 +36,7 @@ public class ListCommand extends Command { final List playersComponent = new ArrayList<>(); - for (PlayerEntry entry : list) { + for (final PlayerEntry entry : list) { if (entry == null) continue; // chayapak diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java index 63474dfd..7f3d9eab 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java @@ -34,7 +34,7 @@ public class MailCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; if (Main.database == null) @@ -62,7 +62,7 @@ public class MailCommand extends Command { ); context.sendOutput(Component.text("Mail sent!").color(bot.colorPalette.defaultColor)); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); } }); @@ -95,11 +95,11 @@ public class MailCommand extends Command { context.sendOutput( Component.text("Mail sent!").color(bot.colorPalette.defaultColor) ); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); } }); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); return null; } @@ -114,7 +114,7 @@ public class MailCommand extends Command { final List mails = bot.mail.list(); int senderMailSize = 0; - for (Mail mail : mails) { + for (final Mail mail : mails) { if (!mail.sentTo().equals(sender.profile.getName())) continue; senderMailSize++; } @@ -128,7 +128,7 @@ public class MailCommand extends Command { final List mailsComponent = new ArrayList<>(); int count = 1; - for (Mail mail : mails) { + for (final Mail mail : mails) { if (!mail.sentTo().equals(sender.profile.getName())) continue; final Instant instant = Instant.ofEpochMilli(mail.timeSent()); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java index 57dfec8c..a573b528 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java @@ -66,7 +66,7 @@ public class MusicCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { if (context.bot.music.locked && !(context instanceof ConsoleCommandContext)) throw new CommandException(Component.text("Managing music is currently locked")); @@ -93,14 +93,14 @@ public class MusicCommand extends Command { }; } - public Component play (CommandContext context) throws CommandException { + public Component play (final CommandContext context) throws CommandException { final MusicPlayerPlugin player = context.bot.music; if (player.loaderThread != null) throw new CommandException(Component.text("Already loading a song")); final String stringPath = context.getString(true, true); - Path path; + final Path path; try { path = Path.of(ROOT.toString(), stringPath); @@ -121,14 +121,14 @@ public class MusicCommand extends Command { final Path realPath = Path.of(ROOT.toString(), String.join(separator, splitPathClone)); - try (DirectoryStream stream = Files.newDirectoryStream(realPath)) { + try (final DirectoryStream stream = Files.newDirectoryStream(realPath)) { final List songsPaths = new ArrayList<>(); - for (Path eachPath : stream) songsPaths.add(eachPath); + for (final Path eachPath : stream) songsPaths.add(eachPath); PathUtilities.sort(songsPaths); final List songs = new ArrayList<>(); - for (Path eachPath : songsPaths) songs.add(eachPath.getFileName().toString()); + for (final Path eachPath : songsPaths) songs.add(eachPath.getFileName().toString()); final String lowerCaseFile = splitPath[splitPath.length - 1].toLowerCase(); @@ -141,18 +141,18 @@ public class MusicCommand extends Command { final String file = matchedArray[0]; player.loadSong(Path.of(realPath.toString(), file), context.sender); - } catch (NoSuchFileException e) { + } catch (final NoSuchFileException e) { throw new CommandException(Component.text("Directory does not exist")); } } else { - try (DirectoryStream stream = Files.newDirectoryStream(ROOT)) { + try (final DirectoryStream stream = Files.newDirectoryStream(ROOT)) { final List songsPaths = new ArrayList<>(); - for (Path eachPath : stream) songsPaths.add(eachPath); + for (final Path eachPath : stream) songsPaths.add(eachPath); PathUtilities.sort(songsPaths); final List songs = new ArrayList<>(); - for (Path eachPath : songsPaths) songs.add(eachPath.getFileName().toString()); + for (final Path eachPath : songsPaths) songs.add(eachPath.getFileName().toString()); final String[] matchedArray = songs.stream() .filter(song -> song.equalsIgnoreCase(stringPath) || song.toLowerCase().contains(stringPath.toLowerCase())) @@ -163,25 +163,25 @@ public class MusicCommand extends Command { final String file = matchedArray[0]; player.loadSong(Path.of(ROOT.toString(), file), context.sender); - } catch (NoSuchFileException e) { + } catch (final NoSuchFileException e) { throw new CommandException(Component.text("this will never happen ok??")); } } } - } catch (MalformedURLException e) { + } catch (final MalformedURLException e) { throw new CommandException(Component.text("Invalid URL")); - } catch (IndexOutOfBoundsException e) { + } catch (final IndexOutOfBoundsException e) { throw new CommandException(Component.text("Song not found")); - } catch (CommandException e) { + } catch (final CommandException e) { throw e; - } catch (Exception e) { + } catch (final Exception e) { throw new CommandException(Component.text(e.toString())); } return null; } - public Component playFromItem (CommandContext context) throws CommandException { + public Component playFromItem (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -202,13 +202,13 @@ public class MusicCommand extends Command { Base64.getDecoder().decode(output), context.sender ); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { try { bot.music.loadSong( Ascii85.decode(output), context.sender ); - } catch (IllegalArgumentException e2) { + } catch (final IllegalArgumentException e2) { context.sendOutput(Component.text("Invalid Base64 or Ascii85 in the selected item").color(NamedTextColor.RED)); } } @@ -219,7 +219,7 @@ public class MusicCommand extends Command { return null; } - public Component stop (CommandContext context) throws CommandException { + public Component stop (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -230,7 +230,7 @@ public class MusicCommand extends Command { return Component.text("Cleared the song queue").color(bot.colorPalette.defaultColor); } - public Component loop (CommandContext context) throws CommandException { + public Component loop (final CommandContext context) throws CommandException { context.checkOverloadArgs(2); final Bot bot = context.bot; @@ -265,7 +265,7 @@ public class MusicCommand extends Command { } } - public Component list (CommandContext context) throws CommandException { + public Component list (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String prefix = context.prefix; @@ -279,21 +279,21 @@ public class MusicCommand extends Command { if (!path.normalize().startsWith(ROOT.toString())) throw new CommandException(Component.text("no")); - try (DirectoryStream stream = Files.newDirectoryStream(path)) { + try (final DirectoryStream stream = Files.newDirectoryStream(path)) { final List paths = new ArrayList<>(); - for (Path eachPath : stream) paths.add(eachPath); + for (final Path eachPath : stream) paths.add(eachPath); PathUtilities.sort(paths); final List fullList = new ArrayList<>(); int i = 0; - for (Path eachPath : paths) { + for (final Path eachPath : paths) { final boolean isDirectory = Files.isDirectory(eachPath); Path location; try { location = path; - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { location = Paths.get(""); // wtf mabe } @@ -324,7 +324,7 @@ public class MusicCommand extends Command { while (index <= fullList.size()) { // we MUST make a new copy of the list else everything will fard..,. - List list = new ArrayList<>(fullList).subList(index, Math.min(index + eachSize, fullList.size())); + final List list = new ArrayList<>(fullList).subList(index, Math.min(index + eachSize, fullList.size())); final Component component = Component.join(JoinConfiguration.separator(Component.space()), list); context.sendOutput(component); @@ -332,14 +332,14 @@ public class MusicCommand extends Command { index += eachSize; list.clear(); } - } catch (IOException e) { + } catch (final IOException e) { throw new CommandException(Component.text("Directory doesn't exist")); } return null; } - public Component skip (CommandContext context) throws CommandException { + public Component skip (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -358,7 +358,7 @@ public class MusicCommand extends Command { return null; } - public Component nowPlaying (CommandContext context) throws CommandException { + public Component nowPlaying (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -371,7 +371,7 @@ public class MusicCommand extends Command { .color(bot.colorPalette.defaultColor); } - public Component queue (CommandContext context) throws CommandException { + public Component queue (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -379,7 +379,7 @@ public class MusicCommand extends Command { final List queueWithNames = new ArrayList<>(); int i = 0; - for (Song song : queue) { + for (final Song song : queue) { queueWithNames.add( Component.text(song.name).color((i++ & 1) == 0 ? bot.colorPalette.primary : bot.colorPalette.secondary) ); @@ -391,7 +391,7 @@ public class MusicCommand extends Command { } // lazy fix for java using "goto" as keyword real - public Component goTo (CommandContext context) throws CommandException { + public Component goTo (final CommandContext context) throws CommandException { final Bot bot = context.bot; final Song currentSong = bot.music.currentSong; @@ -412,7 +412,7 @@ public class MusicCommand extends Command { .color(bot.colorPalette.defaultColor); } - public Component pitch (CommandContext context) throws CommandException { + public Component pitch (final CommandContext context) throws CommandException { context.checkOverloadArgs(2); final Bot bot = context.bot; @@ -427,7 +427,7 @@ public class MusicCommand extends Command { .color(bot.colorPalette.defaultColor); } - public Component speed (CommandContext context) throws CommandException { + public Component speed (final CommandContext context) throws CommandException { context.checkOverloadArgs(2); final Bot bot = context.bot; @@ -451,7 +451,7 @@ public class MusicCommand extends Command { .color(bot.colorPalette.defaultColor); } - public Component amplify (CommandContext context) throws CommandException { + public Component amplify (final CommandContext context) throws CommandException { context.checkOverloadArgs(2); final Bot bot = context.bot; @@ -468,7 +468,7 @@ public class MusicCommand extends Command { .color(bot.colorPalette.defaultColor); } - public Component noteInstrument (CommandContext context) throws CommandException { + public Component noteInstrument (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String instrument = context.getString(true, true); @@ -485,7 +485,7 @@ public class MusicCommand extends Command { } } - public Component pause (CommandContext context) throws CommandException { + public Component pause (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -502,7 +502,7 @@ public class MusicCommand extends Command { } } - public Component info (CommandContext context) throws CommandException { + public Component info (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -532,7 +532,7 @@ public class MusicCommand extends Command { return Component.join(JoinConfiguration.newlines(), components); } - public Component testSong (CommandContext context) throws CommandException { + public Component testSong (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java index e75411a8..2c5982c0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java @@ -29,7 +29,7 @@ public class NetMessageCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final List bots = bot.bots; @@ -78,7 +78,7 @@ public class NetMessageCommand extends Command { ) ).color(NamedTextColor.DARK_GRAY); - for (Bot eachBot : bots) { + for (final Bot eachBot : bots) { if (!eachBot.loggedIn) continue; eachBot.chat.tellraw(component); } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java index c1d988a8..1d6b8a90 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java @@ -25,7 +25,7 @@ public class RandomTeleportCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(0); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/RefillCoreCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/RefillCoreCommand.java index fb28cf29..496c91fc 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RefillCoreCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RefillCoreCommand.java @@ -19,7 +19,7 @@ public class RefillCoreCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(0); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java index 06b536ba..32a5dfba 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java @@ -20,7 +20,7 @@ public class RestartCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String reason = context.getString(true, false); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ScreenshareCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ScreenshareCommand.java index 268e5178..5f5dcec0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ScreenshareCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ScreenshareCommand.java @@ -25,7 +25,7 @@ public class ScreenshareCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getString(false, true, true); @@ -84,7 +84,7 @@ public class ScreenshareCommand extends Command { } default -> throw new CommandException(Component.text("Invalid action")); } - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { throw new CommandException(Component.text("Invalid integer")); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java index 0b0f1c78..72919405 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java @@ -32,7 +32,7 @@ public class SeenCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; if (Main.database == null) @@ -46,7 +46,7 @@ public class SeenCommand extends Command { final List onlineComponents = new ArrayList<>(); - for (Bot eachBot : bot.bots) { + for (final Bot eachBot : bot.bots) { if (eachBot.players.getEntry(player) != null) { online = true; @@ -95,7 +95,7 @@ public class SeenCommand extends Command { Component.text(formattedTime).color(bot.colorPalette.string), Component.text(server).color(bot.colorPalette.string) ).color(bot.colorPalette.defaultColor)); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); } }); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ServerEvalCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ServerEvalCommand.java index 39eb784c..af4c900f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ServerEvalCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ServerEvalCommand.java @@ -27,7 +27,7 @@ public class ServerEvalCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String code = context.getString(true, true); @@ -53,7 +53,7 @@ public class ServerEvalCommand extends Command { final String output = values.length < 1 ? Arrays.toString(values) : values[0].toString(); context.sendOutput(Component.text(output).color(NamedTextColor.GREEN)); - } catch (Exception e) { + } catch (final Exception e) { context.sendOutput(Component.text(e.toString()).color(NamedTextColor.RED)); } }); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java index 12c6b0f1..a5094124 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java @@ -20,7 +20,7 @@ public class StopCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String reason = context.getString(true, false); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/TPSBarCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/TPSBarCommand.java index 51c35d39..a8d7a34f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TPSBarCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TPSBarCommand.java @@ -20,7 +20,7 @@ public class TPSBarCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/TestCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/TestCommand.java index 2e33ea4b..7c7327e7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TestCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TestCommand.java @@ -19,7 +19,7 @@ public class TestCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { return Component.translatable( "Hello, World! Username: %s, Sender UUID: %s, Prefix: %s, Args: %s", Component.text(context.sender.profile.getName()), diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/TimeCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/TimeCommand.java index 1cdf99bc..f6b9cf39 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TimeCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TimeCommand.java @@ -25,7 +25,7 @@ public class TimeCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { try { final Bot bot = context.bot; @@ -42,7 +42,7 @@ public class TimeCommand extends Command { Component.text(timezone).color(bot.colorPalette.string), Component.text(formattedTime).color(NamedTextColor.GREEN) ).color(bot.colorPalette.defaultColor); - } catch (DateTimeException e) { + } catch (final DateTimeException e) { throw new CommandException(Component.text("Invalid timezone (case-sensitive)")); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/TranslateCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/TranslateCommand.java index 80bcfed6..3de90ff4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TranslateCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TranslateCommand.java @@ -29,7 +29,7 @@ public class TranslateCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String from = context.getString(false, true); @@ -73,7 +73,7 @@ public class TranslateCommand extends Command { ) .color(bot.colorPalette.secondary) ); - } catch (Exception e) { + } catch (final Exception e) { context.sendOutput(Component.text(e.toString()).color(NamedTextColor.RED)); } }); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java index 4e12a7af..ba1473cd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java @@ -24,7 +24,7 @@ public class UUIDCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String player = context.getString(true, false); @@ -32,8 +32,8 @@ public class UUIDCommand extends Command { if (!player.isEmpty()) { final PlayerEntry entry = bot.players.getEntry(player); - String name; - String uuid; + final String name; + final String uuid; if (entry == null) { name = player; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java index 20ac23e4..dd9b9056 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java @@ -44,7 +44,7 @@ public class UrbanCommand extends Command { Main.EXECUTOR.scheduleAtFixedRate(() -> requestsPerSecond = 0, 0, 1, TimeUnit.SECONDS); } - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { if (requestsPerSecond > 3) throw new CommandException(Component.text("Too many requests")); final Bot bot = context.bot; @@ -74,7 +74,7 @@ public class UrbanCommand extends Command { int count = 0; int index = 1; - for (JsonElement element : list) { + for (final JsonElement element : list) { if (count >= 3) break; final JsonObject definitionObject = element.getAsJsonObject(); @@ -180,7 +180,7 @@ public class UrbanCommand extends Command { } if (discord && !list.isEmpty()) context.sendOutput(discordComponent); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); context.sendOutput(Component.text(e.toString()).color(NamedTextColor.RED)); } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java index 254d1f0c..c3507f3f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java @@ -20,7 +20,7 @@ public class ValidateCommand extends Command { } @Override - public Component execute (CommandContext context) { + public Component execute (final CommandContext context) { // Trusted - 1 // Admin - 2 // ....... diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java index fe077818..eca22512 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java @@ -27,7 +27,7 @@ public class WeatherCommand extends Command { ); } - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String location = context.getString(true, true); @@ -132,7 +132,7 @@ public class WeatherCommand extends Command { ) .color(bot.colorPalette.string) ).color(bot.colorPalette.defaultColor); - } catch (Exception e) { + } catch (final Exception e) { throw new CommandException(Component.text("Location \"" + location + "\" not found")); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java index 82168f32..97393edc 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java @@ -24,7 +24,7 @@ public class WhitelistCommand extends Command { } @Override - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getAction(); @@ -64,7 +64,7 @@ public class WhitelistCommand extends Command { "Removed %s from the whitelist", Component.text(player).color(bot.colorPalette.username) ).color(bot.colorPalette.defaultColor); - } catch (IndexOutOfBoundsException | IllegalArgumentException | NullPointerException ignored) { + } catch (final IndexOutOfBoundsException | IllegalArgumentException | NullPointerException ignored) { throw new CommandException(Component.text("Invalid index")); } } @@ -81,7 +81,7 @@ public class WhitelistCommand extends Command { final List playersComponent = new ArrayList<>(); int index = 0; - for (String player : bot.whitelist.list) { + for (final String player : bot.whitelist.list) { playersComponent.add( Component.translatable( "%s › %s", diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/WikipediaCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/WikipediaCommand.java index a47cda16..0b73fe0e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/WikipediaCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/WikipediaCommand.java @@ -38,7 +38,7 @@ public class WikipediaCommand extends Command { ); } - public Component execute (CommandContext context) throws CommandException { + public Component execute (final CommandContext context) throws CommandException { final Bot bot = context.bot; final String page = context.getString(true, true); @@ -59,7 +59,7 @@ public class WikipediaCommand extends Command { if (redirectsElement != null) { final JsonArray normalized = redirectsElement.getAsJsonArray(); - for (JsonElement element : normalized) { + for (final JsonElement element : normalized) { final JsonObject redirect = element.getAsJsonObject(); final String redirectedTo = redirect.get("to").getAsString(); @@ -118,12 +118,12 @@ public class WikipediaCommand extends Command { .append(Component.text(extracted).color(NamedTextColor.GREEN)); context.sendOutput(component); - } catch (NumberFormatException e) { + } catch (final NumberFormatException e) { context.sendOutput(Component.text("Failed parsing page ID").color(NamedTextColor.RED)); bot.logger.error(e); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); - } catch (Exception e) { + } catch (final Exception e) { context.sendOutput(Component.text(e.toString()).color(NamedTextColor.RED)); } }); diff --git a/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java index 823c0189..3f959b0e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BossBar.java @@ -15,11 +15,11 @@ public class BossBar { public float health; public BossBar ( - UUID uuid, - Component title, - BossBarColor color, - BossBarDivision division, - float health + final UUID uuid, + final Component title, + final BossBarColor color, + final BossBarDivision division, + final float health ) { this.uuid = uuid; this.title = title; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java index ae0a0e3d..ed1a55c8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/bossbar/BotBossBar.java @@ -30,14 +30,14 @@ public class BotBossBar extends BossBar { private int value; public BotBossBar ( - Component title, - String players, - BossBarColor color, - BossBarDivision division, - boolean visible, - long max, - int value, - Bot bot + final Component title, + final String players, + final BossBarColor color, + final BossBarDivision division, + final boolean visible, + final long max, + final int value, + final Bot bot ) { super(null, title, color, division, value); this.players = players; @@ -50,11 +50,11 @@ public class BotBossBar extends BossBar { return title; } - public void setTitle (Component title) { + public void setTitle (final Component title) { setTitle(title, false); } - public void setTitle (Component title, boolean force) { + public void setTitle (final Component title, final boolean force) { if (!gotSecret) return; if (this.title.equals(title) && !force) return; @@ -75,15 +75,15 @@ public class BotBossBar extends BossBar { bot.core.run("minecraft:execute as @e[type=minecraft:text_display,tag=" + bot.config.namespace + "_" + onlyName + "] run data modify entity @s text set value '" + serialized.replace("\\", "\\\\").replace("'", "\\'") + "'"); } - public BossBarColor color (BossBarColor color) { + public BossBarColor color (final BossBarColor color) { return color; } - public void setColor (BossBarColor color) { + public void setColor (final BossBarColor color) { setColor(color, false); } - public void setColor (BossBarColor color, boolean force) { + public void setColor (final BossBarColor color, final boolean force) { if (!gotSecret) return; if (this.color == color && !force) return; @@ -99,9 +99,9 @@ public class BotBossBar extends BossBar { return players; } - public void setPlayers (String players) { setPlayers(players, false); } + public void setPlayers (final String players) { setPlayers(players, false); } - public void setPlayers (String players, boolean force) { + public void setPlayers (final String players, final boolean force) { if (!gotSecret) return; if (this.players.equals(players) && !force) return; @@ -115,11 +115,11 @@ public class BotBossBar extends BossBar { public BossBarDivision division () { return division; } - public void setDivision (BossBarDivision division) { + public void setDivision (final BossBarDivision division) { setDivision(division, false); } - public void setDivision (BossBarDivision _division, boolean force) { + public void setDivision (final BossBarDivision _division, final boolean force) { if (!gotSecret) return; if (this.division == _division && !force) return; @@ -143,11 +143,11 @@ public class BotBossBar extends BossBar { public int value () { return value; } - public void setValue (int value) { + public void setValue (final int value) { setValue(value, false); } - public void setValue (int value, boolean force) { + public void setValue (final int value, final boolean force) { if (!gotSecret) return; if (this.value == value && !force) return; @@ -161,7 +161,7 @@ public class BotBossBar extends BossBar { public boolean visible () { return visible; } - public void setVisible (boolean visible) { + public void setVisible (final boolean visible) { if (!gotSecret) return; if (this.visible == visible) return; @@ -175,11 +175,11 @@ public class BotBossBar extends BossBar { public long max () { return max; } - public void setMax (long max) { + public void setMax (final long max) { setMax(max, false); } - public void setMax (long max, boolean force) { + public void setMax (final long max, final boolean force) { if (!gotSecret) return; if (this.max == max && !force) return; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/chomeNSMod/PayloadMetadata.java b/src/main/java/me/chayapak1/chomens_bot/data/chomeNSMod/PayloadMetadata.java index 2f1eae06..848ae2d4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/chomeNSMod/PayloadMetadata.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/chomeNSMod/PayloadMetadata.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.Arrays; public record PayloadMetadata(byte[] nonce, long timestamp) { - public static PayloadMetadata deserialize (ByteBuf buf) { + public static PayloadMetadata deserialize (final ByteBuf buf) { final byte[] nonce = new byte[8]; buf.readBytes(nonce); @@ -15,7 +15,7 @@ public record PayloadMetadata(byte[] nonce, long timestamp) { return new PayloadMetadata(nonce, timestamp); } - public void serialize (ByteBuf buf) { + public void serialize (final ByteBuf buf) { buf.writeBytes(nonce); buf.writeLong(timestamp); } diff --git a/src/main/java/me/chayapak1/chomens_bot/data/color/ColorPalette.java b/src/main/java/me/chayapak1/chomens_bot/data/color/ColorPalette.java index ac7ce829..3d9c7a0c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/color/ColorPalette.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/color/ColorPalette.java @@ -15,7 +15,7 @@ public class ColorPalette { public final TextColor number; public final TextColor ownerName; - public ColorPalette (Configuration.ColorPalette configColorPalette) { + public ColorPalette (final Configuration.ColorPalette configColorPalette) { this.primary = getColorByString(configColorPalette.primary); this.secondary = getColorByString(configColorPalette.secondary); this.defaultColor = getColorByString(configColorPalette.defaultColor); diff --git a/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalFunction.java b/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalFunction.java index 5fa60c36..3e3d7dd8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalFunction.java @@ -8,14 +8,14 @@ public class EvalFunction { protected final Bot bot; public EvalFunction ( - String name, - Bot bot + final String name, + final Bot bot ) { this.name = name; this.bot = bot; } - public Output execute (Object... args) throws Exception { return null; } + public Output execute (final Object... args) throws Exception { return null; } public record Output(String message, boolean parseJSON) { } diff --git a/src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java b/src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java index 929ab3da..6f5cb13f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/filter/FilteredPlayer.java @@ -11,10 +11,10 @@ public class FilteredPlayer { @JsonCreator public FilteredPlayer ( - @JsonProperty("playerName") String playerName, - @JsonProperty("reason") String reason, - @JsonProperty("regex") boolean regex, - @JsonProperty("ignoreCase") boolean ignoreCase + @JsonProperty("playerName") final String playerName, + @JsonProperty("reason") final String reason, + @JsonProperty("regex") final boolean regex, + @JsonProperty("ignoreCase") final boolean ignoreCase ) { this.playerName = playerName; this.reason = reason; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/logging/LogType.java b/src/main/java/me/chayapak1/chomens_bot/data/logging/LogType.java index 84051dd1..849fe0d1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/logging/LogType.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/logging/LogType.java @@ -14,7 +14,7 @@ public enum LogType { public final Component component; - LogType (Component component) { + LogType (final Component component) { this.component = component; } } diff --git a/src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java b/src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java index 19a317b6..08c1c5ed 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/mail/Mail.java @@ -6,11 +6,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; public record Mail(String sentBy, String sentTo, long timeSent, String server, String contents) { @JsonCreator public Mail ( - @JsonProperty("sentBy") String sentBy, - @JsonProperty("sentTo") String sentTo, - @JsonProperty("timeSent") long timeSent, - @JsonProperty("server") String server, - @JsonProperty("contents") String contents + @JsonProperty("sentBy") final String sentBy, + @JsonProperty("sentTo") final String sentTo, + @JsonProperty("timeSent") final long timeSent, + @JsonProperty("server") final String server, + @JsonProperty("contents") final String contents ) { this.sentBy = sentBy; this.sentTo = sentTo; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java b/src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java index 7de2380f..406bae69 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/player/PlayerEntry.java @@ -22,14 +22,14 @@ public class PlayerEntry { public String ip; public PlayerEntry ( - GameProfile profile, - GameMode gamemode, - int latency, - Component displayName, - long expiresAt, - PublicKey publicKey, - byte[] keySignature, - boolean listed + final GameProfile profile, + final GameMode gamemode, + final int latency, + final Component displayName, + final long expiresAt, + final PublicKey publicKey, + final byte[] keySignature, + final boolean listed ) { this.profile = profile; this.gamemode = gamemode; @@ -41,7 +41,7 @@ public class PlayerEntry { this.listed = listed; } - public PlayerEntry (PlayerListEntry entry) { + public PlayerEntry (final PlayerListEntry entry) { this(entry.getProfile(), entry.getGameMode(), entry.getLatency(), entry.getDisplayName(), entry.getExpiresAt(), entry.getPublicKey(), entry.getKeySignature(), entry.isListed()); } diff --git a/src/main/java/me/chayapak1/chomens_bot/data/team/Team.java b/src/main/java/me/chayapak1/chomens_bot/data/team/Team.java index 04f975a0..987b42d0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/team/Team.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/team/Team.java @@ -23,16 +23,16 @@ public class Team { public Component suffix; public Team ( - String teamName, - List players, - Component displayName, - boolean friendlyFire, - boolean seeFriendlyInvisibles, - NameTagVisibility nametagVisibility, - CollisionRule collisionRule, - TeamColor color, - Component prefix, - Component suffix + final String teamName, + final List players, + final Component displayName, + final boolean friendlyFire, + final boolean seeFriendlyInvisibles, + final NameTagVisibility nametagVisibility, + final CollisionRule collisionRule, + final TeamColor color, + final Component prefix, + final Component suffix ) { this.teamName = teamName; this.players = players; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/ClientGroup.java b/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/ClientGroup.java index 3fe92438..9025629c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/ClientGroup.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/ClientGroup.java @@ -7,7 +7,7 @@ import java.util.UUID; public record ClientGroup(UUID id, String name, boolean hasPassword, boolean persistent, GroupType type) { - public static ClientGroup fromBytes (FriendlyByteBuf buf) { + public static ClientGroup fromBytes (final FriendlyByteBuf buf) { return new ClientGroup( buf.readUUID(), buf.readUtf(512), @@ -17,7 +17,7 @@ public record ClientGroup(UUID id, String name, boolean hasPassword, boolean per ); } - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { buf.writeUUID(id); buf.writeUtf(name, 512); buf.writeBoolean(hasPassword); diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/ChatFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/ChatFunction.java index 1342ef8e..603c1655 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/ChatFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/ChatFunction.java @@ -4,12 +4,12 @@ import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.eval.EvalFunction; public class ChatFunction extends EvalFunction { - public ChatFunction (Bot bot) { + public ChatFunction (final Bot bot) { super("chat", bot); } @Override - public Output execute (Object... args) { + public Output execute (final Object... args) { if (args.length == 0) return null; final String message = (String) args[0]; diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CoreFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CoreFunction.java index a9cddc4a..abb35cd8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CoreFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CoreFunction.java @@ -11,12 +11,12 @@ import java.util.concurrent.TimeUnit; public class CoreFunction extends EvalFunction { private long lastExecutionTime = System.currentTimeMillis(); - public CoreFunction (Bot bot) { + public CoreFunction (final Bot bot) { super("core", bot); } @Override - public Output execute (Object... args) throws Exception { + public Output execute (final Object... args) throws Exception { if (args.length == 0) return null; // prevent 69 DDOS exploit !!! diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CorePlaceBlockFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CorePlaceBlockFunction.java index 05e7e8e8..04421e4c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CorePlaceBlockFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CorePlaceBlockFunction.java @@ -4,12 +4,12 @@ import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.eval.EvalFunction; public class CorePlaceBlockFunction extends EvalFunction { - public CorePlaceBlockFunction (Bot bot) { + public CorePlaceBlockFunction (final Bot bot) { super("corePlaceBlock", bot); } @Override - public Output execute (Object... args) { + public Output execute (final Object... args) { if (args.length == 0) return null; final String command = (String) args[0]; diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetBotInfoFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetBotInfoFunction.java index 2ae6a286..f4d5b06c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetBotInfoFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetBotInfoFunction.java @@ -5,12 +5,12 @@ import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.eval.EvalFunction; public class GetBotInfoFunction extends EvalFunction { - public GetBotInfoFunction (Bot bot) { + public GetBotInfoFunction (final Bot bot) { super("getBotInfo", bot); } @Override - public Output execute (Object... args) { + public Output execute (final Object... args) { final JsonObject object = new JsonObject(); object.addProperty("usernane", bot.username); diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java index be88d3e2..8e30b168 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java @@ -9,21 +9,21 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; public class GetLatestChatMessageFunction extends EvalFunction implements ChatPlugin.Listener { private String latestMessage = ""; - public GetLatestChatMessageFunction (Bot bot) { + public GetLatestChatMessageFunction (final Bot bot) { super("getLatestChatMessage", bot); bot.chat.addListener(this); } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { latestMessage = GsonComponentSerializer.gson().serialize(component); return true; } @Override - public Output execute (Object... args) { + public Output execute (final Object... args) { return new Output(latestMessage, true); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java index 64d9228b..092961e2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java @@ -10,17 +10,17 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import java.util.List; public class GetPlayerListFunction extends EvalFunction { - public GetPlayerListFunction (Bot bot) { + public GetPlayerListFunction (final Bot bot) { super("getPlayerList", bot); } @Override - public Output execute (Object... args) { + public Output execute (final Object... args) { final List list = bot.players.list; final JsonArray array = new JsonArray(); - for (PlayerEntry entry : list) { + for (final PlayerEntry entry : list) { final JsonObject object = new JsonObject(); object.addProperty("uuid", entry.profile.getIdAsString()); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java index 59b3b954..20580e63 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java @@ -15,7 +15,7 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener { public boolean isAuthenticating = false; public long startTime; - public AuthPlugin (Bot bot) { + public AuthPlugin (final Bot bot) { this.bot = bot; if (!bot.config.ownerAuthentication.enabled) return; @@ -30,7 +30,7 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener { bot.addListener(new Bot.Listener() { @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { AuthPlugin.this.disconnected(); } }); @@ -74,7 +74,7 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener { } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { if (!target.profile.getName().equals(bot.config.ownerName) || !bot.options.useCore) return; startTime = System.currentTimeMillis(); @@ -82,7 +82,7 @@ public class AuthPlugin implements PlayersPlugin.Listener, ChatPlugin.Listener { } @Override - public void playerLeft (PlayerEntry target) { + public void playerLeft (final PlayerEntry target) { if (!target.profile.getName().equals(bot.config.ownerName)) return; isAuthenticating = false; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java index 89688d30..c1b6b8c2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java @@ -30,7 +30,7 @@ public class BossbarManagerPlugin public final String bossBarPrefix; - public BossbarManagerPlugin (Bot bot) { + public BossbarManagerPlugin (final Bot bot) { this.bot = bot; this.bossBarPrefix = bot.config.namespace + ":"; @@ -42,11 +42,11 @@ public class BossbarManagerPlugin } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundBossEventPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundBossEventPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundBossEventPacket packet) { + private void packetReceived (final ClientboundBossEventPacket packet) { if (!enabled || actionBar || !bot.options.useCore) return; try { @@ -54,7 +54,7 @@ public class BossbarManagerPlugin case ADD -> { final Map mapCopy = new HashMap<>(bossBars); - for (Map.Entry _bossBar : mapCopy.entrySet()) { + for (final Map.Entry _bossBar : mapCopy.entrySet()) { final BotBossBar bossBar = _bossBar.getValue(); if (bossBar.secret.equals(packet.getTitle())) { @@ -123,14 +123,14 @@ public class BossbarManagerPlugin bossBar.health = packet.getHealth(); } } - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } @Override public void onSecondTick () { - for (Map.Entry _bossBar : bossBars.entrySet()) { + for (final Map.Entry _bossBar : bossBars.entrySet()) { final UUID uuid = _bossBar.getKey(); final BotBossBar bossBar = _bossBar.getValue(); @@ -155,7 +155,7 @@ public class BossbarManagerPlugin @Override public void coreReady () { - for (Map.Entry _bossBar : bossBars.entrySet()) { + for (final Map.Entry _bossBar : bossBars.entrySet()) { final BotBossBar bossBar = _bossBar.getValue(); addBossBar(bossBar.id, bossBar, true); @@ -163,22 +163,22 @@ public class BossbarManagerPlugin } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { serverBossBars.clear(); } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { if (!enabled || actionBar || !bot.options.useCore) return; - for (Map.Entry _bossBar : bossBars.entrySet()) { + for (final Map.Entry _bossBar : bossBars.entrySet()) { final BotBossBar bossBar = _bossBar.getValue(); bossBar.setPlayers(bossBar.players(), true); } } - public void add (String name, BotBossBar bossBar) { + public void add (final String name, final BotBossBar bossBar) { if (!enabled || !bot.options.useCore) return; bossBar.onlyName = name; @@ -190,11 +190,11 @@ public class BossbarManagerPlugin addBossBar(bossBar.id, bossBar, true); } - private void addBossBar (String name, BotBossBar bossBar) { + private void addBossBar (final String name, final BotBossBar bossBar) { addBossBar(name, bossBar, false); } - private void addBossBar (String name, BotBossBar bossBar, boolean secret) { + private void addBossBar (final String name, final BotBossBar bossBar, final boolean secret) { if (!enabled || actionBar) return; final String prefix = "minecraft:bossbar set " + name + " "; @@ -220,22 +220,22 @@ public class BossbarManagerPlugin bot.core.run(prefix + "value " + bossBar.value()); } - public void remove (String name) { + public void remove (final String name) { if (!enabled || actionBar || !bot.options.useCore) return; final Map mapCopy = new HashMap<>(bossBars); - for (Map.Entry bossBar : mapCopy.entrySet()) { + for (final Map.Entry bossBar : mapCopy.entrySet()) { if (bossBar.getValue().id.equals(bossBarPrefix + name)) bossBars.remove(bossBar.getValue().uuid); } bot.core.run("minecraft:bossbar remove " + bossBarPrefix + name); } - public BotBossBar get (String name) { + public BotBossBar get (final String name) { if (!enabled) return null; - for (Map.Entry _bossBar : bossBars.entrySet()) { + for (final Map.Entry _bossBar : bossBars.entrySet()) { final BotBossBar bossBar = _bossBar.getValue(); if (bossBar.id != null && bossBar.id.equals(bossBarPrefix + name)) return bossBars.get(bossBar.uuid); @@ -244,10 +244,10 @@ public class BossbarManagerPlugin return null; } - public BotBossBar get (UUID uuid) { + public BotBossBar get (final UUID uuid) { if (!enabled) return null; - for (Map.Entry bossBar : bossBars.entrySet()) { + for (final Map.Entry bossBar : bossBars.entrySet()) { if (bossBar.getValue().uuid == uuid) return bossBar.getValue(); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java index e7c223f4..34efebb5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java @@ -12,7 +12,7 @@ public class BruhifyPlugin implements TickPlugin.Listener { private int startHue = 0; - public BruhifyPlugin (Bot bot) { + public BruhifyPlugin (final Bot bot) { this.bot = bot; bot.tick.addListener(this); @@ -23,12 +23,12 @@ public class BruhifyPlugin implements TickPlugin.Listener { if (bruhifyText.isEmpty()) return; int hue = startHue; - String displayName = bruhifyText; - int increment = 360 / Math.max(displayName.length(), 20); + final String displayName = bruhifyText; + final int increment = 360 / Math.max(displayName.length(), 20); Component component = Component.empty(); - for (char character : displayName.toCharArray()) { + for (final char character : displayName.toCharArray()) { component = component.append(Component.text(character) .color(TextColor.color(HSVLike.hsvLike(hue / 360.0f, 1, 1)))); hue = (hue + increment) % 360; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java index f25e24ad..4631b47d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java @@ -17,7 +17,7 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy public final List prefixes; public final List commandSpyPrefixes; - public ChatCommandHandlerPlugin (Bot bot) { + public ChatCommandHandlerPlugin (final Bot bot) { this.bot = bot; this.prefixes = bot.config.prefixes; @@ -28,7 +28,7 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy } @Override - public boolean playerMessageReceived (PlayerMessage message, ChatPacketType packetType) { + public boolean playerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) { if ( message.sender() != null && bot.profile != null && @@ -45,7 +45,7 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy } @Override - public void commandReceived (PlayerEntry sender, String command) { + public void commandReceived (final PlayerEntry sender, final String command) { if ( sender.profile != null && bot.profile != null && @@ -68,19 +68,19 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy } private void handle ( - Component displayNameComponent, - Component messageComponent, - PlayerEntry sender, - String selector, - List prefixes, - ChatPacketType packetType + final Component displayNameComponent, + final Component messageComponent, + final PlayerEntry sender, + final String selector, + final List prefixes, + final ChatPacketType packetType ) { final String displayName = ComponentUtilities.stringify(displayNameComponent); final String contents = ComponentUtilities.stringify(messageComponent); String prefix = null; - for (String eachPrefix : prefixes) { + for (final String eachPrefix : prefixes) { if (!contents.startsWith(eachPrefix)) continue; prefix = eachPrefix; } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java index 61892642..ee28e0c0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java @@ -59,7 +59,7 @@ public class ChatPlugin extends Bot.Listener { private final List listeners = new ArrayList<>(); - public ChatPlugin (Bot bot) { + public ChatPlugin (final Bot bot) { this.bot = bot; queueDelay = bot.options.chatQueueDelay; @@ -75,22 +75,22 @@ public class ChatPlugin extends Bot.Listener { } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundSystemChatPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundPlayerChatPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundDisguisedChatPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundSystemChatPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundPlayerChatPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundDisguisedChatPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundSystemChatPacket packet) { + private void packetReceived (final ClientboundSystemChatPacket packet) { final Component component = packet.getContent(); if ( - component instanceof TextComponent t_component && + component instanceof final TextComponent t_component && t_component.content().length() > 15_000 ) return; - if (component instanceof TranslatableComponent t_component) { + if (component instanceof final TranslatableComponent t_component) { final String key = t_component.key(); if ( @@ -109,7 +109,7 @@ public class ChatPlugin extends Bot.Listener { PlayerMessage playerMessage = null; - for (ChatParser parser : chatParsers) { + for (final ChatParser parser : chatParsers) { playerMessage = parser.parse(component); if (playerMessage != null) break; } @@ -117,17 +117,17 @@ public class ChatPlugin extends Bot.Listener { final String string = ComponentUtilities.stringify(component); final String ansi = ComponentUtilities.stringifyAnsi(component); - for (Listener listener : listeners) { + for (final Listener listener : listeners) { if (!listener.systemMessageReceived(component, string, ansi)) break; if (playerMessage != null && !listener.playerMessageReceived(playerMessage, ChatPacketType.SYSTEM)) break; } } - private void packetReceived (ClientboundRegistryDataPacket packet) { + private void packetReceived (final ClientboundRegistryDataPacket packet) { if (!packet.getRegistry().key().equals(Key.key(CHAT_TYPE_REGISTRY_KEY))) return; - for (RegistryEntry entry : packet.getEntries()) { + for (final RegistryEntry entry : packet.getEntries()) { final NbtMap data = entry.getData(); if (data == null) continue; @@ -152,7 +152,7 @@ public class ChatPlugin extends Bot.Listener { } } - private Component getComponentByChatType (int chatType, Component target, Component sender, Component content) { + private Component getComponentByChatType (final int chatType, final Component target, final Component sender, final Component content) { final Component type = chatTypes.get(chatType); if (type == null) return null; @@ -167,7 +167,7 @@ public class ChatPlugin extends Bot.Listener { ); } - private void packetReceived (ClientboundPlayerChatPacket packet) { + private void packetReceived (final ClientboundPlayerChatPacket packet) { final UUID senderUUID = packet.getSender(); final PlayerEntry entry = bot.players.getEntry(senderUUID); @@ -182,7 +182,7 @@ public class ChatPlugin extends Bot.Listener { final Component unsignedContent = packet.getUnsignedContent(); - for (Listener listener : listeners) { + for (final Listener listener : listeners) { if (!listener.playerMessageReceived(playerMessage, ChatPacketType.PLAYER)) break; final Component chatTypeComponent = getComponentByChatType( @@ -206,12 +206,12 @@ public class ChatPlugin extends Bot.Listener { } } - private void packetReceived (ClientboundDisguisedChatPacket packet) { + private void packetReceived (final ClientboundDisguisedChatPacket packet) { final Component component = packet.getMessage(); PlayerMessage parsedFromMessage = null; - for (ChatParser parser : chatParsers) { + for (final ChatParser parser : chatParsers) { parsedFromMessage = parser.parse(component); if (parsedFromMessage != null) break; } @@ -227,11 +227,11 @@ public class ChatPlugin extends Bot.Listener { final String string = ComponentUtilities.stringify(chatTypeComponent); final String ansi = ComponentUtilities.stringifyAnsi(chatTypeComponent); - for (Listener listener : listeners) { + for (final Listener listener : listeners) { if (!listener.systemMessageReceived(chatTypeComponent, string, ansi)) break; } - for (ChatParser parser : chatParsers) { + for (final ChatParser parser : chatParsers) { final PlayerMessage parsed = parser.parse(chatTypeComponent); if (parsed == null) continue; @@ -242,7 +242,7 @@ public class ChatPlugin extends Bot.Listener { parsed.contents() ); - for (Listener listener : listeners) { + for (final Listener listener : listeners) { if (!listener.playerMessageReceived(playerMessage, ChatPacketType.DISGUISED)) break; } } @@ -258,7 +258,7 @@ public class ChatPlugin extends Bot.Listener { final String string = ComponentUtilities.stringify(component); final String ansi = ComponentUtilities.stringifyAnsi(component); - for (Listener listener : listeners) { + for (final Listener listener : listeners) { if (!listener.playerMessageReceived(playerMessage, ChatPacketType.DISGUISED)) break; if (!listener.systemMessageReceived(component, string, ansi)) break; } @@ -286,13 +286,13 @@ public class ChatPlugin extends Bot.Listener { } } - public void sendCommandInstantly (String command) { + public void sendCommandInstantly (final String command) { if (!bot.loggedIn) return; bot.session.send(new ServerboundChatCommandPacket(command)); } - public void sendChatInstantly (String message) { + public void sendChatInstantly (final String message) { if (!bot.loggedIn) return; bot.session.send(new ServerboundChatPacket( @@ -307,7 +307,7 @@ public class ChatPlugin extends Bot.Listener { public void clearQueue () { queue.clear(); } - public void send (String message) { + public void send (final String message) { if (message.startsWith("/")) { queue.add(message); return; @@ -353,7 +353,7 @@ public class ChatPlugin extends Bot.Listener { } } - public void tellraw (Component component, String targets) { + public void tellraw (final Component component, final String targets) { if (bot.options.useChat) { if (!targets.equals("@a")) return; // worst fix of all time!1! @@ -364,32 +364,32 @@ public class ChatPlugin extends Bot.Listener { } } - public void tellraw (Component component, UUID uuid) { tellraw(component, UUIDUtilities.selector(uuid)); } + public void tellraw (final Component component, final UUID uuid) { tellraw(component, UUIDUtilities.selector(uuid)); } - public void tellraw (Component component) { tellraw(component, "@a"); } + public void tellraw (final Component component) { tellraw(component, "@a"); } - public void actionBar (Component component, String targets) { + public void actionBar (final Component component, final String targets) { if (bot.options.useChat) return; bot.core.run("minecraft:title " + targets + " actionbar " + GsonComponentSerializer.gson().serialize(component)); } - public void actionBar (Component component, UUID uuid) { actionBar(component, UUIDUtilities.selector(uuid)); } + public void actionBar (final Component component, final UUID uuid) { actionBar(component, UUIDUtilities.selector(uuid)); } - public void actionBar (Component component) { actionBar(component, "@a"); } + public void actionBar (final Component component) { actionBar(component, "@a"); } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } public interface Listener { - default boolean playerMessageReceived (PlayerMessage message, ChatPacketType packetType) { return true; } + default boolean playerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) { return true; } - default boolean systemMessageReceived (Component component, String string, String ansi) { return true; } + default boolean systemMessageReceived (final Component component, final String string, final String ansi) { return true; } } private record ChatTypeContext(Component target, Component sender, Component content) { } private static class ChatTypeComponentRenderer extends TranslatableComponentRenderer { @Override - protected @NotNull Component renderText (@NotNull TextComponent component, @NotNull ChatTypeContext context) { + protected @NotNull Component renderText (@NotNull final TextComponent component, @NotNull final ChatTypeContext context) { return switch (component.content()) { case "target" -> context.target(); case "sender" -> context.sender(); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java index 759ddb92..68f8b4ae 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java @@ -56,7 +56,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players private final List seenMetadata = Collections.synchronizedList(new ArrayList<>()); - public ChomeNSModIntegrationPlugin (Bot bot) { + public ChomeNSModIntegrationPlugin (final Bot bot) { this.bot = bot; this.handler = new PacketHandler(bot); @@ -74,7 +74,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players ); } - public void send (PlayerEntry target, Packet packet) { + public void send (final PlayerEntry target, final Packet packet) { if (!connectedPlayers.contains(target) && !(packet instanceof ClientboundHandshakePacket)) return; final ByteBuf buf = Unpooled.buffer(); @@ -97,7 +97,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players int i = 1; - for (String part : split) { + for (final String part : split) { final PayloadState state = i == Iterables.size(split) ? PayloadState.DONE : PayloadState.JOINING; @@ -114,7 +114,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players i++; } - } catch (Exception ignored) { } + } catch (final Exception ignored) { } } private PayloadMetadata generateMetadata () { @@ -126,7 +126,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players return new PayloadMetadata(nonce, timestamp); } - private boolean isValidPayload (PayloadMetadata metadata) { + private boolean isValidPayload (final PayloadMetadata metadata) { // check if the timestamp is less than the expiration time if (System.currentTimeMillis() - metadata.timestamp() > NONCE_EXPIRATION_MS) return false; @@ -140,7 +140,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players return valid; } - private Packet deserialize (byte[] data) { + private Packet deserialize (final byte[] data) { final ByteBuf buf = Unpooled.wrappedBuffer(data); final PayloadMetadata metadata = PayloadMetadata.deserialize(buf); @@ -164,16 +164,16 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players try { return packetClass.getDeclaredConstructor(ByteBuf.class).newInstance(buf); - } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | - IllegalAccessException e) { + } catch (final NoSuchMethodException | InvocationTargetException | InstantiationException | + IllegalAccessException e) { return null; } } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { if ( - !(component instanceof TranslatableComponent translatableComponent) || + !(component instanceof final TranslatableComponent translatableComponent) || !translatableComponent.key().isEmpty() ) return true; @@ -182,11 +182,11 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players if ( arguments.size() != 5 || - !(arguments.get(0).asComponent() instanceof TextComponent idTextComponent) || - !(arguments.get(1).asComponent() instanceof TextComponent uuidTextComponent) || - !(arguments.get(2).asComponent() instanceof TextComponent messageIdTextComponent) || - !(arguments.get(3).asComponent() instanceof TextComponent payloadStateTextComponent) || - !(arguments.get(4).asComponent() instanceof TextComponent payloadTextComponent) || + !(arguments.get(0).asComponent() instanceof final TextComponent idTextComponent) || + !(arguments.get(1).asComponent() instanceof final TextComponent uuidTextComponent) || + !(arguments.get(2).asComponent() instanceof final TextComponent messageIdTextComponent) || + !(arguments.get(3).asComponent() instanceof final TextComponent payloadStateTextComponent) || + !(arguments.get(4).asComponent() instanceof final TextComponent payloadTextComponent) || !idTextComponent.content().equals(ID) ) return true; @@ -239,13 +239,13 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players handlePacket(player, packet); } - } catch (Exception ignored) { } + } catch (final Exception ignored) { } return false; } private void tryHandshaking () { - for (String username : bot.config.chomeNSMod.players) { + for (final String username : bot.config.chomeNSMod.players) { final PlayerEntry target = bot.players.getEntry(username); if (target == null || connectedPlayers.contains(target)) continue; @@ -254,7 +254,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players } } - private void handlePacket (PlayerEntry player, Packet packet) { + private void handlePacket (final PlayerEntry player, final Packet packet) { if (packet instanceof ServerboundSuccessfulHandshakePacket) { connectedPlayers.removeIf(eachPlayer -> eachPlayer.equals(player)); connectedPlayers.add(player); @@ -262,17 +262,17 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players handler.handlePacket(player, packet); - for (Listener listener : listeners) listener.packetReceived(player, packet); + for (final Listener listener : listeners) listener.packetReceived(player, packet); } @Override - public void playerLeft (PlayerEntry target) { + public void playerLeft (final PlayerEntry target) { connectedPlayers.removeIf(player -> player.equals(target)); receivedParts.remove(target); } @SuppressWarnings("unused") public interface Listener { - default void packetReceived (PlayerEntry player, Packet packet) { } + default void packetReceived (final PlayerEntry player, final Packet packet) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java index 29d178a4..c57548c1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java @@ -8,7 +8,7 @@ import net.kyori.adventure.text.format.NamedTextColor; public class ClearChatNameAnnouncerPlugin implements CommandSpyPlugin.Listener { private final Bot bot; - public ClearChatNameAnnouncerPlugin (Bot bot) { + public ClearChatNameAnnouncerPlugin (final Bot bot) { this.bot = bot; if (!bot.config.announceClearChatUsername) return; @@ -17,7 +17,7 @@ public class ClearChatNameAnnouncerPlugin implements CommandSpyPlugin.Listener { } @Override - public void commandReceived (PlayerEntry sender, String command) { + public void commandReceived (final PlayerEntry sender, final String command) { if ( command.equals("/clearchat") || command.equals("/cc") || diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java index c947fed2..ca55b735 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java @@ -14,19 +14,19 @@ public class CloopPlugin { private final List> loopTasks = new ArrayList<>(); public final List loops = new ArrayList<>(); - public CloopPlugin (Bot bot) { + public CloopPlugin (final Bot bot) { this.bot = bot; } - public void add (TimeUnit unit, long interval, String command) { - Runnable loopTask = () -> bot.core.run(command); + public void add (final TimeUnit unit, final long interval, final String command) { + final Runnable loopTask = () -> bot.core.run(command); loops.add(new CommandLoop(command, interval, unit)); loopTasks.add(bot.executor.scheduleAtFixedRate(loopTask, 0, interval, unit)); } - public CommandLoop remove (int index) { - ScheduledFuture loopTask = loopTasks.remove(index); + public CommandLoop remove (final int index) { + final ScheduledFuture loopTask = loopTasks.remove(index); if (loopTask != null) { loopTask.cancel(false); @@ -36,7 +36,7 @@ public class CloopPlugin { } public void clear () { - for (ScheduledFuture loopTask : loopTasks) { + for (final ScheduledFuture loopTask : loopTasks) { loopTask.cancel(false); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java index 4e992db3..d15355b8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java @@ -67,14 +67,14 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { registerCommand(new RestartCommand()); } - public static void registerCommand (Command command) { + public static void registerCommand (final Command command) { COMMANDS.add(command); } - public static Command findCommand (String searchTerm) { + public static Command findCommand (final String searchTerm) { if (searchTerm.isBlank()) return null; - for (Command command : COMMANDS) { + for (final Command command : COMMANDS) { if ( command.name.equals(searchTerm.toLowerCase()) || Arrays.stream(command.aliases).toList().contains(searchTerm.toLowerCase()) @@ -92,7 +92,7 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { private int commandPerSecond = 0; - public CommandHandlerPlugin (Bot bot) { + public CommandHandlerPlugin (final Bot bot) { this.bot = bot; bot.tick.addListener(this); @@ -109,9 +109,9 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { // (sometimes execution time can be as high as 19 ms, // though it can also be as low as 4000 ns) public void executeCommand ( - String input, - CommandContext context, - MessageReceivedEvent event + final String input, + final CommandContext context, + final MessageReceivedEvent event ) { final boolean inGame = context instanceof PlayerCommandContext; final boolean discord = context instanceof DiscordCommandContext; @@ -144,7 +144,7 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { context.sendOutput(Component.text("ChomeNS Bot is currently disabled").color(NamedTextColor.RED)); return; } else if ( - context instanceof PlayerCommandContext playerContext && + context instanceof final PlayerCommandContext playerContext && command.disallowedPacketTypes != null && Arrays.asList(command.disallowedPacketTypes).contains(playerContext.packetType) ) { @@ -176,7 +176,7 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { TrustLevel userTrustLevel = TrustLevel.PUBLIC; - for (Role role : roles) { + for (final Role role : roles) { if (role.getName().equalsIgnoreCase(bot.config.discord.ownerRoleName)) { userTrustLevel = TrustLevel.OWNER; break; @@ -237,9 +237,9 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { final Component output = command.execute(context); if (output != null) context.sendOutput(output); - } catch (CommandException e) { + } catch (final CommandException e) { context.sendOutput(e.message.color(NamedTextColor.RED)); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); final String stackTrace = ExceptionUtilities.getStacktrace(e); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java index c4eb8eb1..e1d415f2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java @@ -15,18 +15,18 @@ public class CommandSpyPlugin implements ChatPlugin.Listener { private final List listeners = new ArrayList<>(); - public CommandSpyPlugin (Bot bot) { + public CommandSpyPlugin (final Bot bot) { this.bot = bot; bot.chat.addListener(this); } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { final List children = component.children(); if ( - !(component instanceof TextComponent textComponent) || + !(component instanceof final TextComponent textComponent) || children.size() != 2 || textComponent.style().isEmpty() || ( @@ -44,14 +44,14 @@ public class CommandSpyPlugin implements ChatPlugin.Listener { if (sender == null) return true; - for (Listener listener : listeners) listener.commandReceived(sender, command); + for (final Listener listener : listeners) listener.commandReceived(sender, command); return true; } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } public interface Listener { - default void commandReceived (PlayerEntry sender, String command) { } + default void commandReceived (final PlayerEntry sender, final String command) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java index 6f958cd7..e55a8ad9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java @@ -14,21 +14,21 @@ public class CommandSuggestionPlugin implements ChatPlugin.Listener { private final Bot bot; - public CommandSuggestionPlugin (Bot bot) { + public CommandSuggestionPlugin (final Bot bot) { this.bot = bot; bot.chat.addListener(this); } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { final List children = component.children(); if ( - !(component instanceof TextComponent idComponent) || + !(component instanceof final TextComponent idComponent) || !idComponent.content().equals(ID) || children.size() != 1 || - !(children.getFirst() instanceof TextComponent playerComponent) + !(children.getFirst() instanceof final TextComponent playerComponent) ) return true; final String player = playerComponent.content(); @@ -36,7 +36,7 @@ public class CommandSuggestionPlugin implements ChatPlugin.Listener { final List output = new ArrayList<>(); output.add(Component.text(ID)); - for (Command command : CommandHandlerPlugin.COMMANDS) { + for (final Command command : CommandHandlerPlugin.COMMANDS) { if (command.consoleOnly) continue; final boolean hasAliases = command.aliases.length != 0; @@ -47,7 +47,7 @@ public class CommandSuggestionPlugin implements ChatPlugin.Listener { .append(Component.text(hasAliases)); if (hasAliases) { - for (String alias : command.aliases) outputComponent = outputComponent.append(Component.text(alias)); + for (final String alias : command.aliases) outputComponent = outputComponent.append(Component.text(alias)); } output.add(outputComponent); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java index 2552b465..31d2fd3b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java @@ -35,7 +35,7 @@ public class ConsolePlugin implements Completer { private final Component format; - public ConsolePlugin (Configuration config) { + public ConsolePlugin (final Configuration config) { this.allBots = Main.bots; this.format = GsonComponentSerializer.gson().deserialize(config.consoleChatFormat); this.prefix = config.consoleCommandPrefix; @@ -54,7 +54,7 @@ public class ConsolePlugin implements Completer { String line = null; try { line = reader.readLine(prompt); - } catch (Exception e) { + } catch (final Exception e) { System.exit(1); } @@ -68,7 +68,7 @@ public class ConsolePlugin implements Completer { } @Override - public void complete (LineReader reader, ParsedLine line, List candidates) { + public void complete (final LineReader reader, final ParsedLine line, final List candidates) { if (!line.line().startsWith(prefix)) return; final String command = line.line().substring(prefix.length()); @@ -86,10 +86,10 @@ public class ConsolePlugin implements Completer { candidates.addAll(filteredCommands); } - private void handleLine (String line) { + private void handleLine (final String line) { if (line == null) return; - for (Bot bot : allBots) { + for (final Bot bot : allBots) { final String server = bot.getServerString(true); if (!server.equals(consoleServer) && !consoleServer.equalsIgnoreCase("all")) continue; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java index bb3a45bd..c4e4aa5f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java @@ -62,7 +62,7 @@ public class CorePlugin private boolean shouldRefill = false; - public CorePlugin (Bot bot) { + public CorePlugin (final Bot bot) { this.bot = bot; this.fromSize = Vector3i.from( @@ -173,7 +173,7 @@ public class CorePlugin incrementBlock(); } - public void run (String command) { + public void run (final String command) { if (!ready || command.length() > 32767) return; if (bot.options.useCore) { @@ -193,9 +193,9 @@ public class CorePlugin } // thanks chipmunk for this new tellraw method - public CompletableFuture runTracked (String command) { return runTracked(false, command); } + public CompletableFuture runTracked (final String command) { return runTracked(false, command); } - public CompletableFuture runTracked (boolean useCargo, String command) { + public CompletableFuture runTracked (final boolean useCargo, final String command) { if (!ready || command.length() > 32767) return null; if (!bot.options.useCore) return null; @@ -231,10 +231,10 @@ public class CorePlugin return trackedFuture; } - public void runPlaceBlock (String command) { + public void runPlaceBlock (final String command) { try { placeBlockQueue.add(command); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } @@ -279,7 +279,7 @@ public class CorePlugin customName ) ); - } catch (JsonSyntaxException e) { + } catch (final JsonSyntaxException e) { bot.logger.error("Error while parsing the core's custom name into Component! You might have an invalid syntax in the custom name."); bot.logger.error(e); } @@ -315,9 +315,9 @@ public class CorePlugin final Vector3i oldSize = toSize; - int x = toSize.getX(); + final int x = toSize.getX(); int y = -64; - int z = toSize.getZ(); + final int z = toSize.getZ(); while (commandsPerTick.get() > 16 * 16) { y++; @@ -354,7 +354,7 @@ public class CorePlugin if (!isCoreComplete()) shouldRefill = true; } - private boolean isCommandBlockState (int blockState) { + private boolean isCommandBlockState (final int blockState) { return // command block ( @@ -376,7 +376,7 @@ public class CorePlugin } // ported from chomens bot js, which is originally from smp - private boolean isCore (Vector3i position) { + private boolean isCore (final Vector3i position) { return position.getX() >= from.getX() && position.getX() <= to.getX() && position.getY() >= from.getY() && position.getY() <= to.getY() && @@ -404,7 +404,7 @@ public class CorePlugin } @Override - public void positionChange (Vector3d position) { + public void positionChange (final Vector3d position) { if (bot.position.isGoingDownFromHeightLimit) return; final int coreChunkPosX = from == null ? -1 : (int) Math.floor((double) from.getX() / 16); @@ -427,18 +427,18 @@ public class CorePlugin ready = true; refillTask = bot.executor.scheduleAtFixedRate(this::refill, 0, bot.config.core.refillInterval, TimeUnit.MILLISECONDS); - for (Listener listener : listeners) listener.coreReady(); + for (final Listener listener : listeners) listener.coreReady(); } } @Override - public void worldChanged (String dimension) { + public void worldChanged (final String dimension) { reset(); refill(); } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { ready = false; refillTask.cancel(false); @@ -471,7 +471,7 @@ public class CorePlugin public void refill () { refill(true); } - public void refill (boolean force) { + public void refill (final boolean force) { if (!ready) return; final Map refilledMap = new HashMap<>(); @@ -512,7 +512,7 @@ public class CorePlugin } if (refilledMap.containsValue(true)) { - for (Listener listener : listeners) listener.coreRefilled(); + for (final Listener listener : listeners) listener.coreRefilled(); } } @@ -522,5 +522,5 @@ public class CorePlugin default void coreRefilled () { } } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java index 26dd4a1d..fb322a46 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java @@ -21,14 +21,14 @@ public class DatabasePlugin { public Connection connection; - public DatabasePlugin (Configuration config) { + public DatabasePlugin (final Configuration config) { try { connection = DriverManager.getConnection( "jdbc:mariadb://" + config.database.address + "/chomens_bot", config.database.username, config.database.password ); - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } } @@ -41,19 +41,19 @@ public class DatabasePlugin { ); } - public boolean execute (String query) throws SQLException { + public boolean execute (final String query) throws SQLException { final Statement statement = connection.createStatement(); return statement.execute(query); } - public ResultSet query (String query) throws SQLException { + public ResultSet query (final String query) throws SQLException { final Statement statement = connection.createStatement(); return statement.executeQuery(query); } - public int update (String query) throws SQLException { + public int update (final String query) throws SQLException { final Statement statement = connection.createStatement(); return statement.executeUpdate(query); @@ -64,7 +64,7 @@ public class DatabasePlugin { try { connection.close(); - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java index 15d5a43c..c16e1704 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java @@ -48,7 +48,7 @@ public class DiscordPlugin extends ListenerAdapter { private final Map totalConnects = new HashMap<>(); - public DiscordPlugin (Configuration config) { + public DiscordPlugin (final Configuration config) { final Configuration.Discord options = config.discord; this.prefix = options.prefix; this.servers = options.servers; @@ -69,7 +69,7 @@ public class DiscordPlugin extends ListenerAdapter { try { jda = builder.build(); jda.awaitReady(); - } catch (InterruptedException ignored) { } + } catch (final InterruptedException ignored) { } if (jda == null) return; @@ -77,7 +77,7 @@ public class DiscordPlugin extends ListenerAdapter { jda.addEventListener(this); - for (Bot bot : Main.bots) { + for (final Bot bot : Main.bots) { final String channelId = servers.get(bot.getServerString(true)); bot.executor.scheduleAtFixedRate(() -> onDiscordTick(channelId), 0, 50, TimeUnit.MILLISECONDS); @@ -86,10 +86,10 @@ public class DiscordPlugin extends ListenerAdapter { bot.addListener(new Bot.Listener() { @Override - public void loadedPlugins (Bot bot) { + public void loadedPlugins (final Bot bot) { bot.chat.addListener(new ChatPlugin.Listener() { @Override - public boolean systemMessageReceived (Component component, String string, String _ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String _ansi) { if (string.length() > 2000 - 12) { sendMessage(CodeBlockUtilities.escape(string), channelId); } else { @@ -129,7 +129,7 @@ public class DiscordPlugin extends ListenerAdapter { } @Override - public void connected (ConnectedEvent event) { + public void connected (final ConnectedEvent event) { totalConnects.put(channelId, 0); sendMessageInstantly( @@ -142,7 +142,7 @@ public class DiscordPlugin extends ListenerAdapter { } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { if (totalConnects.get(channelId) >= 6) return; final String reason = ComponentUtilities.stringifyDiscordAnsi(event.getReason()); @@ -159,8 +159,8 @@ public class DiscordPlugin extends ListenerAdapter { } @Override - public void onMessageReceived (@NotNull MessageReceivedEvent event) { - for (Bot bot : Main.bots) { + public void onMessageReceived (@NotNull final MessageReceivedEvent event) { + for (final Bot bot : Main.bots) { final String channelId = servers.get(bot.getServerString(true)); if ( @@ -185,7 +185,7 @@ public class DiscordPlugin extends ListenerAdapter { Component output = Component.empty(); if (isForwarded) { - for (MessageSnapshot snapshot : messageEvent.getMessageSnapshots()) { + for (final MessageSnapshot snapshot : messageEvent.getMessageSnapshots()) { final List extraComponents = new ArrayList<>(); addExtraComponents( @@ -248,8 +248,8 @@ public class DiscordPlugin extends ListenerAdapter { } private Component getMessageComponent ( - Bot bot, - Message message + final Bot bot, + final Message message ) { final List extraComponents = new ArrayList<>(); @@ -276,7 +276,7 @@ public class DiscordPlugin extends ListenerAdapter { final List rolesList = new ArrayList<>(); - for (Role role : roles) { + for (final Role role : roles) { final Color color = role.getColor(); rolesList.add( @@ -317,7 +317,7 @@ public class DiscordPlugin extends ListenerAdapter { ) ); - for (Role role : roles) { + for (final Role role : roles) { final Color color = role.getColor(); if (color == null) continue; @@ -378,7 +378,7 @@ public class DiscordPlugin extends ListenerAdapter { ).color(NamedTextColor.DARK_GRAY); } - private String replaceMessageContent (String content) { + private String replaceMessageContent (final String content) { return ComponentUtilities // replaces the ANSI codes (from the bot) with section signs corresponding to the color/style .deserializeFromDiscordAnsi(content) @@ -389,19 +389,19 @@ public class DiscordPlugin extends ListenerAdapter { } private void addExtraComponents ( - List extraComponents, - List attachments, - List embeds, - List stickers, - Bot bot + final List extraComponents, + final List attachments, + final List embeds, + final List stickers, + final Bot bot ) { addAttachmentsComponent(attachments, extraComponents); addEmbedsComponent(embeds, extraComponents, bot); addStickersComponent(stickers, extraComponents); } - private void addAttachmentsComponent (List attachments, List extraComponents) { - for (Message.Attachment attachment : attachments) { + private void addAttachmentsComponent (final List attachments, final List extraComponents) { + for (final Message.Attachment attachment : attachments) { extraComponents.add( Component .text("[Attachment]") @@ -418,8 +418,8 @@ public class DiscordPlugin extends ListenerAdapter { } } - private void addEmbedsComponent (List embeds, List extraComponents, Bot bot) { - for (MessageEmbed embed : embeds) { + private void addEmbedsComponent (final List embeds, final List extraComponents, final Bot bot) { + for (final MessageEmbed embed : embeds) { final Component hoverEvent = Component.translatable( """ Title: %s @@ -441,8 +441,8 @@ public class DiscordPlugin extends ListenerAdapter { } } - private void addStickersComponent (List stickers, List extraComponents) { - for (StickerItem sticker : stickers) { + private void addStickersComponent (final List stickers, final List extraComponents) { + for (final StickerItem sticker : stickers) { extraComponents.add( Component .translatable( @@ -472,12 +472,12 @@ public class DiscordPlugin extends ListenerAdapter { final Map nextLogTimes = new HashMap<>(); final Map doneSendingInLogs = new HashMap<>(); - public void sendMessage (String message, String channelId) { + public void sendMessage (final String message, final String channelId) { synchronized (logMessages) { if (!logMessages.containsKey(channelId)) { logMessages.put(channelId, new StringBuilder()); } - StringBuilder logMessage = logMessages.get(channelId); + final StringBuilder logMessage = logMessages.get(channelId); if (logMessage.length() < 2000) { if (!logMessage.isEmpty()) { logMessage.append('\n'); @@ -487,9 +487,9 @@ public class DiscordPlugin extends ListenerAdapter { } } - public void sendMessageInstantly (String message, String channelId) { sendMessageInstantly(message, channelId, true); } + public void sendMessageInstantly (final String message, final String channelId) { sendMessageInstantly(message, channelId, true); } - public MessageCreateAction sendMessageInstantly (String message, String channelId, boolean queue) { + public MessageCreateAction sendMessageInstantly (final String message, final String channelId, final boolean queue) { if (jda == null) return null; final TextChannel logChannel = jda.getTextChannelById(channelId); @@ -515,22 +515,22 @@ public class DiscordPlugin extends ListenerAdapter { } } - public void onDiscordTick (String channelId) { + public void onDiscordTick (final String channelId) { synchronized (logMessages) { if (!logMessages.containsKey(channelId) || logMessages.get(channelId).isEmpty()) { return; } } - long currentTime = System.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!nextLogTimes.containsKey(channelId) || (currentTime >= nextLogTimes.get(channelId) && doneSendingInLogs.get(channelId)) || currentTime - nextLogTimes.get(channelId) > 5000) { - long logDelay = 2000; + final long logDelay = 2000; nextLogTimes.put(channelId, currentTime + logDelay); String message; synchronized (logMessages) { - StringBuilder logMessage = logMessages.get(channelId); + final StringBuilder logMessage = logMessages.get(channelId); message = logMessage.toString() // the ZWSP fixes discord.gg/discord.com showing invite .replace("discord.gg", "discord\u200b.\u200bgg") diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/EvalPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/EvalPlugin.java index 4ef42158..d56793a2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/EvalPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/EvalPlugin.java @@ -30,7 +30,7 @@ public class EvalPlugin { private final Gson gson = new Gson(); - public EvalPlugin (Bot bot) { + public EvalPlugin (final Bot bot) { functions.add(new CoreFunction(bot)); functions.add(new CorePlaceBlockFunction(bot)); functions.add(new ChatFunction(bot)); @@ -40,7 +40,7 @@ public class EvalPlugin { try { socket = IO.socket(bot.config.eval.address); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } @@ -49,7 +49,7 @@ public class EvalPlugin { final JsonArray array = new JsonArray(); - for (EvalFunction function : functions) array.add(function.name); + for (final EvalFunction function : functions) array.add(function.name); socket.emit( "setFunctions", @@ -59,7 +59,7 @@ public class EvalPlugin { socket.on(Socket.EVENT_DISCONNECT, (args) -> connected = false); socket.on(Socket.EVENT_CONNECT_ERROR, (args) -> connected = false); - for (EvalFunction function : functions) { + for (final EvalFunction function : functions) { socket.on(BRIDGE_PREFIX + function.name, args -> new Thread(() -> { try { final EvalFunction.Output output = function.execute(args); @@ -67,7 +67,7 @@ public class EvalPlugin { if (output == null) return; socket.emit("functionOutput:" + function.name, output.message(), output.parseJSON()); - } catch (Exception ignored) { } + } catch (final Exception ignored) { } }).start()); } @@ -84,13 +84,13 @@ public class EvalPlugin { final CompletableFuture future = futures.remove(id); future.complete(new EvalOutput(isError, output)); - } catch (NumberFormatException ignored) { } + } catch (final NumberFormatException ignored) { } }); socket.connect(); } - public CompletableFuture run (String code) { + public CompletableFuture run (final String code) { final CompletableFuture future = new CompletableFuture<>(); if (!connected) return null; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java index e8cd6efe..b84652e0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java @@ -36,7 +36,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener { public boolean isSupported = false; - public ExtrasMessengerPlugin (Bot bot) { + public ExtrasMessengerPlugin (final Bot bot) { this.bot = bot; this.chomens_namespace = bot.config.namespace + ":"; // Ex. chomens_bot: (then it will be appended by channel) @@ -44,11 +44,11 @@ public class ExtrasMessengerPlugin extends Bot.Listener { } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundCustomPayloadPacket packet) { + private void packetReceived (final ClientboundCustomPayloadPacket packet) { final Key packetChannel = packet.getChannel(); if (packetChannel.equals(MINECRAFT_REGISTER_KEY)) { @@ -88,7 +88,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener { registeredChannels.clear(); - for (String channel : oldRegisteredChannels) { + for (final String channel : oldRegisteredChannels) { registerChannel(channel); } } else if (packetChannel.equals(EXTRAS_MESSAGE_KEY)) { @@ -102,11 +102,11 @@ public class ExtrasMessengerPlugin extends Bot.Listener { final byte[] data = readByteArrayToEnd(buf); - for (Listener listener : listeners) listener.onMessage(uuid, data); + for (final Listener listener : listeners) listener.onMessage(uuid, data); } } - public void sendPayload (String name, byte[] data) { + public void sendPayload (final String name, final byte[] data) { final ByteBuf buf = Unpooled.buffer(); writeString(buf, chomens_namespace + name); @@ -122,7 +122,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener { ); } - public void registerChannel (String channel) { + public void registerChannel (final String channel) { final ByteBuf buf = Unpooled.buffer(); writeString(buf, chomens_namespace + channel); @@ -137,7 +137,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener { registeredChannels.add(channel); } - public void unregisterChannel (String channel) { + public void unregisterChannel (final String channel) { final boolean removed = registeredChannels.remove(channel); if (!removed) return; @@ -154,14 +154,14 @@ public class ExtrasMessengerPlugin extends Bot.Listener { ); } - private void writeString (ByteBuf input, String string) { + private void writeString (final ByteBuf input, final String string) { final byte[] bytesString = string.getBytes(StandardCharsets.US_ASCII); bytesString[bytesString.length - 1] |= END_CHAR_MASK; input.writeBytes(bytesString); } - private String readString (ByteBuf byteBuf) { + private String readString (final ByteBuf byteBuf) { final byte[] buf = new byte[255]; int idx = 0; @@ -180,14 +180,14 @@ public class ExtrasMessengerPlugin extends Bot.Listener { return new String(Arrays.copyOf(buf, idx), StandardCharsets.US_ASCII); } - private UUID readUUID (ByteBuf input) { + private UUID readUUID (final ByteBuf input) { final long mostSignificant = input.readLong(); final long leastSignificant = input.readLong(); return new UUID(mostSignificant, leastSignificant); } - private byte[] readByteArrayToEnd (ByteBuf input) { + private byte[] readByteArrayToEnd (final ByteBuf input) { final byte[] bytes = new byte[input.readableBytes()]; input.readBytes(bytes); @@ -195,9 +195,9 @@ public class ExtrasMessengerPlugin extends Bot.Listener { return bytes; } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } public interface Listener { - default void onMessage (UUID sender, byte[] message) { } + default void onMessage (final UUID sender, final byte[] message) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java index a7ef9c17..62b7fec5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java @@ -23,7 +23,7 @@ public class FilterManagerPlugin public final Map list = Collections.synchronizedMap(new HashMap<>()); - public FilterManagerPlugin (Bot bot) { + public FilterManagerPlugin (final Bot bot) { this.bot = bot; bot.executor.scheduleAtFixedRate(this::kick, 0, 10, TimeUnit.SECONDS); @@ -46,7 +46,7 @@ public class FilterManagerPlugin } @Override - public void playerDisplayNameUpdated (PlayerEntry target, Component displayName) { + public void playerDisplayNameUpdated (final PlayerEntry target, final Component displayName) { final Pair player = getFilteredFromName(target.profile.getName()); if (player == null) return; @@ -59,7 +59,7 @@ public class FilterManagerPlugin } @Override - public void commandReceived (PlayerEntry sender, String command) { + public void commandReceived (final PlayerEntry sender, final String command) { final Pair player = getFilteredFromName(sender.profile.getName()); if (player == null) return; @@ -81,7 +81,7 @@ public class FilterManagerPlugin } @Override - public boolean playerMessageReceived (PlayerMessage message, ChatPacketType packetType) { + public boolean playerMessageReceived (final PlayerMessage message, final ChatPacketType packetType) { if (message.sender().profile.getName() == null) return true; final Pair player = getFilteredFromName(message.sender().profile.getName()); @@ -94,13 +94,13 @@ public class FilterManagerPlugin } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { list.clear(); } - public void doAll (PlayerEntry entry) { doAll(entry, ""); } + public void doAll (final PlayerEntry entry) { doAll(entry, ""); } - public void doAll (PlayerEntry entry, String reason) { + public void doAll (final PlayerEntry entry, final String reason) { bot.exploits.kick(entry.profile.getId()); mute(entry, reason); deOp(entry); @@ -108,31 +108,31 @@ public class FilterManagerPlugin clear(entry); } - public void mute (PlayerEntry target) { mute(target, ""); } + public void mute (final PlayerEntry target) { mute(target, ""); } - public void mute (PlayerEntry target, String reason) { + public void mute (final PlayerEntry target, final String reason) { bot.core.run("essentials:mute " + target.profile.getIdAsString() + " 10y " + reason); } - public void deOp (PlayerEntry target) { + public void deOp (final PlayerEntry target) { bot.core.run("minecraft:execute run deop " + UUIDUtilities.selector(target.profile.getId())); } - public void gameMode (PlayerEntry target) { + public void gameMode (final PlayerEntry target) { bot.core.run("minecraft:gamemode spectator " + UUIDUtilities.selector(target.profile.getId())); } - public void clear (PlayerEntry target) { + public void clear (final PlayerEntry target) { bot.core.run("minecraft:clear " + UUIDUtilities.selector(target.profile.getId())); } public void kick () { - for (PlayerEntry filtered : list.keySet()) { + for (final PlayerEntry filtered : list.keySet()) { bot.exploits.kick(filtered.profile.getId()); } } - public void add (PlayerEntry entry, String reason) { + public void add (final PlayerEntry entry, final String reason) { if ( getFilteredFromName(entry.profile.getName()) != null || // prevent already existing filters entry.profile.equals(bot.profile) // prevent self-harm !!!!!! @@ -143,12 +143,12 @@ public class FilterManagerPlugin doAll(entry, reason); } - public void remove (String name) { + public void remove (final String name) { list.entrySet().removeIf(filtered -> filtered.getKey().profile.getName().equals(name)); } - public Pair getFilteredFromName (String name) { - for (Map.Entry entry : list.entrySet()) { + public Pair getFilteredFromName (final String name) { + for (final Map.Entry entry : list.entrySet()) { if (entry.getKey().profile.getName().equals(name)) return Pair.of(entry.getKey(), entry.getValue()); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java index 9c15b8d4..9a00cccf 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java @@ -20,31 +20,31 @@ public class FormatCheckerPlugin implements ChatPlugin.Listener, PlayersPlugin.L private int totalFormat = 0; - public FormatCheckerPlugin (Bot bot) { + public FormatCheckerPlugin (final Bot bot) { this.bot = bot; bot.chat.addListener(this); bot.players.addListener(this); } - private void reset (PlayerEntry entry) { + private void reset (final PlayerEntry entry) { if (!entry.profile.getName().equals(bot.config.ownerName)) return; totalFormat = 0; } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { reset(target); } @Override - public void playerLeft (PlayerEntry target) { + public void playerLeft (final PlayerEntry target) { reset(target); } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { if (!isImposterFormat(component)) return true; bot.chat.tellraw(Component.text("Possible fake ChomeNS custom chat").style(Style.style(TextDecoration.ITALIC)).color(NamedTextColor.GRAY)); @@ -52,10 +52,10 @@ public class FormatCheckerPlugin implements ChatPlugin.Listener, PlayersPlugin.L return true; } - public boolean isImposterFormat (Component component) { + public boolean isImposterFormat (final Component component) { if (!bot.config.imposterFormatChecker.enabled) return false; - if (!(component instanceof TranslatableComponent format)) return false; + if (!(component instanceof final TranslatableComponent format)) return false; final List args = format.arguments(); if (args.size() < 3 || !format.key().equals("[%s] %s › %s")) return false; @@ -71,15 +71,15 @@ public class FormatCheckerPlugin implements ChatPlugin.Listener, PlayersPlugin.L final Object prefix = format.arguments().getFirst().value(); if ( - ((prefix instanceof TextComponent text) && text.content().equals(bot.username + " Console")) || // ohio + ((prefix instanceof final TextComponent text) && text.content().equals(bot.username + " Console")) || // ohio (Main.discord != null && prefix.equals(Main.discord.messagePrefix)) ) return false; - if (!(prefix instanceof TranslatableComponent translatablePrefix)) return true; + if (!(prefix instanceof final TranslatableComponent translatablePrefix)) return true; final Object userHash = translatablePrefix.arguments().getFirst().value(); - if (!(userHash instanceof TextComponent userHashComponent)) return true; + if (!(userHash instanceof final TextComponent userHashComponent)) return true; final String key = bot.config.imposterFormatChecker.key; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java index 97bc56d6..9602cb61 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java @@ -35,11 +35,11 @@ public class GrepLogPlugin { public boolean running = false; - public GrepLogPlugin (Bot bot) { + public GrepLogPlugin (final Bot bot) { this.bot = bot; } - public void search (CommandContext context, String input, boolean ignoreCase, boolean regex) throws CommandException { + public void search (final CommandContext context, final String input, final boolean ignoreCase, final boolean regex) throws CommandException { running = true; try (final Stream files = Files.list(FileLoggerUtilities.logDirectory)) { @@ -49,7 +49,7 @@ public class GrepLogPlugin { final StringBuilder result = new StringBuilder(); - for (Path filePath : fileList) { + for (final Path filePath : fileList) { if (!running) { pattern = null; return; @@ -129,29 +129,29 @@ public class GrepLogPlugin { context.sendOutput(component); }); - } catch (CommandException e) { + } catch (final CommandException e) { running = false; throw e; - } catch (FileNotFoundException e) { + } catch (final FileNotFoundException e) { running = false; throw new CommandException(Component.text("File not found")); - } catch (NotDirectoryException e) { + } catch (final NotDirectoryException e) { running = false; throw new CommandException(Component.text("Logger directory is not a directory")); - } catch (PatternSyntaxException e) { + } catch (final PatternSyntaxException e) { running = false; throw new CommandException(Component.text("Pattern is invalid")); - } catch (IOException e) { + } catch (final IOException e) { running = false; throw new CommandException(Component.text("An I/O error has occurred")); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } running = false; } - private StringBuilder process (BufferedReader bufferedReader, String input, boolean ignoreCase, boolean regex) throws IOException, PatternSyntaxException { + private StringBuilder process (final BufferedReader bufferedReader, final String input, final boolean ignoreCase, final boolean regex) throws IOException, PatternSyntaxException { if (regex && pattern == null) { if (ignoreCase) pattern = Pattern.compile(input, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java index 18c9235c..0dbdc8aa 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java @@ -11,18 +11,18 @@ import java.util.Arrays; public class HashingPlugin { private final Bot bot; - public HashingPlugin (Bot bot) { + public HashingPlugin (final Bot bot) { this.bot = bot; } - public String getHash (String prefix, PlayerEntry sender, boolean sectionSigns) { return getGenericHash(bot.config.keys.trustedKey, prefix, sender, sectionSigns); } + public String getHash (final String prefix, final PlayerEntry sender, final boolean sectionSigns) { return getGenericHash(bot.config.keys.trustedKey, prefix, sender, sectionSigns); } - public String getAdminHash (String prefix, PlayerEntry sender, boolean sectionSigns) { return getGenericHash(bot.config.keys.adminKey, prefix, sender, sectionSigns); } + public String getAdminHash (final String prefix, final PlayerEntry sender, final boolean sectionSigns) { return getGenericHash(bot.config.keys.adminKey, prefix, sender, sectionSigns); } - public String getOwnerHash (String prefix, PlayerEntry sender, boolean sectionSigns) { return getGenericHash(bot.config.keys.ownerKey, prefix, sender, sectionSigns); } + public String getOwnerHash (final String prefix, final PlayerEntry sender, final boolean sectionSigns) { return getGenericHash(bot.config.keys.ownerKey, prefix, sender, sectionSigns); } // should this be public? - public String getGenericHash (String key, String prefix, PlayerEntry sender, boolean sectionSigns) { + public String getGenericHash (final String key, final String prefix, final PlayerEntry sender, final boolean sectionSigns) { final long time = System.currentTimeMillis() / 5_000; final String hashValue = sender.profile.getIdAsString() + prefix + time + key; @@ -41,7 +41,7 @@ public class HashingPlugin { hash; } - private boolean checkHash (String hash, String input) { + private boolean checkHash (final String hash, String input) { // removes reset section sign if (input.length() == (16 * 2 /* <-- don't forget, we have the section signs */) + 2 && input.endsWith("§r")) input = input.substring(0, input.length() - 2); @@ -49,22 +49,22 @@ public class HashingPlugin { return input.equals(hash); } - public boolean isCorrectHash (String input, String prefix, PlayerEntry sender) { + public boolean isCorrectHash (final String input, final String prefix, final PlayerEntry sender) { return checkHash(getHash(prefix, sender, true), input) || checkHash(getHash(prefix, sender, false), input); } - public boolean isCorrectAdminHash (String input, String prefix, PlayerEntry sender) { + public boolean isCorrectAdminHash (final String input, final String prefix, final PlayerEntry sender) { return checkHash(getAdminHash(prefix, sender, true), input) || checkHash(getAdminHash(prefix, sender, false), input); } - public boolean isCorrectOwnerHash (String input, String prefix, PlayerEntry sender) { + public boolean isCorrectOwnerHash (final String input, final String prefix, final PlayerEntry sender) { return checkHash(getOwnerHash(prefix, sender, true), input) || checkHash(getOwnerHash(prefix, sender, false), input); } - public TrustLevel getTrustLevel (String input, String prefix, PlayerEntry sender) { + public TrustLevel getTrustLevel (final String input, final String prefix, final PlayerEntry sender) { if (isCorrectOwnerHash(input, prefix, sender)) return TrustLevel.OWNER; else if (isCorrectAdminHash(input, prefix, sender)) return TrustLevel.ADMIN; else if (isCorrectHash(input, prefix, sender)) return TrustLevel.TRUSTED; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java index 7b3dfbb9..35703d24 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java @@ -26,7 +26,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { Main.database.execute(CREATE_TABLE); - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } }); @@ -37,7 +37,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen private final Bot bot; - public IPFilterPlugin (Bot bot) { + public IPFilterPlugin (final Bot bot) { this.bot = bot; if (Main.database == null) return; @@ -54,13 +54,13 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen } @Override - public void queriedPlayerIP (PlayerEntry target, String ip) { + public void queriedPlayerIP (final PlayerEntry target, final String ip) { if (localList.isEmpty()) return; check(target); } - private void check (PlayerEntry target) { + private void check (final PlayerEntry target) { if (bot.options.useCorePlaceBlock) return; // it will spam the place block core so i ignored this final String ip = target.ip; @@ -73,13 +73,13 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen public static Map list () { final Map output = new LinkedHashMap<>(); - try (ResultSet result = Main.database.query(LIST_FILTERS)) { + try (final ResultSet result = Main.database.query(LIST_FILTERS)) { if (result == null) return output; while (result.next()) { output.put(result.getString("ip"), result.getString("reason")); } - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } @@ -88,7 +88,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen return output; } - public void add (String ip, String reason) { + public void add (final String ip, final String reason) { try { final PreparedStatement statement = Main.database.connection.prepareStatement(INSERT_FILTER); @@ -98,7 +98,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen statement.executeUpdate(); list(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } @@ -109,11 +109,11 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen if (localList.isEmpty()) return; bot.executorService.submit(() -> { - for (PlayerEntry entry : bot.players.list) check(entry); + for (final PlayerEntry entry : bot.players.list) check(entry); }); } - public void remove (String ip) { + public void remove (final String ip) { try { final PreparedStatement statement = Main.database.connection.prepareStatement(REMOVE_FILTER); @@ -122,7 +122,7 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen statement.executeUpdate(); list(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } } @@ -132,13 +132,13 @@ public class IPFilterPlugin implements PlayersPlugin.Listener, CorePlugin.Listen Main.database.update(CLEAR_FILTER); list(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } } - private void handleFilterManager (String ip, PlayerEntry entry) { - for (Map.Entry ipEntry : localList.entrySet()) { + private void handleFilterManager (final String ip, final PlayerEntry entry) { + for (final Map.Entry ipEntry : localList.entrySet()) { final String eachIP = ipEntry.getKey(); final String reason = ipEntry.getValue(); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java index 07f829df..17e451c9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java @@ -30,7 +30,7 @@ public class IRCPlugin extends ListenerAdapter { private PircBotX bot; - public IRCPlugin (Configuration config) { + public IRCPlugin (final Configuration config) { this.ircConfig = config.irc; this.servers = ircConfig.servers; @@ -49,7 +49,7 @@ public class IRCPlugin extends ListenerAdapter { if (!ircConfig.password.isEmpty()) builder.addCapHandler(new SASLCapHandler(ircConfig.name, ircConfig.password, true)); - for (Map.Entry entry : ircConfig.servers.entrySet()) + for (final Map.Entry entry : ircConfig.servers.entrySet()) builder.addAutoJoinChannel(entry.getValue()); final org.pircbotx.Configuration configuration = builder.buildConfiguration(); @@ -59,23 +59,23 @@ public class IRCPlugin extends ListenerAdapter { new Thread(() -> { try { bot.startBot(); - } catch (Exception e) { + } catch (final Exception e) { LoggerUtilities.error(e); } }).start(); - for (Bot bot : Main.bots) { + for (final Bot bot : Main.bots) { bot.addListener(new Bot.Listener() { @Override - public void connected (ConnectedEvent event) { + public void connected (final ConnectedEvent event) { IRCPlugin.this.connected(bot); } @Override - public void loadedPlugins (Bot bot) { + public void loadedPlugins (final Bot bot) { bot.chat.addListener(new ChatPlugin.Listener() { @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { IRCPlugin.this.systemMessageReceived(bot, ansi); return true; @@ -89,12 +89,12 @@ public class IRCPlugin extends ListenerAdapter { } @Override - public void onMessage (MessageEvent event) { + public void onMessage (final MessageEvent event) { Bot serverBot = null; String targetChannel = null; - for (Map.Entry entry : servers.entrySet()) { + for (final Map.Entry entry : servers.entrySet()) { if (entry.getValue().equals(event.getChannel().getName())) { serverBot = Main.bots.stream() .filter(eachBot -> entry.getKey().equals(eachBot.getServerString(true))) @@ -162,18 +162,18 @@ public class IRCPlugin extends ListenerAdapter { serverBot.chat.tellraw(component); } - private void systemMessageReceived (Bot bot, String ansi) { + private void systemMessageReceived (final Bot bot, final String ansi) { sendMessage( bot, ansi ); } - public void quit (String reason) { + public void quit (final String reason) { if (bot.isConnected()) bot.sendIRC().quitServer(reason); } - private void connected (Bot bot) { + private void connected (final Bot bot) { sendMessage( bot, String.format( @@ -189,7 +189,7 @@ public class IRCPlugin extends ListenerAdapter { try { final Map> clonedMap = new HashMap<>(messageQueue); - for (Map.Entry> entry : clonedMap.entrySet()) { + for (final Map.Entry> entry : clonedMap.entrySet()) { final List logs = entry.getValue(); if (logs.isEmpty()) continue; @@ -202,16 +202,16 @@ public class IRCPlugin extends ListenerAdapter { bot.sendIRC().message(entry.getKey(), withIRCColors); } - } catch (Exception ignored) { } + } catch (final Exception ignored) { } } - private void addMessageToQueue (Bot bot, String message) { + private void addMessageToQueue (final Bot bot, final String message) { final String channel = servers.get(bot.getServerString(true)); addMessageToQueue(channel, message); } - private void addMessageToQueue (String channel, String message) { + private void addMessageToQueue (final String channel, final String message) { final List split = new ArrayList<>(Arrays.asList(message.split("\n"))); if (!messageQueue.containsKey(channel)) { @@ -223,7 +223,7 @@ public class IRCPlugin extends ListenerAdapter { } } - public void sendMessage (Bot bot, String message) { + public void sendMessage (final Bot bot, final String message) { final String hostAndPort = bot.getServerString(true); final String channel = servers.get(hostAndPort); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java index e66e5f13..df0b3e25 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java @@ -15,7 +15,7 @@ public class LoggerPlugin implements ChatPlugin.Listener { private int totalConnects = 0; - public LoggerPlugin (Bot bot) { + public LoggerPlugin (final Bot bot) { this.bot = bot; bot.addListener(new Bot.Listener() { @@ -39,7 +39,7 @@ public class LoggerPlugin implements ChatPlugin.Listener { } @Override - public void connected (ConnectedEvent event) { + public void connected (final ConnectedEvent event) { log( String.format( "Successfully connected to: %s", @@ -51,7 +51,7 @@ public class LoggerPlugin implements ChatPlugin.Listener { } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { if (totalConnects >= 20) return; final Component message = Component.translatable( @@ -64,34 +64,34 @@ public class LoggerPlugin implements ChatPlugin.Listener { } @Override - public void loadedPlugins (Bot bot) { + public void loadedPlugins (final Bot bot) { bot.chat.addListener(LoggerPlugin.this); } }); } - public void log (LogType type, Component message) { + public void log (final LogType type, final Component message) { LoggerUtilities.log(type, bot, message, true, logToConsole); } - public void log (LogType type, Component message, boolean logToFile) { + public void log (final LogType type, final Component message, final boolean logToFile) { LoggerUtilities.log(type, bot, message, logToFile, logToConsole); } - public void log (Component message) { log(LogType.INFO, message); } + public void log (final Component message) { log(LogType.INFO, message); } - public void log (String message) { log(LogType.INFO, Component.text(message)); } + public void log (final String message) { log(LogType.INFO, Component.text(message)); } - public void log (LogType type, String message) { log(type, Component.text(message)); } + public void log (final LogType type, final String message) { log(type, Component.text(message)); } - public void error (Component message) { log(LogType.ERROR, message); } + public void error (final Component message) { log(LogType.ERROR, message); } - public void error (String message) { log(LogType.ERROR, Component.text(message)); } + public void error (final String message) { log(LogType.ERROR, Component.text(message)); } - public void error (Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); } + public void error (final Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { log(LogType.CHAT, component); return true; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java index fd60ff39..3e3a186e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java @@ -25,7 +25,7 @@ public class MailPlugin implements PlayersPlugin.Listener { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { Main.database.execute(CREATE_TABLE); - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } }); @@ -34,7 +34,7 @@ public class MailPlugin implements PlayersPlugin.Listener { private final Bot bot; - public MailPlugin (Bot bot) { + public MailPlugin (final Bot bot) { this.bot = bot; if (Main.database == null) return; @@ -43,7 +43,7 @@ public class MailPlugin implements PlayersPlugin.Listener { } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { final String name = target.profile.getName(); @@ -51,7 +51,7 @@ public class MailPlugin implements PlayersPlugin.Listener { final List mails = list(); - for (Mail mail : mails) { + for (final Mail mail : mails) { if (!mail.sentTo().equals(name)) continue; sendToTargetSize++; @@ -72,7 +72,7 @@ public class MailPlugin implements PlayersPlugin.Listener { }); } - public void send (Mail mail) { + public void send (final Mail mail) { try { final PreparedStatement statement = Main.database.connection.prepareStatement(INSERT_MAIL); @@ -83,19 +83,19 @@ public class MailPlugin implements PlayersPlugin.Listener { statement.setString(5, mail.contents()); statement.executeUpdate(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } } - public void clear (String sentTo) { + public void clear (final String sentTo) { try { final PreparedStatement statement = Main.database.connection.prepareStatement(REMOVE_MAIL); statement.setString(1, sentTo); statement.executeUpdate(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } } @@ -103,7 +103,7 @@ public class MailPlugin implements PlayersPlugin.Listener { public List list () { final List output = new ArrayList<>(); - try (ResultSet result = Main.database.query(LIST_MAILS)) { + try (final ResultSet result = Main.database.query(LIST_MAILS)) { if (result == null) return output; while (result.next()) { @@ -117,7 +117,7 @@ public class MailPlugin implements PlayersPlugin.Listener { output.add(mail); } - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java index 0aff6e60..0e163f7a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java @@ -40,7 +40,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen static { try { if (!Files.exists(SONG_DIR)) Files.createDirectory(SONG_DIR); - } catch (IOException e) { + } catch (final IOException e) { LoggerUtilities.error(e); } } @@ -71,7 +71,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen public String currentLyrics = ""; - public MusicPlayerPlugin (Bot bot) { + public MusicPlayerPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); @@ -82,21 +82,21 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen bot.executor.scheduleAtFixedRate(() -> urlLimit = 0, 0, bot.config.music.urlRatelimit.seconds, TimeUnit.SECONDS); } - public void loadSong (Path location, PlayerEntry sender) { + public void loadSong (final Path location, final PlayerEntry sender) { startLoadingSong( location.getFileName().toString(), new SongLoaderThread(location, bot, sender.profile.getName()) ); } - public void loadSong (byte[] data, PlayerEntry sender) { + public void loadSong (final byte[] data, final PlayerEntry sender) { startLoadingSong( sender.profile.getName() + "'s song item", new SongLoaderThread(data, bot, sender.profile.getName()) ); } - public void loadSong (URL location, PlayerEntry sender) { + public void loadSong (final URL location, final PlayerEntry sender) { if (urlLimit >= bot.config.music.urlRatelimit.limit) { bot.chat.tellraw(Component.text("URL loading is being rate limited!").color(NamedTextColor.RED)); return; @@ -110,7 +110,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen ); } - private void startLoadingSong (String songName, SongLoaderThread loaderThread) { + private void startLoadingSong (final String songName, final SongLoaderThread loaderThread) { if (songQueue.size() > 500) return; this.loaderThread = loaderThread; @@ -208,7 +208,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen currentSong.play(); } } - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } @@ -298,7 +298,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen } public Component generateBossBar () { - TextColor nameColor; + final TextColor nameColor; if (rainbow) { final int increment = 360 / 20; @@ -348,7 +348,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen return component; } - public Component formatTime (long millis) { + public Component formatTime (final long millis) { final int seconds = (int) millis / 1000; final String minutePart = String.valueOf(seconds / 60); @@ -367,7 +367,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { if (currentSong != null) currentSong.pause(); // nice. loaderThread = null; } @@ -424,7 +424,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen key -= 33; - double floatingPitch = 0.5 * Math.pow(2, (key + (pitch / 10)) / 12); + final double floatingPitch = 0.5 * Math.pow(2, (key + (pitch / 10)) / 12); for (int i = 0; i < amplify; i++) { bot.core.run( @@ -439,22 +439,22 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen ); } } - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } - private Vector3d getBlockPosition (Note note) { - Vector3d blockPosition; + private Vector3d getBlockPosition (final Note note) { + final Vector3d blockPosition; if (currentSong.nbs) { - double value; + final double value; if (note.stereo == 100 && note.panning != 100) value = note.panning; else if (note.panning == 100 && note.stereo != 100) value = note.stereo; else value = (double) (note.stereo + note.panning) / 2; - double xPos; + final double xPos; if (value > 100) xPos = (value - 100) / -100; else if (value == 100) xPos = 0; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java index c72cffdd..5981bb71 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java @@ -20,7 +20,7 @@ public class PacketSnifferPlugin extends Bot.Listener { private BufferedWriter writer; @SuppressWarnings("ConstantValue") // this can be set through servereval - public PacketSnifferPlugin (Bot bot) { + public PacketSnifferPlugin (final Bot bot) { this.bot = bot; if (enabled) enable(); @@ -43,7 +43,7 @@ public class PacketSnifferPlugin extends Bot.Listener { if (!Files.exists(path)) Files.createFile(path); writer = Files.newBufferedWriter(path, StandardOpenOption.APPEND); - } catch (IOException e) { + } catch (final IOException e) { bot.logger.error(e); } } @@ -55,31 +55,31 @@ public class PacketSnifferPlugin extends Bot.Listener { try { writer.flush(); writer.close(); - } catch (IOException e) { + } catch (final IOException e) { bot.logger.error(e); } } @Override - public void packetReceived (Session session, Packet packet) { + public void packetReceived (final Session session, final Packet packet) { if (!enabled) return; try { writer.write(packet.toString() + "\n"); writer.flush(); - } catch (IOException e) { + } catch (final IOException e) { bot.logger.error(e); } } @Override - public void packetSending (PacketSendingEvent event) { + public void packetSending (final PacketSendingEvent event) { if (!enabled) return; try { writer.write(event.getPacket().toString() + "\n"); writer.flush(); - } catch (IOException e) { + } catch (final IOException e) { bot.logger.error(e); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java index c80c8cba..e8668b3a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java @@ -28,7 +28,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { Main.database.execute(CREATE_TABLE); - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } }); @@ -39,7 +39,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { private final Bot bot; - public PlayerFilterPlugin (Bot bot) { + public PlayerFilterPlugin (final Bot bot) { this.bot = bot; if (Main.database == null) return; @@ -50,7 +50,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { public static List list () { final List output = new ArrayList<>(); - try (ResultSet result = Main.database.query(LIST_FILTERS)) { + try (final ResultSet result = Main.database.query(LIST_FILTERS)) { if (result == null) return output; while (result.next()) { @@ -63,7 +63,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { output.add(filteredPlayer); } - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } @@ -72,8 +72,8 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { return output; } - private FilteredPlayer getPlayer (String name) { - for (FilteredPlayer filteredPlayer : localList) { + private FilteredPlayer getPlayer (final String name) { + for (final FilteredPlayer filteredPlayer : localList) { if (matchesPlayer(name, filteredPlayer)) { return filteredPlayer; } @@ -82,10 +82,10 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { return null; } - private List getPlayers (String name) { + private List getPlayers (final String name) { final List matches = new ArrayList<>(); - for (FilteredPlayer filteredPlayer : localList) { + for (final FilteredPlayer filteredPlayer : localList) { if (matchesPlayer(name, filteredPlayer)) { matches.add(filteredPlayer); } @@ -94,7 +94,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { return matches; } - private boolean matchesPlayer (String name, FilteredPlayer player) { + private boolean matchesPlayer (final String name, final FilteredPlayer player) { if (player.regex) { final Pattern pattern = compilePattern(player); @@ -104,19 +104,19 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { } } - private Pattern compilePattern (FilteredPlayer player) { + private Pattern compilePattern (final FilteredPlayer player) { try { final int flags = player.ignoreCase ? Pattern.CASE_INSENSITIVE : 0; return Pattern.compile(player.playerName, flags); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error("Error compiling player filter regex " + player.playerName + " (this shouldn't happen):"); bot.logger.error(e); return null; } } - private boolean compareNames (String name, FilteredPlayer player) { + private boolean compareNames (final String name, final FilteredPlayer player) { final String playerName = player.ignoreCase ? player.playerName.toLowerCase() : player.playerName; final String targetName = player.ignoreCase ? name.toLowerCase() : name; @@ -124,7 +124,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { bot.executorService.submit(() -> { final FilteredPlayer player = getPlayer(target.profile.getName()); @@ -134,7 +134,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { }); } - public void add (String playerName, String reason, boolean regex, boolean ignoreCase) { + public void add (final String playerName, final String reason, final boolean regex, final boolean ignoreCase) { try { final PreparedStatement statement = Main.database.connection.prepareStatement(INSERT_FILTER); @@ -146,15 +146,15 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { statement.executeUpdate(); list(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } final List matches = getPlayers(playerName); // loop through all the servers too - for (Bot bot : bot.bots) { - for (FilteredPlayer match : matches) { + for (final Bot bot : bot.bots) { + for (final FilteredPlayer match : matches) { final PlayerEntry entry = bot.players.getEntry(match.playerName); if (entry == null) continue; @@ -164,7 +164,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { } } - public void remove (String playerName) { + public void remove (final String playerName) { bot.filterManager.remove(playerName); try { @@ -175,19 +175,19 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { statement.executeUpdate(); list(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } } public void clear () { - for (FilteredPlayer player : localList) bot.filterManager.remove(player.playerName); + for (final FilteredPlayer player : localList) bot.filterManager.remove(player.playerName); try { Main.database.update(CLEAR_FILTER); list(); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java index 568288e4..0bb26750 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java @@ -35,14 +35,14 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { Main.database.execute(CREATE_TABLE); - } catch (SQLException e) { + } catch (final SQLException e) { LoggerUtilities.error(e); } }); } } - public PlayersDatabasePlugin (Bot bot) { + public PlayersDatabasePlugin (final Bot bot) { this.bot = bot; if (Main.database == null) return; @@ -50,7 +50,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { bot.players.addListener(this); } - public JsonNode getPlayerData (String username) { + public JsonNode getPlayerData (final String username) { if (Main.database == null || Main.database.connection == null) return null; try { @@ -67,13 +67,13 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { final String stringJson = result.getString("data"); return objectMapper.readTree(stringJson); - } catch (SQLException | JsonProcessingException e) { + } catch (final SQLException | JsonProcessingException e) { bot.logger.error(e); return null; } } - public String getPlayerIP (String username) { + public String getPlayerIP (final String username) { if (Main.database == null || Main.database.connection == null) return null; try { @@ -91,19 +91,19 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { result.next(); return result.getString("ip"); - } catch (SQLException e) { + } catch (final SQLException e) { bot.logger.error(e); return null; } } - public Map findPlayerAlts (String ip) { return findPlayerAlts(ip, false); } + public Map findPlayerAlts (final String ip) { return findPlayerAlts(ip, false); } - public Map findPlayerAlts (String ip, boolean allServer) { + public Map findPlayerAlts (final String ip, final boolean allServer) { try { final Map output = new HashMap<>(); - PreparedStatement statement; + final PreparedStatement statement; if (allServer) { statement = Main.database.connection.prepareStatement(FIND_ALTS_ALL_SERVERS); @@ -126,14 +126,14 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { } return output; - } catch (SQLException | JsonProcessingException e) { + } catch (final SQLException | JsonProcessingException e) { bot.logger.error(e); return null; } } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { final PreparedStatement insertPlayerStatement = Main.database.connection.prepareStatement(INSERT_PLAYER); @@ -151,14 +151,14 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { insertPlayerStatement.setString(2, objectMapper.writeValueAsString(baseObject)); insertPlayerStatement.executeUpdate(); - } catch (SQLException | JsonProcessingException e) { + } catch (final SQLException | JsonProcessingException e) { bot.logger.error(e); } }); } @Override - public void queriedPlayerIP (PlayerEntry target, String ip) { + public void queriedPlayerIP (final PlayerEntry target, final String ip) { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER); @@ -174,14 +174,14 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { updatePlayerStatement.setString(4, target.profile.getName()); updatePlayerStatement.executeUpdate(); - } catch (SQLException | JsonProcessingException e) { + } catch (final SQLException | JsonProcessingException e) { bot.logger.error(e); } }); } @Override - public void playerLeft (PlayerEntry target) { + public void playerLeft (final PlayerEntry target) { DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { try { final PreparedStatement updatePlayerStatement = Main.database.connection.prepareStatement(UPDATE_PLAYER); @@ -196,7 +196,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { updatePlayerStatement.setString(4, target.profile.getName()); updatePlayerStatement.executeUpdate(); - } catch (SQLException | JsonProcessingException e) { + } catch (final SQLException | JsonProcessingException e) { bot.logger.error(e); } }); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java index ae6e7b0e..19f33bae 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -28,7 +28,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { private final List pendingLeftPlayers = Collections.synchronizedList(new ArrayList<>()); - public PlayersPlugin (Bot bot) { + public PlayersPlugin (final Bot bot) { this.bot = bot; bot.executor.scheduleAtFixedRate(this::onLastKnownNameTick, 0, 5, TimeUnit.SECONDS); @@ -43,16 +43,16 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundPlayerInfoUpdatePacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundPlayerInfoRemovePacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundPlayerInfoUpdatePacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundPlayerInfoRemovePacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundPlayerInfoUpdatePacket packet) { + private void packetReceived (final ClientboundPlayerInfoUpdatePacket packet) { final EnumSet actions = packet.getActions(); - for (PlayerListEntryAction action : actions) { - for (PlayerListEntry entry : packet.getEntries()) { + for (final PlayerListEntryAction action : actions) { + for (final PlayerListEntry entry : packet.getEntries()) { if (action == PlayerListEntryAction.ADD_PLAYER) addPlayer(entry); else if (action == PlayerListEntryAction.INITIALIZE_CHAT) initializeChat(entry); else if (action == PlayerListEntryAction.UPDATE_LISTED) updateListed(entry); @@ -63,15 +63,15 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } } - private void packetReceived (ClientboundPlayerInfoRemovePacket packet) { + private void packetReceived (final ClientboundPlayerInfoRemovePacket packet) { final List uuids = packet.getProfileIds(); - for (UUID uuid : uuids) removePlayer(uuid); + for (final UUID uuid : uuids) removePlayer(uuid); } - private void queryPlayersIP () { for (PlayerEntry target : list) queryPlayersIP(target); } + private void queryPlayersIP () { for (final PlayerEntry target : list) queryPlayersIP(target); } - private void queryPlayersIP (PlayerEntry target) { + private void queryPlayersIP (final PlayerEntry target) { if (target.ip != null) return; final CompletableFuture future = getPlayerIP(target, true); @@ -79,15 +79,15 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { future.thenApply(ip -> { target.ip = ip; - for (Listener listener : listeners) listener.queriedPlayerIP(target, ip); + for (final Listener listener : listeners) listener.queriedPlayerIP(target, ip); return null; }); } - public CompletableFuture getPlayerIP (PlayerEntry target) { return getPlayerIP(target, false); } + public CompletableFuture getPlayerIP (final PlayerEntry target) { return getPlayerIP(target, false); } - public CompletableFuture getPlayerIP (PlayerEntry target, boolean forceSeen) { + public CompletableFuture getPlayerIP (final PlayerEntry target, final boolean forceSeen) { final CompletableFuture outputFuture = new CompletableFuture<>(); DatabasePlugin.EXECUTOR_SERVICE.submit(() -> { @@ -133,8 +133,8 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { return outputFuture; } - public final PlayerEntry getEntry (UUID uuid) { - for (PlayerEntry candidate : list) { + public final PlayerEntry getEntry (final UUID uuid) { + for (final PlayerEntry candidate : list) { if (candidate != null && candidate.profile.getId().equals(uuid)) { return candidate; } @@ -143,8 +143,8 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { return null; } - public final PlayerEntry getEntry (String username) { - for (PlayerEntry candidate : list) { + public final PlayerEntry getEntry (final String username) { + for (final PlayerEntry candidate : list) { if ( candidate != null && ( @@ -160,8 +160,8 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { return null; } - public final PlayerEntry getEntry (Component displayName) { - for (PlayerEntry candidate : list) { + public final PlayerEntry getEntry (final Component displayName) { + for (final PlayerEntry candidate : list) { if (candidate != null && candidate.displayName != null && candidate.displayName.equals(displayName)) { return candidate; } @@ -172,25 +172,25 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { public PlayerEntry getBotEntry () { return getEntry(bot.username); } - private PlayerEntry getEntry (PlayerListEntry other) { + private PlayerEntry getEntry (final PlayerListEntry other) { return getEntry(other.getProfileId()); } - private void initializeChat (PlayerListEntry newEntry) { + private void initializeChat (final PlayerListEntry newEntry) { final PlayerEntry target = getEntry(newEntry); if (target == null) return; target.publicKey = newEntry.getPublicKey(); } - private void updateListed (PlayerListEntry newEntry) { + private void updateListed (final PlayerListEntry newEntry) { final PlayerEntry target = getEntry(newEntry); if (target == null) return; target.listed = newEntry.isListed(); } - private void addPlayer (PlayerListEntry newEntry) { + private void addPlayer (final PlayerListEntry newEntry) { final PlayerEntry duplicate = getEntry(newEntry); final PlayerEntry target = new PlayerEntry(newEntry); @@ -207,17 +207,17 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { list.add(target); - for (Listener listener : listeners) listener.playerUnVanished(target); + for (final Listener listener : listeners) listener.playerUnVanished(target); } else { list.add(target); queryPlayersIP(target); - for (Listener listener : listeners) listener.playerJoined(target); + for (final Listener listener : listeners) listener.playerJoined(target); } } - private void updateGameMode (PlayerListEntry newEntry) { + private void updateGameMode (final PlayerListEntry newEntry) { final PlayerEntry target = getEntry(newEntry); if (target == null) return; @@ -225,10 +225,10 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { target.gamemode = gameMode; - for (Listener listener : listeners) { listener.playerGameModeUpdated(target, gameMode); } + for (final Listener listener : listeners) { listener.playerGameModeUpdated(target, gameMode); } } - private void updateLatency (PlayerListEntry newEntry) { + private void updateLatency (final PlayerListEntry newEntry) { final PlayerEntry target = getEntry(newEntry); if (target == null) return; @@ -236,10 +236,10 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { target.latency = ping; - for (Listener listener : listeners) { listener.playerLatencyUpdated(target, ping); } + for (final Listener listener : listeners) { listener.playerLatencyUpdated(target, ping); } } - private void updateDisplayName (PlayerListEntry newEntry) { + private void updateDisplayName (final PlayerListEntry newEntry) { final PlayerEntry target = getEntry(newEntry); if (target == null) return; @@ -247,14 +247,14 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { target.displayName = displayName; - for (Listener listener : listeners) { listener.playerDisplayNameUpdated(target, displayName); } + for (final Listener listener : listeners) { listener.playerDisplayNameUpdated(target, displayName); } } - private CompletableFuture getLastKnownName (String uuid) { + private CompletableFuture getLastKnownName (final String uuid) { return bot.query.entity(true, uuid, "bukkit.lastKnownName"); } - private void check (PlayerEntry target) { + private void check (final PlayerEntry target) { final PlayerEntry pending = pendingLeftPlayers.stream() .filter(player -> player.equals(target)) .findAny() @@ -275,7 +275,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { // checking if removed prevents the event from being called twice // this was a bug for quite a few weeks lol if (removed) { - for (Listener listener : listeners) listener.playerLeft(target); + for (final Listener listener : listeners) listener.playerLeft(target); } } else if (!lastKnownName.equals(target.profile.getName())) { final PlayerEntry newTarget = new PlayerEntry( @@ -301,14 +301,14 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { list.remove(target); - for (Listener listener : listeners) listener.playerChangedUsername(newTarget); + for (final Listener listener : listeners) listener.playerChangedUsername(newTarget); } else if (pending != null) { // we already passed all the left and username check, // so the only one left is vanish target.listed = false; - for (Listener listener : listeners) listener.playerVanished(target); + for (final Listener listener : listeners) listener.playerVanished(target); } return null; @@ -320,12 +320,12 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { if (!bot.loggedIn || !bot.core.ready || !bot.serverFeatures.hasNamespaces) return; - for (PlayerEntry target : new ArrayList<>(list)) { + for (final PlayerEntry target : new ArrayList<>(list)) { check(target); } } - private void removePlayer (UUID uuid) { + private void removePlayer (final UUID uuid) { final PlayerEntry target = getEntry(uuid); if (target == null) return; @@ -334,7 +334,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { final boolean removed = list.remove(target); if (removed) { - for (Listener listener : listeners) listener.playerLeft(target); + for (final Listener listener : listeners) listener.playerLeft(target); } } else { pendingLeftPlayers.add(target); @@ -344,30 +344,30 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { list.clear(); } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } @SuppressWarnings("unused") public interface Listener { - default void playerJoined (PlayerEntry target) { } + default void playerJoined (final PlayerEntry target) { } - default void playerUnVanished (PlayerEntry target) { } + default void playerUnVanished (final PlayerEntry target) { } - default void playerGameModeUpdated (PlayerEntry target, GameMode gameMode) { } + default void playerGameModeUpdated (final PlayerEntry target, final GameMode gameMode) { } - default void playerLatencyUpdated (PlayerEntry target, int ping) { } + default void playerLatencyUpdated (final PlayerEntry target, final int ping) { } - default void playerDisplayNameUpdated (PlayerEntry target, Component displayName) { } + default void playerDisplayNameUpdated (final PlayerEntry target, final Component displayName) { } - default void playerLeft (PlayerEntry target) { } + default void playerLeft (final PlayerEntry target) { } - default void playerVanished (PlayerEntry target) { } + default void playerVanished (final PlayerEntry target) { } - default void playerChangedUsername (PlayerEntry target) { } + default void playerChangedUsername (final PlayerEntry target) { } - default void queriedPlayerIP (PlayerEntry target, String ip) { } + default void queriedPlayerIP (final PlayerEntry target, final String ip) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java index f7868b44..791bcd39 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java @@ -35,7 +35,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener private final Map positionMap = new HashMap<>(); private final Map rotationMap = new HashMap<>(); - public PositionPlugin (Bot bot) { + public PositionPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); @@ -62,25 +62,25 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundPlayerPositionPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundAddEntityPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundRemoveEntitiesPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundMoveEntityRotPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundMoveEntityPosPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundMoveEntityPosRotPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundEntityPositionSyncPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundPlayerPositionPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundAddEntityPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundRemoveEntitiesPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundMoveEntityRotPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundMoveEntityPosPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundMoveEntityPosRotPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundEntityPositionSyncPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundPlayerPositionPacket packet) { + private void packetReceived (final ClientboundPlayerPositionPacket packet) { bot.session.send(new ServerboundAcceptTeleportationPacket(packet.getId())); position = packet.getPosition(); - for (Listener listener : listeners) { listener.positionChange(position); } + for (final Listener listener : listeners) { listener.positionChange(position); } } - private void packetReceived (ClientboundAddEntityPacket packet) { + private void packetReceived (final ClientboundAddEntityPacket packet) { if (packet.getType() != EntityType.PLAYER) return; final PlayerEntry entry = bot.players.getEntry(packet.getUuid()); @@ -96,17 +96,17 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener rotationMap.put(packet.getEntityId(), new Rotation(packet.getYaw(), packet.getPitch())); } - private void packetReceived (ClientboundRemoveEntitiesPacket packet) { + private void packetReceived (final ClientboundRemoveEntitiesPacket packet) { final int[] ids = packet.getEntityIds(); - for (int id : ids) { + for (final int id : ids) { entityIdMap.remove(id); positionMap.remove(id); rotationMap.remove(id); } } - private void packetReceived (ClientboundEntityPositionSyncPacket packet) { + private void packetReceived (final ClientboundEntityPositionSyncPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getId()); if (player == null) return; @@ -120,10 +120,10 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener positionMap.put(packet.getId(), position); rotationMap.put(packet.getId(), rotation); - for (Listener listener : listeners) listener.playerMoved(player, position, rotation); + for (final Listener listener : listeners) listener.playerMoved(player, position, rotation); } - private void packetReceived (ClientboundMoveEntityRotPacket packet) { + private void packetReceived (final ClientboundMoveEntityRotPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getEntityId()); if (player == null) return; @@ -132,11 +132,11 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener rotationMap.put(packet.getEntityId(), rotation); - for (Listener listener : listeners) + for (final Listener listener : listeners) listener.playerMoved(player, getPlayerPosition(player.profile.getName()), rotation); } - private void packetReceived (ClientboundMoveEntityPosPacket packet) { + private void packetReceived (final ClientboundMoveEntityPosPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getEntityId()); if (player == null) return; @@ -158,11 +158,11 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener positionMap.put(packet.getEntityId(), position); - for (Listener listener : listeners) + for (final Listener listener : listeners) listener.playerMoved(player, position, getPlayerRotation(player.profile.getName())); } - private void packetReceived (ClientboundMoveEntityPosRotPacket packet) { + private void packetReceived (final ClientboundMoveEntityPosRotPacket packet) { final PlayerEntry player = entityIdMap.get(packet.getEntityId()); if (player == null) return; @@ -187,7 +187,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener positionMap.put(packet.getEntityId(), position); rotationMap.put(packet.getEntityId(), rotation); - for (Listener listener : listeners) listener.playerMoved(player, position, rotation); + for (final Listener listener : listeners) listener.playerMoved(player, position, rotation); } // for now this is used in CorePlugin when placing the command block @@ -200,7 +200,7 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener if (isGoingDownFromHeightLimit) { isGoingDownFromHeightLimit = false; - for (Listener listener : listeners) { listener.positionChange(position); } + for (final Listener listener : listeners) { listener.positionChange(position); } } return; @@ -240,42 +240,42 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener )); } - public Vector3d getPlayerPosition (String playerName) { + public Vector3d getPlayerPosition (final String playerName) { int entityId = -1; - for (Map.Entry entry : entityIdMap.entrySet()) { + for (final Map.Entry entry : entityIdMap.entrySet()) { if (entry.getValue().profile.getName().equals(playerName)) entityId = entry.getKey(); } if (entityId == -1) return null; - for (Map.Entry entry : positionMap.entrySet()) { + for (final Map.Entry entry : positionMap.entrySet()) { if (entry.getKey() == entityId) return entry.getValue(); } return null; } - public Rotation getPlayerRotation (String playerName) { + public Rotation getPlayerRotation (final String playerName) { int entityId = -1; - for (Map.Entry entry : entityIdMap.entrySet()) { + for (final Map.Entry entry : entityIdMap.entrySet()) { if (entry.getValue().profile.getName().equals(playerName)) entityId = entry.getKey(); } if (entityId == -1) return null; - for (Map.Entry entry : rotationMap.entrySet()) { + for (final Map.Entry entry : rotationMap.entrySet()) { if (entry.getKey() == entityId) return entry.getValue(); } return null; } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } @SuppressWarnings("unused") public interface Listener { - default void positionChange (Vector3d position) { } + default void positionChange (final Vector3d position) { } - default void playerMoved (PlayerEntry player, Vector3d position, Rotation rotation) { } + default void playerMoved (final PlayerEntry player, final Vector3d position, final Rotation rotation) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java index 6a914c3f..de4b282f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/QueryPlugin.java @@ -24,7 +24,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti public final Queue cargosQueue = new ConcurrentLinkedQueue<>(); - public QueryPlugin (Bot bot) { + public QueryPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); @@ -42,9 +42,9 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { if ( - !(component instanceof TranslatableComponent rootTranslatable) || + !(component instanceof final TranslatableComponent rootTranslatable) || !rootTranslatable.key().equals(ID) ) return true; @@ -55,18 +55,18 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti final Component cargosComponent = arguments.getFirst().asComponent(); if ( - !(cargosComponent instanceof TextComponent cargosTextComponent) || + !(cargosComponent instanceof final TextComponent cargosTextComponent) || !cargosTextComponent.content().isEmpty() ) return false; final List cargos = cargosComponent.children(); - for (Component cargo : cargos) processCargo(cargo); + for (final Component cargo : cargos) processCargo(cargo); return false; } - private void sendQueueComponent (Component component) { + private void sendQueueComponent (final Component component) { final Queue queue = new LinkedList<>(); queue.add(component); @@ -81,7 +81,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti sendQueueComponent(queue); } - private void sendQueueComponent (Queue queue) { + private void sendQueueComponent (final Queue queue) { bot.chat.tellraw( Component .translatable( @@ -95,8 +95,8 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti ); } - private void processCargo (Component cargo) { - if (!(cargo instanceof TextComponent textComponent)) return; + private void processCargo (final Component cargo) { + if (!(cargo instanceof final TextComponent textComponent)) return; final UUID inputId = UUIDUtilities.tryParse(textComponent.content()); @@ -108,7 +108,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti if ( children.size() > 2 || - !(children.getFirst() instanceof TextComponent firstChild) + !(children.getFirst() instanceof final TextComponent firstChild) ) return; try { @@ -129,7 +129,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti future.complete(stringOutput); } - } catch (NumberFormatException ignored) { } + } catch (final NumberFormatException ignored) { } } private Triple, Long, UUID> getFutureAndId () { @@ -144,9 +144,9 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti return Triple.of(future, transactionId, id); } - public CompletableFuture block (Vector3i location, String path) { return block(false, location, path); } + public CompletableFuture block (final Vector3i location, final String path) { return block(false, location, path); } - public CompletableFuture block (boolean useCargo, Vector3i location, String path) { + public CompletableFuture block (final boolean useCargo, final Vector3i location, final String path) { final Triple, Long, UUID> triple = getFutureAndId(); final UUID id = triple.getRight(); @@ -173,9 +173,9 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti return triple.getLeft(); } - public CompletableFuture entity (String selector, String path) { return entity(false, selector, path); } + public CompletableFuture entity (final String selector, final String path) { return entity(false, selector, path); } - public CompletableFuture entity (boolean useCargo, String selector, String path) { + public CompletableFuture entity (final boolean useCargo, final String selector, final String path) { final Triple, Long, UUID> triple = getFutureAndId(); final UUID id = triple.getRight(); @@ -200,7 +200,7 @@ public class QueryPlugin extends Bot.Listener implements ChatPlugin.Listener, Ti // should there be storage query? @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { nextTransactionId.set(0); transactions.clear(); ids.clear(); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ScreensharePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ScreensharePlugin.java index 2bf9b2f8..c3aa5d20 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ScreensharePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ScreensharePlugin.java @@ -28,17 +28,17 @@ public class ScreensharePlugin { // public FFmpegFrameGrabber grabber; - public ScreensharePlugin (Bot bot) { + public ScreensharePlugin (final Bot bot) { this.bot = bot; try { robot = new Robot(); - } catch (AWTException e) { + } catch (final AWTException e) { bot.logger.error(e); } } - public void start (Vector3i position) { + public void start (final Vector3i position) { screen = new Screen(bot, width, height, position); screen.update(); @@ -61,9 +61,9 @@ public class ScreensharePlugin { } private void drawScreen () { - Rectangle screenRect = new Rectangle(Toolkit.getDefaultToolkit().getScreenSize()); + final Rectangle screenRect = new Rectangle(Toolkit.getDefaultToolkit().getScreenSize()); - BufferedImage capture = robot.createScreenCapture(screenRect); + final BufferedImage capture = robot.createScreenCapture(screenRect); // try (Java2DFrameConverter frameConverter = new Java2DFrameConverter()) { // final Frame grabbed = grabber.grab(); @@ -72,14 +72,14 @@ public class ScreensharePlugin { if (capture == null) return; - BufferedImage resized = resize(capture, screen.width, screen.height); + final BufferedImage resized = resize(capture, screen.width, screen.height); for (int y = 0; y < resized.getHeight(); y++) { for (int x = 0; x < resized.getWidth(); x++) { - int rgba = resized.getRGB(x, y); - int red = (rgba >> 16) & 255; - int green = (rgba >> 8) & 255; - int blue = rgba & 255; + final int rgba = resized.getRGB(x, y); + final int red = (rgba >> 16) & 255; + final int green = (rgba >> 8) & 255; + final int blue = rgba & 255; screen.screen[x][y] = String.format("#%02x%02x%02x", red, green, blue); } @@ -93,11 +93,11 @@ public class ScreensharePlugin { } // move this to util? - private BufferedImage resize (BufferedImage img, int newW, int newH) { - Image tmp = img.getScaledInstance(newW, newH, Image.SCALE_SMOOTH); - BufferedImage dimg = new BufferedImage(newW, newH, BufferedImage.TYPE_INT_ARGB); + private BufferedImage resize (final BufferedImage img, final int newW, final int newH) { + final Image tmp = img.getScaledInstance(newW, newH, Image.SCALE_SMOOTH); + final BufferedImage dimg = new BufferedImage(newW, newH, BufferedImage.TYPE_INT_ARGB); - Graphics2D g2d = dimg.createGraphics(); + final Graphics2D g2d = dimg.createGraphics(); g2d.drawImage(tmp, 0, 0, null); g2d.dispose(); @@ -114,7 +114,7 @@ public class ScreensharePlugin { public final ArrayList tags = new ArrayList<>(); - public Screen (Bot bot, int width, int height, Vector3i pos) { + public Screen (final Bot bot, final int width, final int height, final Vector3i pos) { screen = new String[width][height]; this.bot = bot; @@ -146,7 +146,7 @@ public class ScreensharePlugin { } public void kill () { - for (String i : tags) { + for (final String i : tags) { bot.core.run("minecraft:kill @e[tag=" + i + "]"); } @@ -176,9 +176,9 @@ public class ScreensharePlugin { } } - public void setPixel (String hexColor, int x, int y) { screen[x][y] = hexColor; } + public void setPixel (final String hexColor, final int x, final int y) { screen[x][y] = hexColor; } - public void setRow (String[] hexColor, int row) { + public void setRow (final String[] hexColor, final int row) { for (int x = 0; x < width; x++) { screen[x][row] = hexColor[x]; } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java index 21167935..ea736425 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java @@ -46,7 +46,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener private boolean prefix = false; private boolean username = true; - public SelfCarePlugin (Bot bot) { + public SelfCarePlugin (final Bot bot) { this.bot = bot; bot.addListener(this); @@ -54,7 +54,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener } @Override - public boolean systemMessageReceived (Component component, String string, String ansi) { + public boolean systemMessageReceived (final Component component, final String string, final String ansi) { final Configuration.BotOption.EssentialsMessages essentialsMessages = bot.options.essentialsMessages; if (string.equals("Successfully enabled CommandSpy")) cspy = true; @@ -135,15 +135,15 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundGameEventPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundEntityEventPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundOpenScreenPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundSetPassengersPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundGameEventPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundEntityEventPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundOpenScreenPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundSetPassengersPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundLoginPacket packet) { + private void packetReceived (final ClientboundLoginPacket packet) { this.entityId = packet.getEntityId(); this.gamemode = packet.getCommonPlayerSpawnInfo().getGameMode(); @@ -163,7 +163,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener checkTask = bot.executor.scheduleAtFixedRate(task, 0, bot.config.selfCare.delay, TimeUnit.MILLISECONDS); } - private void packetReceived (ClientboundGameEventPacket packet) { + private void packetReceived (final ClientboundGameEventPacket packet) { final GameEvent notification = packet.getNotification(); final GameEventValue value = packet.getValue(); @@ -175,7 +175,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener if (notification == GameEvent.CHANGE_GAMEMODE) gamemode = (GameMode) value; } - private void packetReceived (ClientboundEntityEventPacket packet) { + private void packetReceived (final ClientboundEntityEventPacket packet) { final EntityEvent event = packet.getEvent(); final int id = packet.getEntityId(); @@ -188,7 +188,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener else if (event == EntityEvent.PLAYER_OP_PERMISSION_LEVEL_4) permissionLevel = 4; } - private void packetReceived (ClientboundOpenScreenPacket packet) { + private void packetReceived (final ClientboundOpenScreenPacket packet) { // instantly closes the window when received the packet // also should this be in self care? bot.session.send( @@ -198,7 +198,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener ); } - private void packetReceived (ClientboundSetPassengersPacket packet) { + private void packetReceived (final ClientboundSetPassengersPacket packet) { if ( Arrays.stream(packet.getPassengerIds()) .noneMatch(id -> id == entityId) @@ -216,13 +216,13 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener ); } - private void runEssentialsCommand (String command) { + private void runEssentialsCommand (final String command) { if (bot.options.useChat) bot.chat.sendCommandInstantly(command); else bot.core.run(command); } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { checkTask.cancel(true); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java index 61c9b53a..d421ba4f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerFeaturesPlugin.java @@ -16,19 +16,19 @@ public class ServerFeaturesPlugin extends Bot.Listener { public boolean hasEssentials = false; public boolean hasExtras = false; - public ServerFeaturesPlugin (Bot bot) { + public ServerFeaturesPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundCommandsPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundCommandsPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundCommandsPacket packet) { - for (CommandNode node : packet.getNodes()) { + private void packetReceived (final ClientboundCommandsPacket packet) { + for (final CommandNode node : packet.getNodes()) { if (!node.isExecutable() || node.getType() != CommandType.LITERAL) continue; final String name = node.getName(); @@ -61,7 +61,7 @@ public class ServerFeaturesPlugin extends Bot.Listener { } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { hasNamespaces = false; hasEssentials = false; hasExtras = false; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java index b76087e4..b8fce3dd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java @@ -28,7 +28,7 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { private final String bossbarName = "tpsbar"; - public TPSPlugin (Bot bot) { + public TPSPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); @@ -97,19 +97,19 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { bossBar.setTitle(component); bossBar.setColor(getBossBarColor(tickRate)); bossBar.setValue((int) Math.round(tickRate)); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } - private NamedTextColor getColor (double tickRate) { + private NamedTextColor getColor (final double tickRate) { if (tickRate > 15) return NamedTextColor.GREEN; else if (tickRate == 15) return NamedTextColor.YELLOW; else if (tickRate < 15 && tickRate > 10) return NamedTextColor.RED; else return NamedTextColor.DARK_RED; } - private BossBarColor getBossBarColor (double tickRate) { + private BossBarColor getBossBarColor (final double tickRate) { if (tickRate > 15) return BossBarColor.LIME; else if (tickRate == 15) return BossBarColor.YELLOW; else if (tickRate < 15 && tickRate > 10) return BossBarColor.RED; @@ -117,20 +117,20 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundSetTimePacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundSetTimePacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundSetTimePacket ignoredPacket) { - long now = System.currentTimeMillis(); - float timeElapsed = (float) (now - timeLastTimeUpdate) / 1000.0F; + private void packetReceived (final ClientboundSetTimePacket ignoredPacket) { + final long now = System.currentTimeMillis(); + final float timeElapsed = (float) (now - timeLastTimeUpdate) / 1000.0F; tickRates[nextIndex] = MathUtilities.clamp(20.0f / timeElapsed, 0.0f, 20.0f); nextIndex = (nextIndex + 1) % tickRates.length; timeLastTimeUpdate = now; } - private void packetReceived (ClientboundLoginPacket ignoredPacket) { + private void packetReceived (final ClientboundLoginPacket ignoredPacket) { Arrays.fill(tickRates, 0); nextIndex = 0; timeGameJoined = timeLastTimeUpdate = System.currentTimeMillis(); @@ -141,7 +141,7 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { int numTicks = 0; float sumTickRates = 0.0f; - for (double tickRate : tickRates) { + for (final double tickRate : tickRates) { if (tickRate > 0) { sumTickRates += (float) tickRate; numTicks++; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java index 0491e879..a34af760 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java @@ -15,12 +15,12 @@ public class TabCompletePlugin extends Bot.Listener { private int nextTransactionId = 0; private final Map> transactions = new HashMap<>(); - public TabCompletePlugin (Bot bot) { + public TabCompletePlugin (final Bot bot) { this.bot = bot; bot.addListener(this); } - public CompletableFuture tabComplete (String command) { + public CompletableFuture tabComplete (final String command) { if (!bot.loggedIn) return null; final int transactionId = nextTransactionId++; @@ -34,11 +34,11 @@ public class TabCompletePlugin extends Bot.Listener { } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundCommandSuggestionsPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundCommandSuggestionsPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundCommandSuggestionsPacket packet) { + private void packetReceived (final ClientboundCommandSuggestionsPacket packet) { final int id = packet.getTransactionId(); if (!transactions.containsKey(id)) return; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java index 20856e1b..fb661eda 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java @@ -13,13 +13,13 @@ public class TeamJoinerPlugin { private final Bot bot; - public TeamJoinerPlugin (Bot bot) { + public TeamJoinerPlugin (final Bot bot) { this.bot = bot; this.teamName = bot.config.teamName; bot.addListener(new Bot.Listener() { @Override - public void connected (ConnectedEvent event) { + public void connected (final ConnectedEvent event) { TeamJoinerPlugin.this.connected(); } }); @@ -51,7 +51,7 @@ public class TeamJoinerPlugin { if (team.players.size() == 1 && team.players.getFirst().equals(bot.username)) return; excludeOthers(); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java index 55ffa5db..220345fc 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java @@ -15,25 +15,25 @@ import java.util.List; public class TeamPlugin extends Bot.Listener { public final List teams = Collections.synchronizedList(new ArrayList<>()); - public TeamPlugin (Bot bot) { + public TeamPlugin (final Bot bot) { bot.addListener(this); } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { teams.clear(); } - public synchronized Team findTeamByName (String name) { - for (Team team : new ArrayList<>(teams)) { + public synchronized Team findTeamByName (final String name) { + for (final Team team : new ArrayList<>(teams)) { if (team.teamName.equals(name)) return team; } return null; } - public synchronized Team findTeamByMember (String member) { - for (Team team : new ArrayList<>(teams)) { + public synchronized Team findTeamByMember (final String member) { + for (final Team team : new ArrayList<>(teams)) { if (team.players.contains(member)) return team; } @@ -41,11 +41,11 @@ public class TeamPlugin extends Bot.Listener { } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundSetPlayerTeamPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundSetPlayerTeamPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundSetPlayerTeamPacket packet) { + private void packetReceived (final ClientboundSetPlayerTeamPacket packet) { switch (packet.getAction()) { case CREATE -> { final Team team = new Team( diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java index a01460c2..2c541bf9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java @@ -11,7 +11,7 @@ public class TickPlugin { private final List listeners = new ArrayList<>(); - public TickPlugin (Bot bot) { + public TickPlugin (final Bot bot) { this.bot = bot; bot.executor.scheduleAtFixedRate(this::tick, 0, 50, TimeUnit.MILLISECONDS); @@ -19,10 +19,10 @@ public class TickPlugin { } private void tick () { - for (Listener listener : listeners) { + for (final Listener listener : listeners) { try { listener.onAlwaysTick(); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error("Caught exception in an always tick listener!"); bot.logger.error(e); } @@ -30,10 +30,10 @@ public class TickPlugin { if (!bot.loggedIn) return; - for (Listener listener : listeners) { + for (final Listener listener : listeners) { try { listener.onTick(); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error("Caught exception in a tick listener!"); bot.logger.error(e); } @@ -43,17 +43,17 @@ public class TickPlugin { private void tickSecond () { if (!bot.loggedIn) return; - for (Listener listener : listeners) { + for (final Listener listener : listeners) { try { listener.onSecondTick(); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error("Caught exception in a second tick listener!"); bot.logger.error(e); } } } - public void addListener (Listener listener) { + public void addListener (final Listener listener) { listeners.add(listener); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java index 9184d579..5381a25a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TrustedPlugin.java @@ -17,7 +17,7 @@ public class TrustedPlugin implements PlayersPlugin.Listener { public final List list; - public TrustedPlugin (Bot bot) { + public TrustedPlugin (final Bot bot) { this.bot = bot; this.list = bot.config.trusted; @@ -25,7 +25,7 @@ public class TrustedPlugin implements PlayersPlugin.Listener { bot.players.addListener(this); } - public void broadcast (Component message, UUID exceptTarget) { + public void broadcast (final Component message, final UUID exceptTarget) { final Component component = Component.translatable( "[%s] [%s] %s", Component.text("ChomeNS Bot").color(bot.colorPalette.primary), @@ -35,10 +35,10 @@ public class TrustedPlugin implements PlayersPlugin.Listener { LoggerUtilities.log(LogType.TRUSTED_BROADCAST, component); - for (Bot bot : bot.bots) { + for (final Bot bot : bot.bots) { if (bot == this.bot || !bot.loggedIn) continue; - for (String player : list) { + for (final String player : list) { final PlayerEntry entry = bot.players.getEntry(player); if (entry == null) continue; @@ -50,14 +50,14 @@ public class TrustedPlugin implements PlayersPlugin.Listener { } } - public void broadcast (Component message) { broadcast(message, null); } + public void broadcast (final Component message) { broadcast(message, null); } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { if (!list.contains(target.profile.getName())) return; // based (VERY) - Component component; + final Component component; if (!target.profile.getName().equals(bot.config.ownerName)) { component = Component.translatable( "Hello, %s!", @@ -95,7 +95,7 @@ public class TrustedPlugin implements PlayersPlugin.Listener { } @Override - public void playerLeft (PlayerEntry target) { + public void playerLeft (final PlayerEntry target) { if (!list.contains(target.profile.getName())) return; broadcast( diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java index 627cfa2f..9f5bdb73 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java @@ -42,19 +42,19 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { public final List groups = new ArrayList<>(); - public VoiceChatPlugin (Bot bot) { + public VoiceChatPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundCustomPayloadPacket t_packet) packetReceived(t_packet); } - private void packetReceived (ClientboundLoginPacket ignored) { + private void packetReceived (final ClientboundLoginPacket ignored) { // totally didn't use a real minecraft client with voicechat mod to get this bot.session.send(new ServerboundCustomPayloadPacket( @@ -70,7 +70,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { running = true; } - private void packetReceived (ClientboundCustomPayloadPacket packet) { + private void packetReceived (final ClientboundCustomPayloadPacket packet) { if (packet.getChannel().equals(SECRET_KEY)) { final byte[] bytes = packet.getData(); final FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.wrappedBuffer(bytes)); @@ -89,7 +89,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { try { socket.open(); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error("Failed to create Simple Voice Chat connection!"); bot.logger.error(e); return; @@ -124,7 +124,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { if (message == null) continue; - if (message.packet instanceof PingPacket pingPacket) + if (message.packet instanceof final PingPacket pingPacket) sendToServer(new NetworkMessage(pingPacket)); else if (message.packet instanceof KeepAlivePacket) sendToServer(new NetworkMessage(new KeepAlivePacket())); @@ -139,7 +139,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { ) ); } - } catch (Exception e) { + } catch (final Exception e) { if (running) bot.logger.error(e); else break; // stop the thread } @@ -147,7 +147,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { } @SuppressWarnings("unused") // can be set through ServerEvalCommand - public void joinGroup (String group, String password) { + public void joinGroup (final String group, final String password) { final ClientGroup[] clientGroups = groups .stream() .filter(eachGroup -> eachGroup.name().equals(group)) @@ -167,13 +167,13 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { )); } - public void sendToServer (NetworkMessage message) { + public void sendToServer (final NetworkMessage message) { try { socket.send( message.writeClient(initializationData), socketAddress ); - } catch (Exception e) { + } catch (final Exception e) { bot.logger.error(e); } } @@ -181,19 +181,19 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { private class VoiceChatSocketBase { private final byte[] BUFFER = new byte[4096]; - public RawUdpPacket read (DatagramSocket socket) { + public RawUdpPacket read (final DatagramSocket socket) { if (socket.isClosed()) return null; try { - DatagramPacket packet = new DatagramPacket(BUFFER, BUFFER.length); + final DatagramPacket packet = new DatagramPacket(BUFFER, BUFFER.length); socket.receive(packet); // Setting the timestamp after receiving the packet - long timestamp = System.currentTimeMillis(); - byte[] data = new byte[packet.getLength()]; + final long timestamp = System.currentTimeMillis(); + final byte[] data = new byte[packet.getLength()]; System.arraycopy(packet.getData(), packet.getOffset(), data, 0, packet.getLength()); return new RawUdpPacket(data, packet.getSocketAddress(), timestamp); - } catch (Exception e) { + } catch (final Exception e) { if (!running) return null; bot.logger.error(e); @@ -205,7 +205,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { socket.close(); groups.clear(); @@ -226,7 +226,7 @@ public class VoiceChatPlugin extends Bot.Listener implements Runnable { return read(socket); } - public void send (byte[] data, SocketAddress address) throws Exception { + public void send (final byte[] data, final SocketAddress address) throws Exception { if (socket == null) { return; // Ignoring packet sending when socket isn't open yet } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java index 6e76910e..48b54737 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WhitelistPlugin.java @@ -13,7 +13,7 @@ public class WhitelistPlugin implements PlayersPlugin.Listener { private boolean enabled = false; - public WhitelistPlugin (Bot bot) { + public WhitelistPlugin (final Bot bot) { this.bot = bot; bot.players.addListener(this); @@ -22,7 +22,7 @@ public class WhitelistPlugin implements PlayersPlugin.Listener { public void enable () { enabled = true; - for (PlayerEntry entry : bot.players.list) { + for (final PlayerEntry entry : bot.players.list) { if (list.contains(entry.profile.getName())) continue; list.add(entry.profile.getName()); @@ -34,18 +34,18 @@ public class WhitelistPlugin implements PlayersPlugin.Listener { public void disable () { enabled = false; - for (PlayerEntry entry : bot.players.list) { + for (final PlayerEntry entry : bot.players.list) { bot.filterManager.remove(entry.profile.getName()); } } - public void add (String player) { + public void add (final String player) { list.add(player); bot.filterManager.remove(player); } - public String remove (int index) { + public String remove (final int index) { final String removed = list.remove(index); checkAndAddToFilterManager(removed); @@ -56,16 +56,16 @@ public class WhitelistPlugin implements PlayersPlugin.Listener { public void clear () { list.removeIf(eachPlayer -> !eachPlayer.equals(bot.profile.getName())); - for (PlayerEntry entry : bot.players.list) { + for (final PlayerEntry entry : bot.players.list) { if (entry.profile.equals(bot.profile)) continue; bot.filterManager.add(entry, ""); } } - public boolean isBlacklisted (String name) { return !list.contains(name); } + public boolean isBlacklisted (final String name) { return !list.contains(name); } - private void checkAndAddToFilterManager (String player) { + private void checkAndAddToFilterManager (final String player) { final PlayerEntry entry = bot.players.getEntry(player); if (entry == null) return; @@ -74,7 +74,7 @@ public class WhitelistPlugin implements PlayersPlugin.Listener { } @Override - public void playerJoined (PlayerEntry target) { + public void playerJoined (final PlayerEntry target) { if (!enabled) return; if (isBlacklisted(target.profile.getName())) bot.filterManager.add(target, ""); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java index 58925b17..88cf03d1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java @@ -31,30 +31,30 @@ public class WorldPlugin extends Bot.Listener { private final List listeners = new ArrayList<>(); - public WorldPlugin (Bot bot) { + public WorldPlugin (final Bot bot) { this.bot = bot; bot.addListener(this); } @Override - public void packetReceived (Session session, Packet packet) { - if (packet instanceof ClientboundLevelChunkWithLightPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundForgetLevelChunkPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundBlockUpdatePacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundSectionBlocksUpdatePacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundLoginPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundRespawnPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); - else if (packet instanceof ClientboundSetSimulationDistancePacket t_packet) packetReceived(t_packet); + public void packetReceived (final Session session, final Packet packet) { + if (packet instanceof final ClientboundLevelChunkWithLightPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundForgetLevelChunkPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundBlockUpdatePacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundSectionBlocksUpdatePacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundLoginPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundRespawnPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundRegistryDataPacket t_packet) packetReceived(t_packet); + else if (packet instanceof final ClientboundSetSimulationDistancePacket t_packet) packetReceived(t_packet); } @Override - public void disconnected (DisconnectedEvent event) { + public void disconnected (final DisconnectedEvent event) { chunks.clear(); } - private void worldChanged (String dimension) { + private void worldChanged (final String dimension) { final RegistryEntry currentDimension = registry.stream() .filter(eachDimension -> eachDimension.getId().asString().equals(dimension)) .findFirst() @@ -69,48 +69,48 @@ public class WorldPlugin extends Bot.Listener { minY = data.getInt("min_y"); maxY = data.getInt("height") + minY; - for (Listener listener : listeners) listener.worldChanged(dimension); + for (final Listener listener : listeners) listener.worldChanged(dimension); } - private void packetReceived (ClientboundRegistryDataPacket packet) { + private void packetReceived (final ClientboundRegistryDataPacket packet) { if (!packet.getRegistry().value().equals("dimension_type")) return; registry = packet.getEntries(); } - private void packetReceived (ClientboundLoginPacket packet) { + private void packetReceived (final ClientboundLoginPacket packet) { simulationDistance = packet.getSimulationDistance(); worldChanged(packet.getCommonPlayerSpawnInfo().getWorldName().asString()); } - private void packetReceived (ClientboundRespawnPacket packet) { + private void packetReceived (final ClientboundRespawnPacket packet) { worldChanged(packet.getCommonPlayerSpawnInfo().getWorldName().asString()); } - private void packetReceived (ClientboundSetSimulationDistancePacket packet) { + private void packetReceived (final ClientboundSetSimulationDistancePacket packet) { simulationDistance = packet.getSimulationDistance(); } - private void packetReceived (ClientboundLevelChunkWithLightPacket packet) { + private void packetReceived (final ClientboundLevelChunkWithLightPacket packet) { final ChunkPos pos = new ChunkPos(packet.getX(), packet.getZ()); final ChunkColumn column = new ChunkColumn(bot, pos, packet.getChunkData(), maxY, minY); chunks.put(pos, column); } - private void packetReceived (ClientboundForgetLevelChunkPacket packet) { + private void packetReceived (final ClientboundForgetLevelChunkPacket packet) { chunks.remove(new ChunkPos(packet.getX(), packet.getZ())); } - private void packetReceived (ClientboundBlockUpdatePacket packet) { + private void packetReceived (final ClientboundBlockUpdatePacket packet) { final Vector3i position = packet.getEntry().getPosition(); final int id = packet.getEntry().getBlock(); setBlock(position.getX(), position.getY(), position.getZ(), id); } - private void packetReceived (ClientboundSectionBlocksUpdatePacket packet) { - for (BlockChangeEntry entry : packet.getEntries()) { + private void packetReceived (final ClientboundSectionBlocksUpdatePacket packet) { + for (final BlockChangeEntry entry : packet.getEntries()) { final Vector3i position = entry.getPosition(); final int id = entry.getBlock(); @@ -118,28 +118,28 @@ public class WorldPlugin extends Bot.Listener { } } - public ChunkColumn getChunk (int x, int z) { return chunks.get(new ChunkPos(x, z)); } + public ChunkColumn getChunk (final int x, final int z) { return chunks.get(new ChunkPos(x, z)); } - public ChunkColumn getChunk (ChunkPos pos) { return chunks.get(pos); } + public ChunkColumn getChunk (final ChunkPos pos) { return chunks.get(pos); } public Collection getChunks () { return chunks.values(); } - public int getBlock (int x, int y, int z) { + public int getBlock (final int x, final int y, final int z) { final ChunkPos chunkPos = new ChunkPos(Math.floorDiv(x, 16), Math.floorDiv(z, 16)); final ChunkColumn chunk = chunks.get(chunkPos); return chunk == null ? 0 : chunks.get(chunkPos).getBlock(x & 15, y, z & 15); } // should this be public? - public void setBlock (int x, int y, int z, int id) { + public void setBlock (final int x, final int y, final int z, final int id) { final ChunkPos chunkPos = new ChunkPos(Math.floorDiv(x, 16), Math.floorDiv(z, 16)); if (!chunks.containsKey(chunkPos)) return; chunks.get(chunkPos).setBlock(x & 15, y, z & 15, id); } - public void addListener (Listener listener) { listeners.add(listener); } + public void addListener (final Listener listener) { listeners.add(listener); } public interface Listener { - default void worldChanged (String dimension) { } + default void worldChanged (final String dimension) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/Instrument.java b/src/main/java/me/chayapak1/chomens_bot/song/Instrument.java index a23b9003..7b11664c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Instrument.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Instrument.java @@ -24,27 +24,27 @@ public class Instrument { public final int offset; public final String sound; - private Instrument (int id, String name, int offset) { + private Instrument (final int id, final String name, final int offset) { this.id = id; this.name = name; this.offset = offset; this.sound = "minecraft:block.note_block." + name; } - public Instrument (int id, String name, int offset, String sound) { + public Instrument (final int id, final String name, final int offset, final String sound) { this.id = id; this.name = name; this.offset = offset; this.sound = sound; } - public static Instrument of (String sound) { + public static Instrument of (final String sound) { return new Instrument(-1, null, 0, sound); } private static final Instrument[] values = { HARP, BASEDRUM, SNARE, HAT, BASS, FLUTE, BELL, GUITAR, CHIME, XYLOPHONE, IRON_XYLOPHONE, COW_BELL, DIDGERIDOO, BIT, BANJO, PLING }; - public static Instrument fromId (int id) { + public static Instrument fromId (final int id) { return values[id]; } } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java index 8776064a..591abc25 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java @@ -23,15 +23,15 @@ public class MidiConverter implements Converter { public static final int RESET_CONTROLS = 0x79; @Override - public Song getSongFromBytes (byte[] bytes, String name, Bot bot) throws InvalidMidiDataException, IOException { - Sequence sequence = MidiSystem.getSequence(new ByteArrayInputStream(bytes)); + public Song getSongFromBytes (final byte[] bytes, final String name, final Bot bot) throws InvalidMidiDataException, IOException { + final Sequence sequence = MidiSystem.getSequence(new ByteArrayInputStream(bytes)); return getSong(sequence, name, bot); } - public static Song getSong (Sequence sequence, String name, Bot bot) { + public static Song getSong (final Sequence sequence, final String name, final Bot bot) { final Map lyrics = new HashMap<>(); - long tpq = sequence.getResolution(); + final long tpq = sequence.getResolution(); String songName = null; @@ -40,14 +40,14 @@ public class MidiConverter implements Converter { boolean isFirst = true; - ArrayList tempoEvents = new ArrayList<>(); - for (Track track : sequence.getTracks()) { + final ArrayList tempoEvents = new ArrayList<>(); + for (final Track track : sequence.getTracks()) { final int trackSize = track.size(); for (int i = 0; i < trackSize; i++) { - MidiEvent event = track.get(i); - MidiMessage message = event.getMessage(); - if (message instanceof MetaMessage mm) { + final MidiEvent event = track.get(i); + final MidiMessage message = event.getMessage(); + if (message instanceof final MetaMessage mm) { if (mm.getType() == SET_TEMPO) { tempoEvents.add(event); } else if (mm.getType() == TRACK_NAME) { @@ -90,9 +90,9 @@ public class MidiConverter implements Converter { Arrays.fill(channelVolumes, 127); Arrays.fill(channelPans, 64); - for (Track track : sequence.getTracks()) { + for (final Track track : sequence.getTracks()) { long microTime = 0; - int[] ids = new int[16]; + final int[] ids = new int[16]; int mpq = 500000; int tempoEventIdx = 0; long prevTick = 0; @@ -100,35 +100,35 @@ public class MidiConverter implements Converter { final int trackSize = track.size(); for (int i = 0; i < trackSize; i++) { - MidiEvent event = track.get(i); - MidiMessage message = event.getMessage(); + final MidiEvent event = track.get(i); + final MidiMessage message = event.getMessage(); while (tempoEventIdx < tempoEvents.size() && event.getTick() > tempoEvents.get(tempoEventIdx).getTick()) { - long deltaTick = tempoEvents.get(tempoEventIdx).getTick() - prevTick; + final long deltaTick = tempoEvents.get(tempoEventIdx).getTick() - prevTick; prevTick = tempoEvents.get(tempoEventIdx).getTick(); microTime += (mpq / tpq) * deltaTick; - MetaMessage mm = (MetaMessage) tempoEvents.get(tempoEventIdx).getMessage(); - byte[] data = mm.getData(); - int new_mpq = (data[2] & 0xFF) | ((data[1] & 0xFF) << 8) | ((data[0] & 0xFF) << 16); + final MetaMessage mm = (MetaMessage) tempoEvents.get(tempoEventIdx).getMessage(); + final byte[] data = mm.getData(); + final int new_mpq = (data[2] & 0xFF) | ((data[1] & 0xFF) << 8) | ((data[0] & 0xFF) << 16); if (new_mpq != 0) mpq = new_mpq; tempoEventIdx++; } - if (message instanceof ShortMessage sm) { + if (message instanceof final ShortMessage sm) { if (sm.getCommand() == SET_INSTRUMENT) { ids[sm.getChannel()] = sm.getData1(); } else if (sm.getCommand() == ShortMessage.NOTE_ON) { if (sm.getData2() == 0) continue; - int pitch = sm.getData1(); - int velocity = sm.getData2(); - float effectiveVelocity = (float) velocity * channelVolumes[sm.getChannel()] / 127; - int pan = channelPans[sm.getChannel()]; - long deltaTick = event.getTick() - prevTick; + final int pitch = sm.getData1(); + final int velocity = sm.getData2(); + final float effectiveVelocity = (float) velocity * channelVolumes[sm.getChannel()] / 127; + final int pan = channelPans[sm.getChannel()]; + final long deltaTick = event.getTick() - prevTick; prevTick = event.getTick(); microTime += (mpq / tpq) * deltaTick; - Note note; + final Note note; if (sm.getChannel() == 9) { note = getMidiPercussionNote(pitch, effectiveVelocity, microTime, pan); } else { @@ -138,15 +138,15 @@ public class MidiConverter implements Converter { song.add(note); } - long time = microTime / 1000L; + final long time = microTime / 1000L; if (time > song.length) { song.length = time; } } else if (sm.getCommand() == ShortMessage.NOTE_OFF) { - long deltaTick = event.getTick() - prevTick; + final long deltaTick = event.getTick() - prevTick; prevTick = event.getTick(); microTime += (mpq / tpq) * deltaTick; - long time = microTime / 1000L; + final long time = microTime / 1000L; if (time > song.length) { song.length = time; } @@ -176,11 +176,11 @@ public class MidiConverter implements Converter { return song; } - public static Note getMidiInstrumentNote (int midiInstrument, int midiPitch, float velocity, long microTime, int panning) { + public static Note getMidiInstrumentNote (final int midiInstrument, final int midiPitch, final float velocity, final long microTime, final int panning) { Instrument shiftedInstrument = null; - Instrument[] instrumentList = instrumentMap.get(midiInstrument); + final Instrument[] instrumentList = instrumentMap.get(midiInstrument); if (instrumentList != null) { - for (Instrument candidateInstrument : instrumentList) { + for (final Instrument candidateInstrument : instrumentList) { if (midiPitch >= candidateInstrument.offset && midiPitch <= candidateInstrument.offset + 24) { shiftedInstrument = candidateInstrument; break; @@ -199,7 +199,7 @@ public class MidiConverter implements Converter { int distance = Math.abs(offsets[0] - midiPitch); int idx = 0; for (int c = 1; c < offsets.length; c++) { - int cdistance = Math.abs(offsets[c] - midiPitch); + final int cdistance = Math.abs(offsets[c] - midiPitch); if (cdistance < distance) { idx = c; distance = cdistance; @@ -219,22 +219,22 @@ public class MidiConverter implements Converter { return null; } - int shiftedInstrumentPitch = midiPitch - shiftedInstrument.offset; - int pitch = midiPitch - instrumentList[0].offset; + final int shiftedInstrumentPitch = midiPitch - shiftedInstrument.offset; + final int pitch = midiPitch - instrumentList[0].offset; - float volume = velocity / 127.0f; - long time = microTime / 1000L; + final float volume = velocity / 127.0f; + final long time = microTime / 1000L; return new Note(instrumentList[0], shiftedInstrument, pitch, shiftedInstrumentPitch, midiPitch, volume, time, (int) ((panning - 64) / (float) 64) * 100, 100); } - private static Note getMidiPercussionNote (int midiPitch, float velocity, long microTime, int panning) { + private static Note getMidiPercussionNote (final int midiPitch, final float velocity, final long microTime, final int panning) { if (percussionMap.containsKey(midiPitch)) { - int noteId = percussionMap.get(midiPitch); - int pitch = noteId % 25; - float volume = velocity / 127.0f; - Instrument instrument = Instrument.fromId(noteId / 25); - long time = microTime / 1000L; + final int noteId = percussionMap.get(midiPitch); + final int pitch = noteId % 25; + final float volume = velocity / 127.0f; + final Instrument instrument = Instrument.fromId(noteId / 25); + final long time = microTime / 1000L; return new Note(instrument, pitch, midiPitch, volume, time, (int) ((panning - 64) / (float) 64) * 100, 100, false); } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java index 9a665b79..5e4fa4cc 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java @@ -79,8 +79,8 @@ public class NBSConverter implements Converter { } @Override - public Song getSongFromBytes (byte[] bytes, String fileName, Bot bot) throws IOException { - ByteBuffer buffer = ByteBuffer.wrap(bytes); + public Song getSongFromBytes (final byte[] bytes, final String fileName, final Bot bot) throws IOException { + final ByteBuffer buffer = ByteBuffer.wrap(bytes); buffer.order(ByteOrder.LITTLE_ENDIAN); short songLength; @@ -98,21 +98,21 @@ public class NBSConverter implements Converter { songLength = buffer.getShort(); } - short layerCount = buffer.getShort(); - String songName = getString(buffer, bytes.length); - String songAuthor = getString(buffer, bytes.length); - String songOriginalAuthor = getString(buffer, bytes.length); - String songDescription = getString(buffer, bytes.length); + final short layerCount = buffer.getShort(); + final String songName = getString(buffer, bytes.length); + final String songAuthor = getString(buffer, bytes.length); + final String songOriginalAuthor = getString(buffer, bytes.length); + final String songDescription = getString(buffer, bytes.length); double tempo = buffer.getShort(); - byte autoSaving = buffer.get(); - byte autoSavingDuration = buffer.get(); - byte timeSignature = buffer.get(); - int minutesSpent = buffer.getInt(); - int leftClicks = buffer.getInt(); - int rightClicks = buffer.getInt(); - int blocksAdded = buffer.getInt(); - int blocksRemoved = buffer.getInt(); - String origFileName = getString(buffer, bytes.length); + final byte autoSaving = buffer.get(); + final byte autoSavingDuration = buffer.get(); + final byte timeSignature = buffer.get(); + final int minutesSpent = buffer.getInt(); + final int leftClicks = buffer.getInt(); + final int rightClicks = buffer.getInt(); + final int blocksAdded = buffer.getInt(); + final int blocksRemoved = buffer.getInt(); + final String origFileName = getString(buffer, bytes.length); byte loop = 0; byte maxLoopCount = 0; @@ -123,19 +123,19 @@ public class NBSConverter implements Converter { loopStartTick = buffer.getShort(); } - ArrayList nbsNotes = new ArrayList<>(); + final ArrayList nbsNotes = new ArrayList<>(); short tick = -1; while (true) { - int tickJumps = buffer.getShort(); + final int tickJumps = buffer.getShort(); if (tickJumps == 0) break; tick += (short) tickJumps; short layer = -1; while (true) { - int layerJumps = buffer.getShort(); + final int layerJumps = buffer.getShort(); if (layerJumps == 0) break; layer += (short) layerJumps; - NBSNote note = new NBSNote(); + final NBSNote note = new NBSNote(); note.tick = tick; note.layer = layer; note.instrument = buffer.get(); @@ -149,10 +149,10 @@ public class NBSConverter implements Converter { } } - ArrayList nbsLayers = new ArrayList<>(); + final ArrayList nbsLayers = new ArrayList<>(); if (buffer.hasRemaining()) { for (int i = 0; i < layerCount; i++) { - NBSLayer layer = new NBSLayer(); + final NBSLayer layer = new NBSLayer(); layer.name = getString(buffer, bytes.length); if (format >= 4) { layer.lock = buffer.get(); @@ -165,11 +165,11 @@ public class NBSConverter implements Converter { } } - ArrayList customInstruments = new ArrayList<>(); + final ArrayList customInstruments = new ArrayList<>(); if (buffer.hasRemaining()) { - byte customInstrumentCount = buffer.get(); + final byte customInstrumentCount = buffer.get(); for (int i = 0; i < customInstrumentCount; i++) { - NBSCustomInstrument customInstrument = new NBSCustomInstrument(); + final NBSCustomInstrument customInstrument = new NBSCustomInstrument(); customInstrument.name = getString(buffer, bytes.length); customInstrument.file = getString(buffer, bytes.length); customInstrument.pitch = buffer.get(); @@ -180,21 +180,21 @@ public class NBSConverter implements Converter { final StringBuilder layerNames = new StringBuilder(); - for (NBSLayer layer : nbsLayers) { + for (final NBSLayer layer : nbsLayers) { layerNames.append(layer.name); layerNames.append("\n"); } final String stringLayerNames = layerNames.toString(); - Song song = new Song(!songName.isBlank() ? songName : fileName, bot, songName, songAuthor, songOriginalAuthor, songDescription, stringLayerNames.substring(0, stringLayerNames.length() - 1), true); + final Song song = new Song(!songName.isBlank() ? songName : fileName, bot, songName, songAuthor, songOriginalAuthor, songDescription, stringLayerNames.substring(0, stringLayerNames.length() - 1), true); if (loop > 0) { song.loopPosition = getMilliTime(loopStartTick, tempo); // song.loopCount = maxLoopCount; } - for (NBSNote note : nbsNotes) { + for (final NBSNote note : nbsNotes) { boolean isRainbowToggle = false; - Instrument instrument; + final Instrument instrument; double key = note.key; if (note.instrument < INSTRUMENT_INDEX.length) { instrument = INSTRUMENT_INDEX[note.instrument]; @@ -244,7 +244,7 @@ public class NBSConverter implements Converter { final String bestMatch = outputTitles.isEmpty() ? "" : outputTitles.getFirst(); - for (Map.Entry entry : subtitles.entrySet()) { + for (final Map.Entry entry : subtitles.entrySet()) { if (!entry.getValue().equals(bestMatch)) continue; name = entry.getKey().substring("subtitles.".length()); @@ -266,7 +266,7 @@ public class NBSConverter implements Converter { layerVolume = nbsLayers.get(note.layer).volume; } - double pitch = key - 33; + final double pitch = key - 33; song.add( new Note( @@ -287,24 +287,24 @@ public class NBSConverter implements Converter { return song; } - private static String getString (ByteBuffer buffer, int maxSize) throws IOException { - int length = buffer.getInt(); + private static String getString (final ByteBuffer buffer, final int maxSize) throws IOException { + final int length = buffer.getInt(); if (length > maxSize) { throw new IOException("String is too large"); } - byte[] arr = new byte[length]; + final byte[] arr = new byte[length]; buffer.get(arr, 0, length); return new String(arr, StandardCharsets.UTF_8); } - private static long getMilliTime (int tick, double tempo) { + private static long getMilliTime (final int tick, final double tempo) { return (long) (1000L * tick * 100 / tempo); } private static final Map subtitles = new HashMap<>(); static { - for (Map.Entry entry : ComponentUtilities.LANGUAGE.entrySet()) { + for (final Map.Entry entry : ComponentUtilities.LANGUAGE.entrySet()) { if (!entry.getKey().startsWith("subtitles.")) continue; subtitles.put(entry.getKey(), entry.getValue()); @@ -313,15 +313,15 @@ public class NBSConverter implements Converter { private static final List sounds = loadJsonStringArray("sounds.json"); - private static List loadJsonStringArray (String name) { - List list = new ArrayList<>(); + private static List loadJsonStringArray (final String name) { + final List list = new ArrayList<>(); - InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(name); + final InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(name); assert is != null; - BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - JsonArray json = JsonParser.parseReader(reader).getAsJsonArray(); + final BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + final JsonArray json = JsonParser.parseReader(reader).getAsJsonArray(); - for (JsonElement entry : json) { + for (final JsonElement entry : json) { list.add(entry.getAsString()); } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/Note.java b/src/main/java/me/chayapak1/chomens_bot/song/Note.java index b1a959ba..69ca259a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Note.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Note.java @@ -14,14 +14,14 @@ public class Note implements Comparable { public final boolean isRainbowToggle; public Note ( - Instrument instrument, - double pitch, - double originalPitch, - float volume, - long time, - int panning, - int stereo, - boolean isRainbowToggle + final Instrument instrument, + final double pitch, + final double originalPitch, + final float volume, + final long time, + final int panning, + final int stereo, + final boolean isRainbowToggle ) { this.instrument = instrument; this.shiftedInstrument = this.instrument; @@ -36,15 +36,15 @@ public class Note implements Comparable { } public Note ( - Instrument instrument, - Instrument shiftedInstrument, - double pitch, - double shiftedPitch, - double originalPitch, - float volume, - long time, - int panning, - int stereo + final Instrument instrument, + final Instrument shiftedInstrument, + final double pitch, + final double shiftedPitch, + final double originalPitch, + final float volume, + final long time, + final int panning, + final int stereo ) { this.instrument = instrument; this.shiftedInstrument = shiftedInstrument; @@ -59,7 +59,7 @@ public class Note implements Comparable { } @Override - public int compareTo (Note other) { + public int compareTo (final Note other) { return Long.compare(time, other.time); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/Song.java b/src/main/java/me/chayapak1/chomens_bot/song/Song.java index c40483db..e7959f8d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Song.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Song.java @@ -38,7 +38,7 @@ public class Song { private final Bot bot; - public Song (String originalName, Bot bot, String songName, String songAuthor, String songOriginalAuthor, String songDescription, String tracks, boolean nbs) { + public Song (final String originalName, final Bot bot, final String songName, final String songAuthor, final String songOriginalAuthor, final String songDescription, final String tracks, final boolean nbs) { this.originalName = originalName; this.bot = bot; this.songName = songName; @@ -62,15 +62,15 @@ public class Song { authorPart = songAuthor; } - String namePart = isNotNullAndNotBlank(songName) ? songName : originalName; + final String namePart = isNotNullAndNotBlank(songName) ? songName : originalName; name = (authorPart != null) ? String.format("%s - %s", authorPart, namePart) : namePart; } - public Note get (int i) { + public Note get (final int i) { return notes.get(i); } - public void add (Note e) { + public void add (final Note e) { notes.add(e); } @@ -100,7 +100,7 @@ public class Song { } } - public void setTime (long t) { + public void setTime (final long t) { time = t; startTime = System.currentTimeMillis() - time; position = 0; diff --git a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderException.java b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderException.java index fdfc6062..74126e4e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderException.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderException.java @@ -6,7 +6,7 @@ import net.kyori.adventure.text.Component; public class SongLoaderException extends Exception { public final Component message; - public SongLoaderException (Component message) { + public SongLoaderException (final Component message) { super(); this.message = message; } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java index 37996993..150e1157 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java @@ -45,7 +45,7 @@ public class SongLoaderThread extends Thread { private boolean isFolder = false; - public SongLoaderThread (URL location, Bot bot, String requester) { + public SongLoaderThread (final URL location, final Bot bot, final String requester) { this.bot = bot; this.requester = requester; isUrl = true; @@ -54,7 +54,7 @@ public class SongLoaderThread extends Thread { fileName = location.getFile(); } - public SongLoaderThread (Path location, Bot bot, String requester) { + public SongLoaderThread (final Path location, final Bot bot, final String requester) { this.bot = bot; this.requester = requester; isUrl = false; @@ -65,7 +65,7 @@ public class SongLoaderThread extends Thread { fileName = location.getFileName().toString(); } - public SongLoaderThread (byte[] data, Bot bot, String requester) { + public SongLoaderThread (final byte[] data, final Bot bot, final String requester) { this.bot = bot; this.requester = requester; this.data = data; @@ -78,14 +78,14 @@ public class SongLoaderThread extends Thread { @Override public void run () { if (isFolder && !isUrl && !isItem) { - try (Stream files = Files.list(songPath)) { + try (final Stream files = Files.list(songPath)) { files.forEach((file) -> { songPath = file; processFile(); }); showAddedToQueue(); - } catch (IOException e) { + } catch (final IOException e) { bot.logger.error(e); } } else processFile(); @@ -94,8 +94,8 @@ public class SongLoaderThread extends Thread { private void processFile () { if (bot.music.songQueue.size() > 100) return; - byte[] bytes; - String name; + final byte[] bytes; + final String name; try { if (isUrl) { bytes = DownloadUtilities.DownloadToByteArray(songUrl, 5 * 1024 * 1024); @@ -109,7 +109,7 @@ public class SongLoaderThread extends Thread { bytes = Files.readAllBytes(songPath); name = !isFolder ? fileName : songPath.getFileName().toString(); } - } catch (Exception e) { + } catch (final Exception e) { exception = new SongLoaderException(Component.text(e.getMessage())); failed(); @@ -117,12 +117,12 @@ public class SongLoaderThread extends Thread { return; } - for (Converter converter : converters) { + for (final Converter converter : converters) { if (song != null && !isFolder) break; try { song = converter.getSongFromBytes(bytes, name, bot); - } catch (Exception ignored) { } + } catch (final Exception ignored) { } } if (song == null) { diff --git a/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java index 098e95d1..efe5b0b0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java @@ -17,33 +17,33 @@ public class SongPlayerConverter implements Converter { public static final long MAX_UNCOMPRESSED_SIZE = 50 * 1024 * 1024; @Override - public Song getSongFromBytes (byte[] bytes, String fileName, Bot bot) throws Exception { - InputStream is = new LimitedSizeInputStream(new GZIPInputStream(new ByteArrayInputStream(bytes)), MAX_UNCOMPRESSED_SIZE); + public Song getSongFromBytes (byte[] bytes, final String fileName, final Bot bot) throws Exception { + final InputStream is = new LimitedSizeInputStream(new GZIPInputStream(new ByteArrayInputStream(bytes)), MAX_UNCOMPRESSED_SIZE); bytes = is.readAllBytes(); is.close(); - ByteBuffer buffer = ByteBuffer.wrap(bytes); + final ByteBuffer buffer = ByteBuffer.wrap(bytes); buffer.order(ByteOrder.LITTLE_ENDIAN); - for (byte b : FILE_TYPE_SIGNATURE) { + for (final byte b : FILE_TYPE_SIGNATURE) { if (b != buffer.get()) { throw new IOException("Invalid file type signature"); } } - byte version = buffer.get(); + final byte version = buffer.get(); // Currently on format version 1 if (version != 1) { throw new IOException("Unsupported format version!"); } - long songLength = buffer.getLong(); - String songName = getString(buffer, bytes.length); - int loop = buffer.get() & 0xFF; - int loopCount = buffer.get() & 0xFF; - long loopPosition = buffer.getLong(); + final long songLength = buffer.getLong(); + final String songName = getString(buffer, bytes.length); + final int loop = buffer.get() & 0xFF; + final int loopCount = buffer.get() & 0xFF; + final long loopPosition = buffer.getLong(); - Song song = new Song(fileName, bot, !songName.trim().isEmpty() ? songName : null, null, null, null, null, false); + final Song song = new Song(fileName, bot, !songName.trim().isEmpty() ? songName : null, null, null, null, null, false); song.length = songLength; // song.looping = loop > 0; // song.loopCount = loopCount; @@ -51,7 +51,7 @@ public class SongPlayerConverter implements Converter { long time = 0; while (true) { - int noteId = buffer.getShort(); + final int noteId = buffer.getShort(); if (noteId >= 0 && noteId < 400) { time += getVarLong(buffer); song.add(new Note(Instrument.fromId(noteId / 25), noteId % 25, noteId % 25, 1, time, -1, 100, false)); @@ -65,22 +65,22 @@ public class SongPlayerConverter implements Converter { return song; } - private static String getString (ByteBuffer buffer, int maxSize) throws IOException { - int length = buffer.getInt(); + private static String getString (final ByteBuffer buffer, final int maxSize) throws IOException { + final int length = buffer.getInt(); if (length > maxSize) { throw new IOException("String is too large"); } - byte[] arr = new byte[length]; + final byte[] arr = new byte[length]; buffer.get(arr, 0, length); return new String(arr, StandardCharsets.UTF_8); } - private static long getVarLong (ByteBuffer buffer) { + private static long getVarLong (final ByteBuffer buffer) { long val = 0; long mult = 1; int flag = 1; while (flag != 0) { - int b = buffer.get() & 0xFF; + final int b = buffer.get() & 0xFF; val += (b & 0x7F) * mult; mult <<= 7; flag = b >>> 7; @@ -93,31 +93,31 @@ public class SongPlayerConverter implements Converter { private final long maxSize; private long total; - public LimitedSizeInputStream (InputStream original, long maxSize) { + public LimitedSizeInputStream (final InputStream original, final long maxSize) { this.original = original; this.maxSize = maxSize; } @Override public int read () throws IOException { - int i = original.read(); + final int i = original.read(); if (i >= 0) incrementCounter(1); return i; } @Override - public int read (byte @NotNull [] b) throws IOException { + public int read (final byte @NotNull [] b) throws IOException { return read(b, 0, b.length); } @Override - public int read (byte @NotNull [] b, int off, int len) throws IOException { - int i = original.read(b, off, len); + public int read (final byte @NotNull [] b, final int off, final int len) throws IOException { + final int i = original.read(b, off, len); if (i >= 0) incrementCounter(i); return i; } - private void incrementCounter (int size) throws IOException { + private void incrementCounter (final int size) throws IOException { total += size; if (total > maxSize) throw new IOException("Input stream exceeded maximum size of " + maxSize + " bytes"); } diff --git a/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java b/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java index 4aa7cf7c..954ebc0a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/TextFileConverter.java @@ -6,7 +6,7 @@ import java.nio.charset.StandardCharsets; public class TextFileConverter implements Converter { @Override - public Song getSongFromBytes (byte[] bytes, String fileName, Bot bot) { + public Song getSongFromBytes (final byte[] bytes, final String fileName, final Bot bot) { final String data = new String(bytes, StandardCharsets.UTF_8); if (!data.contains(":")) return null; @@ -15,7 +15,7 @@ public class TextFileConverter implements Converter { final Song song = new Song(fileName, bot, null, null, null, null, null, false); - for (String line : data.split("\r\n|\r|\n")) { + for (final String line : data.split("\r\n|\r|\n")) { if (line.isBlank()) continue; // worst way to implement this but it works lol @@ -44,7 +44,7 @@ public class TextFileConverter implements Converter { int intInstrument = -1; try { intInstrument = Integer.parseInt(instrument); - } catch (NumberFormatException ignored) { } + } catch (final NumberFormatException ignored) { } float volume = 1; if (split.length > 3) volume = Float.parseFloat(split[3]); diff --git a/src/main/java/me/chayapak1/chomens_bot/util/AESUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/AESUtilities.java index d45f07e2..83ac59ba 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/AESUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/AESUtilities.java @@ -18,42 +18,42 @@ public class AESUtilities { private static final SecureRandom RANDOM = new SecureRandom(); private static final String CIPHER = "AES/CBC/PKCS5Padding"; - public static byte[] getBytesFromUUID (UUID uuid) { - ByteBuffer buffer = ByteBuffer.wrap(new byte[16]); + public static byte[] getBytesFromUUID (final UUID uuid) { + final ByteBuffer buffer = ByteBuffer.wrap(new byte[16]); buffer.putLong(uuid.getMostSignificantBits()); buffer.putLong(uuid.getLeastSignificantBits()); return buffer.array(); } private static byte[] generateIV () { - byte[] iv = new byte[16]; + final byte[] iv = new byte[16]; RANDOM.nextBytes(iv); return iv; } - private static SecretKeySpec createKeySpec (UUID secret) { + private static SecretKeySpec createKeySpec (final UUID secret) { return new SecretKeySpec(getBytesFromUUID(secret), "AES"); } - public static byte[] encrypt (UUID secret, byte[] data) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { - byte[] iv = generateIV(); - IvParameterSpec ivSpec = new IvParameterSpec(iv); - Cipher cipher = Cipher.getInstance(CIPHER); + public static byte[] encrypt (final UUID secret, final byte[] data) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + final byte[] iv = generateIV(); + final IvParameterSpec ivSpec = new IvParameterSpec(iv); + final Cipher cipher = Cipher.getInstance(CIPHER); cipher.init(Cipher.ENCRYPT_MODE, createKeySpec(secret), ivSpec); - byte[] enc = cipher.doFinal(data); - byte[] payload = new byte[iv.length + enc.length]; + final byte[] enc = cipher.doFinal(data); + final byte[] payload = new byte[iv.length + enc.length]; System.arraycopy(iv, 0, payload, 0, iv.length); System.arraycopy(enc, 0, payload, iv.length, enc.length); return payload; } - public static byte[] decrypt (UUID secret, byte[] payload) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { - byte[] iv = new byte[16]; + public static byte[] decrypt (final UUID secret, final byte[] payload) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + final byte[] iv = new byte[16]; System.arraycopy(payload, 0, iv, 0, iv.length); - byte[] data = new byte[payload.length - iv.length]; + final byte[] data = new byte[payload.length - iv.length]; System.arraycopy(payload, iv.length, data, 0, data.length); - IvParameterSpec ivSpec = new IvParameterSpec(iv); - Cipher cipher = Cipher.getInstance(CIPHER); + final IvParameterSpec ivSpec = new IvParameterSpec(iv); + final Cipher cipher = Cipher.getInstance(CIPHER); cipher.init(Cipher.DECRYPT_MODE, createKeySpec(secret), ivSpec); return cipher.doFinal(data); } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/ArrayUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/ArrayUtilities.java index a0e55b77..a29391e8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ArrayUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ArrayUtilities.java @@ -1,8 +1,8 @@ package me.chayapak1.chomens_bot.util; public class ArrayUtilities { - public static boolean isAllTrue (boolean[] array) { - for (boolean value : array) if (!value) return false; + public static boolean isAllTrue (final boolean[] array) { + for (final boolean value : array) if (!value) return false; return true; } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/Ascii85.java b/src/main/java/me/chayapak1/chomens_bot/util/Ascii85.java index e81557ff..3ef11a75 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/Ascii85.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/Ascii85.java @@ -30,20 +30,20 @@ public class Ascii85 { private Ascii85 () { } - public static String encode (byte[] payload) { + public static String encode (final byte[] payload) { if (payload == null) { throw new IllegalArgumentException("You must provide a non-null input"); } // By using five ASCII characters to represent four bytes of binary data the encoded size ¹⁄₄ is larger than the original - StringBuilder stringBuff = new StringBuilder(payload.length * 5 / 4); + final StringBuilder stringBuff = new StringBuilder(payload.length * 5 / 4); // We break the payload into int (4 bytes) - byte[] chunk = new byte[4]; + final byte[] chunk = new byte[4]; int chunkIndex = 0; - for (byte currByte : payload) { + for (final byte currByte : payload) { chunk[chunkIndex++] = currByte; if (chunkIndex == 4) { - int value = byteToInt(chunk); + final int value = byteToInt(chunk); //Because all-zero data is quite common, an exception is made for the sake of data compression, //and an all-zero group is encoded as a single character "z" instead of "!!!!!". if (value == 0) { @@ -58,10 +58,10 @@ public class Ascii85 { //If we didn't end on 0, then we need some padding if (chunkIndex > 0) { - int numPadded = chunk.length - chunkIndex; + final int numPadded = chunk.length - chunkIndex; Arrays.fill(chunk, chunkIndex, chunk.length, (byte) 0); - int value = byteToInt(chunk); - char[] encodedChunk = encodeChunk(value); + final int value = byteToInt(chunk); + final char[] encodedChunk = encodeChunk(value); for (int i = 0; i < encodedChunk.length - numPadded; i++) { stringBuff.append(encodedChunk[i]); } @@ -70,10 +70,10 @@ public class Ascii85 { return stringBuff.toString(); } - private static char[] encodeChunk (int value) { + private static char[] encodeChunk (final int value) { //transform value to unsigned long long longValue = value & 0x00000000ffffffffL; - char[] encodedChunk = new char[5]; + final char[] encodedChunk = new char[5]; for (int i = 0; i < encodedChunk.length; i++) { encodedChunk[i] = (char) ((longValue / BASE85_POW[4 - i]) + ASCII_SHIFT); longValue = longValue % BASE85_POW[4 - i]; @@ -99,28 +99,28 @@ public class Ascii85 { final int inputLength = chars.length(); // lets first count the occurrences of 'z' - long zCount = chars.chars().filter(c -> c == 'z').count(); + final long zCount = chars.chars().filter(c -> c == 'z').count(); // Typically by using five ASCII characters to represent four bytes of binary data // the encoded size ¹⁄₄ is larger than the original. // We however have to account for the 'z' which were compressed - BigDecimal uncompressedZLength = BigDecimal.valueOf(zCount).multiply(BigDecimal.valueOf(4)); + final BigDecimal uncompressedZLength = BigDecimal.valueOf(zCount).multiply(BigDecimal.valueOf(4)); - BigDecimal uncompressedNonZLength = BigDecimal.valueOf(inputLength - zCount) + final BigDecimal uncompressedNonZLength = BigDecimal.valueOf(inputLength - zCount) .multiply(BigDecimal.valueOf(4)) .divide(BigDecimal.valueOf(5)); - BigDecimal uncompressedLength = uncompressedZLength.add(uncompressedNonZLength); + final BigDecimal uncompressedLength = uncompressedZLength.add(uncompressedNonZLength); - ByteBuffer bytebuff = ByteBuffer.allocate(uncompressedLength.intValue()); + final ByteBuffer bytebuff = ByteBuffer.allocate(uncompressedLength.intValue()); //1. Whitespace characters may occur anywhere to accommodate line length limitations. So lets strip it. chars = REMOVE_WHITESPACE.matcher(chars).replaceAll(""); //Since Base85 is an ascii encoder, we don't need to get the bytes as UTF-8. - byte[] payload = chars.getBytes(StandardCharsets.US_ASCII); - byte[] chunk = new byte[5]; + final byte[] payload = chars.getBytes(StandardCharsets.US_ASCII); + final byte[] chunk = new byte[5]; int chunkIndex = 0; - for (byte currByte : payload) { + for (final byte currByte : payload) { // Because all-zero data is quite common, an exception is made for the sake of data compression, // and an all-zero group is encoded as a single character "z" instead of "!!!!!". if (currByte == 'z') { @@ -145,9 +145,9 @@ public class Ascii85 { // If we didn't end on 0, then we need some padding if (chunkIndex > 0) { - int numPadded = chunk.length - chunkIndex; + final int numPadded = chunk.length - chunkIndex; Arrays.fill(chunk, chunkIndex, chunk.length, (byte) 'u'); - byte[] paddedDecode = decodeChunk(chunk); + final byte[] paddedDecode = decodeChunk(chunk); for (int i = 0; i < paddedDecode.length - numPadded; i++) { bytebuff.put(paddedDecode[i]); } @@ -157,7 +157,7 @@ public class Ascii85 { return Arrays.copyOf(bytebuff.array(), bytebuff.limit()); } - private static byte[] decodeChunk (byte[] chunk) { + private static byte[] decodeChunk (final byte[] chunk) { if (chunk.length != 5) { throw new IllegalArgumentException("You can only decode chunks of size 5."); } @@ -173,14 +173,14 @@ public class Ascii85 { return intToByte(value); } - private static int byteToInt (byte[] value) { + private static int byteToInt (final byte[] value) { if (value == null || value.length != 4) { throw new IllegalArgumentException("You cannot create an int without exactly 4 bytes."); } return ByteBuffer.wrap(value).getInt(); } - private static byte[] intToByte (int value) { + private static byte[] intToByte (final int value) { return new byte[] { (byte) (value >>> 24), (byte) (value >>> 16), diff --git a/src/main/java/me/chayapak1/chomens_bot/util/CodeBlockUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/CodeBlockUtilities.java index 3da23051..691df601 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/CodeBlockUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/CodeBlockUtilities.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.util; public class CodeBlockUtilities { - public static String escape (String message) { + public static String escape (final String message) { return message.replace("`", "\u200b`"); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/ColorUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/ColorUtilities.java index 31512b5d..04d42609 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ColorUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ColorUtilities.java @@ -16,7 +16,7 @@ public class ColorUtilities { private static final Map ansiToIrcMap = new HashMap<>(); private static final Map ansiStyleToIrcMap = new HashMap<>(); - public static TextColor getColorByString (String _color) { + public static TextColor getColorByString (final String _color) { final String color = _color.toLowerCase(); if (color.startsWith("#")) return TextColor.fromHexString(color); @@ -27,7 +27,7 @@ public class ColorUtilities { } } - public static char getClosestChatColor (int rgb) { + public static char getClosestChatColor (final int rgb) { final NamedTextColor closestNamed = NamedTextColor.nearestTo(TextColor.color(rgb)); return formatToLegacyMap.get(closestNamed); } @@ -57,7 +57,7 @@ public class ColorUtilities { final Map clone = new HashMap<>(ansiToIrcMap); - for (Map.Entry entry : clone.entrySet()) { + for (final Map.Entry entry : clone.entrySet()) { ansiToIrcMap.put(entry.getKey() + 10, ansiToIrcMap.get(entry.getKey())); } @@ -69,27 +69,27 @@ public class ColorUtilities { ansiStyleToIrcMap.put(4, "\u001f"); // Underlined } - public static String convertAnsiToIrc (String input) { - StringBuilder result = new StringBuilder(); + public static String convertAnsiToIrc (final String input) { + final StringBuilder result = new StringBuilder(); boolean insideEscape = false; - StringBuilder ansiCode = new StringBuilder(); + final StringBuilder ansiCode = new StringBuilder(); for (int i = 0; i < input.length(); i++) { - char c = input.charAt(i); + final char c = input.charAt(i); if (insideEscape) { if (c == 'm') { insideEscape = false; // Parse the ANSI color code and map it to IRC color - String[] codes = ansiCode.toString().split(";"); - for (String code : codes) { + final String[] codes = ansiCode.toString().split(";"); + for (final String code : codes) { try { - int ansiColorCode = Integer.parseInt(code); + final int ansiColorCode = Integer.parseInt(code); if (ansiToIrcMap.containsKey(ansiColorCode)) { result.append("\u0003").append(ansiToIrcMap.get(ansiColorCode)); } else if (ansiStyleToIrcMap.containsKey(ansiColorCode)) { result.append(ansiStyleToIrcMap.get(ansiColorCode)); } - } catch (NumberFormatException ignored) { + } catch (final NumberFormatException ignored) { } } ansiCode.setLength(0); // Clear the buffer diff --git a/src/main/java/me/chayapak1/chomens_bot/util/ComponentUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/ComponentUtilities.java index cecc1ea2..7f80d52d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ComponentUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ComponentUtilities.java @@ -69,22 +69,22 @@ public class ComponentUtilities { public static final Map VOICE_CHAT_LANGUAGE = loadJsonStringMap("voiceChatLanguage.json"); public static final Map KEYBINDINGS = loadJsonStringMap("keybinds.json"); - private static Map loadJsonStringMap (String name) { - Map map = new HashMap<>(); + private static Map loadJsonStringMap (final String name) { + final Map map = new HashMap<>(); - InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(name); + final InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(name); assert is != null; - BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - JsonObject json = JsonParser.parseReader(reader).getAsJsonObject(); + final BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + final JsonObject json = JsonParser.parseReader(reader).getAsJsonObject(); - for (Map.Entry entry : json.entrySet()) { + for (final Map.Entry entry : json.entrySet()) { map.put(entry.getKey(), json.get(entry.getKey()).getAsString()); } return map; } - public static String getOrReturnFallback (TranslatableComponent component) { + public static String getOrReturnFallback (final TranslatableComponent component) { final String key = component.key(); final String minecraftKey = LANGUAGE.get(key); @@ -95,15 +95,15 @@ public class ComponentUtilities { else return component.fallback() != null ? component.fallback() : key; } - public static String stringify (Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.PLAIN); } + public static String stringify (final Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.PLAIN); } - public static String stringifySectionSign (Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.SECTION_SIGNS); } + public static String stringifySectionSign (final Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.SECTION_SIGNS); } - public static String stringifyAnsi (Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.ANSI); } + public static String stringifyAnsi (final Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.ANSI); } - public static String stringifyDiscordAnsi (Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.DISCORD_ANSI); } + public static String stringifyDiscordAnsi (final Component message) { return new ComponentParser().stringify(message, ComponentParser.ParseType.DISCORD_ANSI); } - public static String deserializeFromDiscordAnsi (String original) { return new ComponentParser().deserializeFromDiscordAnsi(original); } + public static String deserializeFromDiscordAnsi (final String original) { return new ComponentParser().deserializeFromDiscordAnsi(original); } private static class ComponentParser { public static final Pattern ARG_PATTERN = Pattern.compile("%(?:(\\d+)\\$)?([s%])"); @@ -202,7 +202,7 @@ public class ComponentUtilities { private boolean isSubParsing = false; - public String deserializeFromDiscordAnsi (String original) { + public String deserializeFromDiscordAnsi (final String original) { final Matcher matcher = DISCORD_ANSI_PATTERN.matcher(original); final StringBuilder builder = new StringBuilder(); @@ -211,7 +211,7 @@ public class ComponentUtilities { boolean replaced = false; - for (Map.Entry entry : DISCORD_ANSI_MAP.entrySet()) { + for (final Map.Entry entry : DISCORD_ANSI_MAP.entrySet()) { if (!entry.getValue().equals(match)) continue; matcher.appendReplacement(builder, "§" + entry.getKey()); @@ -229,7 +229,7 @@ public class ComponentUtilities { return builder.toString(); } - private String stringify (Component message, ParseType type) { + private String stringify (final Component message, final ParseType type) { this.type = type; if (System.currentTimeMillis() > parseStartTime + MAX_TIME) return ""; @@ -244,7 +244,7 @@ public class ComponentUtilities { builder.append(output); - for (Component child : message.children()) { + for (final Component child : message.children()) { final ComponentParser parser = new ComponentParser(); parser.lastColor = lastColor + color; parser.lastStyle = lastStyle + style; @@ -261,28 +261,28 @@ public class ComponentUtilities { } return builder.toString(); - } catch (Exception e) { + } catch (final Exception e) { LoggerUtilities.error(e); return ""; } } - public String stringifyPartially (Component message, String color, String style) { + public String stringifyPartially (final Component message, final String color, final String style) { return switch (message) { - case TextComponent t_component -> stringifyPartially(t_component, color, style); - case TranslatableComponent t_component -> stringifyPartially(t_component, color, style); - case SelectorComponent t_component -> stringifyPartially(t_component, color, style); - case KeybindComponent t_component -> stringifyPartially(t_component, color, style); + case final TextComponent t_component -> stringifyPartially(t_component, color, style); + case final TranslatableComponent t_component -> stringifyPartially(t_component, color, style); + case final SelectorComponent t_component -> stringifyPartially(t_component, color, style); + case final KeybindComponent t_component -> stringifyPartially(t_component, color, style); default -> String.format("[Component type %s not implemented!]", message.getClass().getSimpleName()); }; } - public String getStyle (Style textStyle) { + public String getStyle (final Style textStyle) { if (textStyle == null) return ""; final StringBuilder style = new StringBuilder(); - for (Map.Entry decorationEntry : textStyle.decorations().entrySet()) { + for (final Map.Entry decorationEntry : textStyle.decorations().entrySet()) { final TextDecoration decoration = decorationEntry.getKey(); final TextDecoration.State state = decorationEntry.getValue(); @@ -329,12 +329,12 @@ public class ComponentUtilities { return style.toString(); } - public String getColor (TextColor color) { + public String getColor (final TextColor color) { if (color == null) return ""; // map totallynotskidded™ from https://github.com/PrismarineJS/prismarine-chat/blob/master/index.js#L299 - String code; - if (color instanceof NamedTextColor named) { + final String code; + if (color instanceof final NamedTextColor named) { code = NAMED_TEXT_COLOR_MAP.getOrDefault(named, ""); } else { code = color.asHexString(); @@ -379,7 +379,7 @@ public class ComponentUtilities { }; } - private String getPartialResult (String originalResult, String color, String style, boolean setLastStyles) { + private String getPartialResult (final String originalResult, final String color, final String style, final boolean setLastStyles) { if (type == ParseType.PLAIN) return originalResult; final String orderedStyling = type == ParseType.SECTION_SIGNS @@ -403,7 +403,7 @@ public class ComponentUtilities { return result; } - private String stringifyPartially (String message, String color, String style) { + private String stringifyPartially (final String message, final String color, final String style) { if (type == ParseType.PLAIN) return message; final boolean isAllAnsi = type == ParseType.ANSI || type == ParseType.DISCORD_ANSI; @@ -425,22 +425,22 @@ public class ComponentUtilities { DISCORD_ANSI_MAP.get(code); else return color; }); - } catch (Exception ignored) { } + } catch (final Exception ignored) { } } return getPartialResult(replacedContent, color, style, true); } - private String stringifyPartially (TextComponent message, String color, String style) { + private String stringifyPartially (final TextComponent message, final String color, final String style) { return stringifyPartially(message.content(), color, style); } - private String stringifyPartially (TranslatableComponent message, String color, String style) { + private String stringifyPartially (final TranslatableComponent message, final String color, final String style) { final String format = getOrReturnFallback(message); // totallynotskidded™️from HBot (and changed a bit) - Matcher matcher = ARG_PATTERN.matcher(format); - StringBuilder sb = new StringBuilder(); + final Matcher matcher = ARG_PATTERN.matcher(format); + final StringBuilder sb = new StringBuilder(); // not checking if arguments length equals input format length // is INTENTIONAL and is a FEATURE @@ -452,7 +452,7 @@ public class ComponentUtilities { final String idxStr = matcher.group(1); try { - int idx = idxStr == null ? i++ : (Integer.parseInt(idxStr) - 1); + final int idx = idxStr == null ? i++ : (Integer.parseInt(idxStr) - 1); if (idx >= 0 && idx < message.arguments().size()) { final ComponentParser parser = new ComponentParser(); @@ -485,7 +485,7 @@ public class ComponentUtilities { } else { matcher.appendReplacement(sb, ""); } - } catch (NumberFormatException ignored) { } // is this a good idea? + } catch (final NumberFormatException ignored) { } // is this a good idea? } } @@ -496,11 +496,11 @@ public class ComponentUtilities { // on the client side, this acts just like TextComponent // and does NOT process any players stuff - private String stringifyPartially (SelectorComponent message, String color, String style) { + private String stringifyPartially (final SelectorComponent message, final String color, final String style) { return stringifyPartially(message.pattern(), style, color); } - public String stringifyPartially (KeybindComponent message, String color, String style) { + public String stringifyPartially (final KeybindComponent message, final String color, final String style) { final String keybind = message.keybind(); // this is indeed the correct way to process keybindings diff --git a/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java index e580ff6e..9e545056 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java @@ -20,10 +20,10 @@ import java.util.concurrent.TimeUnit; public class DownloadUtilities { public static class DefaultTrustManager implements X509TrustManager { @Override - public void checkClientTrusted (X509Certificate[] arg0, String arg1) { } + public void checkClientTrusted (final X509Certificate[] arg0, final String arg1) { } @Override - public void checkServerTrusted (X509Certificate[] arg0, String arg1) { } + public void checkServerTrusted (final X509Certificate[] arg0, final String arg1) { } @Override public X509Certificate[] getAcceptedIssuers () { @@ -37,24 +37,24 @@ public class DownloadUtilities { Main.EXECUTOR.scheduleAtFixedRate(() -> limit = 0, 0, 1, TimeUnit.SECONDS); } - public static byte[] DownloadToByteArray (URL url, int maxSize) throws IOException, KeyManagementException, NoSuchAlgorithmException { + public static byte[] DownloadToByteArray (final URL url, final int maxSize) throws IOException, KeyManagementException, NoSuchAlgorithmException { if (limit > 3) throw new IOException("NO !!!!!!"); limit++; - SSLContext ctx = SSLContext.getInstance("TLS"); + final SSLContext ctx = SSLContext.getInstance("TLS"); ctx.init(new KeyManager[0], new TrustManager[] { new DefaultTrustManager() }, new SecureRandom()); SSLContext.setDefault(ctx); - URLConnection conn = url.openConnection(); + final URLConnection conn = url.openConnection(); conn.setConnectTimeout(1000); conn.setReadTimeout(5000); // https://www.whatismybrowser.com/guides/the-latest-user-agent/windows conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36"); - try (BufferedInputStream downloadStream = new BufferedInputStream(conn.getInputStream())) { - ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream(); - byte[] buf = new byte[1024]; + try (final BufferedInputStream downloadStream = new BufferedInputStream(conn.getInputStream())) { + final ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream(); + final byte[] buf = new byte[1024]; int n; int tot = 0; while ((n = downloadStream.read(buf)) > 0) { diff --git a/src/main/java/me/chayapak1/chomens_bot/util/ExceptionUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/ExceptionUtilities.java index 24ce9fc5..b476d031 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ExceptionUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ExceptionUtilities.java @@ -5,7 +5,7 @@ import java.io.StringWriter; public class ExceptionUtilities { // totallynotskidded™ from apache's common utils thingy - public static String getStacktrace (Throwable throwable) { + public static String getStacktrace (final Throwable throwable) { final StringWriter sw = new StringWriter(); final PrintWriter pw = new PrintWriter(sw, true); diff --git a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java index d7299f78..470221ee 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java @@ -65,11 +65,11 @@ public class FileLoggerUtilities { executor.scheduleAtFixedRate(() -> { try { tick(); - } catch (Exception e) { + } catch (final Exception e) { LoggerUtilities.error(e); } }, 0, 50, TimeUnit.MILLISECONDS); - } catch (IOException e) { + } catch (final IOException e) { LoggerUtilities.error(e); } } @@ -83,7 +83,7 @@ public class FileLoggerUtilities { try { compressLogFile(); makeNewLogFile(); - } catch (IOException e) { + } catch (final IOException e) { LoggerUtilities.error(e); } } @@ -119,7 +119,7 @@ public class FileLoggerUtilities { final InputStream in = Files.newInputStream(logPath, StandardOpenOption.READ); final GZIPOutputStream out = new GZIPOutputStream(Files.newOutputStream(path, StandardOpenOption.CREATE)) ) { - byte[] buffer = new byte[1024]; + final byte[] buffer = new byte[1024]; int size; while ((size = in.read(buffer)) > 0) { out.write(buffer, 0, size); @@ -127,18 +127,18 @@ public class FileLoggerUtilities { } } - public static synchronized String getLogDate (Path filePath) throws IOException { + public static synchronized String getLogDate (final Path filePath) throws IOException { try (final BufferedReader reader = Files.newBufferedReader(filePath, StandardCharsets.UTF_8)) { return reader.readLine(); } } - public static synchronized boolean logIsCurrent (Path path) throws IOException { - LocalDate date = LocalDate.now(); + public static synchronized boolean logIsCurrent (final Path path) throws IOException { + final LocalDate date = LocalDate.now(); return getLogDate(path).equals(date.toString()); } - public static synchronized void log (String type, String str) { + public static synchronized void log (final String type, final String str) { if (freezeTime > System.currentTimeMillis()) { return; } @@ -180,13 +180,13 @@ public class FileLoggerUtilities { spamLevel += 2; } - } catch (IOException e) { + } catch (final IOException e) { LoggerUtilities.error(e); } } - public static String getPrefix (String type) { - LocalDateTime dateTime = LocalDateTime.now(); + public static String getPrefix (final String type) { + final LocalDateTime dateTime = LocalDateTime.now(); return String.format( "[%s %s] ", dateTime.format(dateTimeFormatter), diff --git a/src/main/java/me/chayapak1/chomens_bot/util/FriendlyByteBuf.java b/src/main/java/me/chayapak1/chomens_bot/util/FriendlyByteBuf.java index f45b1db0..fb06f81c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/FriendlyByteBuf.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/FriendlyByteBuf.java @@ -24,7 +24,7 @@ public class FriendlyByteBuf extends ByteBuf { private final ByteBuf buf; - public FriendlyByteBuf (ByteBuf byteBuf) { + public FriendlyByteBuf (final ByteBuf byteBuf) { buf = byteBuf; } @@ -32,7 +32,7 @@ public class FriendlyByteBuf extends ByteBuf { this(Unpooled.buffer()); } - public void writeByteArray (byte[] bs) { + public void writeByteArray (final byte[] bs) { writeVarInt(bs.length); writeBytes(bs); } @@ -41,12 +41,12 @@ public class FriendlyByteBuf extends ByteBuf { return readByteArray(readableBytes()); } - public byte[] readByteArray (int i) { - int j = readVarInt(); + public byte[] readByteArray (final int i) { + final int j = readVarInt(); if (j > i) { throw new DecoderException("ByteArray with size " + j + " is bigger than allowed " + i); } else { - byte[] bs = new byte[j]; + final byte[] bs = new byte[j]; readBytes(bs); return bs; } @@ -68,7 +68,7 @@ public class FriendlyByteBuf extends ByteBuf { return i; } - public void writeUUID (UUID uUID) { + public void writeUUID (final UUID uUID) { writeLong(uUID.getMostSignificantBits()); writeLong(uUID.getLeastSignificantBits()); } @@ -86,14 +86,14 @@ public class FriendlyByteBuf extends ByteBuf { writeByte(i); } - public String readUtf (int i) { - int j = readVarInt(); + public String readUtf (final int i) { + final int j = readVarInt(); if (j > i * 4) { throw new DecoderException("The received encoded string buffer length is longer than maximum allowed (" + j + " > " + i * 4 + ')'); } else if (j < 0) { throw new DecoderException("The received encoded string buffer length is less than zero! Weird string!"); } else { - String string = toString(readerIndex(), j, StandardCharsets.UTF_8); + final String string = toString(readerIndex(), j, StandardCharsets.UTF_8); readerIndex(readerIndex() + j); if (string.length() > i) { throw new DecoderException("The received string length is longer than maximum allowed (" + j + " > " + i + ')'); @@ -103,8 +103,8 @@ public class FriendlyByteBuf extends ByteBuf { } } - public void writeUtf (String string, int i) { - byte[] bs = string.getBytes(StandardCharsets.UTF_8); + public void writeUtf (final String string, final int i) { + final byte[] bs = string.getBytes(StandardCharsets.UTF_8); if (bs.length > i) { throw new EncoderException("String too big (was " + bs.length + " bytes encoded, max " + i + ')'); } else { @@ -117,7 +117,7 @@ public class FriendlyByteBuf extends ByteBuf { return readUtf(32767); } - public void writeUtf (String string) { + public void writeUtf (final String string) { writeUtf(string, 32767); } @@ -127,7 +127,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf capacity (int i) { + public ByteBuf capacity (final int i) { return buf.capacity(i); } @@ -149,7 +149,7 @@ public class FriendlyByteBuf extends ByteBuf { @Override @Deprecated - public ByteBuf order (ByteOrder byteOrder) { + public ByteBuf order (final ByteOrder byteOrder) { return buf.order(byteOrder); } @@ -179,7 +179,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf readerIndex (int i) { + public ByteBuf readerIndex (final int i) { return buf.readerIndex(i); } @@ -189,12 +189,12 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf writerIndex (int i) { + public ByteBuf writerIndex (final int i) { return buf.writerIndex(i); } @Override - public ByteBuf setIndex (int i, int j) { + public ByteBuf setIndex (final int i, final int j) { return buf.setIndex(i, j); } @@ -219,7 +219,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public boolean isReadable (int i) { + public boolean isReadable (final int i) { return buf.isReadable(i); } @@ -229,7 +229,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public boolean isWritable (int i) { + public boolean isWritable (final int i) { return buf.isWritable(i); } @@ -269,282 +269,282 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf ensureWritable (int i) { + public ByteBuf ensureWritable (final int i) { return buf.ensureWritable(i); } @Override - public int ensureWritable (int i, boolean bl) { + public int ensureWritable (final int i, final boolean bl) { return buf.ensureWritable(i, bl); } @Override - public boolean getBoolean (int i) { + public boolean getBoolean (final int i) { return buf.getBoolean(i); } @Override - public byte getByte (int i) { + public byte getByte (final int i) { return buf.getByte(i); } @Override - public short getUnsignedByte (int i) { + public short getUnsignedByte (final int i) { return buf.getUnsignedByte(i); } @Override - public short getShort (int i) { + public short getShort (final int i) { return buf.getShort(i); } @Override - public short getShortLE (int i) { + public short getShortLE (final int i) { return buf.getShortLE(i); } @Override - public int getUnsignedShort (int i) { + public int getUnsignedShort (final int i) { return buf.getUnsignedShort(i); } @Override - public int getUnsignedShortLE (int i) { + public int getUnsignedShortLE (final int i) { return buf.getUnsignedShortLE(i); } @Override - public int getMedium (int i) { + public int getMedium (final int i) { return buf.getMedium(i); } @Override - public int getMediumLE (int i) { + public int getMediumLE (final int i) { return buf.getMediumLE(i); } @Override - public int getUnsignedMedium (int i) { + public int getUnsignedMedium (final int i) { return buf.getUnsignedMedium(i); } @Override - public int getUnsignedMediumLE (int i) { + public int getUnsignedMediumLE (final int i) { return buf.getUnsignedMediumLE(i); } @Override - public int getInt (int i) { + public int getInt (final int i) { return buf.getInt(i); } @Override - public int getIntLE (int i) { + public int getIntLE (final int i) { return buf.getIntLE(i); } @Override - public long getUnsignedInt (int i) { + public long getUnsignedInt (final int i) { return buf.getUnsignedInt(i); } @Override - public long getUnsignedIntLE (int i) { + public long getUnsignedIntLE (final int i) { return buf.getUnsignedIntLE(i); } @Override - public long getLong (int i) { + public long getLong (final int i) { return buf.getLong(i); } @Override - public long getLongLE (int i) { + public long getLongLE (final int i) { return buf.getLongLE(i); } @Override - public char getChar (int i) { + public char getChar (final int i) { return buf.getChar(i); } @Override - public float getFloat (int i) { + public float getFloat (final int i) { return buf.getFloat(i); } @Override - public double getDouble (int i) { + public double getDouble (final int i) { return buf.getDouble(i); } @Override - public ByteBuf getBytes (int i, ByteBuf byteBuf) { + public ByteBuf getBytes (final int i, final ByteBuf byteBuf) { return buf.getBytes(i, byteBuf); } @Override - public ByteBuf getBytes (int i, ByteBuf byteBuf, int j) { + public ByteBuf getBytes (final int i, final ByteBuf byteBuf, final int j) { return buf.getBytes(i, byteBuf, j); } @Override - public ByteBuf getBytes (int i, ByteBuf byteBuf, int j, int k) { + public ByteBuf getBytes (final int i, final ByteBuf byteBuf, final int j, final int k) { return buf.getBytes(i, byteBuf, j, k); } @Override - public ByteBuf getBytes (int i, byte[] bs) { + public ByteBuf getBytes (final int i, final byte[] bs) { return buf.getBytes(i, bs); } @Override - public ByteBuf getBytes (int i, byte[] bs, int j, int k) { + public ByteBuf getBytes (final int i, final byte[] bs, final int j, final int k) { return buf.getBytes(i, bs, j, k); } @Override - public ByteBuf getBytes (int i, ByteBuffer byteBuffer) { + public ByteBuf getBytes (final int i, final ByteBuffer byteBuffer) { return buf.getBytes(i, byteBuffer); } @Override - public ByteBuf getBytes (int i, OutputStream outputStream, int j) throws IOException { + public ByteBuf getBytes (final int i, final OutputStream outputStream, final int j) throws IOException { return buf.getBytes(i, outputStream, j); } @Override - public int getBytes (int i, GatheringByteChannel gatheringByteChannel, int j) throws IOException { + public int getBytes (final int i, final GatheringByteChannel gatheringByteChannel, final int j) throws IOException { return buf.getBytes(i, gatheringByteChannel, j); } @Override - public int getBytes (int i, FileChannel fileChannel, long l, int j) throws IOException { + public int getBytes (final int i, final FileChannel fileChannel, final long l, final int j) throws IOException { return buf.getBytes(i, fileChannel, l, j); } @Override - public CharSequence getCharSequence (int i, int j, Charset charset) { + public CharSequence getCharSequence (final int i, final int j, final Charset charset) { return buf.getCharSequence(i, j, charset); } @Override - public ByteBuf setBoolean (int i, boolean bl) { + public ByteBuf setBoolean (final int i, final boolean bl) { return buf.setBoolean(i, bl); } @Override - public ByteBuf setByte (int i, int j) { + public ByteBuf setByte (final int i, final int j) { return buf.setByte(i, j); } @Override - public ByteBuf setShort (int i, int j) { + public ByteBuf setShort (final int i, final int j) { return buf.setShort(i, j); } @Override - public ByteBuf setShortLE (int i, int j) { + public ByteBuf setShortLE (final int i, final int j) { return buf.setShortLE(i, j); } @Override - public ByteBuf setMedium (int i, int j) { + public ByteBuf setMedium (final int i, final int j) { return buf.setMedium(i, j); } @Override - public ByteBuf setMediumLE (int i, int j) { + public ByteBuf setMediumLE (final int i, final int j) { return buf.setMediumLE(i, j); } @Override - public ByteBuf setInt (int i, int j) { + public ByteBuf setInt (final int i, final int j) { return buf.setInt(i, j); } @Override - public ByteBuf setIntLE (int i, int j) { + public ByteBuf setIntLE (final int i, final int j) { return buf.setIntLE(i, j); } @Override - public ByteBuf setLong (int i, long l) { + public ByteBuf setLong (final int i, final long l) { return buf.setLong(i, l); } @Override - public ByteBuf setLongLE (int i, long l) { + public ByteBuf setLongLE (final int i, final long l) { return buf.setLongLE(i, l); } @Override - public ByteBuf setChar (int i, int j) { + public ByteBuf setChar (final int i, final int j) { return buf.setChar(i, j); } @Override - public ByteBuf setFloat (int i, float f) { + public ByteBuf setFloat (final int i, final float f) { return buf.setFloat(i, f); } @Override - public ByteBuf setDouble (int i, double d) { + public ByteBuf setDouble (final int i, final double d) { return buf.setDouble(i, d); } @Override - public ByteBuf setBytes (int i, ByteBuf byteBuf) { + public ByteBuf setBytes (final int i, final ByteBuf byteBuf) { return buf.setBytes(i, byteBuf); } @Override - public ByteBuf setBytes (int i, ByteBuf byteBuf, int j) { + public ByteBuf setBytes (final int i, final ByteBuf byteBuf, final int j) { return buf.setBytes(i, byteBuf, j); } @Override - public ByteBuf setBytes (int i, ByteBuf byteBuf, int j, int k) { + public ByteBuf setBytes (final int i, final ByteBuf byteBuf, final int j, final int k) { return buf.setBytes(i, byteBuf, j, k); } @Override - public ByteBuf setBytes (int i, byte[] bs) { + public ByteBuf setBytes (final int i, final byte[] bs) { return buf.setBytes(i, bs); } @Override - public ByteBuf setBytes (int i, byte[] bs, int j, int k) { + public ByteBuf setBytes (final int i, final byte[] bs, final int j, final int k) { return buf.setBytes(i, bs, j, k); } @Override - public ByteBuf setBytes (int i, ByteBuffer byteBuffer) { + public ByteBuf setBytes (final int i, final ByteBuffer byteBuffer) { return buf.setBytes(i, byteBuffer); } @Override - public int setBytes (int i, InputStream inputStream, int j) throws IOException { + public int setBytes (final int i, final InputStream inputStream, final int j) throws IOException { return buf.setBytes(i, inputStream, j); } @Override - public int setBytes (int i, ScatteringByteChannel scatteringByteChannel, int j) throws IOException { + public int setBytes (final int i, final ScatteringByteChannel scatteringByteChannel, final int j) throws IOException { return buf.setBytes(i, scatteringByteChannel, j); } @Override - public int setBytes (int i, FileChannel fileChannel, long l, int j) throws IOException { + public int setBytes (final int i, final FileChannel fileChannel, final long l, final int j) throws IOException { return buf.setBytes(i, fileChannel, l, j); } @Override - public ByteBuf setZero (int i, int j) { + public ByteBuf setZero (final int i, final int j) { return buf.setZero(i, j); } @Override - public int setCharSequence (int i, CharSequence charSequence, Charset charset) { + public int setCharSequence (final int i, final CharSequence charSequence, final Charset charset) { return buf.setCharSequence(i, charSequence, charset); } @@ -649,232 +649,232 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf readBytes (int i) { + public ByteBuf readBytes (final int i) { return buf.readBytes(i); } @Override - public ByteBuf readSlice (int i) { + public ByteBuf readSlice (final int i) { return buf.readSlice(i); } @Override - public ByteBuf readRetainedSlice (int i) { + public ByteBuf readRetainedSlice (final int i) { return buf.readRetainedSlice(i); } @Override - public ByteBuf readBytes (ByteBuf byteBuf) { + public ByteBuf readBytes (final ByteBuf byteBuf) { return buf.readBytes(byteBuf); } @Override - public ByteBuf readBytes (ByteBuf byteBuf, int i) { + public ByteBuf readBytes (final ByteBuf byteBuf, final int i) { return buf.readBytes(byteBuf, i); } @Override - public ByteBuf readBytes (ByteBuf byteBuf, int i, int j) { + public ByteBuf readBytes (final ByteBuf byteBuf, final int i, final int j) { return buf.readBytes(byteBuf, i, j); } @Override - public ByteBuf readBytes (byte[] bs) { + public ByteBuf readBytes (final byte[] bs) { return buf.readBytes(bs); } @Override - public ByteBuf readBytes (byte[] bs, int i, int j) { + public ByteBuf readBytes (final byte[] bs, final int i, final int j) { return buf.readBytes(bs, i, j); } @Override - public ByteBuf readBytes (ByteBuffer byteBuffer) { + public ByteBuf readBytes (final ByteBuffer byteBuffer) { return buf.readBytes(byteBuffer); } @Override - public ByteBuf readBytes (OutputStream outputStream, int i) throws IOException { + public ByteBuf readBytes (final OutputStream outputStream, final int i) throws IOException { return buf.readBytes(outputStream, i); } @Override - public int readBytes (GatheringByteChannel gatheringByteChannel, int i) throws IOException { + public int readBytes (final GatheringByteChannel gatheringByteChannel, final int i) throws IOException { return buf.readBytes(gatheringByteChannel, i); } @Override - public CharSequence readCharSequence (int i, Charset charset) { + public CharSequence readCharSequence (final int i, final Charset charset) { return buf.readCharSequence(i, charset); } @Override - public int readBytes (FileChannel fileChannel, long l, int i) throws IOException { + public int readBytes (final FileChannel fileChannel, final long l, final int i) throws IOException { return buf.readBytes(fileChannel, l, i); } @Override - public ByteBuf skipBytes (int i) { + public ByteBuf skipBytes (final int i) { return buf.skipBytes(i); } @Override - public ByteBuf writeBoolean (boolean bl) { + public ByteBuf writeBoolean (final boolean bl) { return buf.writeBoolean(bl); } @Override - public ByteBuf writeByte (int i) { + public ByteBuf writeByte (final int i) { return buf.writeByte(i); } @Override - public ByteBuf writeShort (int i) { + public ByteBuf writeShort (final int i) { return buf.writeShort(i); } @Override - public ByteBuf writeShortLE (int i) { + public ByteBuf writeShortLE (final int i) { return buf.writeShortLE(i); } @Override - public ByteBuf writeMedium (int i) { + public ByteBuf writeMedium (final int i) { return buf.writeMedium(i); } @Override - public ByteBuf writeMediumLE (int i) { + public ByteBuf writeMediumLE (final int i) { return buf.writeMediumLE(i); } @Override - public ByteBuf writeInt (int i) { + public ByteBuf writeInt (final int i) { return buf.writeInt(i); } @Override - public ByteBuf writeIntLE (int i) { + public ByteBuf writeIntLE (final int i) { return buf.writeIntLE(i); } @Override - public ByteBuf writeLong (long l) { + public ByteBuf writeLong (final long l) { return buf.writeLong(l); } @Override - public ByteBuf writeLongLE (long l) { + public ByteBuf writeLongLE (final long l) { return buf.writeLongLE(l); } @Override - public ByteBuf writeChar (int i) { + public ByteBuf writeChar (final int i) { return buf.writeChar(i); } @Override - public ByteBuf writeFloat (float f) { + public ByteBuf writeFloat (final float f) { return buf.writeFloat(f); } @Override - public ByteBuf writeDouble (double d) { + public ByteBuf writeDouble (final double d) { return buf.writeDouble(d); } @Override - public ByteBuf writeBytes (ByteBuf byteBuf) { + public ByteBuf writeBytes (final ByteBuf byteBuf) { return buf.writeBytes(byteBuf); } @Override - public ByteBuf writeBytes (ByteBuf byteBuf, int i) { + public ByteBuf writeBytes (final ByteBuf byteBuf, final int i) { return buf.writeBytes(byteBuf, i); } @Override - public ByteBuf writeBytes (ByteBuf byteBuf, int i, int j) { + public ByteBuf writeBytes (final ByteBuf byteBuf, final int i, final int j) { return buf.writeBytes(byteBuf, i, j); } @Override - public ByteBuf writeBytes (byte[] bs) { + public ByteBuf writeBytes (final byte[] bs) { return buf.writeBytes(bs); } @Override - public ByteBuf writeBytes (byte[] bs, int i, int j) { + public ByteBuf writeBytes (final byte[] bs, final int i, final int j) { return buf.writeBytes(bs, i, j); } @Override - public ByteBuf writeBytes (ByteBuffer byteBuffer) { + public ByteBuf writeBytes (final ByteBuffer byteBuffer) { return buf.writeBytes(byteBuffer); } @Override - public int writeBytes (InputStream inputStream, int i) throws IOException { + public int writeBytes (final InputStream inputStream, final int i) throws IOException { return buf.writeBytes(inputStream, i); } @Override - public int writeBytes (ScatteringByteChannel scatteringByteChannel, int i) throws IOException { + public int writeBytes (final ScatteringByteChannel scatteringByteChannel, final int i) throws IOException { return buf.writeBytes(scatteringByteChannel, i); } @Override - public int writeBytes (FileChannel fileChannel, long l, int i) throws IOException { + public int writeBytes (final FileChannel fileChannel, final long l, final int i) throws IOException { return buf.writeBytes(fileChannel, l, i); } @Override - public ByteBuf writeZero (int i) { + public ByteBuf writeZero (final int i) { return buf.writeZero(i); } @Override - public int writeCharSequence (CharSequence charSequence, Charset charset) { + public int writeCharSequence (final CharSequence charSequence, final Charset charset) { return buf.writeCharSequence(charSequence, charset); } @Override - public int indexOf (int i, int j, byte b) { + public int indexOf (final int i, final int j, final byte b) { return buf.indexOf(i, j, b); } @Override - public int bytesBefore (byte b) { + public int bytesBefore (final byte b) { return buf.bytesBefore(b); } @Override - public int bytesBefore (int i, byte b) { + public int bytesBefore (final int i, final byte b) { return buf.bytesBefore(i, b); } @Override - public int bytesBefore (int i, int j, byte b) { + public int bytesBefore (final int i, final int j, final byte b) { return buf.bytesBefore(i, j, b); } @Override - public int forEachByte (ByteProcessor byteProcessor) { + public int forEachByte (final ByteProcessor byteProcessor) { return buf.forEachByte(byteProcessor); } @Override - public int forEachByte (int i, int j, ByteProcessor byteProcessor) { + public int forEachByte (final int i, final int j, final ByteProcessor byteProcessor) { return buf.forEachByte(i, j, byteProcessor); } @Override - public int forEachByteDesc (ByteProcessor byteProcessor) { + public int forEachByteDesc (final ByteProcessor byteProcessor) { return buf.forEachByteDesc(byteProcessor); } @Override - public int forEachByteDesc (int i, int j, ByteProcessor byteProcessor) { + public int forEachByteDesc (final int i, final int j, final ByteProcessor byteProcessor) { return buf.forEachByteDesc(i, j, byteProcessor); } @@ -884,7 +884,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf copy (int i, int j) { + public ByteBuf copy (final int i, final int j) { return buf.copy(i, j); } @@ -899,12 +899,12 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf slice (int i, int j) { + public ByteBuf slice (final int i, final int j) { return buf.slice(i, j); } @Override - public ByteBuf retainedSlice (int i, int j) { + public ByteBuf retainedSlice (final int i, final int j) { return buf.retainedSlice(i, j); } @@ -929,12 +929,12 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuffer nioBuffer (int i, int j) { + public ByteBuffer nioBuffer (final int i, final int j) { return buf.nioBuffer(i, j); } @Override - public ByteBuffer internalNioBuffer (int i, int j) { + public ByteBuffer internalNioBuffer (final int i, final int j) { return buf.internalNioBuffer(i, j); } @@ -944,7 +944,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuffer[] nioBuffers (int i, int j) { + public ByteBuffer[] nioBuffers (final int i, final int j) { return buf.nioBuffers(i, j); } @@ -974,12 +974,12 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public String toString (Charset charset) { + public String toString (final Charset charset) { return buf.toString(charset); } @Override - public String toString (int i, int j, Charset charset) { + public String toString (final int i, final int j, final Charset charset) { return buf.toString(i, j, charset); } @@ -996,7 +996,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public int compareTo (ByteBuf byteBuf) { + public int compareTo (final ByteBuf byteBuf) { return buf.compareTo(byteBuf); } @@ -1006,7 +1006,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf retain (int i) { + public ByteBuf retain (final int i) { return buf.retain(i); } @@ -1021,7 +1021,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public ByteBuf touch (Object object) { + public ByteBuf touch (final Object object) { return buf.touch(object); } @@ -1036,7 +1036,7 @@ public class FriendlyByteBuf extends ByteBuf { } @Override - public boolean release (int i) { + public boolean release (final int i) { return buf.release(i); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/HTMLUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/HTMLUtilities.java index 6c4e9f18..a55c9f58 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/HTMLUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/HTMLUtilities.java @@ -10,9 +10,9 @@ public class HTMLUtilities { private static final String CODE_COLOR = "§2"; private static final String DEFAULT_COLOR = "§a"; - public static String toFormattingCodes (String html) { - Matcher matcher = HTML_TAG_PATTERN.matcher(html); - StringBuilder raw = new StringBuilder(); + public static String toFormattingCodes (final String html) { + final Matcher matcher = HTML_TAG_PATTERN.matcher(html); + final StringBuilder raw = new StringBuilder(); boolean bold = false, italic = false, underline = false, code = false; @@ -22,7 +22,7 @@ public class HTMLUtilities { while (matcher.find()) { matcher.appendReplacement(raw, ""); - boolean endTag = matcher.group(1) != null; + final boolean endTag = matcher.group(1) != null; String tagName = matcher.group(2); if (tagName == null) { // we're in a comment or newline diff --git a/src/main/java/me/chayapak1/chomens_bot/util/HttpUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/HttpUtilities.java index 34b57ff6..b07c423a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/HttpUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/HttpUtilities.java @@ -18,20 +18,20 @@ import java.security.SecureRandom; public class HttpUtilities { // ig duplicate codes yup real - public static String getRequest (URL url) throws NoSuchAlgorithmException, KeyManagementException, IOException { - SSLContext ctx = SSLContext.getInstance("TLS"); + public static String getRequest (final URL url) throws NoSuchAlgorithmException, KeyManagementException, IOException { + final SSLContext ctx = SSLContext.getInstance("TLS"); ctx.init(new KeyManager[0], new TrustManager[] { new DownloadUtilities.DefaultTrustManager() }, new SecureRandom()); SSLContext.setDefault(ctx); - URLConnection conn = url.openConnection(); + final URLConnection conn = url.openConnection(); conn.setConnectTimeout(5000); conn.setReadTimeout(10000); // https://www.whatismybrowser.com/guides/the-latest-user-agent/windows conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36"); - BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); + final BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); String inputLine; - StringBuilder content = new StringBuilder(); + final StringBuilder content = new StringBuilder(); while ((inputLine = in.readLine()) != null) { content.append(inputLine); } @@ -40,12 +40,12 @@ public class HttpUtilities { return content.toString(); } - public static String postRequest (URL url, String contentType, String requestBody) throws Exception { - SSLContext ctx = SSLContext.getInstance("TLS"); + public static String postRequest (final URL url, final String contentType, final String requestBody) throws Exception { + final SSLContext ctx = SSLContext.getInstance("TLS"); ctx.init(new KeyManager[0], new TrustManager[] { new DownloadUtilities.DefaultTrustManager() }, new SecureRandom()); SSLContext.setDefault(ctx); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + final HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("POST"); conn.setDoOutput(true); conn.setRequestProperty("Content-Type", contentType); @@ -55,13 +55,13 @@ public class HttpUtilities { // https://www.whatismybrowser.com/guides/the-latest-user-agent/windows conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36"); - OutputStream os = conn.getOutputStream(); + final OutputStream os = conn.getOutputStream(); os.write(requestBody.getBytes()); os.flush(); - BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); + final BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); String inputLine; - StringBuilder content = new StringBuilder(); + final StringBuilder content = new StringBuilder(); while ((inputLine = in.readLine()) != null) { content.append(inputLine); } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/IllegalCharactersUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/IllegalCharactersUtilities.java index e8ae95af..4fbcba9b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/IllegalCharactersUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/IllegalCharactersUtilities.java @@ -1,10 +1,10 @@ package me.chayapak1.chomens_bot.util; public class IllegalCharactersUtilities { - public static String stripIllegalCharacters (String string) { + public static String stripIllegalCharacters (final String string) { final StringBuilder replaced = new StringBuilder(); - for (char character : string.toCharArray()) { + for (final char character : string.toCharArray()) { // ripped STRAIGHT from minecraft code if (character == 167 || character < ' ' || character == 127) continue; diff --git a/src/main/java/me/chayapak1/chomens_bot/util/LevenshteinUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/LevenshteinUtilities.java index 2958472f..4b3da902 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/LevenshteinUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/LevenshteinUtilities.java @@ -10,29 +10,29 @@ import java.util.Map; // stolen from https://github.com/MeteorDevelopment/meteor-client/blob/master/src/main/java/meteordevelopment/meteorclient/utils/Utils.java#L253 // and https://github.com/MeteorDevelopment/meteor-client/blob/master/src/main/java/meteordevelopment/meteorclient/systems/modules/Modules.java#L170 public class LevenshteinUtilities { - public static List searchTitles (String text, Collection texts) { + public static List searchTitles (final String text, final Collection texts) { final Map output = new ValueComparableMap<>(Ordering.natural()); - for (String eachText : texts) { - int score = searchLevenshteinDefault(text, eachText, false); + for (final String eachText : texts) { + final int score = searchLevenshteinDefault(text, eachText, false); output.put(eachText, output.getOrDefault(eachText, 0) + score); } return output.keySet().stream().toList(); } - public static int searchLevenshteinDefault (String text, String filter, boolean caseSensitive) { + public static int searchLevenshteinDefault (final String text, final String filter, final boolean caseSensitive) { return levenshteinDistance(caseSensitive ? filter : filter.toLowerCase(), caseSensitive ? text : text.toLowerCase(), 1, 8, 8); } - public static int searchInWords (String text, String filter) { + public static int searchInWords (String text, final String filter) { if (filter.isEmpty()) return 1; int wordsFound = 0; text = text.toLowerCase(); - String[] words = filter.toLowerCase().split(" "); + final String[] words = filter.toLowerCase().split(" "); - for (String word : words) { + for (final String word : words) { if (!text.contains(word)) return 0; wordsFound += StringUtils.countMatches(text, word); } @@ -40,15 +40,15 @@ public class LevenshteinUtilities { return wordsFound; } - public static int levenshteinDistance (String from, String to, int insCost, int subCost, int delCost) { - int textLength = from.length(); - int filterLength = to.length(); + public static int levenshteinDistance (final String from, final String to, final int insCost, final int subCost, final int delCost) { + final int textLength = from.length(); + final int filterLength = to.length(); if (textLength == 0) return filterLength * insCost; if (filterLength == 0) return textLength * delCost; // Populate matrix - int[][] d = new int[textLength + 1][filterLength + 1]; + final int[][] d = new int[textLength + 1][filterLength + 1]; for (int i = 0; i <= textLength; i++) { d[i][0] = i * delCost; @@ -61,9 +61,9 @@ public class LevenshteinUtilities { // Find best route for (int i = 1; i <= textLength; i++) { for (int j = 1; j <= filterLength; j++) { - int sCost = d[i - 1][j - 1] + (from.charAt(i - 1) == to.charAt(j - 1) ? 0 : subCost); - int dCost = d[i - 1][j] + delCost; - int iCost = d[i][j - 1] + insCost; + final int sCost = d[i - 1][j - 1] + (from.charAt(i - 1) == to.charAt(j - 1) ? 0 : subCost); + final int dCost = d[i - 1][j] + delCost; + final int iCost = d[i][j - 1] + insCost; d[i][j] = Math.min(Math.min(dCost, iCost), sCost); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java index 7f553760..bdcb6f67 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java @@ -12,10 +12,10 @@ import java.time.format.DateTimeFormatter; public class LoggerUtilities { private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm:ss"); - private static Component getPrefix (Bot bot, Component prefix, Component message) { + private static Component getPrefix (final Bot bot, final Component prefix, final Component message) { final LocalDateTime dateTime = LocalDateTime.now(); - Component component; + final Component component; if (bot != null) { component = Component.translatable( "[%s %s] [%s] [%s] %s", @@ -38,19 +38,19 @@ public class LoggerUtilities { return component; } - public static void log (String message) { log(LogType.INFO, null, Component.text(message), true, true); } + public static void log (final String message) { log(LogType.INFO, null, Component.text(message), true, true); } - public static void log (Component message) { log(LogType.INFO, null, message, true, true); } + public static void log (final Component message) { log(LogType.INFO, null, message, true, true); } - public static void log (LogType type, String message) { log(type, null, Component.text(message), true, true); } + public static void log (final LogType type, final String message) { log(type, null, Component.text(message), true, true); } - public static void log (LogType type, Component message) { log(type, null, message, true, true); } + public static void log (final LogType type, final Component message) { log(type, null, message, true, true); } - public static void log (Bot bot, Component message) { log(LogType.INFO, bot, message, true, true); } + public static void log (final Bot bot, final Component message) { log(LogType.INFO, bot, message, true, true); } - public static void log (Bot bot, String message) { log(LogType.INFO, bot, Component.text(message), true, true); } + public static void log (final Bot bot, final String message) { log(LogType.INFO, bot, Component.text(message), true, true); } - public static void log (LogType type, Bot bot, Component message, boolean logToFile, boolean logToConsole) { + public static void log (final LogType type, final Bot bot, final Component message, final boolean logToFile, final boolean logToConsole) { final Component component = getPrefix(bot, type.component, message); if (logToConsole) print(ComponentUtilities.stringifyAnsi(component)); @@ -67,13 +67,13 @@ public class LoggerUtilities { } } - public static void error (String message) { log(LogType.ERROR, message); } + public static void error (final String message) { log(LogType.ERROR, message); } - public static void error (Component message) { log(LogType.ERROR, message); } + public static void error (final Component message) { log(LogType.ERROR, message); } - public static void error (Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); } + public static void error (final Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); } - private static void print (String message) { + private static void print (final String message) { if (Main.console == null) System.out.println(message); else Main.console.reader.printAbove(message); } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/MathUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/MathUtilities.java index 19124b72..d03d6307 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/MathUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/MathUtilities.java @@ -1,21 +1,21 @@ package me.chayapak1.chomens_bot.util; public class MathUtilities { - public static int between (int min, int max) { + public static int between (final int min, final int max) { return (int) Math.floor( Math.random() * (max - min) + min ); } - public static int clamp (int value, int min, int max) { + public static int clamp (final int value, final int min, final int max) { return Math.max(Math.min(value, max), min); } - public static float clamp (float value, float min, float max) { + public static float clamp (final float value, final float min, final float max) { return Math.max(Math.min(value, max), min); } - public static double clamp (double value, double min, double max) { + public static double clamp (final double value, final double min, final double max) { return Math.max(Math.min(value, max), min); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/PathUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/PathUtilities.java index c61a8b5e..5c1d3303 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/PathUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/PathUtilities.java @@ -4,12 +4,12 @@ import java.nio.file.Path; import java.util.List; public class PathUtilities { - public static void sort (List paths) { + public static void sort (final List paths) { paths.sort((p1, p2) -> { final String s1 = p1.getFileName().toString(); final String s2 = p2.getFileName().toString(); - int result = s1.compareToIgnoreCase(s2); + final int result = s1.compareToIgnoreCase(s2); if (result == 0) { return s2.compareTo(s1); } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/RandomStringUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/RandomStringUtilities.java index 38c20c8c..44ef6c80 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/RandomStringUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/RandomStringUtilities.java @@ -26,7 +26,7 @@ public class RandomStringUtilities { private static final SecureRandom random = new SecureRandom(); - public static String generate (int length) { + public static String generate (final int length) { buf = new char[length]; return nextString(); diff --git a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java index 3800e139..d1cd06a1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java @@ -1,7 +1,5 @@ package me.chayapak1.chomens_bot.util; -import io.netty.buffer.ByteBufUtil; - import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; @@ -12,7 +10,7 @@ import java.util.Arrays; import java.util.Map; public class StringUtilities { - public static String removeNamespace (String command) { + public static String removeNamespace (final String command) { final StringBuilder removedCommand = new StringBuilder(command); final String[] splitSpace = command.split("\\s+"); // [minecraft:test, arg1, arg2, ...] @@ -31,26 +29,20 @@ public class StringUtilities { return removedCommand.toString(); } - public static String substringUtfLimit (String string, int limit) { - final int max = ByteBufUtil.utf8MaxBytes(limit); - final byte[] bytes = string.getBytes(StandardCharsets.UTF_8); - return new String(Arrays.copyOfRange(bytes, 0, max), StandardCharsets.UTF_8); - } - // https://stackoverflow.com/a/35148974/18518424 - public static String truncateToFitUtf8ByteLength (String s, int maxBytes) { + public static String truncateToFitUtf8ByteLength (final String s, final int maxBytes) { if (s == null) { return null; } - Charset charset = StandardCharsets.UTF_8; - CharsetDecoder decoder = charset.newDecoder(); - byte[] sba = s.getBytes(charset); + final Charset charset = StandardCharsets.UTF_8; + final CharsetDecoder decoder = charset.newDecoder(); + final byte[] sba = s.getBytes(charset); if (sba.length <= maxBytes) { return s; } // Ensure truncation by having byte buffer = maxBytes - ByteBuffer bb = ByteBuffer.wrap(sba, 0, maxBytes); - CharBuffer cb = CharBuffer.allocate(maxBytes); + final ByteBuffer bb = ByteBuffer.wrap(sba, 0, maxBytes); + final CharBuffer cb = CharBuffer.allocate(maxBytes); // Ignore an incomplete character decoder.onMalformedInput(CodingErrorAction.IGNORE); decoder.decode(bb, cb, true); @@ -59,7 +51,7 @@ public class StringUtilities { } // https://stackoverflow.com/a/25379180/18518424 - public static boolean containsIgnoreCase (String src, String what) { + public static boolean containsIgnoreCase (final String src, final String what) { final int length = what.length(); if (length == 0) return true; // Empty string is contained @@ -80,17 +72,17 @@ public class StringUtilities { return false; } - public static String addPlural (long amount, String unit) { + public static String addPlural (final long amount, final String unit) { return amount > 1 ? unit + "s" : unit; } - public static boolean isNotNullAndNotBlank (String text) { + public static boolean isNotNullAndNotBlank (final String text) { return text != null && !text.isBlank(); } - public static String replaceAllWithMap (String input, Map replacements) { + public static String replaceAllWithMap (final String input, final Map replacements) { String result = input; - for (Map.Entry entry : replacements.entrySet()) { + for (final Map.Entry entry : replacements.entrySet()) { result = result.replaceAll(entry.getKey(), entry.getValue()); } return result; diff --git a/src/main/java/me/chayapak1/chomens_bot/util/TimestampUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/TimestampUtilities.java index 3823e92b..d49480d5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/TimestampUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/TimestampUtilities.java @@ -7,7 +7,7 @@ public class TimestampUtilities { // totallynotskidded™ from SongPlayer (modified a bit) public static final Pattern TIMESTAMP_PATTERN = Pattern.compile("(?:(\\d+):)?(\\d+):(\\d+)"); - public static long parseTimestamp (String timestamp) { + public static long parseTimestamp (final String timestamp) { final Matcher matcher = TIMESTAMP_PATTERN.matcher(timestamp); if (!matcher.matches()) return -1; diff --git a/src/main/java/me/chayapak1/chomens_bot/util/UUIDUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/UUIDUtilities.java index 84bfcb30..9387003d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/UUIDUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/UUIDUtilities.java @@ -8,19 +8,19 @@ import java.util.UUID; // Author: _ChipMC_ for int array and selector stuff public class UUIDUtilities { - public static UUID getOfflineUUID (String username) { + public static UUID getOfflineUUID (final String username) { return UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes()); } - public static UUID tryParse (String input) { + public static UUID tryParse (final String input) { try { return UUID.fromString(input); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { return null; } } - public static int[] intArray (UUID uuid) { + public static int[] intArray (final UUID uuid) { final ByteBuffer buffer = ByteBuffer.wrap(new byte[16]); buffer.putLong(0, uuid.getMostSignificantBits()); buffer.putLong(8, uuid.getLeastSignificantBits()); @@ -31,7 +31,7 @@ public class UUIDUtilities { return intArray; } - public static NbtMap tag (UUID uuid) { + public static NbtMap tag (final UUID uuid) { final NbtMapBuilder builder = NbtMap.builder(); builder.putIntArray("", intArray(uuid)); @@ -39,8 +39,8 @@ public class UUIDUtilities { return builder.build(); } - public static String snbt (UUID uuid) { - int[] array = intArray(uuid); + public static String snbt (final UUID uuid) { + final int[] array = intArray(uuid); return String.format( "[I;%d,%d,%d,%d]", array[0], @@ -50,11 +50,11 @@ public class UUIDUtilities { ); } - public static String selector (UUID uuid) { return selector(uuid, true); } + public static String selector (final UUID uuid) { return selector(uuid, true); } - public static String selector (UUID uuid, boolean end) { return "@p[nbt={UUID:" + snbt(uuid) + "}" + (end ? "]" : ""); } + public static String selector (final UUID uuid, final boolean end) { return "@p[nbt={UUID:" + snbt(uuid) + "}" + (end ? "]" : ""); } - public static String exclusiveSelector (UUID uuid) { return exclusiveSelector(uuid, true); } + public static String exclusiveSelector (final UUID uuid) { return exclusiveSelector(uuid, true); } - public static String exclusiveSelector (UUID uuid, boolean end) { return "@a[nbt=!{UUID:" + snbt(uuid) + "}" + (end ? "]" : ""); } + public static String exclusiveSelector (final UUID uuid, final boolean end) { return "@a[nbt=!{UUID:" + snbt(uuid) + "}" + (end ? "]" : ""); } } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/ValueComparableMap.java b/src/main/java/me/chayapak1/chomens_bot/util/ValueComparableMap.java index f1ef52a8..2d5e0a11 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ValueComparableMap.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ValueComparableMap.java @@ -16,25 +16,25 @@ public class ValueComparableMap , V> extends TreeMap()); } - private ValueComparableMap (Ordering partialValueOrdering, HashMap valueMap) { + private ValueComparableMap (final Ordering partialValueOrdering, final HashMap valueMap) { super(partialValueOrdering.onResultOf(valueMap::get).compound(Comparator.naturalOrder())); this.valueMap = valueMap; } @Override - public V put (K k, V v) { + public V put (final K k, final V v) { if (valueMap.containsKey(k)) remove(k); valueMap.put(k, v); return super.put(k, v); } @Override - public boolean containsKey (Object key) { + public boolean containsKey (final Object key) { return valueMap.containsKey(key); } @Override - public V getOrDefault (Object key, V defaultValue) { + public V getOrDefault (final Object key, final V defaultValue) { return containsKey(key) ? get(key) : defaultValue; } } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/InitializationData.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/InitializationData.java index 27e72ab9..566dc0e3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/InitializationData.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/InitializationData.java @@ -16,7 +16,7 @@ public class InitializationData { public final boolean groupsEnabled; public final boolean allowRecording; - public InitializationData (SecretPacket secretPacket) { + public InitializationData (final SecretPacket secretPacket) { this.serverPort = secretPacket.serverPort; this.playerUUID = secretPacket.playerUUID; this.secret = secretPacket.secret; diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/NetworkMessage.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/NetworkMessage.java index f0325748..f83fd833 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/NetworkMessage.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/NetworkMessage.java @@ -26,12 +26,12 @@ public class NetworkMessage { public Packet> packet; public SocketAddress address; - public NetworkMessage (Packet packet) { + public NetworkMessage (final Packet packet) { this(System.currentTimeMillis()); this.packet = packet; } - private NetworkMessage (long timestamp) { + private NetworkMessage (final long timestamp) { this.timestamp = timestamp; } @@ -51,7 +51,7 @@ public class NetworkMessage { packetRegistry.put((byte) 0xA, ConnectionAckPacket.class); } - public static NetworkMessage readPacket (RawUdpPacket packet, InitializationData initializationData) throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException { + public static NetworkMessage readPacket (final RawUdpPacket packet, final InitializationData initializationData) throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException { if (packet == null) return null; final byte[] data = packet.data(); @@ -62,30 +62,30 @@ public class NetworkMessage { return readFromBytes(packet.socketAddress(), initializationData.secret, b.readByteArray(), System.currentTimeMillis()); } - private static NetworkMessage readFromBytes (SocketAddress socketAddress, UUID secret, byte[] encryptedPayload, long timestamp) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { - byte[] decrypt; + private static NetworkMessage readFromBytes (final SocketAddress socketAddress, final UUID secret, final byte[] encryptedPayload, final long timestamp) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { + final byte[] decrypt; try { decrypt = AESUtilities.decrypt(secret, encryptedPayload); - } catch (Exception e) { + } catch (final Exception e) { LoggerUtilities.error(e); return null; } - FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.wrappedBuffer(decrypt)); - byte packetType = buffer.readByte(); + final FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.wrappedBuffer(decrypt)); + final byte packetType = buffer.readByte(); final Class> packetClass = packetRegistry.get(packetType); if (packetClass == null) return null; - Packet p = packetClass.getDeclaredConstructor().newInstance(); + final Packet p = packetClass.getDeclaredConstructor().newInstance(); - NetworkMessage message = new NetworkMessage(timestamp); + final NetworkMessage message = new NetworkMessage(timestamp); message.address = socketAddress; message.packet = p.fromBytes(buffer); return message; } - private static byte getPacketType (Packet> packet) { - for (Map.Entry>> entry : packetRegistry.entrySet()) { + private static byte getPacketType (final Packet> packet) { + for (final Map.Entry>> entry : packetRegistry.entrySet()) { if (packet.getClass().equals(entry.getValue())) { return entry.getKey(); } @@ -93,22 +93,22 @@ public class NetworkMessage { return -1; } - public byte[] writeClient (InitializationData data) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { - byte[] payload = write(data.secret); - FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer(1 + 16 + payload.length)); + public byte[] writeClient (final InitializationData data) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { + final byte[] payload = write(data.secret); + final FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer(1 + 16 + payload.length)); buffer.writeByte(MAGIC_BYTE); buffer.writeUUID(data.playerUUID); buffer.writeByteArray(payload); - byte[] bytes = new byte[buffer.readableBytes()]; + final byte[] bytes = new byte[buffer.readableBytes()]; buffer.readBytes(bytes); return bytes; } - public byte[] write (UUID secret) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { - FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer()); + public byte[] write (final UUID secret) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { + final FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer()); - byte type = getPacketType(packet); + final byte type = getPacketType(packet); if (type < 0) { throw new IllegalArgumentException("Packet type not found"); } @@ -116,7 +116,7 @@ public class NetworkMessage { buffer.writeByte(type); packet.toBytes(buffer); - byte[] bytes = new byte[buffer.readableBytes()]; + final byte[] bytes = new byte[buffer.readableBytes()]; buffer.readBytes(bytes); return AESUtilities.encrypt(secret, bytes); } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/JoinGroupPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/JoinGroupPacket.java index 7f426604..ebd38bdd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/JoinGroupPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/JoinGroupPacket.java @@ -11,13 +11,13 @@ public class JoinGroupPacket implements Packet { public JoinGroupPacket () { } - public JoinGroupPacket (UUID group, String password) { + public JoinGroupPacket (final UUID group, final String password) { this.group = group; this.password = password; } @Override - public JoinGroupPacket fromBytes (FriendlyByteBuf buf) { + public JoinGroupPacket fromBytes (final FriendlyByteBuf buf) { group = buf.readUUID(); if (buf.readBoolean()) { password = buf.readUtf(512); @@ -26,7 +26,7 @@ public class JoinGroupPacket implements Packet { } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { buf.writeUUID(group); buf.writeBoolean(password != null); if (password != null) { diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/SecretPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/SecretPacket.java index 07aeca24..82e574fb 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/SecretPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/customPayload/SecretPacket.java @@ -19,7 +19,7 @@ public class SecretPacket implements Packet { public boolean allowRecording; @Override - public SecretPacket fromBytes (FriendlyByteBuf buf) { + public SecretPacket fromBytes (final FriendlyByteBuf buf) { secret = buf.readUUID(); serverPort = buf.readInt(); playerUUID = buf.readUUID(); @@ -34,7 +34,7 @@ public class SecretPacket implements Packet { } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { buf.writeUUID(secret); buf.writeInt(serverPort); buf.writeUUID(playerUUID); diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusDecoder.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusDecoder.java index ce3aefc5..b4a7156d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusDecoder.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusDecoder.java @@ -10,7 +10,7 @@ public class JavaOpusDecoder { protected final int frameSize; protected final int maxPayloadSize; - public JavaOpusDecoder (int sampleRate, int frameSize, int maxPayloadSize) { + public JavaOpusDecoder (final int sampleRate, final int frameSize, final int maxPayloadSize) { this.sampleRate = sampleRate; this.frameSize = frameSize; this.maxPayloadSize = maxPayloadSize; @@ -24,16 +24,16 @@ public class JavaOpusDecoder { } try { opusDecoder = new OpusDecoder(sampleRate, 1); - } catch (OpusException e) { + } catch (final OpusException e) { throw new IllegalStateException("Opus decoder error " + e.getMessage()); } } - public short[] decode (byte[] data) { + public short[] decode (final byte[] data) { if (isClosed()) { throw new IllegalStateException("Decoder is closed"); } - int result; + final int result; try { if (data == null || data.length == 0) { @@ -41,11 +41,11 @@ public class JavaOpusDecoder { } else { result = opusDecoder.decode(data, 0, data.length, buffer, 0, frameSize, false); } - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException("Failed to decode audio data: " + e.getMessage()); } - short[] audio = new short[result]; + final short[] audio = new short[result]; System.arraycopy(buffer, 0, audio, 0, result); return audio; } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder.java index 0767e6d7..0a529fd7 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder.java @@ -10,7 +10,7 @@ public class JavaOpusEncoder { public final int frameSize; public final de.maxhenkel.opus4j.OpusEncoder.Application application; - public JavaOpusEncoder (int sampleRate, int frameSize, int maxPayloadSize, de.maxhenkel.opus4j.OpusEncoder.Application application) { + public JavaOpusEncoder (final int sampleRate, final int frameSize, final int maxPayloadSize, final de.maxhenkel.opus4j.OpusEncoder.Application application) { this.sampleRate = sampleRate; this.frameSize = frameSize; this.application = application; @@ -24,20 +24,20 @@ public class JavaOpusEncoder { } try { opusEncoder = new OpusEncoder(sampleRate, 1, getApplication(application)); - } catch (Exception e) { + } catch (final Exception e) { throw new IllegalStateException("Failed to create Opus encoder", e); } } - public byte[] encode (short[] rawAudio) { + public byte[] encode (final short[] rawAudio) { if (isClosed()) { throw new IllegalStateException("Encoder is closed"); } - int result; + final int result; try { result = opusEncoder.encode(rawAudio, 0, frameSize, buffer, 0, buffer.length); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException("Failed to encode audio", e); } @@ -45,7 +45,7 @@ public class JavaOpusEncoder { throw new RuntimeException("Failed to encode audio data"); } - byte[] audio = new byte[result]; + final byte[] audio = new byte[result]; System.arraycopy(buffer, 0, audio, 0, result); return audio; } @@ -68,7 +68,7 @@ public class JavaOpusEncoder { opusEncoder = null; } - public static OpusApplication getApplication (de.maxhenkel.opus4j.OpusEncoder.Application application) { + public static OpusApplication getApplication (final de.maxhenkel.opus4j.OpusEncoder.Application application) { return switch (application) { case AUDIO -> OpusApplication.OPUS_APPLICATION_AUDIO; case LOW_DELAY -> OpusApplication.OPUS_APPLICATION_RESTRICTED_LOWDELAY; diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder2.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder2.java index 391fa792..214dc5cd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder2.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/JavaOpusEncoder2.java @@ -11,7 +11,7 @@ public class JavaOpusEncoder2 { public final int maxPayloadSize; public final OpusApplication application; - public JavaOpusEncoder2 (int sampleRate, int frameSize, int maxPayloadSize, OpusApplication application) { + public JavaOpusEncoder2 (final int sampleRate, final int frameSize, final int maxPayloadSize, final OpusApplication application) { this.sampleRate = sampleRate; this.frameSize = frameSize; this.maxPayloadSize = maxPayloadSize; @@ -26,20 +26,20 @@ public class JavaOpusEncoder2 { } try { opusEncoder = new OpusEncoder(sampleRate, 1, application); - } catch (Exception e) { + } catch (final Exception e) { throw new IllegalStateException("Opus encoder error " + e.getMessage()); } } - public byte[] encode (short[] rawAudio) { + public byte[] encode (final short[] rawAudio) { if (isClosed()) { throw new IllegalStateException("Encoder is closed"); } - int result; + final int result; try { result = opusEncoder.encode(rawAudio, 0, frameSize, buffer, 0, buffer.length); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException("Failed to encode audio data: " + e.getMessage()); } @@ -47,7 +47,7 @@ public class JavaOpusEncoder2 { throw new RuntimeException("Failed to encode audio data"); } - byte[] audio = new byte[result]; + final byte[] audio = new byte[result]; System.arraycopy(buffer, 0, audio, 0, result); return audio; } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/OpusManager.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/OpusManager.java index f4c7a658..ee841391 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/OpusManager.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/OpusManager.java @@ -6,17 +6,17 @@ public class OpusManager { public static final int SAMPLE_RATE = 48000; public static final int FRAME_SIZE = (SAMPLE_RATE / 1000) * 20; - public static JavaOpusEncoder2 createEncoder (int sampleRate, int frameSize, int maxPayloadSize, OpusApplication application) { + public static JavaOpusEncoder2 createEncoder (final int sampleRate, final int frameSize, final int maxPayloadSize, final OpusApplication application) { return new JavaOpusEncoder2(sampleRate, frameSize, maxPayloadSize, application); } public static JavaOpusEncoder2 createEncoder () { - OpusApplication application = OpusApplication.OPUS_APPLICATION_AUDIO; + final OpusApplication application = OpusApplication.OPUS_APPLICATION_AUDIO; return createEncoder(SAMPLE_RATE, FRAME_SIZE, 1024, application); } - public static JavaOpusDecoder createDecoder (int sampleRate, int frameSize, int maxPayloadSize) { + public static JavaOpusDecoder createDecoder (final int sampleRate, final int frameSize, final int maxPayloadSize) { return new JavaOpusDecoder(sampleRate, frameSize, maxPayloadSize); } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticateAckPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticateAckPacket.java index 3fdc12f2..f2a0a345 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticateAckPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticateAckPacket.java @@ -5,11 +5,11 @@ import me.chayapak1.chomens_bot.voiceChat.Packet; public class AuthenticateAckPacket implements Packet { @Override - public AuthenticateAckPacket fromBytes (FriendlyByteBuf buf) { + public AuthenticateAckPacket fromBytes (final FriendlyByteBuf buf) { return new AuthenticateAckPacket(); } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { } } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticatePacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticatePacket.java index d01fd4b0..2ed63873 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticatePacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/AuthenticatePacket.java @@ -12,23 +12,23 @@ public class AuthenticatePacket implements Packet { public AuthenticatePacket () { } public AuthenticatePacket ( - UUID playerUUID, - UUID secret + final UUID playerUUID, + final UUID secret ) { this.playerUUID = playerUUID; this.secret = secret; } @Override - public AuthenticatePacket fromBytes (FriendlyByteBuf buf) { - AuthenticatePacket packet = new AuthenticatePacket(); + public AuthenticatePacket fromBytes (final FriendlyByteBuf buf) { + final AuthenticatePacket packet = new AuthenticatePacket(); packet.playerUUID = buf.readUUID(); packet.secret = buf.readUUID(); return packet; } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { buf.writeUUID(playerUUID); buf.writeUUID(secret); } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionAckPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionAckPacket.java index 5ccd704f..2cf23934 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionAckPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionAckPacket.java @@ -5,11 +5,11 @@ import me.chayapak1.chomens_bot.voiceChat.Packet; public class ConnectionAckPacket implements Packet { @Override - public ConnectionAckPacket fromBytes (FriendlyByteBuf buf) { + public ConnectionAckPacket fromBytes (final FriendlyByteBuf buf) { return new ConnectionAckPacket(); } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { } } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionCheckPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionCheckPacket.java index 0072e274..7485b842 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionCheckPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/ConnectionCheckPacket.java @@ -5,11 +5,11 @@ import me.chayapak1.chomens_bot.voiceChat.Packet; public class ConnectionCheckPacket implements Packet { @Override - public ConnectionCheckPacket fromBytes (FriendlyByteBuf buf) { + public ConnectionCheckPacket fromBytes (final FriendlyByteBuf buf) { return new ConnectionCheckPacket(); } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { } } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/KeepAlivePacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/KeepAlivePacket.java index 393c0314..9a481293 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/KeepAlivePacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/KeepAlivePacket.java @@ -5,11 +5,11 @@ import me.chayapak1.chomens_bot.voiceChat.Packet; public class KeepAlivePacket implements Packet { @Override - public KeepAlivePacket fromBytes (FriendlyByteBuf buf) { + public KeepAlivePacket fromBytes (final FriendlyByteBuf buf) { return new KeepAlivePacket(); } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { } } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/MicPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/MicPacket.java index 414e2b89..ac9e3216 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/MicPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/MicPacket.java @@ -11,9 +11,9 @@ public class MicPacket implements Packet { public MicPacket () { } public MicPacket ( - byte[] data, - boolean whispering, - long sequenceNumber + final byte[] data, + final boolean whispering, + final long sequenceNumber ) { this.data = data; this.whispering = whispering; @@ -21,8 +21,8 @@ public class MicPacket implements Packet { } @Override - public MicPacket fromBytes (FriendlyByteBuf buf) { - MicPacket soundPacket = new MicPacket(); + public MicPacket fromBytes (final FriendlyByteBuf buf) { + final MicPacket soundPacket = new MicPacket(); soundPacket.data = buf.readByteArray(); soundPacket.sequenceNumber = buf.readLong(); soundPacket.whispering = buf.readBoolean(); @@ -30,7 +30,7 @@ public class MicPacket implements Packet { } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { buf.writeByteArray(data); buf.writeLong(sequenceNumber); buf.writeBoolean(whispering); diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/PingPacket.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/PingPacket.java index 18b1b0b2..e74dbb8c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/PingPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/packets/PingPacket.java @@ -10,7 +10,7 @@ public class PingPacket implements Packet { public long timestamp; @Override - public PingPacket fromBytes (FriendlyByteBuf buf) { + public PingPacket fromBytes (final FriendlyByteBuf buf) { final PingPacket pingPacket = new PingPacket(); pingPacket.id = buf.readUUID(); pingPacket.timestamp = buf.readLong(); @@ -18,7 +18,7 @@ public class PingPacket implements Packet { } @Override - public void toBytes (FriendlyByteBuf buf) { + public void toBytes (final FriendlyByteBuf buf) { buf.writeUUID(id); buf.writeLong(timestamp); }