From 04a8d10e1f2339092e84d0b65ee9f6ca679b37a7 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:05:31 +0700 Subject: [PATCH] feat: use ChronoUnit for cloop (forever cloop now real!!!) --- build-number.txt | 2 +- .../me/chayapak1/chomens_bot/commands/CloopCommand.java | 6 +++--- .../me/chayapak1/chomens_bot/data/cloop/CommandLoop.java | 4 ++-- .../java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-number.txt b/build-number.txt index ca49f25a..73e7adfa 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1913 \ No newline at end of file +1916 \ No newline at end of file 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 c7617e7d..f4dca802 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java @@ -11,16 +11,16 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.JoinConfiguration; import net.kyori.adventure.text.format.NamedTextColor; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; public class CloopCommand extends Command { public CloopCommand () { super( "cloop", "Loops commands", - new String[] { "add ", "remove ", "clear", "list" }, + new String[] { "add ", "remove ", "clear", "list" }, new String[] { "commandloop" }, TrustLevel.TRUSTED, false @@ -38,7 +38,7 @@ public class CloopCommand extends Command { int interval = context.getInteger(true); if (interval < 1) interval = 1; - final TimeUnit unit = context.getEnum(TimeUnit.class); + final ChronoUnit unit = context.getEnum(ChronoUnit.class); final String command = context.getString(true, true); 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 68df4c84..764de864 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 @@ -1,10 +1,10 @@ package me.chayapak1.chomens_bot.data.cloop; -import java.util.concurrent.TimeUnit; +import java.time.temporal.ChronoUnit; public record CommandLoop ( String command, int interval, - TimeUnit unit + ChronoUnit unit ) {} 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 2d6070c5..b72ad585 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CloopPlugin.java @@ -3,6 +3,7 @@ package me.chayapak1.chomens_bot.plugins; import me.chayapak1.chomens_bot.Bot; import me.chayapak1.chomens_bot.data.cloop.CommandLoop; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ScheduledFuture; @@ -18,11 +19,11 @@ public class CloopPlugin { this.bot = bot; } - public void add (TimeUnit unit, int interval, String command) { + public void add (ChronoUnit unit, int interval, String command) { Runnable loopTask = () -> bot.core.run(command); loops.add(new CommandLoop(command, interval, unit)); - loopTasks.add(bot.executor.scheduleAtFixedRate(loopTask, 0, interval, unit)); + loopTasks.add(bot.executor.scheduleAtFixedRate(loopTask, 0, interval, TimeUnit.of(unit))); } public CommandLoop remove (int index) {