From 4700adaaf9519335191d7961efbc8ca54b07085c Mon Sep 17 00:00:00 2001 From: Vankka Date: Sat, 27 May 2023 20:22:32 +0300 Subject: [PATCH] Make ServerScheduler helper methods static --- .../com/discordsrv/common/scheduler/ServerScheduler.java | 9 +++------ .../com/discordsrv/sponge/scheduler/SpongeScheduler.java | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java b/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java index c2861291..efeb0bc4 100644 --- a/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java +++ b/common/src/main/java/com/discordsrv/common/scheduler/ServerScheduler.java @@ -28,18 +28,15 @@ public interface ServerScheduler extends Scheduler { int TICKS_PER_SECOND = 20; long MILLISECONDS_PER_TICK = (1000L / TICKS_PER_SECOND); - @ApiStatus.NonExtendable - default long timeToTicks(long time, TimeUnit unit) { + static long timeToTicks(long time, TimeUnit unit) { return millisToTicks(unit.toMillis(time)); } - @ApiStatus.NonExtendable - default long millisToTicks(long milliseconds) { + static long millisToTicks(long milliseconds) { return milliseconds / MILLISECONDS_PER_TICK; } - @ApiStatus.NonExtendable - default long ticksToMillis(long ticks) { + static long ticksToMillis(long ticks) { return ticks * MILLISECONDS_PER_TICK; } diff --git a/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java b/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java index b093cec6..6157c1cb 100644 --- a/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java +++ b/sponge/src/main/java/com/discordsrv/sponge/scheduler/SpongeScheduler.java @@ -41,11 +41,11 @@ public class SpongeScheduler extends StandardScheduler implements ServerSchedule @Override public void runOnMainThreadLaterInTicks(Runnable task, int ticks) { - service.schedule(task, ticksToMillis(ticks), TimeUnit.MILLISECONDS); + service.schedule(task, ServerScheduler.ticksToMillis(ticks), TimeUnit.MILLISECONDS); } @Override public void runOnMainThreadAtFixedRateInTicks(Runnable task, int initialTicks, int rateTicks) { - service.scheduleAtFixedRate(task, ticksToMillis(initialTicks), ticksToMillis(rateTicks), TimeUnit.MILLISECONDS); + service.scheduleAtFixedRate(task, ServerScheduler.ticksToMillis(initialTicks), ServerScheduler.ticksToMillis(rateTicks), TimeUnit.MILLISECONDS); } }