diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java index 3398061b..b39f3d0b 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/Configuration.java @@ -61,8 +61,6 @@ public class Configuration { } public static class SelfCare { - @Getter public int checkInterval; - @Getter public boolean op = true; @Getter public boolean gamemode = true; @Getter public boolean endCredits = true; diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java index 0e6d68e7..b26e4ae9 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java @@ -19,6 +19,7 @@ import land.chipmunk.chayapak.chomens_bot.util.ComponentUtilities; import land.chipmunk.chayapak.chomens_bot.util.IllegalCharactersUtilities; import land.chipmunk.chayapak.chomens_bot.util.UUIDUtilities; import lombok.Getter; +import lombok.Setter; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; @@ -37,11 +38,15 @@ public class ChatPlugin extends Bot.Listener { @Getter private final List queue = new ArrayList<>(); @Getter private final List _queue = new ArrayList<>(); + @Getter @Setter private int queueDelay; + private final List listeners = new ArrayList<>(); public ChatPlugin (Bot bot) { this.bot = bot; + queueDelay = bot.config().chatQueueDelay(); + this.commandSpyParser = new CommandSpyParser(bot); bot.addListener(this); @@ -52,7 +57,7 @@ public class ChatPlugin extends Bot.Listener { chatParsers.add(new ChomeNSCustomChatParser(bot)); bot.executor().scheduleAtFixedRate(this::_sendChatTick, 0, 1, TimeUnit.MILLISECONDS); - bot.executor().scheduleAtFixedRate(this::sendChatTick, 0, bot.config().chatQueueDelay(), TimeUnit.MILLISECONDS); + bot.executor().scheduleAtFixedRate(this::sendChatTick, 0, queueDelay, TimeUnit.MILLISECONDS); } @Override diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java index b47a04ed..c326369e 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java @@ -149,7 +149,7 @@ public class SelfCarePlugin extends Bot.Listener { check(); }; - checkTask = bot.executor().scheduleAtFixedRate(task, 0, bot.config().selfCare().checkInterval(), TimeUnit.MILLISECONDS); + checkTask = bot.executor().scheduleAtFixedRate(task, 0, bot.chat().queueDelay(), TimeUnit.MILLISECONDS); } public void packetReceived (ClientboundGameEventPacket packet) { diff --git a/src/main/resources/default-config.yml b/src/main/resources/default-config.yml index 0aeceb32..f7d3e567 100644 --- a/src/main/resources/default-config.yml +++ b/src/main/resources/default-config.yml @@ -47,8 +47,6 @@ core: # PLEASE give valid JSON component here else the core don't refill at all customName: '[{"text":"ChomeNS ","color":"yellow"},{"text":"Core","color":"green"},{"text":"™","color":"gold"}]' selfCare: - checkInterval: 1000 - # vanilla op: true gamemode: true