Optimize task management

Author: LucasCdry

src/main/java/net/clementraynaud/skoice/Skoice.java

@@ -34,6 +34,7 @@
 import net.clementraynaud.skoice.storage.config.OutdatedConfig;
 import net.clementraynaud.skoice.system.ListenerManager;
 import net.clementraynaud.skoice.tasks.InterruptSystemTask;
+import net.clementraynaud.skoice.tasks.UpdateNetworksTask;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.GameMode;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -51,6 +52,7 @@ public class Skoice extends JavaPlugin {
     private LoginNotificationYamlFile loginNotificationYamlFile;
     private ListenerManager listenerManager;
     private Bot bot;
+    private UpdateNetworksTask updateNetworksTask;
     private BukkitAudiences adventure;
     private HookManager hookManager;
     private AnalyticManager analyticManager;
@@ -86,6 +88,7 @@ public void onEnable() {
         this.listenerManager.registerPermanentMinecraftListeners();
         this.bot = new Bot(this);
         this.bot.connect();
+        this.updateNetworksTask = new UpdateNetworksTask(this);
         this.adventure = BukkitAudiences.create(this);
         new SkoiceCommand(this).init();
         this.hookManager = new HookManager(this);
@@ -160,6 +163,10 @@ public Bot getBot() {
         return this.bot;
     }
 
+    public UpdateNetworksTask getUpdateNetworksTask() {
+        return this.updateNetworksTask;
+    }
+
     public HookManager getHookManager() {
         return this.hookManager;
     }

src/main/java/net/clementraynaud/skoice/listeners/session/ReadyListener.java

@@ -23,7 +23,6 @@
 import net.clementraynaud.skoice.Skoice;
 import net.clementraynaud.skoice.bot.BotStatus;
 import net.clementraynaud.skoice.storage.config.ConfigField;
-import net.clementraynaud.skoice.tasks.UpdateNetworksTask;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.session.ReadyEvent;
@@ -110,16 +109,6 @@ private void handlePublicBot(Player tokenManager) {
     }
 
     private void setup(Player tokenManager) {
-        this.plugin.getServer().getScheduler().runTaskLater(this.plugin, () ->
-                        this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(
-                                this.plugin,
-                                new UpdateNetworksTask(this.plugin)::run,
-                                0,
-                                10
-                        ),
-                0
-        );
-
         this.plugin.getConfigYamlFile().removeInvalidVoiceChannelId();
 
         this.plugin.getBot().setDefaultAvatar();

src/main/java/net/clementraynaud/skoice/system/ListenerManager.java

@@ -42,6 +42,7 @@
 import net.clementraynaud.skoice.menus.ConfigurationMenus;
 import net.clementraynaud.skoice.menus.EmbeddedMenu;
 import net.clementraynaud.skoice.tasks.InterruptSystemTask;
+import net.clementraynaud.skoice.tasks.UpdateNetworksTask;
 import net.dv8tion.jda.api.entities.User;
 import org.bukkit.event.HandlerList;
 
@@ -75,6 +76,7 @@ public void update(User user) {
             this.registerBotListeners();
             this.plugin.getLinksYamlFile().refreshOnlineLinkedPlayers();
             this.plugin.getBot().getVoiceChannel().notifyUnlinkedUsers();
+            this.plugin.getUpdateNetworksTask().start();
             this.plugin.getLogger().info(this.plugin.getLang().getMessage("logger.info.configuration-complete"));
             if (user != null) {
                 new EmbeddedMenu(this.plugin.getBot()).setContent("configuration-complete",

src/main/java/net/clementraynaud/skoice/tasks/InterruptSystemTask.java

@@ -28,11 +28,8 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
-import net.dv8tion.jda.internal.utils.tuple.Pair;
 import org.bukkit.Bukkit;
 
-import java.util.concurrent.CompletableFuture;
-
 public class InterruptSystemTask {
 
     private final Skoice plugin;
@@ -48,9 +45,8 @@ public void run() {
             }
         } catch (NullPointerException ignored) {
         }
-        for (Pair<String, CompletableFuture<Void>> value : UpdateNetworksTask.getAwaitingMoves().values()) {
-            value.getRight().cancel(true);
-        }
+
+        this.plugin.getUpdateNetworksTask().interrupt();
 
         Guild guild = this.plugin.getBot().getGuild();
 

src/main/java/net/clementraynaud/skoice/tasks/UpdateNetworksTask.java

@@ -43,27 +43,34 @@
 
 public class UpdateNetworksTask {
 
-    private static final Map<String, Pair<String, CompletableFuture<Void>>> awaitingMoves = new ConcurrentHashMap<>();
+    private final Skoice plugin;
+    private final Map<String, Pair<String, CompletableFuture<Void>>> awaitingMoves = new ConcurrentHashMap<>();
 
     private final ReentrantLock lock = new ReentrantLock();
-
-    private final Skoice plugin;
+    private int taskId;
 
     public UpdateNetworksTask(Skoice plugin) {
         this.plugin = plugin;
     }
 
-    public static Map<String, Pair<String, CompletableFuture<Void>>> getAwaitingMoves() {
-        try {
-            if (Bukkit.isPrimaryThread() && Bukkit.getPluginManager().isPluginEnabled("Skoice")) {
-                new IllegalStateException("This method should not be called from the main thread.").printStackTrace();
-            }
-        } catch (NullPointerException ignored) {
+    public void start() {
+        this.taskId = this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(
+                this.plugin,
+                this::run,
+                0,
+                10
+        ).getTaskId();
+    }
+
+    public void interrupt() {
+        this.plugin.getServer().getScheduler().cancelTask(this.taskId);
+
+        for (Pair<String, CompletableFuture<Void>> value : this.awaitingMoves.values()) {
+            value.getRight().cancel(true);
         }
-        return UpdateNetworksTask.awaitingMoves;
     }
 
-    public void run() {
+    private void run() {
         try {
             if (Bukkit.isPrimaryThread()) {
                 new IllegalStateException("This method should not be called from the main thread.").printStackTrace();
@@ -111,16 +118,16 @@ public void run() {
                     shouldBeInChannel = mainVoiceChannel;
                 }
 
-                Pair<String, CompletableFuture<Void>> awaitingMove = UpdateNetworksTask.awaitingMoves.get(member.getId());
+                Pair<String, CompletableFuture<Void>> awaitingMove = this.awaitingMoves.get(member.getId());
                 if (awaitingMove == null
                         || !awaitingMove.getLeft().equals(shouldBeInChannel.getId())
                         && awaitingMove.getRight().cancel(false)) {
                     GuildVoiceState voiceState = member.getVoiceState();
                     if (voiceState != null && voiceState.getChannel() != shouldBeInChannel) {
-                        UpdateNetworksTask.awaitingMoves.put(member.getId(), Pair.of(
+                        this.awaitingMoves.put(member.getId(), Pair.of(
                                 shouldBeInChannel.getId(),
                                 this.plugin.getBot().getGuild().moveVoiceMember(member, shouldBeInChannel)
-                                        .submit().whenCompleteAsync((v, t) -> UpdateNetworksTask.awaitingMoves.remove(member.getId()))
+                                        .submit().whenCompleteAsync((v, t) -> this.awaitingMoves.remove(member.getId()))
                         ));
                     }
                 }
@@ -211,7 +218,7 @@ private void manageMoves() {
         }
         LinkedPlayer.getOnlineLinkedPlayers().forEach(p -> {
             if (!p.isInMainVoiceChannel() && !p.isInAnyProximityChannel()) {
-                Pair<String, CompletableFuture<Void>> pair = UpdateNetworksTask.awaitingMoves.get(p.getDiscordId());
+                Pair<String, CompletableFuture<Void>> pair = this.awaitingMoves.get(p.getDiscordId());
                 if (pair != null) {
                     pair.getRight().cancel(false);
                 }