fix rich presence crashing in... lots of circumstances (issue #7)

Author: lycanea

src/main/java/dev/lycanea/mwonmod/Mwonmod.java

@@ -95,7 +95,7 @@ public void onInitializeClient() {
         KeyBindings.setup();
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            DiscordManager.updateStatus();
+            DiscordManager.tick();
             if (client.player != null && client.player.getScoreboardTeam() != null && onMelonKing()) {
                 List<String> playerJoins = client.player.getScoreboardTeam().getPlayerList().stream()
                         .filter(item -> !players.contains(item))

src/main/java/dev/lycanea/mwonmod/util/discord/DiscordListener.java

@@ -4,6 +4,7 @@
 import com.jagrosh.discordipc.IPCListener;
 import com.jagrosh.discordipc.entities.*;
 import com.jagrosh.discordipc.exceptions.NoDiscordClientException;
+import org.json.JSONObject;
 
 public class DiscordListener implements IPCListener {
     private boolean connected = false;
@@ -25,6 +26,18 @@ public void onDisconnect(IPCClient client, Throwable t) {
         }
     }
 
+    @Override
+    public void onClose(IPCClient client, JSONObject json) {
+        connected = false;
+        if (DiscordManager.enabled) {
+            try {
+                client.connect(DiscordBuild.ANY);
+            } catch (NoDiscordClientException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
     public boolean isConnected() {
         return connected;
     }

src/main/java/dev/lycanea/mwonmod/util/discord/DiscordManager.java

@@ -1,5 +1,6 @@
 package dev.lycanea.mwonmod.util.discord;
 
+import com.jagrosh.discordipc.entities.pipe.PipeStatus;
 import dev.lycanea.mwonmod.Mwonmod;
 import static dev.lycanea.mwonmod.Mwonmod.LOGGER;
 import dev.lycanea.mwonmod.Config;
@@ -22,25 +23,33 @@ public class DiscordManager {
     public static boolean enabled = Config.HANDLER.instance().discordRichPresence;
 
     public static void initialise() {
-        if (!enabled) return;
-
         if (client == null) {
             client = new IPCClient(1376119105136103496L);
             client.setListener(listener);
         }
+    }
 
-        try {
-            client.connect(DiscordBuild.ANY);
-            LOGGER.info("Connected Discord Client");
-        } catch (NoDiscordClientException e) {
-            throw new RuntimeException("No Discord client found", e);
+    public static void tick() {
+        if (client != null) {
+            if (!listener.isConnected() && enabled) {
+                try {
+                    client.connect(DiscordBuild.ANY);
+                    LOGGER.info("Connected Discord Client");
+                } catch (NoDiscordClientException | RuntimeException ignored) {}
+            }
+            if (listener.isConnected() && !enabled) {
+                client.close();
+            }
+        }
+        if (enabled && listener.isConnected()) {
+            DiscordManager.updateStatus();
         }
     }
 
     public static void updateStatus() {
+        if (!listener.isConnected()) return;
         if (GameState.melonJoin != null && Config.HANDLER.instance().discordRichPresence && Mwonmod.onMelonKing()) {
             // get ready for a shit ton of ternary statements
-            setEnabled(true);
             if (GameState.beta_plot) {
                 setStatus("On Beta Plot",
                         "Playing around and breaking things",
@@ -77,15 +86,11 @@ public static void updateStatus() {
                     "Running MwonMod " + ((FabricLoader.getInstance().getModContainer("mwonmod").map(ModContainer::getMetadata).map(ModMetadata::getVersion).map(Object::toString).orElse("0.0").equals("0.0.0")) ? "Development":FabricLoader.getInstance().getModContainer("mwonmod").map(ModContainer::getMetadata).map(ModMetadata::getVersion).map(Object::toString).orElse("0.0")),
                     ((Config.HANDLER.instance().richPresencePathIcon && GameState.currentPath != null) ? GameState.currentPath.toLowerCase():null),
                     ((Config.HANDLER.instance().richPresencePathIcon && GameState.currentPath != null) ? "Path: " + GameState.currentPath:null));
-        } else {
-            setEnabled(false);
         }
     }
 
     public static void setStatus(String state, String details, OffsetDateTime startTimestamp, String largeImageKey, String largeImageText, String smallImageKey, String smallImageText) {
-        if (!enabled || client == null) return;
-
-        if (!listener.isConnected()) return;
+        if (!enabled || client == null || client.getStatus() == PipeStatus.CONNECTED || !listener.isConnected()) return;
 
         RichPresence presence = new RichPresence.Builder()
                 .setState(state)
@@ -97,17 +102,4 @@ public static void setStatus(String state, String details, OffsetDateTime startT
 
         client.sendRichPresence(presence);
     }
-
-    public static void setEnabled(boolean value) {
-        if (enabled == value) return; // No change
-
-        enabled = value;
-
-        if (!enabled && client != null) {
-            client.close();
-            client = null; // Clean up
-        } else if (enabled && client == null) {
-            initialise();
-        }
-    }
 }