diff --git a/build-number.txt b/build-number.txt index 583f9c4e..bc90f3f8 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -2331 \ No newline at end of file +2337 \ 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 14989c88..1bed9b05 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -69,16 +69,16 @@ public class Bot extends SessionAdapter { public final ExecutorService executorService = Main.executorService; public final ScheduledExecutorService executor = Main.executor; - public ConsolePlugin console; - public LoggerPlugin logger; // in ConsolePlugin - public DiscordPlugin discord; // same for this one too - public IRCPlugin irc; // AND same for this one too + public ConsolePlugin console = Main.console; + public DatabasePlugin database = Main.database; + public DiscordPlugin discord = Main.discord; + public IRCPlugin irc = Main.irc; + public LoggerPlugin logger; public TickPlugin tick; public ChatPlugin chat; public CommandSpyPlugin commandSpy; public PositionPlugin position; - public DatabasePlugin database; public ServerFeaturesPlugin serverFeatures; public SelfCarePlugin selfCare; public QueryPlugin query; @@ -128,6 +128,7 @@ public class Bot extends SessionAdapter { } public void connect () { + this.logger = new LoggerPlugin(this); this.tick = new TickPlugin(this); this.chat = new ChatPlugin(this); this.commandSpy = new CommandSpyPlugin(this); @@ -344,7 +345,7 @@ public class Bot extends SessionAdapter { for (SessionListener listener : listeners) { listener.packetError(packetErrorEvent); } - packetErrorEvent.setSuppress(true); // fix the ohio sus exploit + packetErrorEvent.setSuppress(true); // fixes the ohio sus exploit } @Override @@ -367,7 +368,7 @@ public class Bot extends SessionAdapter { int reconnectDelay = options.reconnectDelay; if (isTransferring) { - // for now, it's going to transfer to the same server instead of, + // for now, it's going to transfer to the same server instead of // other servers reconnect(); // instantly reconnect diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java index 4f93c18c..ea486ec2 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Main.java +++ b/src/main/java/me/chayapak1/chomens_bot/Main.java @@ -45,7 +45,8 @@ public class Main { public static ConsolePlugin console; public static DatabasePlugin database; - private static DiscordPlugin discord; + public static DiscordPlugin discord; + public static IRCPlugin irc; public static void main (String[] args) throws IOException { final Path configPath = Path.of("config.yml"); @@ -132,11 +133,10 @@ public class Main { // initialize plugins console = new ConsolePlugin(config); - LoggerPlugin.init(); ChomeNSModIntegrationPlugin.init(); if (config.database.enabled) database = new DatabasePlugin(config); if (config.discord.enabled) discord = new DiscordPlugin(config); - if (config.irc.enabled) new IRCPlugin(config); + if (config.irc.enabled) irc = new IRCPlugin(config); LoggerUtilities.log("Initialized all bots. Now connecting"); 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 910698d5..ea39c6df 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java @@ -46,8 +46,6 @@ public class ConsolePlugin implements Completer { reader.option(LineReader.Option.DISABLE_EVENT_EXPANSION, true); - for (Bot bot : allBots) bot.console = this; - final String prompt = "> "; final Thread thread = new Thread(() -> { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java index cb5f1a3d..633fb02f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DatabasePlugin.java @@ -1,9 +1,7 @@ package me.chayapak1.chomens_bot.plugins; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.Configuration; -import me.chayapak1.chomens_bot.Main; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.util.LoggerUtilities; import net.kyori.adventure.text.Component; @@ -30,10 +28,7 @@ public class DatabasePlugin { ); } catch (SQLException e) { LoggerUtilities.error(e); - return; } - - for (Bot bot : Main.bots) bot.database = this; } public void checkOverloaded () throws CommandException { 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 def5d0d5..e0b0dfc3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java @@ -156,8 +156,6 @@ public class DiscordPlugin extends ListenerAdapter { ); } }); - - bot.discord = this; } } 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 f0f8f0ae..e8377401 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java @@ -83,8 +83,6 @@ public class IRCPlugin extends ListenerAdapter { }); } }); - - bot.irc = this; } Main.executor.scheduleAtFixedRate(this::queueTick, 0, 100, TimeUnit.MILLISECONDS); 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 043d3340..e66e5f13 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java @@ -1,7 +1,6 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.Main; import me.chayapak1.chomens_bot.data.logging.LogType; import me.chayapak1.chomens_bot.util.ExceptionUtilities; import me.chayapak1.chomens_bot.util.LoggerUtilities; @@ -10,10 +9,6 @@ import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent; import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent; public class LoggerPlugin implements ChatPlugin.Listener { - public static void init () { - for (Bot bot : Main.bots) new LoggerPlugin(bot); - } - private final Bot bot; public boolean logToConsole = true; @@ -73,8 +68,6 @@ public class LoggerPlugin implements ChatPlugin.Listener { bot.chat.addListener(LoggerPlugin.this); } }); - - bot.logger = this; } public void log (LogType type, Component message) {