improve Sponge scheduler

Rollczi · Nov 17, 2024 · e661340 · e661340
1 parent 6357936
commit e661340
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/litecommands-sponge/src/dev/rollczi/litecommands/sponge/LiteSpongeFactory.java b/litecommands-sponge/src/dev/rollczi/litecommands/sponge/LiteSpongeFactory.java
@@ -27,12 +27,6 @@ public static <B extends LiteCommandsBuilder<CommandCause, LiteSpongeSettings, B
         return (B) LiteCommandsFactory.builder(CommandCause.class, new SpongePlatform(plugin, settings)).selfProcessor((builder, internal) -> {
             MessageRegistry<CommandCause> messageRegistry = internal.getMessageRegistry();
 
-            if (game.isServerAvailable()) {
-                builder = builder.scheduler(new SpongeScheduler(plugin, game.server().scheduler(), game.asyncScheduler()));
-            } else if (game.isClientAvailable()) {
-                builder = builder.scheduler(new SpongeScheduler(plugin, game.client().scheduler(), game.asyncScheduler()));
-            }
-
             builder
                 .bind(Server.class, () -> game.server())
                 .bind(Client.class, () -> game.client())
@@ -41,6 +35,7 @@ public static <B extends LiteCommandsBuilder<CommandCause, LiteSpongeSettings, B
 
                 .argument(ServerPlayer.class, new ServerPlayerArgument(game, messageRegistry))
                 .context(ServerPlayer.class, new ServerPlayerOnlyContext(messageRegistry))
+                .scheduler(new SpongeScheduler(plugin, game))
 
                 .extension(new LiteAdventureExtension<>(invocation -> invocation.sender().audience()));
         });

diff --git a/litecommands-sponge/src/dev/rollczi/litecommands/sponge/SpongeScheduler.java b/litecommands-sponge/src/dev/rollczi/litecommands/sponge/SpongeScheduler.java
@@ -1,6 +1,8 @@
 package dev.rollczi.litecommands.sponge;
 
 import dev.rollczi.litecommands.scheduler.AbstractMainThreadBasedScheduler;
+import org.spongepowered.api.Game;
+import org.spongepowered.api.scheduler.Scheduler;
 import org.spongepowered.api.scheduler.Task;
 import org.spongepowered.plugin.PluginContainer;
 
@@ -9,13 +11,13 @@
 public class SpongeScheduler extends AbstractMainThreadBasedScheduler {
 
     private final PluginContainer pluginContainer;
-    private final org.spongepowered.api.scheduler.Scheduler mainScheduler;
-    private final org.spongepowered.api.scheduler.Scheduler asyncScheduler;
+    private final Scheduler mainScheduler;
+    private final Scheduler asyncScheduler;
 
-    public SpongeScheduler(PluginContainer pluginContainer, org.spongepowered.api.scheduler.Scheduler mainScheduler, org.spongepowered.api.scheduler.Scheduler asyncScheduler) {
+    public SpongeScheduler(PluginContainer pluginContainer, Game game) {
         this.pluginContainer = pluginContainer;
-        this.mainScheduler = mainScheduler;
-        this.asyncScheduler = asyncScheduler;
+        this.mainScheduler = findMainScheduler(game);
+        this.asyncScheduler = game.asyncScheduler();
     }
 
     @Override
@@ -38,10 +40,20 @@ protected void log(Throwable throwable) {
     }
 
     private Task createTask(Runnable task, Duration delay) {
-        Task.Builder builder = Task.builder().plugin(pluginContainer).execute(task);
-        if (delay.isPositive()) {
-            builder.delay(delay);
+        return Task.builder()
+            .plugin(pluginContainer)
+            .execute(task)
+            .delay(delay.isPositive() ? delay : Duration.ZERO)
+            .build();
+    }
+
+    private Scheduler findMainScheduler(Game game) {
+        if (game.isServerAvailable()) {
+            return game.server().scheduler();
+        } else if (game.isClientAvailable()) {
+            return game.client().scheduler();
+        } else {
+            throw new IllegalStateException("Nor server or client are available");
         }
-        return builder.build();
     }
 }