fix: properly shutdown the thread

Author: MichaelHillcox

common/src/main/java/com/sunekaer/sdrp/SDRP.java

@@ -1,11 +1,9 @@
 package com.sunekaer.sdrp;
 
-import com.jagrosh.discordipc.entities.pipe.PipeStatus;
 import com.sunekaer.sdrp.config.SDRPConfig;
 import com.sunekaer.sdrp.discord.RPClient;
 import dev.architectury.event.EventResult;
 import dev.architectury.event.events.client.ClientGuiEvent;
-import dev.architectury.event.events.client.ClientLifecycleEvent;
 import dev.architectury.event.events.common.EntityEvent;
 import dev.architectury.hooks.client.screen.ScreenAccess;
 import me.shedaniel.autoconfig.AutoConfig;
@@ -33,9 +31,6 @@ public static void init() {
 
         RP_CLIENT = new RPClient();
 
-        ClientLifecycleEvent.CLIENT_STOPPING.register((minecraft) -> shutdownDiscordClient());
-        Runtime.getRuntime().addShutdownHook(new Thread(SDRP::shutdownDiscordClient));
-
         EntityEvent.ADD.register(SDRP::clientJoinEvent);
         ClientGuiEvent.INIT_POST.register(SDRP::screenEvent);
     }
@@ -99,19 +94,4 @@ public static void setDimension(Level level, Player player) {
             }
         }
     }
-
-    /**
-     * Shutdown various threads
-     */
-    private static void shutdownDiscordClient() {
-        if (!RPClient.EXECUTOR_SERVICE.isShutdown()) {
-            RPClient.EXECUTOR_SERVICE.shutdown();
-        }
-
-        if (RP_CLIENT == null || RP_CLIENT.getClient() == null || RP_CLIENT.getClient().getStatus() != PipeStatus.CONNECTED) {
-            return;
-        }
-
-        RP_CLIENT.getClient().close();
-    }
 }

common/src/main/java/com/sunekaer/sdrp/discord/RPClient.java

@@ -24,7 +24,13 @@
  */
 public class RPClient {
     private static final Logger LOGGER = LoggerFactory.getLogger(RPClient.class);
-    public static final ScheduledExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor();
+    public static final ScheduledExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(factory -> {
+        // Make sure we close with the game
+        Thread thread = new Thread(factory);
+        thread.setName("SDRP-Discord-RPC-Thread");
+        thread.setDaemon(true);
+        return thread;
+    });
 
     private IPCClient client = null;
     private RichPresence currentState = null;