From 90323d355299b760a28609cfc7f8b1aae79e107e Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Tue, 1 Apr 2025 09:58:31 +0700 Subject: [PATCH] refactor: `Reformat Code` with chome NS code style !!! too lazy to export it somewhere, if you need it feel free to ask me --- build-number.txt | 2 +- .../java/me/chayapak1/chomens_bot/Bot.java | 18 +- .../chayapak1/chomens_bot/Configuration.java | 6 +- .../java/me/chayapak1/chomens_bot/Main.java | 14 +- .../chatParsers/CreayunChatParser.java | 11 +- .../chatParsers/KaboomChatParser.java | 2 +- .../chatParsers/MinecraftChatParser.java | 7 +- .../chatParsers/U203aChatParser.java | 7 +- .../chomens_bot/chomeNSMod/Packet.java | 1 + .../ClientboundHandshakePacket.java | 4 +- .../ServerboundSuccessfulHandshakePacket.java | 6 +- .../chomens_bot/command/Command.java | 2 +- .../chomens_bot/command/CommandContext.java | 8 +- .../contexts/DiscordCommandContext.java | 2 +- .../command/contexts/IRCCommandContext.java | 8 +- .../contexts/PlayerCommandContext.java | 2 +- .../commands/BotVisibilityCommand.java | 2 +- .../chomens_bot/commands/BruhifyCommand.java | 2 +- .../commands/ClearChatCommand.java | 2 +- .../commands/ClearChatQueueCommand.java | 2 +- .../chomens_bot/commands/CloopCommand.java | 2 +- .../commands/CommandBlockCommand.java | 8 +- .../chomens_bot/commands/ConsoleCommand.java | 4 +- .../chomens_bot/commands/CowsayCommand.java | 2 +- .../chomens_bot/commands/EchoCommand.java | 2 +- .../chomens_bot/commands/EndCommand.java | 2 +- .../chomens_bot/commands/EvalCommand.java | 2 +- .../chomens_bot/commands/FilterCommand.java | 2 +- .../chomens_bot/commands/FindAltsCommand.java | 7 +- .../chomens_bot/commands/GrepLogCommand.java | 4 +- .../chomens_bot/commands/HelpCommand.java | 24 +- .../chomens_bot/commands/IPFilterCommand.java | 4 +- .../chomens_bot/commands/InfoCommand.java | 8 +- .../chomens_bot/commands/KickCommand.java | 4 +- .../chomens_bot/commands/ListCommand.java | 46 +- .../chomens_bot/commands/MailCommand.java | 5 +- .../chomens_bot/commands/MusicCommand.java | 43 +- .../commands/NetMessageCommand.java | 2 +- .../commands/RandomTeleportCommand.java | 2 +- .../commands/RefillCoreCommand.java | 2 +- .../chomens_bot/commands/RestartCommand.java | 4 +- .../commands/ScreenshareCommand.java | 2 +- .../chomens_bot/commands/SeenCommand.java | 19 +- .../commands/ServerEvalCommand.java | 2 +- .../chomens_bot/commands/StopCommand.java | 2 +- .../chomens_bot/commands/TPSBarCommand.java | 2 +- .../chomens_bot/commands/TestCommand.java | 2 +- .../chomens_bot/commands/TimeCommand.java | 2 +- .../commands/TranslateCommand.java | 12 +- .../chomens_bot/commands/UUIDCommand.java | 2 +- .../chomens_bot/commands/UrbanCommand.java | 15 +- .../chomens_bot/commands/ValidateCommand.java | 13 +- .../chomens_bot/commands/WeatherCommand.java | 2 +- .../commands/WhitelistCommand.java | 2 +- .../chomens_bot/data/bossbar/BossBar.java | 4 +- .../chomens_bot/data/bossbar/BotBossBar.java | 19 +- .../chomens_bot/data/chat/PlayerMessage.java | 4 +- .../chomens_bot/data/chunk/ChunkPos.java | 2 +- .../chomens_bot/data/cloop/CommandLoop.java | 10 +- .../chomens_bot/data/entity/Rotation.java | 8 +- .../chomens_bot/data/eval/EvalFunction.java | 2 +- .../chomens_bot/data/eval/EvalOutput.java | 8 +- .../data/filter/FilteredPlayer.java | 2 +- .../chayapak1/chomens_bot/data/mail/Mail.java | 2 +- .../chomens_bot/data/player/PlayerEntry.java | 4 +- .../chayapak1/chomens_bot/data/team/Team.java | 4 +- .../data/voiceChat/ClientGroup.java | 4 +- .../data/voiceChat/RawUdpPacket.java | 2 +- .../evalFunctions/ChatFunction.java | 2 +- .../evalFunctions/CoreFunction.java | 2 +- .../evalFunctions/CorePlaceBlockFunction.java | 2 +- .../evalFunctions/GetBotInfoFunction.java | 4 +- .../GetLatestChatMessageFunction.java | 2 +- .../evalFunctions/GetPlayerListFunction.java | 9 +- .../plugins/BossbarManagerPlugin.java | 3 +- .../chomens_bot/plugins/BruhifyPlugin.java | 6 +- .../plugins/ChatCommandHandlerPlugin.java | 4 +- .../chomens_bot/plugins/ChatPlugin.java | 8 +- .../plugins/ChomeNSModIntegrationPlugin.java | 14 +- .../plugins/ClearChatNameAnnouncerPlugin.java | 2 +- .../plugins/CommandHandlerPlugin.java | 19 +- .../chomens_bot/plugins/CommandSpyPlugin.java | 4 +- .../plugins/CommandSuggestionPlugin.java | 2 +- .../chomens_bot/plugins/ConsolePlugin.java | 4 +- .../chomens_bot/plugins/CorePlugin.java | 9 +- .../chomens_bot/plugins/DiscordPlugin.java | 13 +- .../chomens_bot/plugins/EvalPlugin.java | 4 +- .../plugins/ExtrasMessengerPlugin.java | 8 +- .../plugins/FilterManagerPlugin.java | 21 +- .../plugins/FormatCheckerPlugin.java | 6 +- .../chomens_bot/plugins/GrepLogPlugin.java | 5 +- .../chomens_bot/plugins/HashingPlugin.java | 11 +- .../chomens_bot/plugins/IRCPlugin.java | 16 +- .../chomens_bot/plugins/LoggerPlugin.java | 6 +- .../chomens_bot/plugins/MailPlugin.java | 2 +- .../plugins/MusicPlayerPlugin.java | 73 ++-- .../plugins/PacketSnifferPlugin.java | 4 +- .../plugins/PlayerFilterPlugin.java | 2 +- .../plugins/PlayersDatabasePlugin.java | 3 +- .../chomens_bot/plugins/PlayersPlugin.java | 30 +- .../chomens_bot/plugins/PositionPlugin.java | 11 +- .../plugins/ScreensharePlugin.java | 64 +-- .../chomens_bot/plugins/SelfCarePlugin.java | 31 +- .../chomens_bot/plugins/TPSPlugin.java | 12 +- .../plugins/TabCompletePlugin.java | 2 +- .../chomens_bot/plugins/TeamJoinerPlugin.java | 2 +- .../chomens_bot/plugins/TeamPlugin.java | 9 +- .../chomens_bot/plugins/TickPlugin.java | 8 +- .../chomens_bot/plugins/VoiceChatPlugin.java | 37 +- .../chomens_bot/plugins/WorldPlugin.java | 6 +- .../chomens_bot/song/Instrument.java | 3 +- .../chomens_bot/song/MidiConverter.java | 381 +++++++++-------- .../chomens_bot/song/NBSConverter.java | 8 +- .../me/chayapak1/chomens_bot/song/Note.java | 2 +- .../me/chayapak1/chomens_bot/song/Song.java | 11 +- .../chomens_bot/song/SongLoaderThread.java | 6 +- .../chomens_bot/song/SongPlayerConverter.java | 34 +- .../chomens_bot/song/TextFileConverter.java | 4 +- .../chomens_bot/util/AESUtilities.java | 10 +- .../chayapak1/chomens_bot/util/Ascii85.java | 33 +- .../chomens_bot/util/ColorUtilities.java | 4 +- .../chomens_bot/util/ComponentUtilities.java | 17 +- .../chomens_bot/util/DownloadUtilities.java | 17 +- .../chomens_bot/util/FileLoggerUtilities.java | 16 +- .../chomens_bot/util/FriendlyByteBuf.java | 396 +++++++++--------- .../chomens_bot/util/HTMLUtilities.java | 2 +- .../chomens_bot/util/HttpUtilities.java | 4 +- .../util/IllegalCharactersUtilities.java | 2 +- .../util/LevenshteinUtilities.java | 14 +- .../chomens_bot/util/LoggerUtilities.java | 14 +- .../util/RandomStringUtilities.java | 2 +- .../chomens_bot/util/StringUtilities.java | 2 +- .../chomens_bot/util/UUIDUtilities.java | 4 +- .../chomens_bot/util/ValueComparableMap.java | 14 +- .../voiceChat/InitializationData.java | 2 +- .../chomens_bot/voiceChat/NetworkMessage.java | 18 +- .../chomens_bot/voiceChat/Packet.java | 2 +- .../customPayload/JoinGroupPacket.java | 6 +- .../voiceChat/customPayload/SecretPacket.java | 2 +- .../voiceChat/mic/JavaOpusDecoder.java | 10 +- .../voiceChat/mic/JavaOpusEncoder.java | 14 +- .../voiceChat/mic/JavaOpusEncoder2.java | 10 +- .../chomens_bot/voiceChat/mic/MicThread.java | 300 ++++++------- .../voiceChat/mic/OpusManager.java | 8 +- .../packets/AuthenticateAckPacket.java | 4 +- .../voiceChat/packets/AuthenticatePacket.java | 2 +- .../packets/ConnectionAckPacket.java | 4 +- .../packets/ConnectionCheckPacket.java | 4 +- .../voiceChat/packets/KeepAlivePacket.java | 4 +- .../voiceChat/packets/MicPacket.java | 6 +- .../voiceChat/packets/PingPacket.java | 4 +- 151 files changed, 1226 insertions(+), 1095 deletions(-) diff --git a/build-number.txt b/build-number.txt index 5f0766f4..0748c0f7 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2316 \ No newline at end of file +2317 \ 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 8403f5b5..14989c88 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -162,7 +162,7 @@ public class Bot extends SessionAdapter { this.teamJoiner = new TeamJoinerPlugin(this); this.chomeNSMod = new ChomeNSModIntegrationPlugin(this); this.auth = new AuthPlugin(this); -// this.screenshare = new ScreensharePlugin(this); + // this.screenshare = new ScreensharePlugin(this); this.formatChecker = new FormatCheckerPlugin(this); this.clearChatNameAnnouncer = new ClearChatNameAnnouncerPlugin(this); this.whitelist = new WhitelistPlugin(this); @@ -326,21 +326,21 @@ public class Bot extends SessionAdapter { } @Override - public void packetSending(PacketSendingEvent packetSendingEvent) { + public void packetSending (PacketSendingEvent packetSendingEvent) { for (SessionListener listener : listeners) { listener.packetSending(packetSendingEvent); } } @Override - public void packetSent(Session session, Packet packet) { + public void packetSent (Session session, Packet packet) { for (SessionListener listener : listeners) { listener.packetSent(session, packet); } } @Override - public void packetError(PacketErrorEvent packetErrorEvent) { + public void packetError (PacketErrorEvent packetErrorEvent) { for (SessionListener listener : listeners) { listener.packetError(packetErrorEvent); } @@ -348,14 +348,14 @@ public class Bot extends SessionAdapter { } @Override - public void disconnecting(DisconnectingEvent disconnectingEvent) { + public void disconnecting (DisconnectingEvent disconnectingEvent) { for (SessionListener listener : listeners) { listener.disconnecting(disconnectingEvent); } } @Override - public void disconnected(DisconnectedEvent disconnectedEvent) { + public void disconnected (DisconnectedEvent disconnectedEvent) { loggedIn = false; final Throwable cause = disconnectedEvent.getCause(); @@ -391,6 +391,7 @@ public class Bot extends SessionAdapter { } public String getServerString () { return getServerString(false); } + public String getServerString (boolean bypassHidden) { return options.hidden && !bypassHidden ? options.serverName : @@ -417,7 +418,8 @@ public class Bot extends SessionAdapter { } public static class Listener extends SessionAdapter { - public void connecting () {} - public void loadedPlugins (Bot bot) {} + public void connecting () { } + + public void loadedPlugins (Bot bot) { } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/Configuration.java b/src/main/java/me/chayapak1/chomens_bot/Configuration.java index 74c58e40..50ea350c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Configuration.java +++ b/src/main/java/me/chayapak1/chomens_bot/Configuration.java @@ -29,7 +29,7 @@ public class Configuration { public Eval eval = new Eval(); public ColorPalette colorPalette = new ColorPalette(); - + public String ownerName = "chayapak"; // mabe mabe public String consoleChatFormat = "{\"translate\":\"chat.type.text\",\"with\":[\"OWNER_NAME\",\"MESSAGE\"]}"; @@ -39,11 +39,11 @@ public class Configuration { public OwnerAuthentication ownerAuthentication = new OwnerAuthentication(); public boolean announceClearChatUsername = false; - + public List trusted = new ArrayList<>(); public SelfCare selfCare = new SelfCare(); - public BotOption[] bots = new BotOption[]{}; + public BotOption[] bots = new BotOption[] {}; public static class ImposterFormatChecker { public boolean enabled = false; diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java index 8079d657..4f93c18c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Main.java +++ b/src/main/java/me/chayapak1/chomens_bot/Main.java @@ -47,7 +47,7 @@ public class Main { public static DatabasePlugin database; private static DiscordPlugin discord; - public static void main(String[] args) throws IOException { + public static void main (String[] args) throws IOException { final Path configPath = Path.of("config.yml"); final Constructor constructor = new Constructor(Configuration.class, new LoaderOptions()); @@ -119,7 +119,7 @@ public class Main { } } - public static void initializeBots() { + public static void initializeBots () { alreadyStarted = true; try { @@ -154,7 +154,7 @@ public class Main { if (Files.exists(stopReasonFilePath)) { try { reason = new String(Files.readAllBytes(stopReasonFilePath)).trim(); - } catch (IOException ignored) {} + } catch (IOException ignored) { } } stop(0, reason, false); @@ -162,9 +162,13 @@ public class Main { // most of these are stolen from HBot public static void stop (int exitCode) { stop(exitCode, null, null, true); } + public static void stop (int exitCode, 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 (int exitCode, String reason, boolean callSystemExit) { stop(exitCode, reason, null, callSystemExit); } + public static void stop (int exitCode, String reason, String type, boolean callSystemExit) { if (stopping) return; @@ -212,7 +216,7 @@ public class Main { if (ircEnabled) bot.irc.quit(stoppingMessage); bot.stop(); - } catch (Exception ignored) {} + } catch (Exception ignored) { } botIndex++; } @@ -222,7 +226,7 @@ public class Main { try { if (!ArrayUtilities.isAllTrue(stoppedDiscord)) Thread.sleep(50); else break; - } catch (InterruptedException ignored) {} + } catch (InterruptedException ignored) { } } discord.jda.shutdown(); diff --git a/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java b/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java index 273e656b..181f8476 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/CreayunChatParser.java @@ -1,14 +1,14 @@ package me.chayapak1.chomens_bot.chatParsers; -import me.chayapak1.chomens_bot.util.UUIDUtilities; -import org.geysermc.mcprotocollib.auth.GameProfile; -import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.chat.ChatParser; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; +import me.chayapak1.chomens_bot.util.UUIDUtilities; import net.kyori.adventure.text.Component; +import org.geysermc.mcprotocollib.auth.GameProfile; +import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -38,7 +38,8 @@ public class CreayunChatParser implements ChatParser { final String contents = matcher.group(2); PlayerEntry sender = bot.players.getEntry(displayName); - if (sender == null) sender = new PlayerEntry(new GameProfile(UUIDUtilities.getOfflineUUID(displayName), displayName), GameMode.SURVIVAL, 0, Component.text(displayName), 0L, null, new byte[0], true); + if (sender == null) + sender = new PlayerEntry(new GameProfile(UUIDUtilities.getOfflineUUID(displayName), displayName), GameMode.SURVIVAL, 0, Component.text(displayName), 0L, null, new byte[0], true); return new PlayerMessage(sender, Component.text(displayName), Component.text(contents)); } 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 65c760ff..1eb509a6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/KaboomChatParser.java @@ -1,9 +1,9 @@ package me.chayapak1.chomens_bot.chatParsers; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.ChatParser; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; import net.kyori.adventure.text.Component; 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 29b7e805..90125439 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java @@ -2,20 +2,23 @@ package me.chayapak1.chomens_bot.chatParsers; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.chat.ChatParser; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.TranslationArgument; import net.kyori.adventure.text.event.HoverEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; public class MinecraftChatParser implements ChatParser { private final Bot bot; private static final List keys = new ArrayList<>(); + static { keys.add("chat.type.text"); keys.add("chat.type.announcement"); 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 60cb8a47..123ebad1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/U203aChatParser.java @@ -2,8 +2,8 @@ package me.chayapak1.chomens_bot.chatParsers; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.chat.ChatParser; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TranslatableComponent; @@ -17,7 +17,7 @@ import java.util.UUID; public class U203aChatParser implements ChatParser { private final Bot bot; - public U203aChatParser(Bot bot) { + public U203aChatParser (Bot bot) { this.bot = bot; } @@ -30,7 +30,8 @@ public class U203aChatParser implements ChatParser { // very similar to MinecraftChatParser public PlayerMessage parse (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; + if (args.size() < 3 || (!message.key().equals("[%s] %s › %s") && !message.key().equals("%s %s › %s"))) + return null; final Component senderComponent = args.get(1).asComponent(); final Component contents = args.get(2).asComponent(); diff --git a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Packet.java b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Packet.java index 9fceae72..e7013417 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Packet.java +++ b/src/main/java/me/chayapak1/chomens_bot/chomeNSMod/Packet.java @@ -4,5 +4,6 @@ import io.netty.buffer.ByteBuf; public interface Packet { int getId (); + void serialize (ByteBuf buf); } 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 b83fcfcf..2e4ac67e 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 @@ -4,10 +4,10 @@ import io.netty.buffer.ByteBuf; import me.chayapak1.chomens_bot.chomeNSMod.Packet; public class ClientboundHandshakePacket implements Packet { - public ClientboundHandshakePacket() { + public ClientboundHandshakePacket () { } - public ClientboundHandshakePacket(ByteBuf buf) { + public ClientboundHandshakePacket (ByteBuf buf) { } @Override 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 0f865d90..8d989b78 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 @@ -4,14 +4,14 @@ import io.netty.buffer.ByteBuf; import me.chayapak1.chomens_bot.chomeNSMod.Packet; public class ServerboundSuccessfulHandshakePacket implements Packet { - public ServerboundSuccessfulHandshakePacket() { + public ServerboundSuccessfulHandshakePacket () { } - public ServerboundSuccessfulHandshakePacket(ByteBuf buf) { + public ServerboundSuccessfulHandshakePacket (ByteBuf buf) { } @Override - public int getId() { + public int getId () { return 0; } 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 aef26630..dc1013ac 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/Command.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/Command.java @@ -31,7 +31,7 @@ public abstract class Command { public abstract Component execute (CommandContext context) throws Exception; @Override - public String toString() { + public String toString () { return "Command{" + "name='" + name + '\'' + ", 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 71e6f9ba..fd15dd1a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java +++ b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java @@ -38,14 +38,18 @@ public class CommandContext { } public Component displayName () { return Component.empty(); } - public void sendOutput (Component component) {} + + public void sendOutput (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 (boolean greedy, boolean required, 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 (boolean greedy, boolean returnLowerCase, boolean required, String type) throws CommandException { if (argsPosition >= args.length || args[argsPosition] == null) { if (required) { @@ -88,7 +92,7 @@ public class CommandContext { string.append(greedyString); } else if ( greedyString.length() > 1 && - (greedyString.startsWith("'") || greedyString.startsWith("\"")) + (greedyString.startsWith("'") || greedyString.startsWith("\"")) ) { // parses arguments with quotes 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 38b13dc5..96b2ad4b 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 (Bot bot, String prefix, MessageReceivedEvent event) { super( bot, prefix, 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 a4672248..df24bc97 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 @@ -1,13 +1,13 @@ package me.chayapak1.chomens_bot.command.contexts; -import me.chayapak1.chomens_bot.command.CommandContext; -import me.chayapak1.chomens_bot.util.UUIDUtilities; -import org.geysermc.mcprotocollib.auth.GameProfile; -import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; import me.chayapak1.chomens_bot.Bot; +import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; +import me.chayapak1.chomens_bot.util.UUIDUtilities; import net.kyori.adventure.text.Component; +import org.geysermc.mcprotocollib.auth.GameProfile; +import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode; public class IRCCommandContext extends CommandContext { private final Bot bot; 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 f9c9f0a1..bcfe3855 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 @@ -1,8 +1,8 @@ package me.chayapak1.chomens_bot.command.contexts; +import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.data.player.PlayerEntry; -import me.chayapak1.chomens_bot.Bot; import net.kyori.adventure.text.Component; public class PlayerCommandContext extends CommandContext { 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 30518f14..4bc28395 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java @@ -22,7 +22,7 @@ public class BotVisibilityCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 6e09bca7..815c739f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/BruhifyCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/BruhifyCommand.java @@ -20,7 +20,7 @@ public class BruhifyCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 37706d8c..6f22d662 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatCommand.java @@ -24,7 +24,7 @@ public class ClearChatCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 a8945be6..ed0b3182 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatQueueCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ClearChatQueueCommand.java @@ -20,7 +20,7 @@ public class ClearChatQueueCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 d97fd4c8..54fc05e3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java @@ -28,7 +28,7 @@ public class CloopCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getAction(); 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 b9493769..9513a54c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java @@ -39,7 +39,7 @@ public class CommandBlockCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; runCommand(bot, context, context.getString(true, true), null); @@ -68,8 +68,10 @@ public class CommandBlockCommand extends Command { String replacedCommand; - if (userFound) replacedCommand = new StringBuilder(command).replace(userMatcher.start(), userMatcher.end(), username).toString(); - else replacedCommand = new StringBuilder(command).replace(uuidMatcher.start(), uuidMatcher.end(), uuid).toString(); + if (userFound) + replacedCommand = new StringBuilder(command).replace(userMatcher.start(), userMatcher.end(), username).toString(); + else + replacedCommand = new StringBuilder(command).replace(uuidMatcher.start(), uuidMatcher.end(), uuid).toString(); replacedCommand = replacedCommand .replace("{username}", username) 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 278a873b..a0a26997 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ConsoleCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ConsoleCommand.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; public class ConsoleCommand extends Command { - public ConsoleCommand() { + public ConsoleCommand () { super( "console", "Controls stuff about console", @@ -29,7 +29,7 @@ public class ConsoleCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getString(false, true, true); 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 b7ed0692..7a2a23d5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CowsayCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CowsayCommand.java @@ -20,7 +20,7 @@ public class CowsayCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 582ddff9..11debd85 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EchoCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EchoCommand.java @@ -20,7 +20,7 @@ public class EchoCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 2f78d24f..45db3e8a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EndCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EndCommand.java @@ -20,7 +20,7 @@ public class EndCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 8ec7a260..53ed835d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java @@ -25,7 +25,7 @@ public class EvalCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 5c8bfcab..0a1faf0c 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 (CommandContext context) throws CommandException { final Bot bot = context.bot; boolean ignoreCase = false; 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 6d40ac5c..1b0dff1d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java @@ -16,7 +16,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; public class FindAltsCommand extends Command { - public FindAltsCommand() { + public FindAltsCommand () { super( "findalts", "Finds players with the same IP address", @@ -28,10 +28,11 @@ public class FindAltsCommand extends Command { } @Override - public Component execute(CommandContext context) throws Exception { + public Component execute (CommandContext context) throws Exception { final Bot bot = context.bot; - if (bot.database == null) throw new CommandException(Component.text("Database is not enabled in the bot's config")); + if (bot.database == null) + throw new CommandException(Component.text("Database is not enabled in the bot's config")); bot.database.checkOverloaded(); 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 e25d207a..a0d8acb2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/GrepLogCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/GrepLogCommand.java @@ -12,7 +12,7 @@ import net.kyori.adventure.text.format.NamedTextColor; public class GrepLogCommand extends Command { private Thread thread; - public GrepLogCommand() { + public GrepLogCommand () { super( "greplog", "Queries the bot's logs", @@ -24,7 +24,7 @@ public class GrepLogCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; if (bot.discord == null || bot.discord.jda == null) { 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 b2f1a682..fcb11f9b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/HelpCommand.java @@ -1,7 +1,10 @@ package me.chayapak1.chomens_bot.commands; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.Command; +import me.chayapak1.chomens_bot.command.CommandContext; +import me.chayapak1.chomens_bot.command.CommandException; +import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.plugins.CommandHandlerPlugin; import me.chayapak1.chomens_bot.util.ColorUtilities; @@ -56,14 +59,14 @@ public class HelpCommand extends Command { ); return Component.empty() - .append(Component.text("Commands ").color(NamedTextColor.GRAY)) - .append(Component.text("(").color(NamedTextColor.DARK_GRAY)) - .append(Component.text(list.size()).color(NamedTextColor.GREEN)) - .append(Component.text(") ").color(NamedTextColor.DARK_GRAY)) - .append(Component.text("(").color(NamedTextColor.DARK_GRAY)) - .append(Component.translatable("%s", trustLevels)) - .append(Component.text(") - ").color(NamedTextColor.DARK_GRAY)) - .append(Component.join(JoinConfiguration.separator(Component.space()), list)); + .append(Component.text("Commands ").color(NamedTextColor.GRAY)) + .append(Component.text("(").color(NamedTextColor.DARK_GRAY)) + .append(Component.text(list.size()).color(NamedTextColor.GREEN)) + .append(Component.text(") ").color(NamedTextColor.DARK_GRAY)) + .append(Component.text("(").color(NamedTextColor.DARK_GRAY)) + .append(Component.translatable("%s", trustLevels)) + .append(Component.text(") - ").color(NamedTextColor.DARK_GRAY)) + .append(Component.join(JoinConfiguration.separator(Component.space()), list)); } public List getCommandListByTrustLevel (CommandContext context, TrustLevel trustLevel) throws CommandException { @@ -72,7 +75,8 @@ public class HelpCommand extends Command { List commandNames = new ArrayList<>(); for (Command command : CommandHandlerPlugin.commands) { - if (command.trustLevel != trustLevel || (command.consoleOnly && !(context instanceof ConsoleCommandContext))) continue; + if (command.trustLevel != trustLevel || (command.consoleOnly && !(context instanceof ConsoleCommandContext))) + continue; commandNames.add(command.name); } 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 49970a24..94d55642 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; public class IPFilterCommand extends Command { - public IPFilterCommand() { + public IPFilterCommand () { super( "ipfilter", "Filters IPs", @@ -35,7 +35,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 (CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getAction(); 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 f37b78af..383822a6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java @@ -42,7 +42,7 @@ public class InfoCommand extends Command { static { try (final InputStream input = ClassLoader.getSystemClassLoader().getResourceAsStream("application.properties")) { BUILD_INFO.load(input); - } catch (IOException ignored) {} + } catch (IOException ignored) { } } public InfoCommand () { @@ -65,7 +65,7 @@ public class InfoCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { context.checkOverloadArgs(1); final Bot bot = context.bot; @@ -121,7 +121,7 @@ public class InfoCommand extends Command { channel.close(); file.close(); - } catch (IOException ignored) {} + } catch (IOException ignored) { } final TextColor color = ColorUtilities.getColorByString(bot.config.colorPalette.string); @@ -137,7 +137,7 @@ public class InfoCommand extends Command { try { localHost = InetAddress.getLocalHost(); - } catch (UnknownHostException ignored) {} + } catch (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 4b9e2539..02dfae73 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/KickCommand.java @@ -5,8 +5,8 @@ import me.chayapak1.chomens_bot.command.Command; import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.exploitMethods.Kick; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; @@ -30,7 +30,7 @@ public class KickCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 7d8b77c2..a365b205 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java @@ -29,7 +29,7 @@ public class ListCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { context.checkOverloadArgs(0); final Bot bot = context.bot; @@ -111,29 +111,29 @@ public class ListCommand extends Command { playersComponent.add( Component.translatable( - "%s", - entry.displayName == null ? - Component.text(entry.profile.getName()) : - entry.displayName, - Component - .text(entry.profile.getIdAsString()) - .hoverEvent( - HoverEvent.showText( - Component.text("Click here to copy the UUID to your clipboard").color(NamedTextColor.GREEN) + "%s", + entry.displayName == null ? + Component.text(entry.profile.getName()) : + entry.displayName, + Component + .text(entry.profile.getIdAsString()) + .hoverEvent( + HoverEvent.showText( + Component.text("Click here to copy the UUID to your clipboard").color(NamedTextColor.GREEN) + ) ) - ) - .clickEvent( - ClickEvent.copyToClipboard(entry.profile.getIdAsString()) - ) - .color(ColorUtilities.getColorByString(bot.config.colorPalette.uuid)) - ) - .hoverEvent( - HoverEvent.showText(hoverEvent) - ) - .clickEvent( - ClickEvent.copyToClipboard(entry.profile.getName()) - ) - .insertion(entry.profile.getIdAsString()) + .clickEvent( + ClickEvent.copyToClipboard(entry.profile.getIdAsString()) + ) + .color(ColorUtilities.getColorByString(bot.config.colorPalette.uuid)) + ) + .hoverEvent( + HoverEvent.showText(hoverEvent) + ) + .clickEvent( + ClickEvent.copyToClipboard(entry.profile.getName()) + ) + .insertion(entry.profile.getIdAsString()) ); } 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 7b205e04..1b591805 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java @@ -35,10 +35,11 @@ public class MailCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; - if (bot.database == null) throw new CommandException(Component.text("Database is not enabled in the bot's config")); + if (bot.database == null) + throw new CommandException(Component.text("Database is not enabled in the bot's config")); bot.database.checkOverloaded(); 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 2c5d0854..50c3fb73 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java @@ -1,7 +1,10 @@ package me.chayapak1.chomens_bot.commands; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.Command; +import me.chayapak1.chomens_bot.command.CommandContext; +import me.chayapak1.chomens_bot.command.CommandException; +import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.plugins.MusicPlayerPlugin; import me.chayapak1.chomens_bot.song.Instrument; @@ -62,8 +65,9 @@ public class MusicCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { - if (context.bot.music.locked && !(context instanceof ConsoleCommandContext)) throw new CommandException(Component.text("Managing music is currently locked")); + public Component execute (CommandContext context) throws CommandException { + if (context.bot.music.locked && !(context instanceof ConsoleCommandContext)) + throw new CommandException(Component.text("Managing music is currently locked")); final String action = context.getAction(); @@ -236,9 +240,9 @@ public class MusicCommand extends Command { switch (loop) { case OFF -> { return Component.empty() - .append(Component.text("Looping is now ")) - .append(Component.text("disabled").color(NamedTextColor.RED)) - .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)); + .append(Component.text("Looping is now ")) + .append(Component.text("disabled").color(NamedTextColor.RED)) + .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)); } case CURRENT -> { if (bot.music.currentSong != null) { @@ -342,9 +346,9 @@ public class MusicCommand extends Command { context.sendOutput( Component.empty() - .append(Component.text("Skipping ")) - .append(Component.text(music.currentSong.name).color(ColorUtilities.getColorByString(bot.config.colorPalette.secondary))) - .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)) + .append(Component.text("Skipping ")) + .append(Component.text(music.currentSong.name).color(ColorUtilities.getColorByString(bot.config.colorPalette.secondary))) + .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)) ); music.skip(); @@ -395,7 +399,8 @@ public class MusicCommand extends Command { if (currentSong == null) throw new CommandException(Component.text("No song is currently playing")); - if (timestamp < 0 || timestamp > currentSong.length) throw new CommandException(Component.text("Invalid timestamp")); + if (timestamp < 0 || timestamp > currentSong.length) + throw new CommandException(Component.text("Invalid timestamp")); currentSong.setTime(timestamp); @@ -508,13 +513,19 @@ public class MusicCommand extends Command { final TextColor keyColor = ColorUtilities.getColorByString(bot.config.colorPalette.secondary); final TextColor valueColor = ColorUtilities.getColorByString(bot.config.colorPalette.string); - if (isNotNullAndNotBlank(currentSong.name)) components.add(Component.translatable("Title/Filename: %s", Component.text(currentSong.name).color(valueColor)).color(keyColor)); - if (isNotNullAndNotBlank(currentSong.requester)) components.add(Component.translatable("Requester: %s", Component.text(currentSong.requester).color(valueColor)).color(keyColor)); - if (isNotNullAndNotBlank(currentSong.songAuthor)) components.add(Component.translatable("Author: %s", Component.text(currentSong.songAuthor).color(valueColor)).color(keyColor)); - if (isNotNullAndNotBlank(currentSong.songOriginalAuthor)) components.add(Component.translatable("Original author: %s", Component.text(currentSong.songOriginalAuthor).color(valueColor)).color(keyColor)); - if (isNotNullAndNotBlank(currentSong.tracks)) components.add(Component.translatable("Tracks: %s", Component.text(currentSong.tracks).color(valueColor)).color(keyColor)); + if (isNotNullAndNotBlank(currentSong.name)) + components.add(Component.translatable("Title/Filename: %s", Component.text(currentSong.name).color(valueColor)).color(keyColor)); + if (isNotNullAndNotBlank(currentSong.requester)) + components.add(Component.translatable("Requester: %s", Component.text(currentSong.requester).color(valueColor)).color(keyColor)); + if (isNotNullAndNotBlank(currentSong.songAuthor)) + components.add(Component.translatable("Author: %s", Component.text(currentSong.songAuthor).color(valueColor)).color(keyColor)); + if (isNotNullAndNotBlank(currentSong.songOriginalAuthor)) + components.add(Component.translatable("Original author: %s", Component.text(currentSong.songOriginalAuthor).color(valueColor)).color(keyColor)); + if (isNotNullAndNotBlank(currentSong.tracks)) + components.add(Component.translatable("Tracks: %s", Component.text(currentSong.tracks).color(valueColor)).color(keyColor)); components.add(Component.translatable("Notes: %s", Component.text(currentSong.size()).color(valueColor)).color(keyColor)); - if (isNotNullAndNotBlank(currentSong.songDescription)) components.add(Component.translatable("Description: %s", Component.text(currentSong.songDescription).color(valueColor)).color(keyColor)); + if (isNotNullAndNotBlank(currentSong.songDescription)) + components.add(Component.translatable("Description: %s", Component.text(currentSong.songDescription).color(valueColor)).color(keyColor)); return Component.join(JoinConfiguration.newlines(), components); } 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 357a8e3c..8b4ba7eb 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java @@ -27,7 +27,7 @@ public class NetMessageCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final List bots = bot.bots; 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 32b7a2d7..8f6c7c49 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RandomTeleportCommand.java @@ -24,7 +24,7 @@ public class RandomTeleportCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 dfac7bd9..9c223af4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RefillCoreCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RefillCoreCommand.java @@ -20,7 +20,7 @@ public class RefillCoreCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 67aaec6a..db8a444c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/RestartCommand.java @@ -10,7 +10,7 @@ import me.chayapak1.chomens_bot.util.ColorUtilities; import net.kyori.adventure.text.Component; public class RestartCommand extends Command { - public RestartCommand() { + public RestartCommand () { super( "restart", "Gracefully restarts the bot", @@ -22,7 +22,7 @@ public class RestartCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 06c7537f..3a6422ec 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ScreenshareCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ScreenshareCommand.java @@ -27,7 +27,7 @@ public class ScreenshareCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getString(false, true, true); 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 5084827b..e6d8fb54 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/SeenCommand.java @@ -33,10 +33,11 @@ public class SeenCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; - if (bot.database == null) throw new CommandException(Component.text("Database is not enabled in the bot's config")); + if (bot.database == null) + throw new CommandException(Component.text("Database is not enabled in the bot's config")); bot.database.checkOverloaded(); @@ -52,10 +53,10 @@ public class SeenCommand extends Command { onlineComponents.add( Component.empty() - .append(Component.text(player)) - .append(Component.text(" is currently online on ")) - .append(Component.text(eachBot.getServerString())) - .color(NamedTextColor.RED) + .append(Component.text(player)) + .append(Component.text(" is currently online on ")) + .append(Component.text(eachBot.getServerString())) + .color(NamedTextColor.RED) ); } } @@ -72,11 +73,13 @@ public class SeenCommand extends Command { final ObjectNode lastSeen = (ObjectNode) playerElement.get("lastSeen"); - if (lastSeen == null || lastSeen.isNull()) throw new CommandException(Component.text("This player doesn't seem to have the last seen entry in the database for some reason.")); + if (lastSeen == null || lastSeen.isNull()) + throw new CommandException(Component.text("This player doesn't seem to have the last seen entry in the database for some reason.")); final JsonNode time = lastSeen.get("time"); - if (time == null || time.isNull()) throw new CommandException(Component.text("This player doesn't seem to have the `lastSeen.time` entry in the database for some reason.")); + if (time == null || time.isNull()) + throw new CommandException(Component.text("This player doesn't seem to have the `lastSeen.time` entry in the database for some reason.")); final Instant instant = Instant.ofEpochMilli(time.asLong()); final ZoneId zoneId = ZoneId.of("UTC"); // should i be doing this? 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 3bb67f70..7479cf96 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ServerEvalCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ServerEvalCommand.java @@ -29,7 +29,7 @@ public class ServerEvalCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String code = context.getString(true, true); 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 603d715c..c350eca6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/StopCommand.java @@ -22,7 +22,7 @@ public class StopCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 6a90a1a1..bc0366a2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TPSBarCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TPSBarCommand.java @@ -22,7 +22,7 @@ public class TPSBarCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 c5c95428..56f8b5ef 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TestCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TestCommand.java @@ -20,7 +20,7 @@ public class TestCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (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 8bfd391c..569b2e26 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TimeCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TimeCommand.java @@ -27,7 +27,7 @@ public class TimeCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { try { final Bot bot = context.bot; 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 277dd360..3d791a79 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/TranslateCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/TranslateCommand.java @@ -31,7 +31,7 @@ public class TranslateCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String from = context.getString(false, true); @@ -69,11 +69,11 @@ public class TranslateCommand extends Command { context.sendOutput( Component - .translatable( - "Result: %s", - Component.text(output).color(NamedTextColor.GREEN) - ) - .color(ColorUtilities.getColorByString(bot.config.colorPalette.secondary)) + .translatable( + "Result: %s", + Component.text(output).color(NamedTextColor.GREEN) + ) + .color(ColorUtilities.getColorByString(bot.config.colorPalette.secondary)) ); } catch (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 3d0f306b..fd5ec04b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/UUIDCommand.java @@ -26,7 +26,7 @@ public class UUIDCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String player = context.getString(true, false); 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 1694c749..d9182c59 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/UrbanCommand.java @@ -6,7 +6,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Main; -import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.Command; +import me.chayapak1.chomens_bot.command.CommandContext; +import me.chayapak1.chomens_bot.command.CommandException; +import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; import me.chayapak1.chomens_bot.util.ColorUtilities; import me.chayapak1.chomens_bot.util.HttpUtilities; @@ -152,11 +155,11 @@ public class UrbanCommand extends Command { if (discord) { discordComponent = discordComponent .append( - Component.translatable( - "%s - %s", - Component.text(word).color(NamedTextColor.GRAY), - definitionComponent - ).color(NamedTextColor.DARK_GRAY) + Component.translatable( + "%s - %s", + Component.text(word).color(NamedTextColor.GRAY), + definitionComponent + ).color(NamedTextColor.DARK_GRAY) ) .append(Component.newline()); 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 36728505..7d700b82 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ValidateCommand.java @@ -1,6 +1,9 @@ package me.chayapak1.chomens_bot.commands; -import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.Command; +import me.chayapak1.chomens_bot.command.CommandContext; +import me.chayapak1.chomens_bot.command.CommandException; +import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; import net.kyori.adventure.text.Component; @@ -19,7 +22,7 @@ public class ValidateCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { // Trusted - 1 // Admin - 2 // ....... @@ -35,8 +38,8 @@ public class ValidateCommand extends Command { .text("You are the console! You have no trust level") .color(NamedTextColor.GREEN); else return Component - .translatable("Valid hash (%s)") - .arguments(trustLevelComponent) - .color(NamedTextColor.GREEN); + .translatable("Valid hash (%s)") + .arguments(trustLevelComponent) + .color(NamedTextColor.GREEN); } } 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 0690cbeb..c71ce762 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/WeatherCommand.java @@ -40,7 +40,7 @@ public class WeatherCommand extends Command { final URL url = new URI( "https://api.weatherapi.com/v1/current.json?key=" + bot.config.weatherApiKey + "&q=" + URLEncoder.encode( - location, + location, StandardCharsets.UTF_8 ) ).toURL(); 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 147eadf5..24a40a1b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java @@ -26,7 +26,7 @@ public class WhitelistCommand extends Command { } @Override - public Component execute(CommandContext context) throws CommandException { + public Component execute (CommandContext context) throws CommandException { final Bot bot = context.bot; final String action = context.getAction(); 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 72376ff2..823c0189 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 @@ -1,8 +1,8 @@ package me.chayapak1.chomens_bot.data.bossbar; +import net.kyori.adventure.text.Component; import org.geysermc.mcprotocollib.protocol.data.game.BossBarColor; import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision; -import net.kyori.adventure.text.Component; import java.util.UUID; @@ -29,7 +29,7 @@ public class BossBar { } @Override - public String toString() { + public String toString () { return "BossBar{" + "uuid=" + uuid + ", 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 48f4713c..e8ef1708 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,7 +30,7 @@ public class BotBossBar extends BossBar { private long max; private int value; - public BotBossBar( + public BotBossBar ( Component title, String players, BossBarColor color, @@ -47,13 +47,14 @@ public class BotBossBar extends BossBar { this.bot = bot; } - public Component title() { + public Component title () { return title; } public void setTitle (Component title) { setTitle(title, false); } + public void setTitle (Component title, boolean force) { if (!gotSecret) return; @@ -71,16 +72,18 @@ public class BotBossBar extends BossBar { bot.core.run("minecraft:bossbar set " + id + " name " + serialized); - if (!bot.core.hasRateLimit()) 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("'", "\\'") + "'"); + if (!bot.core.hasRateLimit()) + 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 (BossBarColor color) { return color; } public void setColor (BossBarColor color) { setColor(color, false); } + public void setColor (BossBarColor color, boolean force) { if (!gotSecret) return; @@ -98,6 +101,7 @@ public class BotBossBar extends BossBar { } public void setPlayers (String players) { setPlayers(players, false); } + public void setPlayers (String players, boolean force) { if (!gotSecret) return; @@ -111,9 +115,11 @@ public class BotBossBar extends BossBar { } public BossBarDivision division () { return division; } + public void setDivision (BossBarDivision division) { setDivision(division, false); } + public void setDivision (BossBarDivision _division, boolean force) { if (!gotSecret) return; @@ -137,9 +143,11 @@ public class BotBossBar extends BossBar { } public int value () { return value; } + public void setValue (int value) { setValue(value, false); } + public void setValue (int value, boolean force) { if (!gotSecret) return; @@ -153,6 +161,7 @@ public class BotBossBar extends BossBar { } public boolean visible () { return visible; } + public void setVisible (boolean visible) { if (!gotSecret) return; @@ -166,9 +175,11 @@ public class BotBossBar extends BossBar { } public long max () { return max; } + public void setMax (long max) { setMax(max, false); } + public void setMax (long max, boolean force) { if (!gotSecret) return; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java b/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java index 8c65fff8..cf72bf59 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/chat/PlayerMessage.java @@ -3,9 +3,9 @@ package me.chayapak1.chomens_bot.data.chat; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.Component; -public record PlayerMessage (PlayerEntry sender, Component displayName, Component contents) { +public record PlayerMessage(PlayerEntry sender, Component displayName, Component contents) { @Override - public String toString() { + public String toString () { return "PlayerMessage{" + "sender=" + sender + ", displayName=" + displayName + diff --git a/src/main/java/me/chayapak1/chomens_bot/data/chunk/ChunkPos.java b/src/main/java/me/chayapak1/chomens_bot/data/chunk/ChunkPos.java index aac4de94..c2fd7c9f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/chunk/ChunkPos.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/chunk/ChunkPos.java @@ -1,4 +1,4 @@ package me.chayapak1.chomens_bot.data.chunk; -public record ChunkPos (int x, int z) { +public record ChunkPos(int x, int z) { } diff --git a/src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java b/src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java index 4637f005..7ac68c0d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/cloop/CommandLoop.java @@ -2,9 +2,9 @@ package me.chayapak1.chomens_bot.data.cloop; import java.util.concurrent.TimeUnit; -public record CommandLoop ( - String command, - long interval, - TimeUnit unit -) {} +public record CommandLoop( + String command, + long interval, + TimeUnit unit +) { } diff --git a/src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java b/src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java index 52912152..9fb57c03 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/entity/Rotation.java @@ -1,6 +1,6 @@ package me.chayapak1.chomens_bot.data.entity; -public record Rotation ( - float yaw, - float pitch -) {} +public record Rotation( + float yaw, + float pitch +) { } 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 dca3b5d1..94cd7a15 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 @@ -15,7 +15,7 @@ public class EvalFunction { this.bot = bot; } - public Output execute (Object ...args) throws Exception { return null; } + public Output execute (Object... args) throws Exception { return null; } public static class Output { public final String message; diff --git a/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalOutput.java b/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalOutput.java index bb83b49e..9190c6a0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalOutput.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/eval/EvalOutput.java @@ -1,6 +1,6 @@ package me.chayapak1.chomens_bot.data.eval; -public record EvalOutput ( - boolean isError, - String output -) {} +public record EvalOutput( + boolean isError, + String output +) { } 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 3a57efe7..929ab3da 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 @@ -23,7 +23,7 @@ public class FilteredPlayer { } @Override - public String toString() { + public String toString () { return "FilteredPlayer{" + "playerName='" + playerName + '\'' + ", reason='" + reason + '\'' + 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 45225853..4adb4f0d 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 @@ -26,7 +26,7 @@ public class Mail { } @Override - public String toString() { + public String toString () { return "Mail{" + "sentBy='" + sentBy + '\'' + ", 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 8be3e174..1e75cf05 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 @@ -21,7 +21,7 @@ public class PlayerEntry { public boolean listed; public String ip; - public PlayerEntry( + public PlayerEntry ( GameProfile profile, GameMode gamemode, int latency, @@ -46,7 +46,7 @@ public class PlayerEntry { } @Override - public String toString() { + public String toString () { return "PlayerEntry{" + "gamemode=" + gamemode + ", latency=" + latency + 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 2521780f..39b95ccc 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 @@ -1,12 +1,12 @@ package me.chayapak1.chomens_bot.data.team; +import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextDecoration; import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.CollisionRule; import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.NameTagVisibility; import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.TeamColor; -import net.kyori.adventure.text.Component; import java.util.List; @@ -74,7 +74,7 @@ public class Team { } @Override - public String toString() { + public String toString () { return "Team{" + "teamName='" + teamName + '\'' + ", 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 b3edf686..3fe92438 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 (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 (FriendlyByteBuf buf) { buf.writeUUID(id); buf.writeUtf(name, 512); buf.writeBoolean(hasPassword); diff --git a/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/RawUdpPacket.java b/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/RawUdpPacket.java index 47b7e0de..2102180b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/RawUdpPacket.java +++ b/src/main/java/me/chayapak1/chomens_bot/data/voiceChat/RawUdpPacket.java @@ -2,4 +2,4 @@ package me.chayapak1.chomens_bot.data.voiceChat; import java.net.SocketAddress; -public record RawUdpPacket(byte[] data, SocketAddress socketAddress, long timestamp) {} +public record RawUdpPacket(byte[] data, SocketAddress socketAddress, long timestamp) { } 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 475a3f95..1342ef8e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/ChatFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/ChatFunction.java @@ -9,7 +9,7 @@ public class ChatFunction extends EvalFunction { } @Override - public Output execute(Object... args) { + public Output execute (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 3687a2ca..a9cddc4a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CoreFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CoreFunction.java @@ -16,7 +16,7 @@ public class CoreFunction extends EvalFunction { } @Override - public Output execute(Object... args) throws Exception { + public Output execute (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 f59fc6c8..05e7e8e8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CorePlaceBlockFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/CorePlaceBlockFunction.java @@ -9,7 +9,7 @@ public class CorePlaceBlockFunction extends EvalFunction { } @Override - public Output execute(Object... args) { + public Output execute (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 a187188d..2ae6a286 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 (Bot bot) { super("getBotInfo", bot); } @Override - public Output execute(Object... args) { + public Output execute (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 b2ad5a46..be88d3e2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetLatestChatMessageFunction.java @@ -23,7 +23,7 @@ public class GetLatestChatMessageFunction extends EvalFunction implements ChatPl } @Override - public Output execute(Object... args) { + public Output execute (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 a6607f44..64d9228b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java +++ b/src/main/java/me/chayapak1/chomens_bot/evalFunctions/GetPlayerListFunction.java @@ -3,19 +3,19 @@ package me.chayapak1.chomens_bot.evalFunctions; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.eval.EvalFunction; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import java.util.List; public class GetPlayerListFunction extends EvalFunction { - public GetPlayerListFunction(Bot bot) { + public GetPlayerListFunction (Bot bot) { super("getPlayerList", bot); } @Override - public Output execute(Object... args) { + public Output execute (Object... args) { final List list = bot.players.list; final JsonArray array = new JsonArray(); @@ -25,7 +25,8 @@ public class GetPlayerListFunction extends EvalFunction { object.addProperty("uuid", entry.profile.getIdAsString()); object.addProperty("username", entry.profile.getName()); - if (entry.displayName != null) object.addProperty("displayName", GsonComponentSerializer.gson().serialize(entry.displayName)); + if (entry.displayName != null) + object.addProperty("displayName", GsonComponentSerializer.gson().serialize(entry.displayName)); array.add(object); } 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 093cb833..3bbe3ce6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BossbarManagerPlugin.java @@ -151,7 +151,7 @@ public class BossbarManagerPlugin extends Bot.Listener implements PlayersPlugin. } @Override - public void connected(ConnectedEvent event) { + public void connected (ConnectedEvent event) { for (Map.Entry _bossBar : bossBars.entrySet()) { final BotBossBar bossBar = _bossBar.getValue(); @@ -190,6 +190,7 @@ public class BossbarManagerPlugin extends Bot.Listener implements PlayersPlugin. private void addBossBar (String name, BotBossBar bossBar) { addBossBar(name, bossBar, false); } + private void addBossBar (String name, BotBossBar bossBar, boolean secret) { if (actionBar) return; 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 300c591b..e7c223f4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/BruhifyPlugin.java @@ -12,14 +12,14 @@ public class BruhifyPlugin implements TickPlugin.Listener { private int startHue = 0; - public BruhifyPlugin(Bot bot) { + public BruhifyPlugin (Bot bot) { this.bot = bot; bot.tick.addListener(this); } @Override - public void onTick() { + public void onTick () { if (bruhifyText.isEmpty()) return; int hue = startHue; @@ -30,7 +30,7 @@ public class BruhifyPlugin implements TickPlugin.Listener { for (char character : displayName.toCharArray()) { component = component.append(Component.text(character) - .color(TextColor.color(HSVLike.hsvLike(hue / 360.0f, 1, 1)))); + .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 881b5c32..ba53e2e9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatCommandHandlerPlugin.java @@ -2,8 +2,8 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.command.contexts.PlayerCommandContext; -import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.chat.PlayerMessage; +import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.util.ComponentUtilities; import me.chayapak1.chomens_bot.util.UUIDUtilities; import net.kyori.adventure.text.Component; @@ -16,7 +16,7 @@ public class ChatCommandHandlerPlugin implements ChatPlugin.Listener, CommandSpy public final List prefixes; public final List commandSpyPrefixes; - public ChatCommandHandlerPlugin(Bot bot) { + public ChatCommandHandlerPlugin (Bot bot) { this.bot = bot; this.prefixes = bot.config.prefixes; 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 a31b63da..a5358760 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java @@ -105,7 +105,7 @@ public class ChatPlugin extends Bot.Listener { // command set key.equals("قيادة المجموعة: %s") // i'm pretty sure the text direction will depend on what you are using to view this file right now - // no other stuff because laziness + // no other stuff because laziness ) return; } @@ -334,7 +334,8 @@ public class ChatPlugin extends Bot.Listener { final Matcher colorCodeEndMatcher = COLOR_CODE_END_PATTERN.matcher(strippedMessage); - if (colorCodeEndMatcher.find()) strippedMessage = strippedMessage.substring(0, strippedMessage.length() - 2); + if (colorCodeEndMatcher.find()) + strippedMessage = strippedMessage.substring(0, strippedMessage.length() - 2); if (!isFirst) { final Matcher colorCodeEndMatcher2 = COLOR_CODE_END_PATTERN.matcher(message); @@ -384,10 +385,11 @@ public class ChatPlugin extends Bot.Listener { public interface Listener { default boolean playerMessageReceived (PlayerMessage message) { return true; } + default boolean systemMessageReceived (Component component, String string, String ansi) { return true; } } - private record ChatTypeContext (Component target, Component sender, Component content) {} + private record ChatTypeContext(Component target, Component sender, Component content) { } private static class ChatTypeComponentRenderer extends TranslatableComponentRenderer { @Override 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 7e0a4e56..3b3320ce 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java @@ -119,7 +119,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players username, clientKeyFactory.generatePublic(new X509EncodedKeySpec(publicKeyBytes)) ); - } catch (Exception ignored) {} + } catch (Exception ignored) { } } } } @@ -173,7 +173,8 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players } public void send (PlayerEntry target, Packet packet) { - if (!connectedPlayers.contains(target) && !(packet instanceof ClientboundHandshakePacket)) return; // LoL sus check + if (!connectedPlayers.contains(target) && !(packet instanceof ClientboundHandshakePacket)) + return; // LoL sus check final ByteBuf buf = Unpooled.buffer(); @@ -222,7 +223,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players ); bot.chat.actionBar(component, target.profile.getId()); - } catch (Exception ignored) {} + } catch (Exception ignored) { } fullBytesIndex += chunk.length; } @@ -245,7 +246,8 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players try { return Pair.of(player, packetClass.getDeclaredConstructor(ByteBuf.class).newInstance(buf)); - } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) { + } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | + IllegalAccessException e) { return null; } } @@ -275,7 +277,7 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players final Packet packet = deserialized.getValue(); handlePacket(player, packet); - } catch (Exception ignored) {} + } catch (Exception ignored) { } return false; } @@ -311,6 +313,6 @@ public class ChomeNSModIntegrationPlugin implements ChatPlugin.Listener, Players @SuppressWarnings("unused") public interface Listener { - default void packetReceived (PlayerEntry player, Packet packet) {} + default void packetReceived (PlayerEntry player, 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 7e51ced1..29d178a4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ClearChatNameAnnouncerPlugin.java @@ -17,7 +17,7 @@ public class ClearChatNameAnnouncerPlugin implements CommandSpyPlugin.Listener { } @Override - public void commandReceived(PlayerEntry sender, String command) { + public void commandReceived (PlayerEntry sender, String command) { if ( command.equals("/clearchat") || command.equals("/cc") || 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 c0ab9062..fa310d7b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java @@ -1,7 +1,10 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.command.*; +import me.chayapak1.chomens_bot.command.Command; +import me.chayapak1.chomens_bot.command.CommandContext; +import me.chayapak1.chomens_bot.command.CommandException; +import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.command.contexts.ChomeNSModCommandContext; import me.chayapak1.chomens_bot.command.contexts.ConsoleCommandContext; import me.chayapak1.chomens_bot.command.contexts.DiscordCommandContext; @@ -54,7 +57,7 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { registerCommand(new EvalCommand()); registerCommand(new InfoCommand()); registerCommand(new ConsoleCommand()); -// registerCommand(new ScreenshareCommand()); + // registerCommand(new ScreenshareCommand()); registerCommand(new WhitelistCommand()); registerCommand(new SeenCommand()); registerCommand(new IPFilterCommand()); @@ -111,14 +114,16 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { // I think this is kinda annoying when you correct spelling mistakes or something, // so I made it return nothing if it's in game - if (command == null && !inGame) return Component.text("Unknown command: " + commandName).color(NamedTextColor.RED); + if (command == null && !inGame) + return Component.text("Unknown command: " + commandName).color(NamedTextColor.RED); else if (command == null) return null; if (!bypass && disabled) return Component.text("ChomeNS Bot is currently disabled").color(NamedTextColor.RED); final TrustLevel trustLevel = command.trustLevel; - if (trustLevel != TrustLevel.PUBLIC && splitInput.length < 2 && inGame) return Component.text("Please provide a hash").color(NamedTextColor.RED); + if (trustLevel != TrustLevel.PUBLIC && splitInput.length < 2 && inGame) + return Component.text("Please provide a hash").color(NamedTextColor.RED); String userHash = ""; if (trustLevel != TrustLevel.PUBLIC && inGame) userHash = splitInput[1]; @@ -177,7 +182,8 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { } // should i give access to all bypass contexts instead of only console? - if (!bypass && command.consoleOnly) return Component.text("This command can only be run via console").color(NamedTextColor.RED); + if (!bypass && command.consoleOnly) + return Component.text("This command can only be run via console").color(NamedTextColor.RED); // should these be here? context.fullArgs = fullArgs; @@ -194,7 +200,8 @@ public class CommandHandlerPlugin implements TickPlugin.Listener { final String stackTrace = ExceptionUtilities.getStacktrace(e); if (inGame) { - if (bot.options.useChat || !bot.options.useCore) return Component.text(e.toString()).color(NamedTextColor.RED); + if (bot.options.useChat || !bot.options.useCore) + return Component.text(e.toString()).color(NamedTextColor.RED); return Component .text("An error occurred while trying to execute the command, hover here for stacktrace", NamedTextColor.RED) .hoverEvent( 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 64df63ef..c4eb8eb1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSpyPlugin.java @@ -31,7 +31,7 @@ public class CommandSpyPlugin implements ChatPlugin.Listener { textComponent.style().isEmpty() || ( textComponent.color() != NamedTextColor.AQUA && - textComponent.color() != NamedTextColor.YELLOW + textComponent.color() != NamedTextColor.YELLOW ) || !(children.getFirst() instanceof TextComponent) || !(children.getLast() instanceof TextComponent) @@ -52,6 +52,6 @@ public class CommandSpyPlugin implements ChatPlugin.Listener { public void addListener (Listener listener) { listeners.add(listener); } public interface Listener { - default void commandReceived (PlayerEntry sender, String command) {} + default void commandReceived (PlayerEntry sender, 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 d017ae7a..c371847e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandSuggestionPlugin.java @@ -21,7 +21,7 @@ public class CommandSuggestionPlugin implements ChatPlugin.Listener { } @Override - public boolean systemMessageReceived(Component component, String string, String ansi) { + public boolean systemMessageReceived (Component component, String string, String ansi) { final List children = component.children(); if ( 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 6a408017..910698d5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java @@ -68,7 +68,7 @@ public class ConsolePlugin implements Completer { } @Override - public void complete(LineReader reader, ParsedLine line, List candidates) { + public void complete (LineReader reader, ParsedLine line, List candidates) { if (!line.line().startsWith(prefix)) return; final String command = line.line().substring(prefix.length()); @@ -131,7 +131,7 @@ public class ConsolePlugin implements Completer { // Everything below is from https://code.chipmunk.land/ChomeNS/chipmunkmod/src/branch/1.21.4/src/main/java/land/chipmunk/chipmunkmod/modules/custom_chat // Thank you, Amy! - private record ConsoleFormatContext (String uuid, Component message, Map args) {} + private record ConsoleFormatContext(String uuid, Component message, Map args) { } private final static class ConsoleFormatRenderer extends TranslatableComponentRenderer { @Override 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 960e529c..6f850d97 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java @@ -36,8 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class CorePlugin extends Bot.Listener - implements PositionPlugin.Listener, WorldPlugin.Listener, TickPlugin.Listener -{ + implements PositionPlugin.Listener, WorldPlugin.Listener, TickPlugin.Listener { public static final int COMMAND_BLOCK_ID = 418; private final Bot bot; @@ -469,6 +468,7 @@ public class CorePlugin } public void refill () { refill(true); } + public void refill (boolean force) { if (!ready) return; @@ -515,8 +515,9 @@ public class CorePlugin } public interface Listener { - default void coreReady () {} - default void coreRefilled () {} + default void coreReady () { } + + default void coreRefilled () { } } public void addListener (Listener listener) { listeners.add(listener); } 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 5b774da7..6a9a9899 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java @@ -70,7 +70,7 @@ public class DiscordPlugin extends ListenerAdapter { try { jda = builder.build(); jda.awaitReady(); - } catch (InterruptedException ignored) {} + } catch (InterruptedException ignored) { } if (jda == null) return; @@ -108,7 +108,7 @@ public class DiscordPlugin extends ListenerAdapter { } @Override - public void connecting() { + public void connecting () { final int newTotalConnects = totalConnects.get(channelId) + 1; totalConnects.put(channelId, newTotalConnects); @@ -143,7 +143,7 @@ public class DiscordPlugin extends ListenerAdapter { } @Override - public void disconnected(DisconnectedEvent event) { + public void disconnected (DisconnectedEvent event) { if (totalConnects.get(channelId) >= 6) return; final String reason = ComponentUtilities.stringifyAnsi(event.getReason()); @@ -479,7 +479,7 @@ 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 (String message, String channelId) { synchronized (logMessages) { if (!logMessages.containsKey(channelId)) { logMessages.put(channelId, new StringBuilder()); @@ -495,6 +495,7 @@ public class DiscordPlugin extends ListenerAdapter { } public void sendMessageInstantly (String message, String channelId) { sendMessageInstantly(message, channelId, true); } + public MessageCreateAction sendMessageInstantly (String message, String channelId, boolean queue) { if (jda == null) return null; @@ -521,7 +522,7 @@ public class DiscordPlugin extends ListenerAdapter { } } - public void onDiscordTick(String channelId) { + public void onDiscordTick (String channelId) { synchronized (logMessages) { if (!logMessages.containsKey(channelId) || logMessages.get(channelId).isEmpty()) { return; @@ -540,7 +541,7 @@ public class DiscordPlugin extends ListenerAdapter { message = logMessage.toString().replace(".", "\u200b.\u200b"); // the ZWSP fixes discord.gg showing invite final int maxLength = 2_000 - (""" ```ansi - + ```""" ).length(); // kinda sus if (message.length() >= maxLength) { 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 c60e5f41..b42453c2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/EvalPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/EvalPlugin.java @@ -67,7 +67,7 @@ public class EvalPlugin { if (output == null) return; socket.emit("functionOutput:" + function.name, output.message, output.parseJSON); - } catch (Exception ignored) {} + } catch (Exception ignored) { } }).start()); } @@ -84,7 +84,7 @@ public class EvalPlugin { final CompletableFuture future = futures.remove(id); future.complete(new EvalOutput(isError, output)); - } catch (NumberFormatException ignored) {} + } catch (NumberFormatException ignored) { } }); socket.connect(); 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 52b10af9..e8cd6efe 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ExtrasMessengerPlugin.java @@ -59,8 +59,8 @@ public class ExtrasMessengerPlugin extends Bot.Listener { Arrays.stream(availableChannels).noneMatch( channel -> channel.equals(EXTRAS_REGISTER_KEY.asString()) || - channel.equals(EXTRAS_UNREGISTER_KEY.asString()) || - channel.equals(EXTRAS_MESSAGE_KEY.asString()) + channel.equals(EXTRAS_UNREGISTER_KEY.asString()) || + channel.equals(EXTRAS_MESSAGE_KEY.asString()) ) ) { isSupported = false; @@ -165,7 +165,7 @@ public class ExtrasMessengerPlugin extends Bot.Listener { final byte[] buf = new byte[255]; int idx = 0; - for (;;) { + for (; ; ) { final byte input = byteBuf.readByte(); if (idx == buf.length) break; @@ -198,6 +198,6 @@ public class ExtrasMessengerPlugin extends Bot.Listener { public void addListener (Listener listener) { listeners.add(listener); } public interface Listener { - default void onMessage (UUID sender, byte[] message) {} + default void onMessage (UUID sender, 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 6f99c034..dc04f2eb 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FilterManagerPlugin.java @@ -17,8 +17,7 @@ import java.util.concurrent.TimeUnit; public class FilterManagerPlugin extends Bot.Listener - implements PlayersPlugin.Listener, ChatPlugin.Listener, CommandSpyPlugin.Listener, TickPlugin.Listener -{ + implements PlayersPlugin.Listener, ChatPlugin.Listener, CommandSpyPlugin.Listener, TickPlugin.Listener { private final Bot bot; public final Map list = Collections.synchronizedMap(new HashMap<>()); @@ -66,13 +65,13 @@ public class FilterManagerPlugin if ( command.startsWith("/mute") || - command.startsWith("/emute") || - command.startsWith("/silence") || - command.startsWith("/esilence") || - command.startsWith("/essentials:mute") || - command.startsWith("/essentials:emute") || - command.startsWith("/essentials:silence") || - command.startsWith("/essentials:esilence") + command.startsWith("/emute") || + command.startsWith("/silence") || + command.startsWith("/esilence") || + command.startsWith("/essentials:mute") || + command.startsWith("/essentials:emute") || + command.startsWith("/essentials:silence") || + command.startsWith("/essentials:esilence") ) mute(sender, player.getRight()); deOp(sender); @@ -99,6 +98,7 @@ public class FilterManagerPlugin } public void doAll (PlayerEntry entry) { doAll(entry, ""); } + public void doAll (PlayerEntry entry, String reason) { bot.exploits.kick(entry.profile.getId()); mute(entry, reason); @@ -108,6 +108,7 @@ public class FilterManagerPlugin } public void mute (PlayerEntry target) { mute(target, ""); } + public void mute (PlayerEntry target, String reason) { bot.core.run("essentials:mute " + target.profile.getIdAsString() + " 10y " + reason); } @@ -133,7 +134,7 @@ public class FilterManagerPlugin public void add (PlayerEntry entry, String reason) { if ( getFilteredFromName(entry.profile.getName()) != null || // prevent already existing filters - entry.profile.equals(bot.profile) // prevent self-harm !!!!!! + entry.profile.equals(bot.profile) // prevent self-harm !!!!!! ) return; list.put(entry, reason); 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 a3c2e4b2..5b2888a0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/FormatCheckerPlugin.java @@ -33,17 +33,17 @@ public class FormatCheckerPlugin implements ChatPlugin.Listener, PlayersPlugin.L } @Override - public void playerJoined(PlayerEntry target) { + public void playerJoined (PlayerEntry target) { reset(target); } @Override - public void playerLeft(PlayerEntry target) { + public void playerLeft (PlayerEntry target) { reset(target); } @Override - public boolean systemMessageReceived(Component component, String string, String ansi) { + public boolean systemMessageReceived (Component component, String string, 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)); 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 a505c499..a674c19a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java @@ -153,7 +153,8 @@ public class GrepLogPlugin { private StringBuilder process (BufferedReader bufferedReader, String input, boolean ignoreCase, boolean regex) throws IOException, PatternSyntaxException { if (regex && pattern == null) { - if (ignoreCase) pattern = Pattern.compile(input, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS); + if (ignoreCase) + pattern = Pattern.compile(input, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS); else pattern = Pattern.compile(input, Pattern.UNICODE_CHARACTER_CLASS); } @@ -163,7 +164,7 @@ public class GrepLogPlugin { while ((line = bufferedReader.readLine()) != null) { if ( (regex && pattern.matcher(line).find()) || // *greplog -regex text OR *greplog -ignorecase -regex text - (!ignoreCase && !regex && line.contains(input)) || // *greplog text + (!ignoreCase && !regex && line.contains(input)) || // *greplog text (ignoreCase && StringUtilities.containsIgnoreCase(line, input)) // *greplog -ignorecase ) { result.append(line).append("\n"); 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 92019708..18c9235c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/HashingPlugin.java @@ -16,7 +16,9 @@ public class HashingPlugin { } public String getHash (String prefix, PlayerEntry sender, 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 getOwnerHash (String prefix, PlayerEntry sender, boolean sectionSigns) { return getGenericHash(bot.config.keys.ownerKey, prefix, sender, sectionSigns); } // should this be public? @@ -32,16 +34,17 @@ public class HashingPlugin { return sectionSigns ? String.join("", - Arrays.stream(hash.split("")) - .map((letter) -> "§" + letter) - .toArray(String[]::new) + Arrays.stream(hash.split("")) + .map((letter) -> "§" + letter) + .toArray(String[]::new) ) : hash; } private boolean checkHash (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); + if (input.length() == (16 * 2 /* <-- don't forget, we have the section signs */) + 2 && input.endsWith("§r")) + input = input.substring(0, input.length() - 2); return input.equals(hash); } 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 d82cd69b..f0f8f0ae 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java @@ -46,9 +46,11 @@ public class IRCPlugin extends ListenerAdapter { .setMessageDelay(new StaticReadonlyDelay(50)) .addListener(this); - if (!ircConfig.password.isEmpty()) builder.addCapHandler(new SASLCapHandler(ircConfig.name, ircConfig.password, true)); + if (!ircConfig.password.isEmpty()) + builder.addCapHandler(new SASLCapHandler(ircConfig.name, ircConfig.password, true)); - for (Map.Entry entry : ircConfig.servers.entrySet()) builder.addAutoJoinChannel(entry.getValue()); + for (Map.Entry entry : ircConfig.servers.entrySet()) + builder.addAutoJoinChannel(entry.getValue()); final org.pircbotx.Configuration configuration = builder.buildConfiguration(); @@ -65,7 +67,7 @@ public class IRCPlugin extends ListenerAdapter { for (Bot bot : Main.bots) { bot.addListener(new Bot.Listener() { @Override - public void connected(ConnectedEvent event) { + public void connected (ConnectedEvent event) { IRCPlugin.this.connected(bot); } @@ -73,7 +75,7 @@ public class IRCPlugin extends ListenerAdapter { public void loadedPlugins (Bot bot) { bot.chat.addListener(new ChatPlugin.Listener() { @Override - public boolean systemMessageReceived(Component component, String string, String ansi) { + public boolean systemMessageReceived (Component component, String string, String ansi) { IRCPlugin.this.systemMessageReceived(bot, ansi); return true; @@ -85,11 +87,11 @@ public class IRCPlugin extends ListenerAdapter { bot.irc = this; } - Main.executor.scheduleAtFixedRate(this::queueTick, 0, 100, TimeUnit.MILLISECONDS); + Main.executor.scheduleAtFixedRate(this::queueTick, 0, 100, TimeUnit.MILLISECONDS); } @Override - public void onMessage(MessageEvent event) { + public void onMessage (MessageEvent event) { Bot serverBot = null; String targetChannel = null; @@ -204,7 +206,7 @@ public class IRCPlugin extends ListenerAdapter { bot.sendIRC().message(entry.getKey(), withIRCColors); } - } catch (Exception ignored) {} + } catch (Exception ignored) { } } private void addMessageToQueue (Bot bot, String message) { 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 dd5f198c..043d3340 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java @@ -25,7 +25,7 @@ public class LoggerPlugin implements ChatPlugin.Listener { bot.addListener(new Bot.Listener() { @Override - public void connecting() { + public void connecting () { totalConnects++; if (totalConnects > 20) return; @@ -86,11 +86,15 @@ public class LoggerPlugin implements ChatPlugin.Listener { } public void log (Component message) { log(LogType.INFO, message); } + public void log (String message) { log(LogType.INFO, Component.text(message)); } + public void log (LogType type, String message) { log(type, Component.text(message)); } public void error (Component message) { log(LogType.ERROR, message); } + public void error (String message) { log(LogType.ERROR, Component.text(message)); } + public void error (Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); } @Override 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 7063ac3c..cfe7b4b4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MailPlugin.java @@ -44,7 +44,7 @@ public class MailPlugin implements PlayersPlugin.Listener { } @Override - public void playerJoined(PlayerEntry target) { + public void playerJoined (PlayerEntry target) { DatabasePlugin.executorService.submit(() -> { final String name = target.profile.getName(); 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 5a0ca348..69f48189 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/MusicPlayerPlugin.java @@ -37,6 +37,7 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen private final Bot bot; public static final Path SONG_DIR = Path.of("songs"); + static { try { if (!Files.exists(SONG_DIR)) Files.createDirectory(SONG_DIR); @@ -253,42 +254,42 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen // midi lyrics are very weird // i need some karaoke players to see how this works -// final Map lyrics = currentSong.lyrics; -// -// if (lyrics.isEmpty()) return; -// -// final List lyricsList = new ArrayList<>(); -// -// for (Map.Entry entry : lyrics.entrySet()) { -// final long time = entry.getKey(); -// String _lyric = entry.getValue(); -// -// if (time > currentSong.time) continue; -// -//// StringBuilder lyric = new StringBuilder(); -//// -//// for (char character : _lyric.toCharArray()) { -//// if ((character != '\n' && character != '\r' && character < ' ') || character == '�') continue; -//// -//// lyric.append(character); -//// } -//// -//// String stringLyric = lyric.toString(); -//// -//// if (stringLyric.startsWith("\\") || stringLyric.startsWith("/")) { -//// lyricsList.clear(); -//// -//// stringLyric = stringLyric.substring(1); -//// } -// -// lyricsList.add(_lyric); -// } -// -// final String joined = String.join("", lyricsList); -// currentLyrics = joined.substring(Math.max(0, joined.length() - 25)); + // final Map lyrics = currentSong.lyrics; + // + // if (lyrics.isEmpty()) return; + // + // final List lyricsList = new ArrayList<>(); + // + // for (Map.Entry entry : lyrics.entrySet()) { + // final long time = entry.getKey(); + // String _lyric = entry.getValue(); + // + // if (time > currentSong.time) continue; + // + //// StringBuilder lyric = new StringBuilder(); + //// + //// for (char character : _lyric.toCharArray()) { + //// if ((character != '\n' && character != '\r' && character < ' ') || character == '�') continue; + //// + //// lyric.append(character); + //// } + //// + //// String stringLyric = lyric.toString(); + //// + //// if (stringLyric.startsWith("\\") || stringLyric.startsWith("/")) { + //// lyricsList.clear(); + //// + //// stringLyric = stringLyric.substring(1); + //// } + // + // lyricsList.add(_lyric); + // } + // + // final String joined = String.join("", lyricsList); + // currentLyrics = joined.substring(Math.max(0, joined.length() - 25)); } - public void removeBossBar() { + public void removeBossBar () { final BotBossBar bossBar = bot.bossbar.get(bossBarName); if (bossBar != null) bossBar.setTitle(Component.text("No song is currently playing")); @@ -322,8 +323,8 @@ public class MusicPlayerPlugin extends Bot.Listener implements CorePlugin.Listen .append( Component .translatable("%s / %s", - formatTime((long) (currentSong.time * speed)).color(NamedTextColor.GRAY), - formatTime((long) (currentSong.length * speed)).color(NamedTextColor.GRAY)).color(NamedTextColor.DARK_GRAY) + formatTime((long) (currentSong.time * speed)).color(NamedTextColor.GRAY), + formatTime((long) (currentSong.length * speed)).color(NamedTextColor.GRAY)).color(NamedTextColor.DARK_GRAY) ); if (!bot.core.hasRateLimit() && !currentLyrics.isEmpty()) { 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 a0d1c0e1..c72cffdd 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PacketSnifferPlugin.java @@ -61,7 +61,7 @@ public class PacketSnifferPlugin extends Bot.Listener { } @Override - public void packetReceived(Session session, Packet packet) { + public void packetReceived (Session session, Packet packet) { if (!enabled) return; try { @@ -73,7 +73,7 @@ public class PacketSnifferPlugin extends Bot.Listener { } @Override - public void packetSending(PacketSendingEvent event) { + public void packetSending (PacketSendingEvent event) { if (!enabled) return; try { 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 21c6b41b..46c48fb2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayerFilterPlugin.java @@ -41,7 +41,7 @@ public class PlayerFilterPlugin implements PlayersPlugin.Listener { private final Bot bot; - public PlayerFilterPlugin(Bot bot) { + public PlayerFilterPlugin (Bot bot) { this.bot = bot; if (Main.database == null) return; 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 2a6f42fa..6123ae49 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java @@ -99,6 +99,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { } public Map findPlayerAlts (String ip) { return findPlayerAlts(ip, false); } + public Map findPlayerAlts (String ip, boolean allServer) { try { final Map output = new HashMap<>(); @@ -186,7 +187,7 @@ public class PlayersDatabasePlugin implements PlayersPlugin.Listener { } @Override - public void playerLeft(PlayerEntry target) { + public void playerLeft (PlayerEntry target) { DatabasePlugin.executorService.submit(() -> { try { final PreparedStatement updatePlayerStatement = bot.database.connection.prepareStatement(UPDATE_PLAYER); 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 2ceb5473..e9866659 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -71,6 +71,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } private void queryPlayersIP () { for (PlayerEntry target : list) queryPlayersIP(target); } + private void queryPlayersIP (PlayerEntry target) { if (target.ip != null) return; @@ -80,6 +81,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } public CompletableFuture getPlayerIP (PlayerEntry target) { return getPlayerIP(target, false); } + public CompletableFuture getPlayerIP (PlayerEntry target, boolean forceSeen) { final CompletableFuture outputFuture = new CompletableFuture<>(); @@ -301,7 +303,8 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } private void onLastKnownNameTick () { - if (!bot.loggedIn || !bot.core.ready || !bot.serverFeatures.hasNamespaces) return; // hasNamespaces also means vanilla/non-bukkit + if (!bot.loggedIn || !bot.core.ready || !bot.serverFeatures.hasNamespaces) + return; // hasNamespaces also means vanilla/non-bukkit for (PlayerEntry target : new ArrayList<>(list)) { check(target); @@ -325,7 +328,7 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { } @Override - public void disconnected(DisconnectedEvent event) { + public void disconnected (DisconnectedEvent event) { list.clear(); } @@ -333,13 +336,20 @@ public class PlayersPlugin extends Bot.Listener implements TickPlugin.Listener { @SuppressWarnings("unused") public interface Listener { - default void playerJoined (PlayerEntry target) {} - default void playerUnVanished (PlayerEntry target) {} - default void playerGameModeUpdated (PlayerEntry target, GameMode gameMode) {} - default void playerLatencyUpdated (PlayerEntry target, int ping) {} - default void playerDisplayNameUpdated (PlayerEntry target, Component displayName) {} - default void playerLeft (PlayerEntry target) {} - default void playerVanished (PlayerEntry target) {} - default void playerChangedUsername (PlayerEntry target) {} + default void playerJoined (PlayerEntry target) { } + + default void playerUnVanished (PlayerEntry target) { } + + default void playerGameModeUpdated (PlayerEntry target, GameMode gameMode) { } + + default void playerLatencyUpdated (PlayerEntry target, int ping) { } + + default void playerDisplayNameUpdated (PlayerEntry target, Component displayName) { } + + default void playerLeft (PlayerEntry target) { } + + default void playerVanished (PlayerEntry target) { } + + default void playerChangedUsername (PlayerEntry target) { } } } 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 b69215dd..ebfecc02 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PositionPlugin.java @@ -132,7 +132,8 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener rotationMap.put(packet.getEntityId(), rotation); - for (Listener listener : listeners) listener.playerMoved(player, getPlayerPosition(player.profile.getName()), rotation); + for (Listener listener : listeners) + listener.playerMoved(player, getPlayerPosition(player.profile.getName()), rotation); } private void packetReceived (ClientboundMoveEntityPosPacket packet) { @@ -157,7 +158,8 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener positionMap.put(packet.getEntityId(), position); - for (Listener listener : listeners) listener.playerMoved(player, position, getPlayerRotation(player.profile.getName())); + for (Listener listener : listeners) + listener.playerMoved(player, position, getPlayerRotation(player.profile.getName())); } private void packetReceived (ClientboundMoveEntityPosRotPacket packet) { @@ -272,7 +274,8 @@ public class PositionPlugin extends Bot.Listener implements TickPlugin.Listener @SuppressWarnings("unused") public interface Listener { - default void positionChange (Vector3d position) {} - default void playerMoved (PlayerEntry player, Vector3d position, Rotation rotation) {} + default void positionChange (Vector3d position) { } + + default void playerMoved (PlayerEntry player, Vector3d position, Rotation rotation) { } } } 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 35c1d758..e1867357 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ScreensharePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ScreensharePlugin.java @@ -26,7 +26,7 @@ public class ScreensharePlugin { public Robot robot; -// public FFmpegFrameGrabber grabber; + // public FFmpegFrameGrabber grabber; public ScreensharePlugin (Bot bot) { this.bot = bot; @@ -43,13 +43,13 @@ public class ScreensharePlugin { screen.update(); -// try (FFmpegFrameGrabber grabber = new FFmpegFrameGrabber("/tmp/rick.mp4")) { -// this.grabber = grabber; -// } catch (Exception e) { -// bot.logger.error(e); -// } -// -// try { grabber.start(); } catch (Exception ignored) {} + // try (FFmpegFrameGrabber grabber = new FFmpegFrameGrabber("/tmp/rick.mp4")) { + // this.grabber = grabber; + // } catch (Exception e) { + // bot.logger.error(e); + // } + // + // try { grabber.start(); } catch (Exception ignored) {} future = bot.executor.scheduleAtFixedRate(this::drawScreen, 0, 1000 / fps, TimeUnit.MILLISECONDS); // frame. per. second. } @@ -65,35 +65,35 @@ public class ScreensharePlugin { BufferedImage capture = robot.createScreenCapture(screenRect); -// try (Java2DFrameConverter frameConverter = new Java2DFrameConverter()) { -// final Frame grabbed = grabber.grab(); + // try (Java2DFrameConverter frameConverter = new Java2DFrameConverter()) { + // final Frame grabbed = grabber.grab(); -// final BufferedImage capture = frameConverter.convert(grabbed); + // final BufferedImage capture = frameConverter.convert(grabbed); - if (capture == null) return; + if (capture == null) return; - BufferedImage resized = resize(capture, screen.width, screen.height); + 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; + 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; - screen.screen[x][y] = String.format("#%02x%02x%02x", red, green, blue); - } + screen.screen[x][y] = String.format("#%02x%02x%02x", red, green, blue); } + } - screen.draw(); -// } catch (Exception e) { -// System.err.println("EXCEPTION ::::"); -// bot.logger.error(e); -// } + screen.draw(); + // } catch (Exception e) { + // System.err.println("EXCEPTION ::::"); + // bot.logger.error(e); + // } } // move this to util? - private BufferedImage resize(BufferedImage img, int newW, int newH) { + 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); @@ -114,7 +114,7 @@ public class ScreensharePlugin { public ArrayList tags = new ArrayList<>(); - public Screen(Bot bot, int width, int height, Vector3i pos) { + public Screen (Bot bot, int width, int height, Vector3i pos) { screen = new String[width][height]; this.bot = bot; @@ -146,14 +146,14 @@ public class ScreensharePlugin { } public void kill () { - for(String i : tags) { + for (String i : tags) { bot.core.run("minecraft:kill @e[tag=" + i + "]"); } tags.clear(); } - public void update() { + public void update () { double startY = pos.getY(); kill(); @@ -176,9 +176,9 @@ public class ScreensharePlugin { } } - public void setPixel(String hexColor, int x, int y) { screen[x][y] = hexColor; } + public void setPixel (String hexColor, int x, int y) { screen[x][y] = hexColor; } - public void setRow(String[] hexColor, int row) { + public void setRow (String[] hexColor, 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 4ee151dd..38cfe961 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java @@ -28,8 +28,7 @@ import java.util.concurrent.TimeUnit; public class SelfCarePlugin extends Bot.Listener - implements ChatPlugin.Listener, CommandSpyPlugin.Listener, PositionPlugin.Listener -{ + implements ChatPlugin.Listener, CommandSpyPlugin.Listener, PositionPlugin.Listener { private final Bot bot; private ScheduledFuture checkTask; @@ -64,9 +63,11 @@ public class SelfCarePlugin if (string.equals("Successfully enabled CommandSpy")) cspy = true; else if (string.equals("Successfully disabled CommandSpy")) cspy = false; - else if (string.equals(String.format(bot.options.essentialsMessages.vanishEnable1, bot.username))) vanish = true; + else if (string.equals(String.format(bot.options.essentialsMessages.vanishEnable1, bot.username))) + vanish = true; else if (string.equals(bot.options.essentialsMessages.vanishEnable2)) vanish = true; - else if (string.equals(String.format(bot.options.essentialsMessages.vanishDisable, bot.username))) vanish = false; + else if (string.equals(String.format(bot.options.essentialsMessages.vanishDisable, bot.username))) + vanish = false; else if (string.equals(bot.options.essentialsMessages.nickNameRemove)) nickname = true; else if (string.startsWith(bot.options.essentialsMessages.nickNameSet)) nickname = false; @@ -81,14 +82,14 @@ public class SelfCarePlugin else if (string.startsWith("You no longer have a tag")) prefix = false; else if (string.startsWith("You now have the tag: ")) prefix = false; // prefix = true as a workaround to prevent spamming - else if (string.equals("Something went wrong while saving the prefix. Please check console.")) prefix = true; // Parker2991 + else if (string.equals("Something went wrong while saving the prefix. Please check console.")) + prefix = true; // Parker2991 else if (string.equals("Successfully set your username to \"" + bot.username + "\"")) username = true; else if (string.startsWith("Successfully set your username to \"")) { username = false; usernameStartTime = System.currentTimeMillis(); - } - else if (string.startsWith("You already have the username \"" + bot.username + "\"")) username = true; + } else if (string.startsWith("You already have the username \"" + bot.username + "\"")) username = true; else if (string.startsWith("You already have the username \"")) username = false; return true; @@ -123,19 +124,23 @@ public class SelfCarePlugin // chat only if (selfCares.op && permissionLevel < 2) bot.chat.send("/minecraft:op @s[type=player]"); - else if (selfCares.gamemode && gamemode != GameMode.CREATIVE && !bot.options.creayun) bot.chat.send("/minecraft:gamemode creative @s[type=player]"); + else if (selfCares.gamemode && gamemode != GameMode.CREATIVE && !bot.options.creayun) + bot.chat.send("/minecraft:gamemode creative @s[type=player]"); - // core + // core else if (selfCares.cspy && !cspy && kaboom) { - if (bot.options.useChat || !bot.options.coreCommandSpy) bot.chat.sendCommandInstantly("commandspy:commandspy on"); + if (bot.options.useChat || !bot.options.coreCommandSpy) + bot.chat.sendCommandInstantly("commandspy:commandspy on"); else bot.core.run("commandspy:commandspy " + bot.username + " on"); } // back to chat only - else if (selfCares.prefix.enabled && !prefix && kaboom && !bot.options.creayun) bot.chat.send("/extras:prefix " + bot.config.selfCare.prefix.prefix); - else if (selfCares.username && (System.currentTimeMillis() - usernameStartTime) >= 2 * 1000 && !username && kaboom) bot.chat.send("/extras:username " + bot.username); + else if (selfCares.prefix.enabled && !prefix && kaboom && !bot.options.creayun) + bot.chat.send("/extras:prefix " + bot.config.selfCare.prefix.prefix); + else if (selfCares.username && (System.currentTimeMillis() - usernameStartTime) >= 2 * 1000 && !username && kaboom) + bot.chat.send("/extras:username " + bot.username); - // core + // core else if (hasEssentials) { final String usernameOrBlank = !bot.options.useChat ? bot.username + " " : 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 b984653b..e9ceea55 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TPSPlugin.java @@ -1,16 +1,16 @@ package me.chayapak1.chomens_bot.plugins; +import me.chayapak1.chomens_bot.Bot; +import me.chayapak1.chomens_bot.data.bossbar.BotBossBar; +import me.chayapak1.chomens_bot.util.MathUtilities; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import org.geysermc.mcprotocollib.network.Session; import org.geysermc.mcprotocollib.network.packet.Packet; import org.geysermc.mcprotocollib.protocol.data.game.BossBarColor; import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket; -import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.bossbar.BotBossBar; -import me.chayapak1.chomens_bot.util.MathUtilities; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; import java.text.DecimalFormat; import java.util.Arrays; @@ -129,7 +129,7 @@ public class TPSPlugin extends Bot.Listener implements TickPlugin.Listener { timeGameJoined = timeLastTimeUpdate = System.currentTimeMillis(); } - public double getTickRate() { + public double getTickRate () { if (System.currentTimeMillis() - timeGameJoined < 4000) return 20; int numTicks = 0; 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 5a0c0970..0491e879 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TabCompletePlugin.java @@ -1,10 +1,10 @@ package me.chayapak1.chomens_bot.plugins; +import me.chayapak1.chomens_bot.Bot; import org.geysermc.mcprotocollib.network.Session; import org.geysermc.mcprotocollib.network.packet.Packet; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCommandSuggestionsPacket; import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundCommandSuggestionPacket; -import me.chayapak1.chomens_bot.Bot; import java.util.HashMap; import java.util.Map; 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 7334d79c..20856e1b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java @@ -19,7 +19,7 @@ public class TeamJoinerPlugin { bot.addListener(new Bot.Listener() { @Override - public void connected(ConnectedEvent event) { + public void connected (ConnectedEvent event) { TeamJoinerPlugin.this.connected(); } }); 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 0eddcad8..55ffa5db 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamPlugin.java @@ -7,7 +7,10 @@ import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; import org.geysermc.mcprotocollib.network.packet.Packet; import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; public class TeamPlugin extends Bot.Listener { public final List teams = Collections.synchronizedList(new ArrayList<>()); @@ -17,7 +20,7 @@ public class TeamPlugin extends Bot.Listener { } @Override - public void disconnected(DisconnectedEvent event) { + public void disconnected (DisconnectedEvent event) { teams.clear(); } @@ -38,7 +41,7 @@ public class TeamPlugin extends Bot.Listener { } @Override - public void packetReceived(Session session, Packet packet) { + public void packetReceived (Session session, Packet packet) { if (packet instanceof ClientboundSetPlayerTeamPacket t_packet) packetReceived(t_packet); } 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 d321dc1c..a01460c2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TickPlugin.java @@ -58,8 +58,10 @@ public class TickPlugin { } public interface Listener { - default void onTick () {} - default void onAlwaysTick () {} - default void onSecondTick () {} + default void onTick () { } + + default void onAlwaysTick () { } + + default void onSecondTick () { } } } 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 9c95de93..568b4568 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/VoiceChatPlugin.java @@ -1,12 +1,5 @@ package me.chayapak1.chomens_bot.plugins; -import net.kyori.adventure.key.Key; -import org.geysermc.mcprotocollib.network.Session; -import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; -import org.geysermc.mcprotocollib.network.packet.Packet; -import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket; -import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket; -import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket; import io.netty.buffer.Unpooled; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.voiceChat.ClientGroup; @@ -17,6 +10,13 @@ import me.chayapak1.chomens_bot.voiceChat.NetworkMessage; import me.chayapak1.chomens_bot.voiceChat.customPayload.JoinGroupPacket; import me.chayapak1.chomens_bot.voiceChat.customPayload.SecretPacket; import me.chayapak1.chomens_bot.voiceChat.packets.*; +import net.kyori.adventure.key.Key; +import org.geysermc.mcprotocollib.network.Session; +import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; +import org.geysermc.mcprotocollib.network.packet.Packet; +import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket; +import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket; +import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket; import java.net.*; import java.util.ArrayList; @@ -36,14 +36,14 @@ public class VoiceChatPlugin extends Bot.Listener { public final List groups = new ArrayList<>(); - public VoiceChatPlugin(Bot bot) { + public VoiceChatPlugin (Bot bot) { this.bot = bot; bot.addListener(this); } @Override - public void packetReceived(Session session, Packet packet) { + 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); } @@ -90,9 +90,12 @@ public class VoiceChatPlugin extends Bot.Listener { if (message == null) continue; - if (message.packet instanceof PingPacket pingPacket) sendToServer(new NetworkMessage(pingPacket)); - else if (message.packet instanceof KeepAlivePacket) sendToServer(new NetworkMessage(new KeepAlivePacket())); - else if (message.packet instanceof AuthenticateAckPacket) sendToServer(new NetworkMessage(new ConnectionCheckPacket())); + if (message.packet instanceof PingPacket pingPacket) + sendToServer(new NetworkMessage(pingPacket)); + else if (message.packet instanceof KeepAlivePacket) + sendToServer(new NetworkMessage(new KeepAlivePacket())); + else if (message.packet instanceof AuthenticateAckPacket) + sendToServer(new NetworkMessage(new ConnectionCheckPacket())); } catch (Exception e) { if (running) bot.logger.error(e); else break; // is this neccessary? @@ -177,7 +180,7 @@ public class VoiceChatPlugin extends Bot.Listener { } @Override - public void disconnected(DisconnectedEvent event) { + public void disconnected (DisconnectedEvent event) { socket.close(); groups.clear(); @@ -188,25 +191,25 @@ public class VoiceChatPlugin extends Bot.Listener { private class ClientVoiceChatSocket extends VoiceChatSocketBase { private DatagramSocket socket; - public void open() throws SocketException { + public void open () throws SocketException { this.socket = new DatagramSocket(); } - public RawUdpPacket read() { + public RawUdpPacket read () { if (socket == null) { throw new IllegalStateException("Socket not opened yet"); } return read(socket); } - public void send(byte[] data, SocketAddress address) throws Exception { + public void send (byte[] data, SocketAddress address) throws Exception { if (socket == null) { return; // Ignoring packet sending when socket isn't open yet } socket.send(new DatagramPacket(data, data.length, address)); } - public void close() { + public void close () { if (socket != null) { socket.close(); socket = null; 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 25745bd2..58925b17 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/WorldPlugin.java @@ -38,7 +38,7 @@ public class WorldPlugin extends Bot.Listener { } @Override - public void packetReceived(Session session, Packet packet) { + 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); @@ -119,7 +119,9 @@ public class WorldPlugin extends Bot.Listener { } public ChunkColumn getChunk (int x, int z) { return chunks.get(new ChunkPos(x, z)); } + public ChunkColumn getChunk (ChunkPos pos) { return chunks.get(pos); } + public Collection getChunks () { return chunks.values(); } public int getBlock (int x, int y, int z) { @@ -138,6 +140,6 @@ public class WorldPlugin extends Bot.Listener { public void addListener (Listener listener) { listeners.add(listener); } public interface Listener { - default void worldChanged (String dimension) {} + default void worldChanged (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 ced256e0..a23b9003 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Instrument.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Instrument.java @@ -42,7 +42,8 @@ public class Instrument { 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}; + 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) { 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 5c3876fd..8776064a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/MidiConverter.java @@ -23,12 +23,12 @@ 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 { + public Song getSongFromBytes (byte[] bytes, String name, Bot bot) throws InvalidMidiDataException, IOException { 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 (Sequence sequence, String name, Bot bot) { final Map lyrics = new HashMap<>(); long tpq = sequence.getResolution(); @@ -106,11 +106,11 @@ public class MidiConverter implements Converter { while (tempoEventIdx < tempoEvents.size() && event.getTick() > tempoEvents.get(tempoEventIdx).getTick()) { long deltaTick = tempoEvents.get(tempoEventIdx).getTick() - prevTick; prevTick = tempoEvents.get(tempoEventIdx).getTick(); - microTime += (mpq/tpq) * deltaTick; + 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); + int new_mpq = (data[2] & 0xFF) | ((data[1] & 0xFF) << 8) | ((data[0] & 0xFF) << 16); if (new_mpq != 0) mpq = new_mpq; tempoEventIdx++; } @@ -118,8 +118,7 @@ public class MidiConverter implements Converter { if (message instanceof ShortMessage sm) { if (sm.getCommand() == SET_INSTRUMENT) { ids[sm.getChannel()] = sm.getData1(); - } - else if (sm.getCommand() == ShortMessage.NOTE_ON) { + } else if (sm.getCommand() == ShortMessage.NOTE_ON) { if (sm.getData2() == 0) continue; int pitch = sm.getData1(); int velocity = sm.getData2(); @@ -127,13 +126,12 @@ public class MidiConverter implements Converter { int pan = channelPans[sm.getChannel()]; long deltaTick = event.getTick() - prevTick; prevTick = event.getTick(); - microTime += (mpq/tpq) * deltaTick; + microTime += (mpq / tpq) * deltaTick; Note note; if (sm.getChannel() == 9) { note = getMidiPercussionNote(pitch, effectiveVelocity, microTime, pan); - } - else { + } else { note = getMidiInstrumentNote(ids[sm.getChannel()], pitch, effectiveVelocity, microTime, pan); } if (note != null) { @@ -144,17 +142,15 @@ public class MidiConverter implements Converter { if (time > song.length) { song.length = time; } - } - else if (sm.getCommand() == ShortMessage.NOTE_OFF) { + } else if (sm.getCommand() == ShortMessage.NOTE_OFF) { long deltaTick = event.getTick() - prevTick; prevTick = event.getTick(); - microTime += (mpq/tpq) * deltaTick; + microTime += (mpq / tpq) * deltaTick; long time = microTime / 1000L; if (time > song.length) { song.length = time; } - } - else if (sm.getCommand() == ShortMessage.CONTROL_CHANGE) { + } else if (sm.getCommand() == ShortMessage.CONTROL_CHANGE) { if (sm.getData1() == VOLUME_CONTROL_MSB) { channelVolumes[sm.getChannel()] = sm.getData2(); } else if (sm.getData1() == PAN_CONTROL_MSB) { @@ -163,8 +159,7 @@ public class MidiConverter implements Converter { channelVolumes[sm.getChannel()] = 127; channelPans[sm.getChannel()] = 64; } - } - else if (sm.getCommand() == SYSTEM_RESET) { + } else if (sm.getCommand() == SYSTEM_RESET) { Arrays.fill(channelVolumes, 127); Arrays.fill(channelPans, 64); } @@ -181,19 +176,19 @@ 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 (int midiInstrument, int midiPitch, float velocity, long microTime, int panning) { Instrument shiftedInstrument = null; Instrument[] instrumentList = instrumentMap.get(midiInstrument); if (instrumentList != null) { for (Instrument candidateInstrument : instrumentList) { - if (midiPitch >= candidateInstrument.offset && midiPitch <= candidateInstrument.offset+24) { + if (midiPitch >= candidateInstrument.offset && midiPitch <= candidateInstrument.offset + 24) { shiftedInstrument = candidateInstrument; break; } } if (shiftedInstrument == null) { -// shiftedInstrument = instrumentList[0]; + // shiftedInstrument = instrumentList[0]; // we are finding the closest instrument offset here and use that // closest instrument as the instrument @@ -247,212 +242,214 @@ public class MidiConverter implements Converter { } public static final HashMap instrumentMap = new HashMap<>(); + static { // Piano (HARP BASS BELL) - instrumentMap.put(0, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Acoustic Grand Piano - instrumentMap.put(1, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Bright Acoustic Piano - instrumentMap.put(2, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); // Electric Grand Piano - instrumentMap.put(3, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Honky-tonk Piano - instrumentMap.put(4, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); // Electric Piano 1 - instrumentMap.put(5, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); // Electric Piano 2 - instrumentMap.put(6, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Harpsichord - instrumentMap.put(7, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Clavinet + instrumentMap.put(0, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Acoustic Grand Piano + instrumentMap.put(1, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Bright Acoustic Piano + instrumentMap.put(2, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); // Electric Grand Piano + instrumentMap.put(3, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Honky-tonk Piano + instrumentMap.put(4, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); // Electric Piano 1 + instrumentMap.put(5, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); // Electric Piano 2 + instrumentMap.put(6, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Harpsichord + instrumentMap.put(7, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Clavinet // Chromatic Percussion (IRON_XYLOPHONE XYLOPHONE BASS) - instrumentMap.put(8, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Celesta - instrumentMap.put(9, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Glockenspiel - instrumentMap.put(10, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Music Box - instrumentMap.put(11, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Vibraphone - instrumentMap.put(12, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Marimba - instrumentMap.put(13, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Xylophone - instrumentMap.put(14, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Tubular Bells - instrumentMap.put(15, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); // Dulcimer + instrumentMap.put(8, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Celesta + instrumentMap.put(9, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Glockenspiel + instrumentMap.put(10, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Music Box + instrumentMap.put(11, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Vibraphone + instrumentMap.put(12, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Marimba + instrumentMap.put(13, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Xylophone + instrumentMap.put(14, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Tubular Bells + instrumentMap.put(15, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); // Dulcimer // Organ (BIT DIDGERIDOO BELL) - instrumentMap.put(16, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Drawbar Organ - instrumentMap.put(17, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Percussive Organ - instrumentMap.put(18, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Rock Organ - instrumentMap.put(19, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Church Organ - instrumentMap.put(20, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Reed Organ - instrumentMap.put(21, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Accordian - instrumentMap.put(22, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Harmonica - instrumentMap.put(23, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Tango Accordian + instrumentMap.put(16, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Drawbar Organ + instrumentMap.put(17, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Percussive Organ + instrumentMap.put(18, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Rock Organ + instrumentMap.put(19, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Church Organ + instrumentMap.put(20, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Reed Organ + instrumentMap.put(21, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Accordian + instrumentMap.put(22, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Harmonica + instrumentMap.put(23, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Tango Accordian // Guitar (BIT DIDGERIDOO BELL) - instrumentMap.put(24, new Instrument[]{Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Acoustic Guitar (nylon) - instrumentMap.put(25, new Instrument[]{Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Acoustic Guitar (steel) - instrumentMap.put(26, new Instrument[]{Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Electric Guitar (jazz) - instrumentMap.put(27, new Instrument[]{Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Electric Guitar (clean) - instrumentMap.put(28, new Instrument[]{Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Electric Guitar (muted) - instrumentMap.put(29, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Overdriven Guitar - instrumentMap.put(30, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Distortion Guitar - instrumentMap.put(31, new Instrument[]{Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Guitar Harmonics + instrumentMap.put(24, new Instrument[] { Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Acoustic Guitar (nylon) + instrumentMap.put(25, new Instrument[] { Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Acoustic Guitar (steel) + instrumentMap.put(26, new Instrument[] { Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Electric Guitar (jazz) + instrumentMap.put(27, new Instrument[] { Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Electric Guitar (clean) + instrumentMap.put(28, new Instrument[] { Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Electric Guitar (muted) + instrumentMap.put(29, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Overdriven Guitar + instrumentMap.put(30, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Distortion Guitar + instrumentMap.put(31, new Instrument[] { Instrument.GUITAR, Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Guitar Harmonics // Bass - instrumentMap.put(32, new Instrument[]{Instrument.BASS, Instrument.HARP, Instrument.BELL}); // Acoustic Bass - instrumentMap.put(33, new Instrument[]{Instrument.BASS, Instrument.HARP, Instrument.BELL}); // Electric Bass (finger) - instrumentMap.put(34, new Instrument[]{Instrument.BASS, Instrument.HARP, Instrument.BELL}); // Electric Bass (pick) - instrumentMap.put(35, new Instrument[]{Instrument.BASS, Instrument.HARP, Instrument.BELL}); // Fretless Bass - instrumentMap.put(36, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Slap Bass 1 - instrumentMap.put(37, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Slap Bass 2 - instrumentMap.put(38, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Synth Bass 1 - instrumentMap.put(39, new Instrument[]{Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE}); // Synth Bass 2 + instrumentMap.put(32, new Instrument[] { Instrument.BASS, Instrument.HARP, Instrument.BELL }); // Acoustic Bass + instrumentMap.put(33, new Instrument[] { Instrument.BASS, Instrument.HARP, Instrument.BELL }); // Electric Bass (finger) + instrumentMap.put(34, new Instrument[] { Instrument.BASS, Instrument.HARP, Instrument.BELL }); // Electric Bass (pick) + instrumentMap.put(35, new Instrument[] { Instrument.BASS, Instrument.HARP, Instrument.BELL }); // Fretless Bass + instrumentMap.put(36, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Slap Bass 1 + instrumentMap.put(37, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Slap Bass 2 + instrumentMap.put(38, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Synth Bass 1 + instrumentMap.put(39, new Instrument[] { Instrument.DIDGERIDOO, Instrument.BIT, Instrument.XYLOPHONE }); // Synth Bass 2 // Strings - instrumentMap.put(40, new Instrument[]{Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL}); // Violin - instrumentMap.put(41, new Instrument[]{Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL}); // Viola - instrumentMap.put(42, new Instrument[]{Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL}); // Cello - instrumentMap.put(43, new Instrument[]{Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL}); // Contrabass - instrumentMap.put(44, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); // Tremolo Strings - instrumentMap.put(45, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Pizzicato Strings - instrumentMap.put(46, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.CHIME}); // Orchestral Harp - instrumentMap.put(47, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Timpani + instrumentMap.put(40, new Instrument[] { Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL }); // Violin + instrumentMap.put(41, new Instrument[] { Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL }); // Viola + instrumentMap.put(42, new Instrument[] { Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL }); // Cello + instrumentMap.put(43, new Instrument[] { Instrument.FLUTE, Instrument.GUITAR, Instrument.BASS, Instrument.BELL }); // Contrabass + instrumentMap.put(44, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); // Tremolo Strings + instrumentMap.put(45, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Pizzicato Strings + instrumentMap.put(46, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.CHIME }); // Orchestral Harp + instrumentMap.put(47, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Timpani // Ensenble - instrumentMap.put(48, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // String Ensemble 1 - instrumentMap.put(49, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // String Ensemble 2 - instrumentMap.put(50, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Synth Strings 1 - instrumentMap.put(51, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Synth Strings 2 - instrumentMap.put(52, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Choir Aahs - instrumentMap.put(53, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Voice Oohs - instrumentMap.put(54, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Synth Choir - instrumentMap.put(55, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); // Orchestra Hit + instrumentMap.put(48, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // String Ensemble 1 + instrumentMap.put(49, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // String Ensemble 2 + instrumentMap.put(50, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Synth Strings 1 + instrumentMap.put(51, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Synth Strings 2 + instrumentMap.put(52, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Choir Aahs + instrumentMap.put(53, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Voice Oohs + instrumentMap.put(54, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Synth Choir + instrumentMap.put(55, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Orchestra Hit // Brass - instrumentMap.put(56, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(57, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(58, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(59, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(60, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(61, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(62, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(63, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); + instrumentMap.put(56, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(57, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(58, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(59, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(60, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(61, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(62, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(63, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); // Reed - instrumentMap.put(64, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(65, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(66, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(67, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(68, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(69, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(70, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(71, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); + instrumentMap.put(64, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(65, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(66, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(67, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(68, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(69, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(70, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(71, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); // Pipe - instrumentMap.put(72, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(73, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(74, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(75, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(76, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(77, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(78, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); - instrumentMap.put(79, new Instrument[]{Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL}); + instrumentMap.put(72, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(73, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(74, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(75, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(76, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(77, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(78, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); + instrumentMap.put(79, new Instrument[] { Instrument.FLUTE, Instrument.DIDGERIDOO, Instrument.IRON_XYLOPHONE, Instrument.BELL }); // Synth Lead - instrumentMap.put(80, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(81, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(82, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(83, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(84, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(85, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(86, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(87, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); + instrumentMap.put(80, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(81, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(82, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(83, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(84, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(85, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(86, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(87, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Synth Pad - instrumentMap.put(88, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(89, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(90, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(91, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(92, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(93, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(94, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(95, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); + instrumentMap.put(88, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(89, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(90, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(91, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(92, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(93, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(94, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(95, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Synth Effects -// instrumentMap.put(96, new Instrument[]{}); -// instrumentMap.put(97, new Instrument[]{}); - instrumentMap.put(98, new Instrument[]{Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(99, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(100, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(101, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(102, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(103, new Instrument[]{Instrument.HARP, Instrument.BASS, Instrument.BELL}); + // instrumentMap.put(96, new Instrument[]{}); + // instrumentMap.put(97, new Instrument[]{}); + instrumentMap.put(98, new Instrument[] { Instrument.BIT, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(99, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(100, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(101, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(102, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(103, new Instrument[] { Instrument.HARP, Instrument.BASS, Instrument.BELL }); // Ethnic - instrumentMap.put(104, new Instrument[]{Instrument.BANJO, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(105, new Instrument[]{Instrument.BANJO, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(106, new Instrument[]{Instrument.BANJO, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(107, new Instrument[]{Instrument.BANJO, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(108, new Instrument[]{Instrument.BANJO, Instrument.BASS, Instrument.BELL}); - instrumentMap.put(109, new Instrument[]{Instrument.HARP, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(110, new Instrument[]{Instrument.HARP, Instrument.DIDGERIDOO, Instrument.BELL}); - instrumentMap.put(111, new Instrument[]{Instrument.HARP, Instrument.DIDGERIDOO, Instrument.BELL}); + instrumentMap.put(104, new Instrument[] { Instrument.BANJO, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(105, new Instrument[] { Instrument.BANJO, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(106, new Instrument[] { Instrument.BANJO, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(107, new Instrument[] { Instrument.BANJO, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(108, new Instrument[] { Instrument.BANJO, Instrument.BASS, Instrument.BELL }); + instrumentMap.put(109, new Instrument[] { Instrument.HARP, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(110, new Instrument[] { Instrument.HARP, Instrument.DIDGERIDOO, Instrument.BELL }); + instrumentMap.put(111, new Instrument[] { Instrument.HARP, Instrument.DIDGERIDOO, Instrument.BELL }); // Percussive - instrumentMap.put(112, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(113, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(114, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(115, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(116, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(117, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(118, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); - instrumentMap.put(119, new Instrument[]{Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE}); + instrumentMap.put(112, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(113, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(114, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(115, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(116, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(117, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(118, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); + instrumentMap.put(119, new Instrument[] { Instrument.IRON_XYLOPHONE, Instrument.BASS, Instrument.XYLOPHONE }); } public static final HashMap percussionMap = new HashMap<>(); + static { - percussionMap.put(35, 10 + 25*Instrument.BASEDRUM.id); - percussionMap.put(36, 6 + 25*Instrument.BASEDRUM.id); - percussionMap.put(37, 6 + 25*Instrument.HAT.id); - percussionMap.put(38, 8 + 25*Instrument.SNARE.id); - percussionMap.put(39, 6 + 25*Instrument.HAT.id); - percussionMap.put(40, 4 + 25*Instrument.SNARE.id); - percussionMap.put(41, 6 + 25*Instrument.BASEDRUM.id); - percussionMap.put(42, 22 + 25*Instrument.SNARE.id); - percussionMap.put(43, 13 + 25*Instrument.BASEDRUM.id); - percussionMap.put(44, 22 + 25*Instrument.SNARE.id); - percussionMap.put(45, 15 + 25*Instrument.BASEDRUM.id); - percussionMap.put(46, 18 + 25*Instrument.SNARE.id); - percussionMap.put(47, 20 + 25*Instrument.BASEDRUM.id); - percussionMap.put(48, 23 + 25*Instrument.BASEDRUM.id); - percussionMap.put(49, 17 + 25*Instrument.SNARE.id); - percussionMap.put(50, 23 + 25*Instrument.BASEDRUM.id); - percussionMap.put(51, 24 + 25*Instrument.SNARE.id); - percussionMap.put(52, 8 + 25*Instrument.SNARE.id); - percussionMap.put(53, 13 + 25*Instrument.SNARE.id); - percussionMap.put(54, 18 + 25*Instrument.HAT.id); - percussionMap.put(55, 18 + 25*Instrument.SNARE.id); - percussionMap.put(56, 1 + 25*Instrument.HAT.id); - percussionMap.put(57, 13 + 25*Instrument.SNARE.id); - percussionMap.put(58, 2 + 25*Instrument.HAT.id); - percussionMap.put(59, 13 + 25*Instrument.SNARE.id); - percussionMap.put(60, 9 + 25*Instrument.HAT.id); - percussionMap.put(61, 2 + 25*Instrument.HAT.id); - percussionMap.put(62, 8 + 25*Instrument.HAT.id); - percussionMap.put(63, 22 + 25*Instrument.BASEDRUM.id); - percussionMap.put(64, 15 + 25*Instrument.BASEDRUM.id); - percussionMap.put(65, 13 + 25*Instrument.SNARE.id); - percussionMap.put(66, 8 + 25*Instrument.SNARE.id); - percussionMap.put(67, 8 + 25*Instrument.HAT.id); - percussionMap.put(68, 3 + 25*Instrument.HAT.id); - percussionMap.put(69, 20 + 25*Instrument.HAT.id); - percussionMap.put(70, 23 + 25*Instrument.HAT.id); - percussionMap.put(71, 24 + 25*Instrument.HAT.id); - percussionMap.put(72, 24 + 25*Instrument.HAT.id); - percussionMap.put(73, 17 + 25*Instrument.HAT.id); - percussionMap.put(74, 11 + 25*Instrument.HAT.id); - percussionMap.put(75, 18 + 25*Instrument.HAT.id); - percussionMap.put(76, 9 + 25*Instrument.HAT.id); - percussionMap.put(77, 5 + 25*Instrument.HAT.id); - percussionMap.put(78, 22 + 25*Instrument.HAT.id); - percussionMap.put(79, 19 + 25*Instrument.SNARE.id); - percussionMap.put(80, 17 + 25*Instrument.HAT.id); - percussionMap.put(81, 22 + 25*Instrument.HAT.id); - percussionMap.put(82, 22 + 25*Instrument.SNARE.id); - percussionMap.put(83, 24 + 25*Instrument.CHIME.id); - percussionMap.put(84, 24 + 25*Instrument.CHIME.id); - percussionMap.put(85, 21 + 25*Instrument.HAT.id); - percussionMap.put(86, 14 + 25*Instrument.BASEDRUM.id); - percussionMap.put(87, 7 + 25*Instrument.BASEDRUM.id); + percussionMap.put(35, 10 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(36, 6 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(37, 6 + 25 * Instrument.HAT.id); + percussionMap.put(38, 8 + 25 * Instrument.SNARE.id); + percussionMap.put(39, 6 + 25 * Instrument.HAT.id); + percussionMap.put(40, 4 + 25 * Instrument.SNARE.id); + percussionMap.put(41, 6 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(42, 22 + 25 * Instrument.SNARE.id); + percussionMap.put(43, 13 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(44, 22 + 25 * Instrument.SNARE.id); + percussionMap.put(45, 15 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(46, 18 + 25 * Instrument.SNARE.id); + percussionMap.put(47, 20 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(48, 23 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(49, 17 + 25 * Instrument.SNARE.id); + percussionMap.put(50, 23 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(51, 24 + 25 * Instrument.SNARE.id); + percussionMap.put(52, 8 + 25 * Instrument.SNARE.id); + percussionMap.put(53, 13 + 25 * Instrument.SNARE.id); + percussionMap.put(54, 18 + 25 * Instrument.HAT.id); + percussionMap.put(55, 18 + 25 * Instrument.SNARE.id); + percussionMap.put(56, 1 + 25 * Instrument.HAT.id); + percussionMap.put(57, 13 + 25 * Instrument.SNARE.id); + percussionMap.put(58, 2 + 25 * Instrument.HAT.id); + percussionMap.put(59, 13 + 25 * Instrument.SNARE.id); + percussionMap.put(60, 9 + 25 * Instrument.HAT.id); + percussionMap.put(61, 2 + 25 * Instrument.HAT.id); + percussionMap.put(62, 8 + 25 * Instrument.HAT.id); + percussionMap.put(63, 22 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(64, 15 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(65, 13 + 25 * Instrument.SNARE.id); + percussionMap.put(66, 8 + 25 * Instrument.SNARE.id); + percussionMap.put(67, 8 + 25 * Instrument.HAT.id); + percussionMap.put(68, 3 + 25 * Instrument.HAT.id); + percussionMap.put(69, 20 + 25 * Instrument.HAT.id); + percussionMap.put(70, 23 + 25 * Instrument.HAT.id); + percussionMap.put(71, 24 + 25 * Instrument.HAT.id); + percussionMap.put(72, 24 + 25 * Instrument.HAT.id); + percussionMap.put(73, 17 + 25 * Instrument.HAT.id); + percussionMap.put(74, 11 + 25 * Instrument.HAT.id); + percussionMap.put(75, 18 + 25 * Instrument.HAT.id); + percussionMap.put(76, 9 + 25 * Instrument.HAT.id); + percussionMap.put(77, 5 + 25 * Instrument.HAT.id); + percussionMap.put(78, 22 + 25 * Instrument.HAT.id); + percussionMap.put(79, 19 + 25 * Instrument.SNARE.id); + percussionMap.put(80, 17 + 25 * Instrument.HAT.id); + percussionMap.put(81, 22 + 25 * Instrument.HAT.id); + percussionMap.put(82, 22 + 25 * Instrument.SNARE.id); + percussionMap.put(83, 24 + 25 * Instrument.CHIME.id); + percussionMap.put(84, 24 + 25 * Instrument.CHIME.id); + percussionMap.put(85, 21 + 25 * Instrument.HAT.id); + percussionMap.put(86, 14 + 25 * Instrument.BASEDRUM.id); + percussionMap.put(87, 7 + 25 * Instrument.BASEDRUM.id); } } 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 357a2116..2ff9b48a 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java @@ -79,7 +79,7 @@ public class NBSConverter implements Converter { } @Override - public Song getSongFromBytes(byte[] bytes, String fileName, Bot bot) throws IOException { + public Song getSongFromBytes (byte[] bytes, String fileName, Bot bot) throws IOException { ByteBuffer buffer = ByteBuffer.wrap(bytes); buffer.order(ByteOrder.LITTLE_ENDIAN); @@ -151,7 +151,7 @@ public class NBSConverter implements Converter { ArrayList nbsLayers = new ArrayList<>(); if (buffer.hasRemaining()) { - for (int i=0; i= 4) { @@ -190,7 +190,7 @@ public class NBSConverter implements Converter { 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; + // song.loopCount = maxLoopCount; } for (NBSNote note : nbsNotes) { boolean isRainbowToggle = false; @@ -282,7 +282,7 @@ public class NBSConverter implements Converter { ); } - song.length = song.get(song.size()-1).time + 50; + song.length = song.get(song.size() - 1).time + 50; return song; } 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 7da9305e..b1a959ba 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Note.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Note.java @@ -59,7 +59,7 @@ public class Note implements Comparable { } @Override - public int compareTo(Note other) { + public int compareTo (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 25174146..f61bc2e5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/Song.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/Song.java @@ -2,7 +2,10 @@ package me.chayapak1.chomens_bot.song; import me.chayapak1.chomens_bot.Bot; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import static me.chayapak1.chomens_bot.util.StringUtilities.isNotNullAndNotBlank; @@ -30,8 +33,8 @@ public class Song { public final boolean nbs; -// public int loopCount = 0; // Number of times to loop -// public int currentLoop = 0; // Number of loops so far + // public int loopCount = 0; // Number of times to loop + // public int currentLoop = 0; // Number of loops so far private final Bot bot; @@ -48,7 +51,7 @@ public class Song { updateName(); } - public void updateName() { + public void updateName () { String authorPart = null; if (isNotNullAndNotBlank(songOriginalAuthor) && isNotNullAndNotBlank(songAuthor)) { 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 e5360fa4..5351ff5e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java @@ -46,7 +46,7 @@ public class SongLoaderThread extends Thread { private boolean isFolder = false; - public SongLoaderThread(URL location, Bot bot, String requester) { + public SongLoaderThread (URL location, Bot bot, String requester) { this.bot = bot; this.requester = requester; isUrl = true; @@ -55,7 +55,7 @@ public class SongLoaderThread extends Thread { fileName = location.getFile(); } - public SongLoaderThread(Path location, Bot bot, String requester) { + public SongLoaderThread (Path location, Bot bot, String requester) { this.bot = bot; this.requester = requester; isUrl = false; @@ -123,7 +123,7 @@ public class SongLoaderThread extends Thread { try { song = converter.getSongFromBytes(bytes, name, bot); - } catch (Exception ignored) {} + } catch (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 66705696..098e95d1 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongPlayerConverter.java @@ -13,11 +13,11 @@ import java.util.zip.GZIPInputStream; // Author: hhhzzzsss (i ported it from songplayer) public class SongPlayerConverter implements Converter { - public static final byte[] FILE_TYPE_SIGNATURE = {-53, 123, -51, -124, -122, -46, -35, 38}; + public static final byte[] FILE_TYPE_SIGNATURE = { -53, 123, -51, -124, -122, -46, -35, 38 }; public static final long MAX_UNCOMPRESSED_SIZE = 50 * 1024 * 1024; @Override - public Song getSongFromBytes(byte[] bytes, String fileName, Bot bot) throws Exception { + public Song getSongFromBytes (byte[] bytes, String fileName, Bot bot) throws Exception { InputStream is = new LimitedSizeInputStream(new GZIPInputStream(new ByteArrayInputStream(bytes)), MAX_UNCOMPRESSED_SIZE); bytes = is.readAllBytes(); is.close(); @@ -45,8 +45,8 @@ public class SongPlayerConverter implements Converter { 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; + // song.looping = loop > 0; + // song.loopCount = loopCount; song.loopPosition = loopPosition; long time = 0; @@ -55,11 +55,9 @@ public class SongPlayerConverter implements Converter { 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)); - } - else if ((noteId & 0xFFFF) == 0xFFFF) { + } else if ((noteId & 0xFFFF) == 0xFFFF) { break; - } - else { + } else { throw new IOException("Song contains invalid note id of " + noteId); } } @@ -67,7 +65,7 @@ public class SongPlayerConverter implements Converter { return song; } - private static String getString(ByteBuffer buffer, int maxSize) throws IOException { + private static String getString (ByteBuffer buffer, int maxSize) throws IOException { int length = buffer.getInt(); if (length > maxSize) { throw new IOException("String is too large"); @@ -77,7 +75,7 @@ public class SongPlayerConverter implements Converter { return new String(arr, StandardCharsets.UTF_8); } - private static long getVarLong(ByteBuffer buffer) { + private static long getVarLong (ByteBuffer buffer) { long val = 0; long mult = 1; int flag = 1; @@ -95,33 +93,33 @@ public class SongPlayerConverter implements Converter { private final long maxSize; private long total; - public LimitedSizeInputStream(InputStream original, long maxSize) { + public LimitedSizeInputStream (InputStream original, long maxSize) { this.original = original; this.maxSize = maxSize; } @Override - public int read() throws IOException { + public int read () throws IOException { int i = original.read(); - if (i>=0) incrementCounter(1); + if (i >= 0) incrementCounter(1); return i; } @Override - public int read(byte @NotNull [] b) throws IOException { + public int read (byte @NotNull [] b) throws IOException { return read(b, 0, b.length); } @Override - public int read(byte @NotNull [] b, int off, int len) throws IOException { + public int read (byte @NotNull [] b, int off, int len) throws IOException { int i = original.read(b, off, len); - if (i>=0) incrementCounter(i); + if (i >= 0) incrementCounter(i); return i; } - private void incrementCounter(int size) throws IOException { + private void incrementCounter (int size) throws IOException { total += size; - if (total>maxSize) throw new IOException("Input stream exceeded maximum size of " + maxSize + " bytes"); + 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 ab949e22..4aa7cf7c 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 (byte[] bytes, String fileName, Bot bot) { final String data = new String(bytes, StandardCharsets.UTF_8); if (!data.contains(":")) return null; @@ -44,7 +44,7 @@ public class TextFileConverter implements Converter { int intInstrument = -1; try { intInstrument = Integer.parseInt(instrument); - } catch (NumberFormatException ignored) {} + } catch (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 366fe7be..d45f07e2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/AESUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/AESUtilities.java @@ -18,24 +18,24 @@ public class AESUtilities { private static final SecureRandom RANDOM = new SecureRandom(); private static final String CIPHER = "AES/CBC/PKCS5Padding"; - public static byte[] getBytesFromUUID(UUID uuid) { + public static byte[] getBytesFromUUID (UUID uuid) { ByteBuffer buffer = ByteBuffer.wrap(new byte[16]); buffer.putLong(uuid.getMostSignificantBits()); buffer.putLong(uuid.getLeastSignificantBits()); return buffer.array(); } - private static byte[] generateIV() { + private static byte[] generateIV () { byte[] iv = new byte[16]; RANDOM.nextBytes(iv); return iv; } - private static SecretKeySpec createKeySpec(UUID secret) { + private static SecretKeySpec createKeySpec (UUID secret) { return new SecretKeySpec(getBytesFromUUID(secret), "AES"); } - public static byte[] encrypt(UUID secret, byte[] data) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + 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); @@ -47,7 +47,7 @@ public class AESUtilities { return payload; } - public static byte[] decrypt(UUID secret, byte[] payload) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { + public static byte[] decrypt (UUID secret, byte[] payload) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException { byte[] iv = new byte[16]; System.arraycopy(payload, 0, iv, 0, iv.length); byte[] data = new byte[payload.length - iv.length]; 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 2221fcb5..e81557ff 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/Ascii85.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/Ascii85.java @@ -23,19 +23,19 @@ public class Ascii85 { 85, 85 * 85, 85 * 85 * 85, - 85 * 85 * 85 *85 + 85 * 85 * 85 * 85 }; private static final Pattern REMOVE_WHITESPACE = Pattern.compile("\\s+"); - private Ascii85 () {} + private Ascii85 () { } - public static String encode(byte[] payload) { + public static String encode (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); + StringBuilder stringBuff = new StringBuilder(payload.length * 5 / 4); // We break the payload into int (4 bytes) byte[] chunk = new byte[4]; int chunkIndex = 0; @@ -59,10 +59,10 @@ public class Ascii85 { //If we didn't end on 0, then we need some padding if (chunkIndex > 0) { int numPadded = chunk.length - chunkIndex; - Arrays.fill(chunk, chunkIndex, chunk.length, (byte)0); + Arrays.fill(chunk, chunkIndex, chunk.length, (byte) 0); int value = byteToInt(chunk); char[] encodedChunk = encodeChunk(value); - for(int i = 0 ; i < encodedChunk.length - numPadded; i++) { + for (int i = 0; i < encodedChunk.length - numPadded; i++) { stringBuff.append(encodedChunk[i]); } } @@ -70,11 +70,11 @@ public class Ascii85 { return stringBuff.toString(); } - private static char[] encodeChunk(int value) { + private static char[] encodeChunk (int value) { //transform value to unsigned long long longValue = value & 0x00000000ffffffffL; char[] encodedChunk = new char[5]; - for(int i = 0 ; i < encodedChunk.length; i++) { + for (int i = 0; i < encodedChunk.length; i++) { encodedChunk[i] = (char) ((longValue / BASE85_POW[4 - i]) + ASCII_SHIFT); longValue = longValue % BASE85_POW[4 - i]; } @@ -84,11 +84,12 @@ public class Ascii85 { /** * This is a very simple base85 decoder. It respects the 'z' optimization for empty chunks, and * strips whitespace between characters to respect line limits. - * @see Ascii85 + * * @param chars The input characters that are base85 encoded. * @return The binary data decoded from the input + * @see Ascii85 */ - public static byte[] decode(String chars) { + public static byte[] decode (String chars) { if (chars == null) { throw new IllegalArgumentException("You must provide a non-null input"); } @@ -145,18 +146,18 @@ public class Ascii85 { // If we didn't end on 0, then we need some padding if (chunkIndex > 0) { int numPadded = chunk.length - chunkIndex; - Arrays.fill(chunk, chunkIndex, chunk.length, (byte)'u'); + Arrays.fill(chunk, chunkIndex, chunk.length, (byte) 'u'); byte[] paddedDecode = decodeChunk(chunk); - for(int i = 0 ; i < paddedDecode.length - numPadded; i++) { + for (int i = 0; i < paddedDecode.length - numPadded; i++) { bytebuff.put(paddedDecode[i]); } } bytebuff.flip(); - return Arrays.copyOf(bytebuff.array(),bytebuff.limit()); + return Arrays.copyOf(bytebuff.array(), bytebuff.limit()); } - private static byte[] decodeChunk(byte[] chunk) { + private static byte[] decodeChunk (byte[] chunk) { if (chunk.length != 5) { throw new IllegalArgumentException("You can only decode chunks of size 5."); } @@ -172,14 +173,14 @@ public class Ascii85 { return intToByte(value); } - private static int byteToInt(byte[] value) { + private static int byteToInt (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 (int value) { return new byte[] { (byte) (value >>> 24), (byte) (value >>> 16), 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 6a0b5bdb..31512b5d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ColorUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ColorUtilities.java @@ -27,7 +27,7 @@ public class ColorUtilities { } } - public static char getClosestChatColor(int rgb) { + public static char getClosestChatColor (int rgb) { final NamedTextColor closestNamed = NamedTextColor.nearestTo(TextColor.color(rgb)); return formatToLegacyMap.get(closestNamed); } @@ -69,7 +69,7 @@ public class ColorUtilities { ansiStyleToIrcMap.put(4, "\u001f"); // Underlined } - public static String convertAnsiToIrc(String input) { + public static String convertAnsiToIrc (String input) { StringBuilder result = new StringBuilder(); boolean insideEscape = false; StringBuilder ansiCode = new StringBuilder(); 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 83ce43ce..c9ace3e9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ComponentUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ComponentUtilities.java @@ -26,8 +26,8 @@ public class ComponentUtilities { TextReplacementConfig .builder() .match(Pattern - .compile("((https?://(ww(w|\\d)\\.)?|ww(w|\\d))[-a-zA-Z0-9@:%._+~#=]{1,256}" - + "\\.[a-zA-Z0-9]{1,63}\\b([-a-zA-Z0-9@:%_+.~#?&/=]*))")) + .compile("((https?://(ww(w|\\d)\\.)?|ww(w|\\d))[-a-zA-Z0-9@:%._+~#=]{1,256}" + + "\\.[a-zA-Z0-9]{1,63}\\b([-a-zA-Z0-9@:%_+.~#?&/=]*))")) .replacement((b, c) -> { if (c == null) { return null; @@ -95,8 +95,11 @@ public class ComponentUtilities { } public static String stringify (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 stringifyAnsi (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 deserializeFromDiscordAnsi (String original) { return new ComponentParser().deserializeFromDiscordAnsi(original); } @@ -107,6 +110,7 @@ public class ComponentUtilities { public static final long MAX_TIME = 100; // this is actually more than we need public static final Map ANSI_MAP = new HashMap<>(); + static { ANSI_MAP.put("0", "\u001b[38;2;0;0;0m"); ANSI_MAP.put("1", "\u001b[38;2;0;0;170m"); @@ -133,6 +137,7 @@ public class ComponentUtilities { } public static final Map DISCORD_ANSI_MAP = new HashMap<>(); + static { // map totallynotskidded™ from https://github.com/PrismarineJS/prismarine-chat/blob/master/index.js#L10 @@ -354,8 +359,8 @@ public class ComponentUtilities { final String result = lastStyle + color + style + - originalResult + - (lastStyle.isEmpty() ? resetCode : ""); + originalResult + + (lastStyle.isEmpty() ? resetCode : ""); lastStyle = color + style; @@ -384,7 +389,7 @@ public class ComponentUtilities { DISCORD_ANSI_MAP.get(code); else return color; }); - } catch (Exception ignored) {} + } catch (Exception ignored) { } } return getPartialResultAndSetLastColor(replacedContent, color, style); @@ -435,7 +440,7 @@ public class ComponentUtilities { } else { matcher.appendReplacement(sb, ""); } - } catch (NumberFormatException ignored) {} // is this a good idea? + } catch (NumberFormatException ignored) { } // is this a good idea? } } 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 6c786b4d..3f086303 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/DownloadUtilities.java @@ -6,8 +6,11 @@ import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -17,13 +20,13 @@ 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 (X509Certificate[] arg0, String arg1) { } @Override - public void checkServerTrusted(X509Certificate[] arg0, String arg1) {} + public void checkServerTrusted (X509Certificate[] arg0, String arg1) { } @Override - public X509Certificate[] getAcceptedIssuers() { + public X509Certificate[] getAcceptedIssuers () { return null; } } @@ -34,13 +37,13 @@ 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 (URL url, int maxSize) throws IOException, KeyManagementException, NoSuchAlgorithmException { if (limit > 3) throw new IOException("NO !!!!!!"); limit++; SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(new KeyManager[0], new TrustManager[] {new DefaultTrustManager()}, new SecureRandom()); + ctx.init(new KeyManager[0], new TrustManager[] { new DefaultTrustManager() }, new SecureRandom()); SSLContext.setDefault(ctx); URLConnection conn = url.openConnection(); 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 4fd931b9..1afcef0f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java @@ -45,7 +45,7 @@ public class FileLoggerUtilities { init(); } - public static void init() { + public static void init () { try { if (!Files.exists(logDirectory)) Files.createDirectory(logDirectory); @@ -70,7 +70,7 @@ public class FileLoggerUtilities { } } - private static void tick() { + private static void tick () { if (freezeTime <= System.currentTimeMillis() && spamLevel > 0) { spamLevel--; } @@ -85,19 +85,19 @@ public class FileLoggerUtilities { } } - public static synchronized void makeNewLogFile() throws IOException { + public static synchronized void makeNewLogFile () throws IOException { currentLogDate = LocalDate.now(); logWriter = new OutputStreamWriter(Files.newOutputStream(logPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING), StandardCharsets.UTF_8); logWriter.write(currentLogDate.toString() + '\n'); logWriter.flush(); } - public static synchronized void openLogFile() throws IOException { + public static synchronized void openLogFile () throws IOException { currentLogDate = LocalDate.parse(getLogDate(logPath)); logWriter = new OutputStreamWriter(Files.newOutputStream(logPath, StandardOpenOption.CREATE, StandardOpenOption.APPEND), StandardCharsets.UTF_8); } - public static synchronized void compressLogFile() throws IOException { + public static synchronized void compressLogFile () throws IOException { if (Files.size(logPath) > 100 * 1024 * 1024) { // Will not save because log file is too big return; } @@ -122,12 +122,12 @@ public class FileLoggerUtilities { } } - public static synchronized boolean logIsCurrent(Path path) throws IOException { + public static synchronized boolean logIsCurrent (Path path) throws IOException { LocalDate date = LocalDate.now(); return getLogDate(path).equals(date.toString()); } - public static synchronized void log(String type, String str) { + public static synchronized void log (String type, String str) { if (freezeTime > System.currentTimeMillis()) { return; } @@ -174,7 +174,7 @@ public class FileLoggerUtilities { } } - public static String getPrefix(String type) { + public static String getPrefix (String type) { LocalDateTime dateTime = LocalDateTime.now(); return String.format( "[%s %s] ", 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 581cdce0..bae8e710 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/FriendlyByteBuf.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/FriendlyByteBuf.java @@ -1,6 +1,8 @@ package me.chayapak1.chomens_bot.util; -import io.netty.buffer.*; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.Unpooled; import io.netty.handler.codec.DecoderException; import io.netty.handler.codec.EncoderException; import io.netty.util.ByteProcessor; @@ -21,24 +23,24 @@ public class FriendlyByteBuf extends ByteBuf { private final ByteBuf buf; - public FriendlyByteBuf(ByteBuf byteBuf) { + public FriendlyByteBuf (ByteBuf byteBuf) { buf = byteBuf; } - public FriendlyByteBuf() { + public FriendlyByteBuf () { this(Unpooled.buffer()); } - public void writeByteArray(byte[] bs) { + public void writeByteArray (byte[] bs) { writeVarInt(bs.length); writeBytes(bs); } - public byte[] readByteArray() { + public byte[] readByteArray () { return readByteArray(readableBytes()); } - public byte[] readByteArray(int i) { + public byte[] readByteArray (int i) { int j = readVarInt(); if (j > i) { throw new DecoderException("ByteArray with size " + j + " is bigger than allowed " + i); @@ -49,7 +51,7 @@ public class FriendlyByteBuf extends ByteBuf { } } - public int readVarInt() { + public int readVarInt () { int i = 0; int j = 0; @@ -65,16 +67,16 @@ public class FriendlyByteBuf extends ByteBuf { return i; } - public void writeUUID(UUID uUID) { + public void writeUUID (UUID uUID) { writeLong(uUID.getMostSignificantBits()); writeLong(uUID.getLeastSignificantBits()); } - public UUID readUUID() { + public UUID readUUID () { return new UUID(readLong(), readLong()); } - public void writeVarInt(int i) { + public void writeVarInt (int i) { while ((i & -128) != 0) { writeByte(i & 127 | 128); i >>>= 7; @@ -83,7 +85,7 @@ public class FriendlyByteBuf extends ByteBuf { writeByte(i); } - public String readUtf(int i) { + public String readUtf (int i) { int j = readVarInt(); if (j > i * 4) { throw new DecoderException("The received encoded string buffer length is longer than maximum allowed (" + j + " > " + i * 4 + ')'); @@ -100,7 +102,7 @@ public class FriendlyByteBuf extends ByteBuf { } } - public void writeUtf(String string, int i) { + public void writeUtf (String string, int i) { byte[] bs = string.getBytes(StandardCharsets.UTF_8); if (bs.length > i) { throw new EncoderException("String too big (was " + bs.length + " bytes encoded, max " + i + ')'); @@ -110,926 +112,926 @@ public class FriendlyByteBuf extends ByteBuf { } } - public String readUtf() { + public String readUtf () { return readUtf(32767); } - public void writeUtf(String string) { + public void writeUtf (String string) { writeUtf(string, 32767); } @Override - public int capacity() { + public int capacity () { return buf.capacity(); } @Override - public ByteBuf capacity(int i) { + public ByteBuf capacity (int i) { return buf.capacity(i); } @Override - public int maxCapacity() { + public int maxCapacity () { return buf.maxCapacity(); } @Override - public ByteBufAllocator alloc() { + public ByteBufAllocator alloc () { return buf.alloc(); } @Override - public ByteOrder order() { + public ByteOrder order () { return buf.order(); } @Override - public ByteBuf order(ByteOrder byteOrder) { + public ByteBuf order (ByteOrder byteOrder) { return buf.order(byteOrder); } @Override - public ByteBuf unwrap() { + public ByteBuf unwrap () { return buf.unwrap(); } @Override - public boolean isDirect() { + public boolean isDirect () { return buf.isDirect(); } @Override - public boolean isReadOnly() { + public boolean isReadOnly () { return buf.isReadOnly(); } @Override - public ByteBuf asReadOnly() { + public ByteBuf asReadOnly () { return buf.asReadOnly(); } @Override - public int readerIndex() { + public int readerIndex () { return buf.readerIndex(); } @Override - public ByteBuf readerIndex(int i) { + public ByteBuf readerIndex (int i) { return buf.readerIndex(i); } @Override - public int writerIndex() { + public int writerIndex () { return buf.writerIndex(); } @Override - public ByteBuf writerIndex(int i) { + public ByteBuf writerIndex (int i) { return buf.writerIndex(i); } @Override - public ByteBuf setIndex(int i, int j) { + public ByteBuf setIndex (int i, int j) { return buf.setIndex(i, j); } @Override - public int readableBytes() { + public int readableBytes () { return buf.readableBytes(); } @Override - public int writableBytes() { + public int writableBytes () { return buf.writableBytes(); } @Override - public int maxWritableBytes() { + public int maxWritableBytes () { return buf.maxWritableBytes(); } @Override - public boolean isReadable() { + public boolean isReadable () { return buf.isReadable(); } @Override - public boolean isReadable(int i) { + public boolean isReadable (int i) { return buf.isReadable(i); } @Override - public boolean isWritable() { + public boolean isWritable () { return buf.isWritable(); } @Override - public boolean isWritable(int i) { + public boolean isWritable (int i) { return buf.isWritable(i); } @Override - public ByteBuf clear() { + public ByteBuf clear () { return buf.clear(); } @Override - public ByteBuf markReaderIndex() { + public ByteBuf markReaderIndex () { return buf.markReaderIndex(); } @Override - public ByteBuf resetReaderIndex() { + public ByteBuf resetReaderIndex () { return buf.resetReaderIndex(); } @Override - public ByteBuf markWriterIndex() { + public ByteBuf markWriterIndex () { return buf.markWriterIndex(); } @Override - public ByteBuf resetWriterIndex() { + public ByteBuf resetWriterIndex () { return buf.resetWriterIndex(); } @Override - public ByteBuf discardReadBytes() { + public ByteBuf discardReadBytes () { return buf.discardReadBytes(); } @Override - public ByteBuf discardSomeReadBytes() { + public ByteBuf discardSomeReadBytes () { return buf.discardSomeReadBytes(); } @Override - public ByteBuf ensureWritable(int i) { + public ByteBuf ensureWritable (int i) { return buf.ensureWritable(i); } @Override - public int ensureWritable(int i, boolean bl) { + public int ensureWritable (int i, boolean bl) { return buf.ensureWritable(i, bl); } @Override - public boolean getBoolean(int i) { + public boolean getBoolean (int i) { return buf.getBoolean(i); } @Override - public byte getByte(int i) { + public byte getByte (int i) { return buf.getByte(i); } @Override - public short getUnsignedByte(int i) { + public short getUnsignedByte (int i) { return buf.getUnsignedByte(i); } @Override - public short getShort(int i) { + public short getShort (int i) { return buf.getShort(i); } @Override - public short getShortLE(int i) { + public short getShortLE (int i) { return buf.getShortLE(i); } @Override - public int getUnsignedShort(int i) { + public int getUnsignedShort (int i) { return buf.getUnsignedShort(i); } @Override - public int getUnsignedShortLE(int i) { + public int getUnsignedShortLE (int i) { return buf.getUnsignedShortLE(i); } @Override - public int getMedium(int i) { + public int getMedium (int i) { return buf.getMedium(i); } @Override - public int getMediumLE(int i) { + public int getMediumLE (int i) { return buf.getMediumLE(i); } @Override - public int getUnsignedMedium(int i) { + public int getUnsignedMedium (int i) { return buf.getUnsignedMedium(i); } @Override - public int getUnsignedMediumLE(int i) { + public int getUnsignedMediumLE (int i) { return buf.getUnsignedMediumLE(i); } @Override - public int getInt(int i) { + public int getInt (int i) { return buf.getInt(i); } @Override - public int getIntLE(int i) { + public int getIntLE (int i) { return buf.getIntLE(i); } @Override - public long getUnsignedInt(int i) { + public long getUnsignedInt (int i) { return buf.getUnsignedInt(i); } @Override - public long getUnsignedIntLE(int i) { + public long getUnsignedIntLE (int i) { return buf.getUnsignedIntLE(i); } @Override - public long getLong(int i) { + public long getLong (int i) { return buf.getLong(i); } @Override - public long getLongLE(int i) { + public long getLongLE (int i) { return buf.getLongLE(i); } @Override - public char getChar(int i) { + public char getChar (int i) { return buf.getChar(i); } @Override - public float getFloat(int i) { + public float getFloat (int i) { return buf.getFloat(i); } @Override - public double getDouble(int i) { + public double getDouble (int i) { return buf.getDouble(i); } @Override - public ByteBuf getBytes(int i, ByteBuf byteBuf) { + public ByteBuf getBytes (int i, ByteBuf byteBuf) { return buf.getBytes(i, byteBuf); } @Override - public ByteBuf getBytes(int i, ByteBuf byteBuf, int j) { + public ByteBuf getBytes (int i, ByteBuf byteBuf, int j) { return buf.getBytes(i, byteBuf, j); } @Override - public ByteBuf getBytes(int i, ByteBuf byteBuf, int j, int k) { + public ByteBuf getBytes (int i, ByteBuf byteBuf, int j, int k) { return buf.getBytes(i, byteBuf, j, k); } @Override - public ByteBuf getBytes(int i, byte[] bs) { + public ByteBuf getBytes (int i, byte[] bs) { return buf.getBytes(i, bs); } @Override - public ByteBuf getBytes(int i, byte[] bs, int j, int k) { + public ByteBuf getBytes (int i, byte[] bs, int j, int k) { return buf.getBytes(i, bs, j, k); } @Override - public ByteBuf getBytes(int i, ByteBuffer byteBuffer) { + public ByteBuf getBytes (int i, ByteBuffer byteBuffer) { return buf.getBytes(i, byteBuffer); } @Override - public ByteBuf getBytes(int i, OutputStream outputStream, int j) throws IOException { + public ByteBuf getBytes (int i, OutputStream outputStream, 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 (int i, GatheringByteChannel gatheringByteChannel, 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 (int i, FileChannel fileChannel, long l, int j) throws IOException { return buf.getBytes(i, fileChannel, l, j); } @Override - public CharSequence getCharSequence(int i, int j, Charset charset) { + public CharSequence getCharSequence (int i, int j, Charset charset) { return buf.getCharSequence(i, j, charset); } @Override - public ByteBuf setBoolean(int i, boolean bl) { + public ByteBuf setBoolean (int i, boolean bl) { return buf.setBoolean(i, bl); } @Override - public ByteBuf setByte(int i, int j) { + public ByteBuf setByte (int i, int j) { return buf.setByte(i, j); } @Override - public ByteBuf setShort(int i, int j) { + public ByteBuf setShort (int i, int j) { return buf.setShort(i, j); } @Override - public ByteBuf setShortLE(int i, int j) { + public ByteBuf setShortLE (int i, int j) { return buf.setShortLE(i, j); } @Override - public ByteBuf setMedium(int i, int j) { + public ByteBuf setMedium (int i, int j) { return buf.setMedium(i, j); } @Override - public ByteBuf setMediumLE(int i, int j) { + public ByteBuf setMediumLE (int i, int j) { return buf.setMediumLE(i, j); } @Override - public ByteBuf setInt(int i, int j) { + public ByteBuf setInt (int i, int j) { return buf.setInt(i, j); } @Override - public ByteBuf setIntLE(int i, int j) { + public ByteBuf setIntLE (int i, int j) { return buf.setIntLE(i, j); } @Override - public ByteBuf setLong(int i, long l) { + public ByteBuf setLong (int i, long l) { return buf.setLong(i, l); } @Override - public ByteBuf setLongLE(int i, long l) { + public ByteBuf setLongLE (int i, long l) { return buf.setLongLE(i, l); } @Override - public ByteBuf setChar(int i, int j) { + public ByteBuf setChar (int i, int j) { return buf.setChar(i, j); } @Override - public ByteBuf setFloat(int i, float f) { + public ByteBuf setFloat (int i, float f) { return buf.setFloat(i, f); } @Override - public ByteBuf setDouble(int i, double d) { + public ByteBuf setDouble (int i, double d) { return buf.setDouble(i, d); } @Override - public ByteBuf setBytes(int i, ByteBuf byteBuf) { + public ByteBuf setBytes (int i, ByteBuf byteBuf) { return buf.setBytes(i, byteBuf); } @Override - public ByteBuf setBytes(int i, ByteBuf byteBuf, int j) { + public ByteBuf setBytes (int i, ByteBuf byteBuf, int j) { return buf.setBytes(i, byteBuf, j); } @Override - public ByteBuf setBytes(int i, ByteBuf byteBuf, int j, int k) { + public ByteBuf setBytes (int i, ByteBuf byteBuf, int j, int k) { return buf.setBytes(i, byteBuf, j, k); } @Override - public ByteBuf setBytes(int i, byte[] bs) { + public ByteBuf setBytes (int i, byte[] bs) { return buf.setBytes(i, bs); } @Override - public ByteBuf setBytes(int i, byte[] bs, int j, int k) { + public ByteBuf setBytes (int i, byte[] bs, int j, int k) { return buf.setBytes(i, bs, j, k); } @Override - public ByteBuf setBytes(int i, ByteBuffer byteBuffer) { + public ByteBuf setBytes (int i, ByteBuffer byteBuffer) { return buf.setBytes(i, byteBuffer); } @Override - public int setBytes(int i, InputStream inputStream, int j) throws IOException { + public int setBytes (int i, InputStream inputStream, 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 (int i, ScatteringByteChannel scatteringByteChannel, 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 (int i, FileChannel fileChannel, long l, int j) throws IOException { return buf.setBytes(i, fileChannel, l, j); } @Override - public ByteBuf setZero(int i, int j) { + public ByteBuf setZero (int i, int j) { return buf.setZero(i, j); } @Override - public int setCharSequence(int i, CharSequence charSequence, Charset charset) { + public int setCharSequence (int i, CharSequence charSequence, Charset charset) { return buf.setCharSequence(i, charSequence, charset); } @Override - public boolean readBoolean() { + public boolean readBoolean () { return buf.readBoolean(); } @Override - public byte readByte() { + public byte readByte () { return buf.readByte(); } @Override - public short readUnsignedByte() { + public short readUnsignedByte () { return buf.readUnsignedByte(); } @Override - public short readShort() { + public short readShort () { return buf.readShort(); } @Override - public short readShortLE() { + public short readShortLE () { return buf.readShortLE(); } @Override - public int readUnsignedShort() { + public int readUnsignedShort () { return buf.readUnsignedShort(); } @Override - public int readUnsignedShortLE() { + public int readUnsignedShortLE () { return buf.readUnsignedShortLE(); } @Override - public int readMedium() { + public int readMedium () { return buf.readMedium(); } @Override - public int readMediumLE() { + public int readMediumLE () { return buf.readMediumLE(); } @Override - public int readUnsignedMedium() { + public int readUnsignedMedium () { return buf.readUnsignedMedium(); } @Override - public int readUnsignedMediumLE() { + public int readUnsignedMediumLE () { return buf.readUnsignedMediumLE(); } @Override - public int readInt() { + public int readInt () { return buf.readInt(); } @Override - public int readIntLE() { + public int readIntLE () { return buf.readIntLE(); } @Override - public long readUnsignedInt() { + public long readUnsignedInt () { return buf.readUnsignedInt(); } @Override - public long readUnsignedIntLE() { + public long readUnsignedIntLE () { return buf.readUnsignedIntLE(); } @Override - public long readLong() { + public long readLong () { return buf.readLong(); } @Override - public long readLongLE() { + public long readLongLE () { return buf.readLongLE(); } @Override - public char readChar() { + public char readChar () { return buf.readChar(); } @Override - public float readFloat() { + public float readFloat () { return buf.readFloat(); } @Override - public double readDouble() { + public double readDouble () { return buf.readDouble(); } @Override - public ByteBuf readBytes(int i) { + public ByteBuf readBytes (int i) { return buf.readBytes(i); } @Override - public ByteBuf readSlice(int i) { + public ByteBuf readSlice (int i) { return buf.readSlice(i); } @Override - public ByteBuf readRetainedSlice(int i) { + public ByteBuf readRetainedSlice (int i) { return buf.readRetainedSlice(i); } @Override - public ByteBuf readBytes(ByteBuf byteBuf) { + public ByteBuf readBytes (ByteBuf byteBuf) { return buf.readBytes(byteBuf); } @Override - public ByteBuf readBytes(ByteBuf byteBuf, int i) { + public ByteBuf readBytes (ByteBuf byteBuf, int i) { return buf.readBytes(byteBuf, i); } @Override - public ByteBuf readBytes(ByteBuf byteBuf, int i, int j) { + public ByteBuf readBytes (ByteBuf byteBuf, int i, int j) { return buf.readBytes(byteBuf, i, j); } @Override - public ByteBuf readBytes(byte[] bs) { + public ByteBuf readBytes (byte[] bs) { return buf.readBytes(bs); } @Override - public ByteBuf readBytes(byte[] bs, int i, int j) { + public ByteBuf readBytes (byte[] bs, int i, int j) { return buf.readBytes(bs, i, j); } @Override - public ByteBuf readBytes(ByteBuffer byteBuffer) { + public ByteBuf readBytes (ByteBuffer byteBuffer) { return buf.readBytes(byteBuffer); } @Override - public ByteBuf readBytes(OutputStream outputStream, int i) throws IOException { + public ByteBuf readBytes (OutputStream outputStream, int i) throws IOException { return buf.readBytes(outputStream, i); } @Override - public int readBytes(GatheringByteChannel gatheringByteChannel, int i) throws IOException { + public int readBytes (GatheringByteChannel gatheringByteChannel, int i) throws IOException { return buf.readBytes(gatheringByteChannel, i); } @Override - public CharSequence readCharSequence(int i, Charset charset) { + public CharSequence readCharSequence (int i, Charset charset) { return buf.readCharSequence(i, charset); } @Override - public int readBytes(FileChannel fileChannel, long l, int i) throws IOException { + public int readBytes (FileChannel fileChannel, long l, int i) throws IOException { return buf.readBytes(fileChannel, l, i); } @Override - public ByteBuf skipBytes(int i) { + public ByteBuf skipBytes (int i) { return buf.skipBytes(i); } @Override - public ByteBuf writeBoolean(boolean bl) { + public ByteBuf writeBoolean (boolean bl) { return buf.writeBoolean(bl); } @Override - public ByteBuf writeByte(int i) { + public ByteBuf writeByte (int i) { return buf.writeByte(i); } @Override - public ByteBuf writeShort(int i) { + public ByteBuf writeShort (int i) { return buf.writeShort(i); } @Override - public ByteBuf writeShortLE(int i) { + public ByteBuf writeShortLE (int i) { return buf.writeShortLE(i); } @Override - public ByteBuf writeMedium(int i) { + public ByteBuf writeMedium (int i) { return buf.writeMedium(i); } @Override - public ByteBuf writeMediumLE(int i) { + public ByteBuf writeMediumLE (int i) { return buf.writeMediumLE(i); } @Override - public ByteBuf writeInt(int i) { + public ByteBuf writeInt (int i) { return buf.writeInt(i); } @Override - public ByteBuf writeIntLE(int i) { + public ByteBuf writeIntLE (int i) { return buf.writeIntLE(i); } @Override - public ByteBuf writeLong(long l) { + public ByteBuf writeLong (long l) { return buf.writeLong(l); } @Override - public ByteBuf writeLongLE(long l) { + public ByteBuf writeLongLE (long l) { return buf.writeLongLE(l); } @Override - public ByteBuf writeChar(int i) { + public ByteBuf writeChar (int i) { return buf.writeChar(i); } @Override - public ByteBuf writeFloat(float f) { + public ByteBuf writeFloat (float f) { return buf.writeFloat(f); } @Override - public ByteBuf writeDouble(double d) { + public ByteBuf writeDouble (double d) { return buf.writeDouble(d); } @Override - public ByteBuf writeBytes(ByteBuf byteBuf) { + public ByteBuf writeBytes (ByteBuf byteBuf) { return buf.writeBytes(byteBuf); } @Override - public ByteBuf writeBytes(ByteBuf byteBuf, int i) { + public ByteBuf writeBytes (ByteBuf byteBuf, int i) { return buf.writeBytes(byteBuf, i); } @Override - public ByteBuf writeBytes(ByteBuf byteBuf, int i, int j) { + public ByteBuf writeBytes (ByteBuf byteBuf, int i, int j) { return buf.writeBytes(byteBuf, i, j); } @Override - public ByteBuf writeBytes(byte[] bs) { + public ByteBuf writeBytes (byte[] bs) { return buf.writeBytes(bs); } @Override - public ByteBuf writeBytes(byte[] bs, int i, int j) { + public ByteBuf writeBytes (byte[] bs, int i, int j) { return buf.writeBytes(bs, i, j); } @Override - public ByteBuf writeBytes(ByteBuffer byteBuffer) { + public ByteBuf writeBytes (ByteBuffer byteBuffer) { return buf.writeBytes(byteBuffer); } @Override - public int writeBytes(InputStream inputStream, int i) throws IOException { + public int writeBytes (InputStream inputStream, int i) throws IOException { return buf.writeBytes(inputStream, i); } @Override - public int writeBytes(ScatteringByteChannel scatteringByteChannel, int i) throws IOException { + public int writeBytes (ScatteringByteChannel scatteringByteChannel, int i) throws IOException { return buf.writeBytes(scatteringByteChannel, i); } @Override - public int writeBytes(FileChannel fileChannel, long l, int i) throws IOException { + public int writeBytes (FileChannel fileChannel, long l, int i) throws IOException { return buf.writeBytes(fileChannel, l, i); } @Override - public ByteBuf writeZero(int i) { + public ByteBuf writeZero (int i) { return buf.writeZero(i); } @Override - public int writeCharSequence(CharSequence charSequence, Charset charset) { + public int writeCharSequence (CharSequence charSequence, Charset charset) { return buf.writeCharSequence(charSequence, charset); } @Override - public int indexOf(int i, int j, byte b) { + public int indexOf (int i, int j, byte b) { return buf.indexOf(i, j, b); } @Override - public int bytesBefore(byte b) { + public int bytesBefore (byte b) { return buf.bytesBefore(b); } @Override - public int bytesBefore(int i, byte b) { + public int bytesBefore (int i, byte b) { return buf.bytesBefore(i, b); } @Override - public int bytesBefore(int i, int j, byte b) { + public int bytesBefore (int i, int j, byte b) { return buf.bytesBefore(i, j, b); } @Override - public int forEachByte(ByteProcessor byteProcessor) { + public int forEachByte (ByteProcessor byteProcessor) { return buf.forEachByte(byteProcessor); } @Override - public int forEachByte(int i, int j, ByteProcessor byteProcessor) { + public int forEachByte (int i, int j, ByteProcessor byteProcessor) { return buf.forEachByte(i, j, byteProcessor); } @Override - public int forEachByteDesc(ByteProcessor byteProcessor) { + public int forEachByteDesc (ByteProcessor byteProcessor) { return buf.forEachByteDesc(byteProcessor); } @Override - public int forEachByteDesc(int i, int j, ByteProcessor byteProcessor) { + public int forEachByteDesc (int i, int j, ByteProcessor byteProcessor) { return buf.forEachByteDesc(i, j, byteProcessor); } @Override - public ByteBuf copy() { + public ByteBuf copy () { return buf.copy(); } @Override - public ByteBuf copy(int i, int j) { + public ByteBuf copy (int i, int j) { return buf.copy(i, j); } @Override - public ByteBuf slice() { + public ByteBuf slice () { return buf.slice(); } @Override - public ByteBuf retainedSlice() { + public ByteBuf retainedSlice () { return buf.retainedSlice(); } @Override - public ByteBuf slice(int i, int j) { + public ByteBuf slice (int i, int j) { return buf.slice(i, j); } @Override - public ByteBuf retainedSlice(int i, int j) { + public ByteBuf retainedSlice (int i, int j) { return buf.retainedSlice(i, j); } @Override - public ByteBuf duplicate() { + public ByteBuf duplicate () { return buf.duplicate(); } @Override - public ByteBuf retainedDuplicate() { + public ByteBuf retainedDuplicate () { return buf.retainedDuplicate(); } @Override - public int nioBufferCount() { + public int nioBufferCount () { return buf.nioBufferCount(); } @Override - public ByteBuffer nioBuffer() { + public ByteBuffer nioBuffer () { return buf.nioBuffer(); } @Override - public ByteBuffer nioBuffer(int i, int j) { + public ByteBuffer nioBuffer (int i, int j) { return buf.nioBuffer(i, j); } @Override - public ByteBuffer internalNioBuffer(int i, int j) { + public ByteBuffer internalNioBuffer (int i, int j) { return buf.internalNioBuffer(i, j); } @Override - public ByteBuffer[] nioBuffers() { + public ByteBuffer[] nioBuffers () { return buf.nioBuffers(); } @Override - public ByteBuffer[] nioBuffers(int i, int j) { + public ByteBuffer[] nioBuffers (int i, int j) { return buf.nioBuffers(i, j); } @Override - public boolean hasArray() { + public boolean hasArray () { return buf.hasArray(); } @Override - public byte[] array() { + public byte[] array () { return buf.array(); } @Override - public int arrayOffset() { + public int arrayOffset () { return buf.arrayOffset(); } @Override - public boolean hasMemoryAddress() { + public boolean hasMemoryAddress () { return buf.hasMemoryAddress(); } @Override - public long memoryAddress() { + public long memoryAddress () { return buf.memoryAddress(); } @Override - public String toString(Charset charset) { + public String toString (Charset charset) { return buf.toString(charset); } @Override - public String toString(int i, int j, Charset charset) { + public String toString (int i, int j, Charset charset) { return buf.toString(i, j, charset); } @Override - public int hashCode() { + public int hashCode () { return buf.hashCode(); } @Override - public boolean equals(Object object) { + public boolean equals (Object object) { return buf.equals(object); } @Override - public int compareTo(ByteBuf byteBuf) { + public int compareTo (ByteBuf byteBuf) { return buf.compareTo(byteBuf); } @Override - public String toString() { + public String toString () { return buf.toString(); } @Override - public ByteBuf retain(int i) { + public ByteBuf retain (int i) { return buf.retain(i); } @Override - public ByteBuf retain() { + public ByteBuf retain () { return buf.retain(); } @Override - public ByteBuf touch() { + public ByteBuf touch () { return buf.touch(); } @Override - public ByteBuf touch(Object object) { + public ByteBuf touch (Object object) { return buf.touch(object); } @Override - public int refCnt() { + public int refCnt () { return buf.refCnt(); } @Override - public boolean release() { + public boolean release () { return buf.release(); } @Override - public boolean release(int i) { + public boolean release (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 7ddf74d0..6c4e9f18 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/HTMLUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/HTMLUtilities.java @@ -10,7 +10,7 @@ public class HTMLUtilities { private static final String CODE_COLOR = "§2"; private static final String DEFAULT_COLOR = "§a"; - public static String toFormattingCodes (String html) { + public static String toFormattingCodes (String html) { Matcher matcher = HTML_TAG_PATTERN.matcher(html); StringBuilder raw = new StringBuilder(); 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 7fb72653..34b57ff6 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/HttpUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/HttpUtilities.java @@ -20,7 +20,7 @@ public class HttpUtilities { public static String getRequest (URL url) throws NoSuchAlgorithmException, KeyManagementException, IOException { SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(new KeyManager[0], new TrustManager[] {new DownloadUtilities.DefaultTrustManager()}, new SecureRandom()); + ctx.init(new KeyManager[0], new TrustManager[] { new DownloadUtilities.DefaultTrustManager() }, new SecureRandom()); SSLContext.setDefault(ctx); URLConnection conn = url.openConnection(); @@ -42,7 +42,7 @@ public class HttpUtilities { public static String postRequest (URL url, String contentType, String requestBody) throws Exception { SSLContext ctx = SSLContext.getInstance("TLS"); - ctx.init(new KeyManager[0], new TrustManager[] {new DownloadUtilities.DefaultTrustManager()}, new SecureRandom()); + ctx.init(new KeyManager[0], new TrustManager[] { new DownloadUtilities.DefaultTrustManager() }, new SecureRandom()); SSLContext.setDefault(ctx); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); 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 a16b2e0a..e4df5c4e 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/IllegalCharactersUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/IllegalCharactersUtilities.java @@ -1,7 +1,7 @@ package me.chayapak1.chomens_bot.util; public class IllegalCharactersUtilities { - public static String stripIllegalCharacters(String string) { + public static String stripIllegalCharacters (String string) { final StringBuilder replaced = new StringBuilder(); for (char character : string.toCharArray()) { 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 59d5b21e..2958472f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/LevenshteinUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/LevenshteinUtilities.java @@ -10,7 +10,7 @@ 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 (String text, Collection texts) { final Map output = new ValueComparableMap<>(Ordering.natural()); for (String eachText : texts) { @@ -21,11 +21,11 @@ public class LevenshteinUtilities { return output.keySet().stream().toList(); } - public static int searchLevenshteinDefault(String text, String filter, boolean caseSensitive) { + public static int searchLevenshteinDefault (String text, String filter, 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, String filter) { if (filter.isEmpty()) return 1; int wordsFound = 0; @@ -40,7 +40,7 @@ public class LevenshteinUtilities { return wordsFound; } - public static int levenshteinDistance(String from, String to, int insCost, int subCost, int delCost) { + public static int levenshteinDistance (String from, String to, int insCost, int subCost, int delCost) { int textLength = from.length(); int filterLength = to.length(); @@ -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; + 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; 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 689f625d..7f553760 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java @@ -39,11 +39,17 @@ public class LoggerUtilities { } public static void log (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 (LogType type, 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 (Bot bot, 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 (LogType type, Bot bot, Component message, boolean logToFile, boolean logToConsole) { final Component component = getPrefix(bot, type.component, message); @@ -52,9 +58,9 @@ public class LoggerUtilities { if (logToFile) { final String formattedMessage = bot == null ? ComponentUtilities.stringify(message) : String.format( - "[%s] %s", - bot.getServerString(true), - ComponentUtilities.stringify(message) + "[%s] %s", + bot.getServerString(true), + ComponentUtilities.stringify(message) ); FileLoggerUtilities.log(ComponentUtilities.stringify(type.component), formattedMessage); @@ -62,7 +68,9 @@ public class LoggerUtilities { } public static void error (String message) { log(LogType.ERROR, message); } + public static void error (Component message) { log(LogType.ERROR, message); } + public static void error (Throwable throwable) { log(LogType.ERROR, ExceptionUtilities.getStacktrace(throwable)); } private static void print (String message) { 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 a4f4ada6..38c20c8c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/RandomStringUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/RandomStringUtilities.java @@ -5,7 +5,7 @@ import java.security.SecureRandom; // https://stackoverflow.com/questions/41107/how-to-generate-a-random-alpha-numeric-string // but modified public class RandomStringUtilities { - private static String nextString() { + private static String nextString () { // fard for (int i = 0; i < buf.length; i++) buf[i] = symbols[random.nextInt(symbols.length)]; 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 99e63c2b..93b172d0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java @@ -51,7 +51,7 @@ public class StringUtilities { } // https://stackoverflow.com/a/25379180/18518424 - public static boolean containsIgnoreCase(String src, String what) { + public static boolean containsIgnoreCase (String src, String what) { final int length = what.length(); if (length == 0) return true; // Empty string is contained 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 39c0984f..84bfcb30 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/UUIDUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/UUIDUtilities.java @@ -3,8 +3,8 @@ package me.chayapak1.chomens_bot.util; import org.cloudburstmc.nbt.NbtMap; import org.cloudburstmc.nbt.NbtMapBuilder; -import java.util.UUID; import java.nio.ByteBuffer; +import java.util.UUID; // Author: _ChipMC_ for int array and selector stuff public class UUIDUtilities { @@ -51,8 +51,10 @@ public class UUIDUtilities { } public static String selector (UUID uuid) { return selector(uuid, true); } + public static String selector (UUID uuid, boolean end) { return "@p[nbt={UUID:" + snbt(uuid) + "}" + (end ? "]" : ""); } public static String exclusiveSelector (UUID uuid) { return exclusiveSelector(uuid, true); } + public static String exclusiveSelector (UUID uuid, 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 0688219d..f1ef52a8 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/ValueComparableMap.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/ValueComparableMap.java @@ -9,32 +9,32 @@ import java.util.Map; import java.util.TreeMap; // https://github.com/MeteorDevelopment/meteor-client/blob/master/src/main/java/meteordevelopment/meteorclient/utils/misc/ValueComparableMap.java -public class ValueComparableMap, V> extends TreeMap { +public class ValueComparableMap , V> extends TreeMap { private final Map valueMap; - public ValueComparableMap(final Ordering partialValueOrdering) { + public ValueComparableMap (final Ordering partialValueOrdering) { this(partialValueOrdering, new HashMap<>()); } - private ValueComparableMap(Ordering partialValueOrdering, HashMap valueMap) { + private ValueComparableMap (Ordering partialValueOrdering, HashMap valueMap) { super(partialValueOrdering.onResultOf(valueMap::get).compound(Comparator.naturalOrder())); this.valueMap = valueMap; } @Override - public V put(K k, V v) { + public V put (K k, V v) { if (valueMap.containsKey(k)) remove(k); - valueMap.put(k,v); + valueMap.put(k, v); return super.put(k, v); } @Override - public boolean containsKey(Object key) { + public boolean containsKey (Object key) { return valueMap.containsKey(key); } @Override - public V getOrDefault(Object key, V defaultValue) { + public V getOrDefault (Object key, 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 96a7bb3d..27e72ab9 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 (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 d5a05d4b..f0325748 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 (Packet packet) { this(System.currentTimeMillis()); this.packet = packet; } - private NetworkMessage(long timestamp) { + private NetworkMessage (long timestamp) { this.timestamp = timestamp; } @@ -40,9 +40,9 @@ public class NetworkMessage { static { packetRegistry = new HashMap<>(); packetRegistry.put((byte) 0x1, MicPacket.class); -// packetRegistry.put((byte) 0x2, PlayerSoundPacket.class); -// packetRegistry.put((byte) 0x3, GroupSoundPacket.class); -// packetRegistry.put((byte) 0x4, LocationSoundPacket.class); + // packetRegistry.put((byte) 0x2, PlayerSoundPacket.class); + // packetRegistry.put((byte) 0x3, GroupSoundPacket.class); + // packetRegistry.put((byte) 0x4, LocationSoundPacket.class); packetRegistry.put((byte) 0x5, AuthenticatePacket.class); packetRegistry.put((byte) 0x6, AuthenticateAckPacket.class); packetRegistry.put((byte) 0x7, PingPacket.class); @@ -62,7 +62,7 @@ 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 { + private static NetworkMessage readFromBytes (SocketAddress socketAddress, UUID secret, byte[] encryptedPayload, long timestamp) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { byte[] decrypt; try { decrypt = AESUtilities.decrypt(secret, encryptedPayload); @@ -84,7 +84,7 @@ public class NetworkMessage { return message; } - private static byte getPacketType(Packet> packet) { + private static byte getPacketType (Packet> packet) { for (Map.Entry>> entry : packetRegistry.entrySet()) { if (packet.getClass().equals(entry.getValue())) { return entry.getKey(); @@ -93,7 +93,7 @@ public class NetworkMessage { return -1; } - public byte[] writeClient(InitializationData data) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { + 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)); buffer.writeByte(MAGIC_BYTE); @@ -105,7 +105,7 @@ public class NetworkMessage { return bytes; } - public byte[] write(UUID secret) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { + public byte[] write (UUID secret) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer()); byte type = getPacketType(packet); diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/Packet.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/Packet.java index 661e5f0a..6d33fe48 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/Packet.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/Packet.java @@ -2,7 +2,7 @@ package me.chayapak1.chomens_bot.voiceChat; import me.chayapak1.chomens_bot.util.FriendlyByteBuf; -public interface Packet> { +public interface Packet > { T fromBytes (FriendlyByteBuf buf); void toBytes (FriendlyByteBuf buf); 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 740be02f..7f426604 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 @@ -9,7 +9,7 @@ public class JoinGroupPacket implements Packet { public UUID group; public String password; - public JoinGroupPacket () {} + public JoinGroupPacket () { } public JoinGroupPacket (UUID group, String password) { this.group = group; @@ -17,7 +17,7 @@ public class JoinGroupPacket implements Packet { } @Override - public JoinGroupPacket fromBytes(FriendlyByteBuf buf) { + public JoinGroupPacket fromBytes (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 (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 c023f9cc..07aeca24 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 (FriendlyByteBuf buf) { secret = buf.readUUID(); serverPort = buf.readInt(); playerUUID = buf.readUUID(); 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 172833f9..89b17675 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 @@ -18,7 +18,7 @@ public class JavaOpusDecoder { open(); } - private void open() { + private void open () { if (opusDecoder != null) { return; } @@ -29,7 +29,7 @@ public class JavaOpusDecoder { } } - public short[] decode(byte[] data) { + public short[] decode (byte[] data) { if (isClosed()) { throw new IllegalStateException("Decoder is closed"); } @@ -50,18 +50,18 @@ public class JavaOpusDecoder { return audio; } - public boolean isClosed() { + public boolean isClosed () { return opusDecoder == null; } - public void close() { + public void close () { if (opusDecoder == null) { return; } opusDecoder = null; } - public void resetState() { + public void resetState () { if (isClosed()) { throw new IllegalStateException("Decoder is closed"); } 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 85f43d59..9b3dca31 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 int frameSize; public de.maxhenkel.opus4j.OpusEncoder.Application application; - public JavaOpusEncoder(int sampleRate, int frameSize, int maxPayloadSize, de.maxhenkel.opus4j.OpusEncoder.Application application) { + public JavaOpusEncoder (int sampleRate, int frameSize, int maxPayloadSize, de.maxhenkel.opus4j.OpusEncoder.Application application) { this.sampleRate = sampleRate; this.frameSize = frameSize; this.application = application; @@ -18,7 +18,7 @@ public class JavaOpusEncoder { open(); } - private void open() { + private void open () { if (opusEncoder != null) { return; } @@ -29,7 +29,7 @@ public class JavaOpusEncoder { } } - public byte[] encode(short[] rawAudio) { + public byte[] encode (short[] rawAudio) { if (isClosed()) { throw new IllegalStateException("Encoder is closed"); } @@ -50,25 +50,25 @@ public class JavaOpusEncoder { return audio; } - public void resetState() { + public void resetState () { if (isClosed()) { throw new IllegalStateException("Encoder is closed"); } opusEncoder.resetState(); } - public boolean isClosed() { + public boolean isClosed () { return opusEncoder == null; } - public void close() { + public void close () { if (isClosed()) { return; } opusEncoder = null; } - public static OpusApplication getApplication(de.maxhenkel.opus4j.OpusEncoder.Application application) { + public static OpusApplication getApplication (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 3b7f8e18..2b94577d 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 @@ -20,7 +20,7 @@ public class JavaOpusEncoder2 { open(); } - private void open() { + private void open () { if (opusEncoder != null) { return; } @@ -31,7 +31,7 @@ public class JavaOpusEncoder2 { } } - public byte[] encode(short[] rawAudio) { + public byte[] encode (short[] rawAudio) { if (isClosed()) { throw new IllegalStateException("Encoder is closed"); } @@ -52,18 +52,18 @@ public class JavaOpusEncoder2 { return audio; } - public void resetState() { + public void resetState () { if (isClosed()) { throw new IllegalStateException("Encoder is closed"); } opusEncoder.resetState(); } - public boolean isClosed() { + public boolean isClosed () { return opusEncoder == null; } - public void close() { + public void close () { if (isClosed()) { return; } diff --git a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/MicThread.java b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/MicThread.java index bd4d0f80..9cf1d579 100644 --- a/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/MicThread.java +++ b/src/main/java/me/chayapak1/chomens_bot/voiceChat/mic/MicThread.java @@ -2,154 +2,154 @@ package me.chayapak1.chomens_bot.voiceChat.mic; public class MicThread extends Thread { // this will probably never be finished -// private Microphone mic; -// private boolean running; -// private boolean microphoneLocked; -// private boolean wasWhispering; -// private final JavaOpusEncoder2 encoder; -// -// public MicThread() { -// this.running = true; -// this.encoder = OpusManager.createEncoder(); -// -// setDaemon(true); -// setName("Simple Voice Chat Microphone Thread"); -// } -// -// @Override -// public void run() { -// Microphone mic = getMic(); -// if (mic == null) { -// return; -// } -// -// while (running) { -// short[] audio = pollMic(); -// if (audio == null) { -// continue; -// } -// -// voice(audio); -// } -// } -// -// public short[] pollMic() { -// Microphone mic = getMic(); -// if (mic == null) { -// throw new IllegalStateException("No microphone available"); -// } -// if (!mic.isStarted()) { -// mic.start(); -// } -// -// if (mic.available() < SoundManager.FRAME_SIZE) { -// Utils.sleep(5); -// return null; -// } -// short[] buff = mic.read(); -// volumeManager.adjustVolumeMono(buff, VoicechatClient.CLIENT_CONFIG.microphoneAmplification.get().floatValue()); -// return denoiseIfEnabled(buff); -// } -// -// private Microphone getMic() { -// if (!running) { -// return null; -// } -// if (mic == null) { -// try { -// mic = MicrophoneManager.createMicrophone(); -// } catch (MicrophoneException e) { -// running = false; -// return null; -// } -// } -// return mic; -// } -// -// private volatile boolean activating; -// private volatile int deactivationDelay; -// private volatile short[] lastBuff; -// -// private void voice(short[] audio) { -// sendAudioPacket(audio); -// lastBuff = audio; -// } -// -// private void flush() { -// sendStopPacket(); -// if (!encoder.isClosed()) { -// encoder.resetState(); -// } -// } -// -// public boolean isTalking() { -// return !microphoneLocked && (activating || wasPTT); -// } -// -// public boolean isWhispering() { -// return isTalking() && wasWhispering; -// } -// -// public void close() { -// if (!running) { -// return; -// } -// running = false; -// -// if (Thread.currentThread() != this) { -// try { -// join(100); -// } catch (InterruptedException e) { -// bot.logger.error(e); -// } -// } -// -// mic.close(); -// encoder.close(); -// flush(); -// } -// -// private final AtomicLong sequenceNumber = new AtomicLong(); -// private volatile boolean stopPacketSent = true; -// -// private void sendAudioPacket(short[] data) { -// short[] audio = PluginManager.instance().onClientSound(data, whispering); -// if (audio == null) { -// return; -// } -// -// try { -// if (connection != null && connection.isInitialized()) { -// byte[] encoded = encoder.encode(audio); -// connection.sendToServer(new NetworkMessage(new MicPacket(encoded, whispering, sequenceNumber.getAndIncrement()))); -// stopPacketSent = false; -// } -// } catch (Exception e) { -// bot.logger.error(e); -// } -// try { -// if (client != null && client.getRecorder() != null) { -// client.getRecorder().appendChunk(Minecraft.getInstance().getUser().getGameProfile().getId(), System.currentTimeMillis(), PositionalAudioUtils.convertToStereo(audio)); -// } -// } catch (IOException e) { -// Voicechat.LOGGER.error("Failed to record audio", e); -// client.setRecording(false); -// } -// } -// -// private void sendStopPacket() { -// if (stopPacketSent) { -// return; -// } -// -// if (connection == null || !connection.isInitialized()) { -// return; -// } -// try { -// connection.sendToServer(new NetworkMessage(new MicPacket(new byte[0], false, sequenceNumber.getAndIncrement()))); -// stopPacketSent = true; -// } catch (Exception e) { -// bot.logger.error(e); -// } -// } + // private Microphone mic; + // private boolean running; + // private boolean microphoneLocked; + // private boolean wasWhispering; + // private final JavaOpusEncoder2 encoder; + // + // public MicThread() { + // this.running = true; + // this.encoder = OpusManager.createEncoder(); + // + // setDaemon(true); + // setName("Simple Voice Chat Microphone Thread"); + // } + // + // @Override + // public void run() { + // Microphone mic = getMic(); + // if (mic == null) { + // return; + // } + // + // while (running) { + // short[] audio = pollMic(); + // if (audio == null) { + // continue; + // } + // + // voice(audio); + // } + // } + // + // public short[] pollMic() { + // Microphone mic = getMic(); + // if (mic == null) { + // throw new IllegalStateException("No microphone available"); + // } + // if (!mic.isStarted()) { + // mic.start(); + // } + // + // if (mic.available() < SoundManager.FRAME_SIZE) { + // Utils.sleep(5); + // return null; + // } + // short[] buff = mic.read(); + // volumeManager.adjustVolumeMono(buff, VoicechatClient.CLIENT_CONFIG.microphoneAmplification.get().floatValue()); + // return denoiseIfEnabled(buff); + // } + // + // private Microphone getMic() { + // if (!running) { + // return null; + // } + // if (mic == null) { + // try { + // mic = MicrophoneManager.createMicrophone(); + // } catch (MicrophoneException e) { + // running = false; + // return null; + // } + // } + // return mic; + // } + // + // private volatile boolean activating; + // private volatile int deactivationDelay; + // private volatile short[] lastBuff; + // + // private void voice(short[] audio) { + // sendAudioPacket(audio); + // lastBuff = audio; + // } + // + // private void flush() { + // sendStopPacket(); + // if (!encoder.isClosed()) { + // encoder.resetState(); + // } + // } + // + // public boolean isTalking() { + // return !microphoneLocked && (activating || wasPTT); + // } + // + // public boolean isWhispering() { + // return isTalking() && wasWhispering; + // } + // + // public void close() { + // if (!running) { + // return; + // } + // running = false; + // + // if (Thread.currentThread() != this) { + // try { + // join(100); + // } catch (InterruptedException e) { + // bot.logger.error(e); + // } + // } + // + // mic.close(); + // encoder.close(); + // flush(); + // } + // + // private final AtomicLong sequenceNumber = new AtomicLong(); + // private volatile boolean stopPacketSent = true; + // + // private void sendAudioPacket(short[] data) { + // short[] audio = PluginManager.instance().onClientSound(data, whispering); + // if (audio == null) { + // return; + // } + // + // try { + // if (connection != null && connection.isInitialized()) { + // byte[] encoded = encoder.encode(audio); + // connection.sendToServer(new NetworkMessage(new MicPacket(encoded, whispering, sequenceNumber.getAndIncrement()))); + // stopPacketSent = false; + // } + // } catch (Exception e) { + // bot.logger.error(e); + // } + // try { + // if (client != null && client.getRecorder() != null) { + // client.getRecorder().appendChunk(Minecraft.getInstance().getUser().getGameProfile().getId(), System.currentTimeMillis(), PositionalAudioUtils.convertToStereo(audio)); + // } + // } catch (IOException e) { + // Voicechat.LOGGER.error("Failed to record audio", e); + // client.setRecording(false); + // } + // } + // + // private void sendStopPacket() { + // if (stopPacketSent) { + // return; + // } + // + // if (connection == null || !connection.isInitialized()) { + // return; + // } + // try { + // connection.sendToServer(new NetworkMessage(new MicPacket(new byte[0], false, sequenceNumber.getAndIncrement()))); + // stopPacketSent = true; + // } catch (Exception e) { + // bot.logger.error(e); + // } + // } } 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 bb209e36..f4c7a658 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,21 +6,21 @@ 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 (int sampleRate, int frameSize, int maxPayloadSize, OpusApplication application) { return new JavaOpusEncoder2(sampleRate, frameSize, maxPayloadSize, application); } - public static JavaOpusEncoder2 createEncoder() { + public static JavaOpusEncoder2 createEncoder () { 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 (int sampleRate, int frameSize, int maxPayloadSize) { return new JavaOpusDecoder(sampleRate, frameSize, maxPayloadSize); } - public static JavaOpusDecoder createDecoder() { + public static JavaOpusDecoder createDecoder () { return createDecoder(SAMPLE_RATE, FRAME_SIZE, 1024); } } 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 6748df10..3fdc12f2 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 (FriendlyByteBuf buf) { return new AuthenticateAckPacket(); } @Override - public void toBytes(FriendlyByteBuf buf) { + public void toBytes (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 f996c34b..d01fd4b0 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 @@ -9,7 +9,7 @@ public class AuthenticatePacket implements Packet { public UUID playerUUID; public UUID secret; - public AuthenticatePacket () {} + public AuthenticatePacket () { } public AuthenticatePacket ( UUID playerUUID, 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 aec6a128..5ccd704f 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 (FriendlyByteBuf buf) { return new ConnectionAckPacket(); } @Override - public void toBytes(FriendlyByteBuf buf) { + public void toBytes (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 4c0096a8..0072e274 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 (FriendlyByteBuf buf) { return new ConnectionCheckPacket(); } @Override - public void toBytes(FriendlyByteBuf buf) { + public void toBytes (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 6f8aefb2..393c0314 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 (FriendlyByteBuf buf) { return new KeepAlivePacket(); } @Override - public void toBytes(FriendlyByteBuf buf) { + public void toBytes (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 31d88c1b..414e2b89 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 @@ -8,7 +8,7 @@ public class MicPacket implements Packet { public boolean whispering; public long sequenceNumber; - public MicPacket() {} + public MicPacket () { } public MicPacket ( byte[] data, @@ -21,7 +21,7 @@ public class MicPacket implements Packet { } @Override - public MicPacket fromBytes(FriendlyByteBuf buf) { + public MicPacket fromBytes (FriendlyByteBuf buf) { MicPacket soundPacket = new MicPacket(); soundPacket.data = buf.readByteArray(); soundPacket.sequenceNumber = buf.readLong(); @@ -30,7 +30,7 @@ public class MicPacket implements Packet { } @Override - public void toBytes(FriendlyByteBuf buf) { + public void toBytes (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 8ebf337a..18b1b0b2 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 (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 (FriendlyByteBuf buf) { buf.writeUUID(id); buf.writeLong(timestamp); }