Shutdown Discord Integration at launcher shutdown

Author: Matyrobbrt

src/api/java/com/mcmoddev/relauncher/api/DiscordIntegration.java

@@ -30,6 +30,13 @@ public interface DiscordIntegration {
      */
     void setActivity(ActivityType type, String name);
 
+    /**
+     * Shuts down the integration.
+     */
+    default void shutdown() {
+
+    }
+
     enum ActivityType {
         PLAYING,
         STREAMING,

src/launcher/java/com/mcmoddev/relauncher/Main.java

@@ -143,6 +143,12 @@ public static void main(String[] args) throws IOException {
             updater.tryFirstStart();
             SERVICE.allowCoreThreadTimeOut(true);
         }
+
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            if (discordIntegration != null) {
+                discordIntegration.shutdown();
+            }
+        }));
     }
 
     @Nullable
@@ -211,6 +217,7 @@ public static void selfUpdate(String tagName) throws Exception {
             )
             .inheritIO()
             .start();
+
         System.exit(0);
     }
 

src/launcher/java/com/mcmoddev/relauncher/discord/DefaultDiscordIntegration.java

@@ -73,8 +73,6 @@ public DefaultDiscordIntegration(final Path basePath, final Config.Discord confi
                 .setGatewayPool(Main.SERVICE)
                 .build()
                 .setRequiredScopes("applications.commands", "bot");
-
-            Runtime.getRuntime().addShutdownHook(new Thread(jda::shutdownNow));
         } catch (LoginException e) {
             throw new RuntimeException("Please provide a valid bot token!");
         }
@@ -85,4 +83,9 @@ public DefaultDiscordIntegration(final Path basePath, final Config.Discord confi
     public void setActivity(final ActivityType type, final String name) {
         jda.getPresence().setActivity(Activity.of(Activity.ActivityType.valueOf(type.name()), name));
     }
+
+    @Override
+    public void shutdown() {
+        jda.shutdown();
+    }
 }