diff --git a/build-number.txt b/build-number.txt index bae22292..b33708e2 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2928 \ No newline at end of file +2929 \ No newline at end of file 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 87e826ee..cd4890b3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java +++ b/src/main/java/me/chayapak1/chomens_bot/chatParsers/MinecraftChatParser.java @@ -10,22 +10,19 @@ import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.TranslationArgument; import net.kyori.adventure.text.event.HoverEvent; -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"); - keys.add("commands.message.display.incoming"); - keys.add("chat.type.team.text"); - keys.add("chat.type.emote"); - } + private static final List keys = List.of( + "chat.type.text", + "chat.type.announcement", + "commands.message.display.incoming", + "chat.type.team.text", + "chat.type.emote" + ); public MinecraftChatParser (final Bot bot) { this.bot = bot; 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 a8672468..67a6f5b0 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChatPlugin.java @@ -46,7 +46,7 @@ public class ChatPlugin implements Listener { public final Pattern CHAT_SPLIT_PATTERN = Pattern.compile("\\G\\s*([^\\r\\n]{1,254}(?=\\s|$)|[^\\r\\n]{254})"); - private final List chatParsers = Collections.synchronizedList(new ArrayList<>()); + private final List chatParsers = new ArrayList<>(); public final List chatTypes = new ArrayList<>(); 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 58b6bcc3..427d5d6b 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ChomeNSModIntegrationPlugin.java @@ -37,13 +37,11 @@ public class ChomeNSModIntegrationPlugin implements Listener { private static final SecureRandom RANDOM = new SecureRandom(); - public static final List> SERVERBOUND_PACKETS = new ArrayList<>(); - - static { - SERVERBOUND_PACKETS.add(ServerboundSuccessfulHandshakePacket.class); - SERVERBOUND_PACKETS.add(ServerboundRunCoreCommandPacket.class); - SERVERBOUND_PACKETS.add(ServerboundRunCommandPacket.class); - } + public static final List> SERVERBOUND_PACKETS = List.of( + ServerboundSuccessfulHandshakePacket.class, + ServerboundRunCoreCommandPacket.class, + ServerboundRunCommandPacket.class + ); private final Bot bot; 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 1427e6c0..476dfd8d 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CommandHandlerPlugin.java @@ -16,59 +16,52 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.HoverEvent; import net.kyori.adventure.text.format.NamedTextColor; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; public class CommandHandlerPlugin implements Listener { - public static final List COMMANDS = new ArrayList<>(); - - static { - registerCommand(new CommandBlockCommand()); - registerCommand(new CowsayCommand()); - registerCommand(new EchoCommand()); - registerCommand(new HelpCommand()); - registerCommand(new TestCommand()); - registerCommand(new ValidateCommand()); - registerCommand(new MusicCommand()); - registerCommand(new RandomTeleportCommand()); - registerCommand(new BotVisibilityCommand()); - registerCommand(new TPSBarCommand()); - registerCommand(new NetMessageCommand()); - registerCommand(new RefillCoreCommand()); - registerCommand(new WikipediaCommand()); - registerCommand(new UrbanCommand()); - registerCommand(new ClearChatCommand()); - registerCommand(new ListCommand()); - registerCommand(new ServerEvalCommand()); - registerCommand(new UUIDCommand()); - registerCommand(new TimeCommand()); - registerCommand(new BruhifyCommand()); - registerCommand(new EndCommand()); - registerCommand(new CloopCommand()); - registerCommand(new WeatherCommand()); - registerCommand(new TranslateCommand()); - registerCommand(new KickCommand()); - registerCommand(new ClearChatQueueCommand()); - registerCommand(new FilterCommand()); - registerCommand(new MailCommand()); - registerCommand(new EvalCommand()); - registerCommand(new InfoCommand()); - registerCommand(new ConsoleCommand()); - // registerCommand(new ScreenshareCommand()); - registerCommand(new WhitelistCommand()); - registerCommand(new SeenCommand()); - registerCommand(new IPFilterCommand()); - registerCommand(new StopCommand()); - registerCommand(new GrepLogCommand()); - registerCommand(new FindAltsCommand()); - registerCommand(new RestartCommand()); - registerCommand(new NetCommandCommand()); - } - - public static void registerCommand (final Command command) { - COMMANDS.add(command); - } + public static final List COMMANDS = List.of( + new CommandBlockCommand(), + new CowsayCommand(), + new EchoCommand(), + new HelpCommand(), + new TestCommand(), + new ValidateCommand(), + new MusicCommand(), + new RandomTeleportCommand(), + new BotVisibilityCommand(), + new TPSBarCommand(), + new NetMessageCommand(), + new RefillCoreCommand(), + new WikipediaCommand(), + new UrbanCommand(), + new ClearChatCommand(), + new ListCommand(), + new ServerEvalCommand(), + new UUIDCommand(), + new TimeCommand(), + new BruhifyCommand(), + new EndCommand(), + new CloopCommand(), + new WeatherCommand(), + new TranslateCommand(), + new KickCommand(), + new ClearChatQueueCommand(), + new FilterCommand(), + new MailCommand(), + new EvalCommand(), + new InfoCommand(), + new ConsoleCommand(), + // new ScreenshareCommand(), + new WhitelistCommand(), + new SeenCommand(), + new IPFilterCommand(), + new StopCommand(), + new GrepLogCommand(), + new FindAltsCommand(), + new RestartCommand(), + new NetCommandCommand() + ); public static Command findCommand (final String searchTerm) { if (searchTerm.isBlank()) return null; 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 1f4abe6a..6a028085 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/NBSConverter.java @@ -14,10 +14,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; // Author: hhhzzzsss public class NBSConverter implements Converter { @@ -303,6 +300,6 @@ public class NBSConverter implements Converter { list.add(entry.getAsString()); } - return list; + return Collections.unmodifiableList(list); } } 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 c8baaf37..7fcdb31f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java +++ b/src/main/java/me/chayapak1/chomens_bot/song/SongLoaderThread.java @@ -10,21 +10,18 @@ import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; // Author: _ChipMC_ & hhhzzzsss but modified public class SongLoaderThread extends Thread { // should the converters be here? - public static final List converters = new ArrayList<>(); - - static { - converters.add(new MidiConverter()); - converters.add(new NBSConverter()); - converters.add(new TextFileConverter()); - converters.add(new SongPlayerConverter()); - } + public static final List converters = List.of( + new MidiConverter(), + new NBSConverter(), + new TextFileConverter(), + new SongPlayerConverter() + ); public final String fileName;