From 4ff9286a799148fc6110a62b5d2541e99ed68813 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Thu, 30 Mar 2023 13:28:41 -0400
Subject: [PATCH] Move over some discord things

---
 .../discord/listeners/DiscordCommandDispatcher.java    |  2 +-
 .../net/essentialsx/discord/util/ConsoleInjector.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java
index 20fa1ff0a..2ddbf8d6c 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java
@@ -25,7 +25,7 @@ public class DiscordCommandDispatcher extends ListenerAdapter {
             }
 
             final String command = event.getMessage().getContentRaw();
-            Bukkit.getScheduler().runTask(jda.getPlugin(), () -> {
+            jda.getPlugin().getEss().scheduleGlobalDelayedTask(() -> {
                 try {
                     Bukkit.dispatchCommand(new DiscordCommandSender(jda, Bukkit.getConsoleSender(), message ->
                             event.getMessage().reply(message).queue()).getSender(), command);
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java
index 3d2502770..5546fe849 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java
@@ -4,6 +4,7 @@ import com.earth2me.essentials.utils.FormatUtil;
 import com.google.common.base.Splitter;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.utils.TimeFormat;
+import net.ess3.provider.SchedulingProvider;
 import net.essentialsx.discord.EssentialsDiscord;
 import net.essentialsx.discord.JDADiscordService;
 import org.apache.logging.log4j.LogManager;
@@ -11,7 +12,6 @@ import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.bukkit.Bukkit;
 
 import java.time.Instant;
 import java.util.concurrent.BlockingQueue;
@@ -26,14 +26,14 @@ public class ConsoleInjector extends AbstractAppender {
 
     private final JDADiscordService jda;
     private final BlockingQueue<String> messageQueue = new LinkedBlockingQueue<>();
-    private final int taskId;
+    private final SchedulingProvider.EssentialsTask task;
     private boolean removed = false;
 
     public ConsoleInjector(JDADiscordService jda) {
         super("EssentialsX-ConsoleInjector", null, null, false);
         this.jda = jda;
         ((Logger) LogManager.getRootLogger()).addAppender(this);
-        taskId = Bukkit.getScheduler().runTaskTimerAsynchronously(jda.getPlugin(), () -> {
+        task = jda.getPlugin().getEss().runTaskTimerAsynchronously(() -> {
             final StringBuilder buffer = new StringBuilder();
             String curLine;
             while ((curLine = messageQueue.peek()) != null) {
@@ -47,7 +47,7 @@ public class ConsoleInjector extends AbstractAppender {
             if (buffer.length() != 0) {
                 sendMessage(buffer.toString());
             }
-        }, 20, 40).getTaskId();
+        }, 20, 40);
     }
 
     private void sendMessage(String content) {
@@ -92,7 +92,7 @@ public class ConsoleInjector extends AbstractAppender {
 
     public void remove() {
         ((Logger) LogManager.getRootLogger()).removeAppender(this);
-        Bukkit.getScheduler().cancelTask(taskId);
+        task.cancel();
         messageQueue.clear();
         removed = true;
     }