From 9a406255dbd4b558e63c641e855c22068615f798 Mon Sep 17 00:00:00 2001
From: Bella <bella.who.two@gmail.com>
Date: Thu, 19 Dec 2019 22:03:33 -0500
Subject: [PATCH] Revert "add username to main menu"

This reverts commit d31babb179c799ac5dfd5c7288988783eeebeb02.
---
 .../me/zeroeightsix/kami/DiscordPresence.java | 69 ++++---------------
 1 file changed, 13 insertions(+), 56 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/DiscordPresence.java b/src/main/java/me/zeroeightsix/kami/DiscordPresence.java
index 277ad6a61..948145864 100644
--- a/src/main/java/me/zeroeightsix/kami/DiscordPresence.java
+++ b/src/main/java/me/zeroeightsix/kami/DiscordPresence.java
@@ -36,7 +36,6 @@ public class DiscordPresence {
 
     public static void start() {
         boolean versionPrivateStart = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).versionGlobal.getValue();
-        boolean usernamePrivateStart = ((BlueDiscordRPC) ModuleManager.getModuleByName("DiscordRPC")).usernameGlobal.getValue();
 
         FMLLog.log.info("Starting Discord RPC");
         if (DiscordPresence.hasStarted) {
@@ -47,25 +46,11 @@ public class DiscordPresence {
         handlers.disconnected = ((var1, var2) -> System.out.println("Discord RPC disconnected, var1: " + String.valueOf(var1) + ", var2: " + var2));
         DiscordPresence.rpc.Discord_Initialize(APP_ID, handlers, true, "");
         DiscordPresence.presence.startTimestamp = System.currentTimeMillis() / 1000L;
-        if (usernamePrivateStart) {
-            if (versionPrivateStart) {
-                DiscordPresence.presence.details = MODVER + " - " + mc.session.getUsername();
-                DiscordPresence.presence.state = "Main Menu";
-            }
-            else {
-                DiscordPresence.presence.details = mc.session.getUsername();
-                DiscordPresence.presence.state = "Main Menu";
-            }
+        if (versionPrivateStart) {
+            DiscordPresence.presence.details = MODVER + " - " + "Main Menu";
         }
         else {
-            if (versionPrivateStart) {
-                DiscordPresence.presence.details = MODVER;
-                DiscordPresence.presence.state = "Main Menu";
-            }
-            else {
-                DiscordPresence.presence.details = "";
-                DiscordPresence.presence.state = "Main Menu";
-            }
+            DiscordPresence.presence.details = "Main Menu";
         }
         DiscordPresence.presence.state = "";
         DiscordPresence.presence.largeImageKey = "kami";
@@ -107,16 +92,14 @@ public class DiscordPresence {
                             if (userNamePrivate) {
                                 if (versionPrivate) {
                                     details = MODVER + " - " + mc.player.getName();
-                                }
-                                else {
+                                } else {
                                     details = mc.player.getName();
                                 }
                             }
                             else {
                                 if (versionPrivate) {
                                     details = MODVER + " - " + "Multiplayer";
-                                }
-                                else {
+                                } else {
                                     details = "Multiplayer";
                                 }
                             }
@@ -146,26 +129,13 @@ public class DiscordPresence {
                         }
                     }
                     else {
-                        if (userNamePrivate) {
-                            if (versionPrivate) {
-                                details = MODVER + " - " + mc.player.getName();
-                                state = "Main Menu";
-                            }
-                            else {
-                                details = mc.player.getName();
-                                state = "Main Menu";
-                            }
+                        if (versionPrivate) {
+                            details = MODVER + " - " + "Main Menu";
                         }
                         else {
-                            if (versionPrivate) {
-                                details = MODVER;
-                                state = "Main Menu";
-                            }
-                            else {
-                                details = "";
-                                state = "Main Menu";
-                            }
+                            details = "Main Menu";
                         }
+                        state = "";
                     }
                     if (!details.equals(DiscordPresence.presence.details) || !state.equals(DiscordPresence.presence.state)) {
                         DiscordPresence.presence.startTimestamp = System.currentTimeMillis() / 1000L;
@@ -261,26 +231,13 @@ public class DiscordPresence {
                     }
                 }
                 else {
-                    if (userNamePrivate) {
-                        if (versionPrivate) {
-                            details = MODVER + " - " + mc.player.getName();
-                            state = "Main Menu";
-                        }
-                        else {
-                            details = mc.player.getName();
-                            state = "Main Menu";
-                        }
+                    if (versionPrivate) {
+                        details = MODVER + " - " + "Main Menu";
                     }
                     else {
-                        if (versionPrivate) {
-                            details = MODVER;
-                            state = "Main Menu";
-                        }
-                        else {
-                            details = "";
-                            state = "Main Menu";
-                        }
+                        details = "Main Menu";
                     }
+                    state = "";
                 }
                 if (!details.equals(DiscordPresence.presence.details) || !state.equals(DiscordPresence.presence.state)) {
                     DiscordPresence.presence.startTimestamp = System.currentTimeMillis() / 1000L;