From 159cb8ce11fb3234915bc12002f416a5f7f13384 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:11:16 +0700 Subject: [PATCH] refactor: make cloop remove return command name --- .../me/chayapak1/chomens_bot/commands/CloopCommand.java | 9 ++++----- .../me/chayapak1/chomens_bot/plugins/CloopPlugin.java | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) 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 21c6d7d8..0c6bb2ac 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java @@ -52,11 +52,12 @@ public class CloopCommand extends Command { try { final int index = context.getInteger(true); - bot.cloop.remove(index); + + final CommandLoop cloop = bot.cloop.remove(index); return Component.translatable( "Removed cloop %s", - Component.text(index).color(ColorUtilities.getColorByString(bot.config.colorPalette.number)) + Component.text(cloop.command()).color(ColorUtilities.getColorByString(bot.config.colorPalette.number)) ).color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)); } catch (IndexOutOfBoundsException | IllegalArgumentException | NullPointerException ignored) { throw new CommandException(Component.text("Invalid index")); @@ -96,9 +97,7 @@ public class CloopCommand extends Command { Component.join(JoinConfiguration.newlines(), cloopsComponent) ); } - default -> { - throw new CommandException(Component.text("Invalid action")); - } + default -> throw new CommandException(Component.text("Invalid action")); } } } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java index 7fa23780..d2023f11 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java @@ -26,14 +26,14 @@ public class CloopPlugin { loopTasks.add(bot.executor.scheduleAtFixedRate(loopTask, 0, interval, TimeUnit.MILLISECONDS)); } - public void remove (int index) { + public CommandLoop remove (int index) { ScheduledFuture loopTask = loopTasks.remove(index); if (loopTask != null) { loopTask.cancel(true); } - loops.remove(index); + return loops.remove(index); } public void clear () {