Better Rich Presence

21 files changed, 942 insertions, 341 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java
index 48c392e0..c8c96940 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java
@@ -28,14 +28,14 @@ import kr.syeyoung.dungeonsguide.eventlistener.FeatureListener;
 import kr.syeyoung.dungeonsguide.eventlistener.PacketListener;
 import kr.syeyoung.dungeonsguide.events.StompConnectedEvent;
 import kr.syeyoung.dungeonsguide.features.FeatureRegistry;
-import kr.syeyoung.dungeonsguide.party.PartyInviteViewer;
+import kr.syeyoung.dungeonsguide.features.impl.discord.inviteViewer.PartyInviteViewer;
 import kr.syeyoung.dungeonsguide.party.PartyManager;
 import kr.syeyoung.dungeonsguide.resources.DGTexturePack;
+import kr.syeyoung.dungeonsguide.rpc.RichPresenceManager;
 import kr.syeyoung.dungeonsguide.stomp.CloseListener;
 import kr.syeyoung.dungeonsguide.stomp.StompClient;
 import kr.syeyoung.dungeonsguide.stomp.StompInterface;
 import kr.syeyoung.dungeonsguide.utils.AhUtils;
-import kr.syeyoung.dungeonsguide.utils.cursor.GLCursors;
 import kr.syeyoung.dungeonsguide.wsresource.StaticResourceCache;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
@@ -44,12 +44,10 @@ import net.minecraft.launchwrapper.LaunchClassLoader;
 import net.minecraft.util.IChatComponent;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.ProgressManager;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
-import org.apache.commons.io.IOUtils;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
@@ -124,11 +122,10 @@ public class DungeonsGuide implements DGInterface, CloseListener {
         MinecraftForge.EVENT_BUS.register(new PacketListener());
         MinecraftForge.EVENT_BUS.register(new Keybinds());
 
-        RichPresenceManager.INSTANCE.setup();
+        RichPresenceManager.INSTANCE.getLastSetupCode();
         MinecraftForge.EVENT_BUS.register(RichPresenceManager.INSTANCE);
         MinecraftForge.EVENT_BUS.register(PartyManager.INSTANCE);
         MinecraftForge.EVENT_BUS.register(StaticResourceCache.INSTANCE);
-        MinecraftForge.EVENT_BUS.register(PartyInviteViewer.INSTANCE);
 
         AhUtils.registerTimer();
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java b/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java
deleted file mode 100644
index 7f02d69a..00000000
--- a/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *     Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
- *     Copyright (C) 2021  cyoung06
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
- *
- *     You should have received a copy of the GNU Affero General Public License
- *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package kr.syeyoung.dungeonsguide;
-
-import com.sun.jna.Pointer;
-import com.sun.jna.ptr.PointerByReference;
-import kr.syeyoung.dungeonsguide.dungeon.DungeonContext;
-import kr.syeyoung.dungeonsguide.events.SkyblockJoinedEvent;
-import kr.syeyoung.dungeonsguide.events.SkyblockLeftEvent;
-import kr.syeyoung.dungeonsguide.features.FeatureRegistry;
-import kr.syeyoung.dungeonsguide.gamesdk.GameSDK;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.NativeGameSDK;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.datastruct.*;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.enumuration.EDiscordActivityActionType;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.enumuration.EDiscordActivityJoinRequestReply;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.enumuration.EDiscordLogLevel;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.enumuration.EDiscordResult;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.interfacestruct.IDiscordActivityEvents;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.interfacestruct.IDiscordActivityManager;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.interfacestruct.IDiscordCore;
-import kr.syeyoung.dungeonsguide.gamesdk.jna.typedef.*;
-import kr.syeyoung.dungeonsguide.party.PartyInviteViewer;
-import kr.syeyoung.dungeonsguide.party.PartyJoinRequest;
-import kr.syeyoung.dungeonsguide.party.PartyManager;
-import kr.syeyoung.dungeonsguide.stomp.StompHeader;
-import kr.syeyoung.dungeonsguide.stomp.StompPayload;
-import lombok.Getter;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import org.json.JSONObject;
-
-public class RichPresenceManager implements Runnable {
-    public static RichPresenceManager INSTANCE = new RichPresenceManager();
-    private Thread t = new Thread(this);
-
-    public RichPresenceManager() {
-        t.start();
-    }
-    @Getter
-    private NativeGameSDK nativeGameSDK;
-    @Getter
-    private IDiscordCore iDiscordCore;
-    private IDiscordActivityManager activityManager;
-    private IDiscordActivityEvents.ByReference callbacks;
-
-    @Getter
-    private boolean setupSuccessful = false;
-    public boolean setup() {
-        nativeGameSDK = GameSDK.getNativeGameSDK();
-        if (nativeGameSDK == null) return false;
-        DiscordCreateParams discordCreateParams = new DiscordCreateParams();
-        discordCreateParams.client_id = new DiscordClientID(816298079732498473L);
-
-        callbacks = new IDiscordActivityEvents.ByReference();
-        callbacks.OnActivityInvite = (eventData, type, user, activity) -> {
-            PartyJoinRequest partyJoinRequest = new PartyJoinRequest();
-            partyJoinRequest.setDiscordUser(user);
-            partyJoinRequest.setExpire(System.currentTimeMillis() + 30000);
-            partyJoinRequest.setInvite(true);
-
-            PartyInviteViewer.INSTANCE.joinRequests.add(partyJoinRequest);
-            System.out.println("Received Join Request from "+user.id.longValue()+" ("+partyJoinRequest.getUsername()+"#"+partyJoinRequest.getDiscriminator()+")");
-        };
-        callbacks.OnActivityJoin = (eventData, secret) -> {DungeonsGuide.getDungeonsGuide().getStompConnection().send(new StompPayload().method(StompHeader.SEND)
-                .header("destination", "/app/party.askedtojoin")
-                .payload(new JSONObject().put("token", secret).toString()));
-            System.out.println("Trying to join with token "+secret);
-        };
-        callbacks.OnActivityJoinRequest = (eventData, user) -> {
-                PartyJoinRequest partyJoinRequest = new PartyJoinRequest();
-                partyJoinRequest.setDiscordUser(user);
-                partyJoinRequest.setExpire(System.currentTimeMillis() + 30000);
-
-                PartyInviteViewer.INSTANCE.joinRequests.add(partyJoinRequest);
-                System.out.println("Received Join Request from "+user.id.longValue()+" ("+partyJoinRequest.getUsername()+"#"+partyJoinRequest.getDiscriminator()+")");
-        };
-        callbacks.OnActivitySpectate = (eventData, secret) -> {
-
-        };
-        callbacks.write();
-        discordCreateParams.activity_events = callbacks;
-
-        PointerByReference pointerByReference = new PointerByReference();
-        nativeGameSDK.DiscordCreate(new DiscordVersion(NativeGameSDK.DISCORD_VERSION), discordCreateParams, pointerByReference);
-        if (pointerByReference.getValue() == Pointer.NULL) return false;
-        iDiscordCore = new IDiscordCore(pointerByReference.getValue());
-
-        iDiscordCore.SetLogHook.setLogHook(iDiscordCore, EDiscordLogLevel.DiscordLogLevel_Debug, Pointer.NULL, new IDiscordCore.LogHook() {
-            @Override
-            public void hook(Pointer hookData, EDiscordLogLevel level, String message) {
-                System.out.println(message+" - "+level+" - "+hookData);
-            }
-        });
-
-        activityManager = iDiscordCore.GetActivityManager.getActivityManager(iDiscordCore);
-        latestDiscordActivity = new DiscordActivity();
-        latestDiscordActivity.assets = new DiscordActivityAssets();
-        latestDiscordActivity.secrets = new DiscordActivitySecrets();
-        latestDiscordActivity.party = new DiscordActivityParty();
-        latestDiscordActivity.party.discordActivityParty = new DiscordPartySize();
-        latestDiscordActivity.timestamps = new DiscordActivityTimestamps();
-        GameSDK.writeString(latestDiscordActivity.assets.large_image, "mort");
-        GameSDK.writeString(latestDiscordActivity.assets.large_text, "mort");
-
-        return true;
-    }
-
-    private final SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
-
-    private DiscordActivity latestDiscordActivity;
-
-    public void respond(DiscordSnowflake userID, EDiscordActivityJoinRequestReply reply) {
-        activityManager.SendRequestReply.sendRequestReply(activityManager, userID, reply, Pointer.NULL, (callbackData, result) -> {
-            System.out.println("Discord Returned "+result+" For Replying "+reply+" To "+userID.longValue()+"L");
-        });
-    }
-
-    public void accept(DiscordSnowflake userID) {
-        activityManager.AcceptInvite.acceptInvite(activityManager, userID, Pointer.NULL, (callbackData, result) -> {
-            System.out.println("Discord Returned "+result+" For Accepting invite from "+userID.longValue()+"L");
-        });
-    }
-    public void updatePresence() {
-        if (!skyblockStatus.isOnHypixel() || !FeatureRegistry.ADVANCED_RICHPRESENCE.isEnabled() || (!skyblockStatus.isOnSkyblock() && FeatureRegistry.ADVANCED_RICHPRESENCE.<Boolean>getParameter("disablenotskyblock").getValue())) {
-            activityManager.ClearActivity.clearActivity(activityManager, Pointer.NULL, new NativeGameSDK.DiscordCallback() {
-                @Override
-                public void callback(Pointer callbackData, EDiscordResult result) {
-                }
-            });
-        } else {
-            String name = skyblockStatus.getDungeonName();
-            if (name.trim().equals("Your Island")) name = "Private Island";
-
-            GameSDK.writeString(latestDiscordActivity.state, name);
-
-
-                GameSDK.writeString(latestDiscordActivity.party.id, PartyManager.INSTANCE.getPartyID() == null ? "" : PartyManager.INSTANCE.getPartyID());
-                latestDiscordActivity.party.discordActivityParty.current_size = new Int32(PartyManager.INSTANCE.getMemberCount());
-                latestDiscordActivity.party.discordActivityParty.max_size = new Int32(PartyManager.INSTANCE.getMaxParty());
-
-            if (skyblockStatus.getContext() != null) {
-                DungeonContext dungeonContext = skyblockStatus.getContext();
-                long init = dungeonContext.getInit();
-                latestDiscordActivity.timestamps.start = new DiscordTimestamp(init);
-
-                if (dungeonContext.getBossfightProcessor() != null) {
-                    GameSDK.writeString(latestDiscordActivity.details, "Fighting "+dungeonContext.getBossfightProcessor().getBossName()+": "+dungeonContext.getBossfightProcessor().getCurrentPhase());
-                } else {
-                    GameSDK.writeString(latestDiscordActivity.details, "Clearing Rooms");
-                }
-            } else {
-                latestDiscordActivity.timestamps.start = new DiscordTimestamp(0);
-                GameSDK.writeString(latestDiscordActivity.details, "Dungeons Guide");
-            }
-            if (PartyManager.INSTANCE.isAllowAskToJoin()) {
-                GameSDK.writeString(latestDiscordActivity.secrets.join, PartyManager.INSTANCE.getAskToJoinSecret());
-            } else {
-                GameSDK.writeString(latestDiscordActivity.secrets.join, "");
-            }
-            activityManager.UpdateActivity.updateActivity(activityManager, latestDiscordActivity, Pointer.NULL, new NativeGameSDK.DiscordCallback() {
-                @Override
-                public void callback(Pointer callbackData, EDiscordResult result) {
-                }
-            });
-        }
-    }
-
-    @Override
-    public void run() {
-        setupSuccessful = setup();
-        if (!setupSuccessful) return;
-        while(!Thread.interrupted()) {
-            try {
-                iDiscordCore.RunCallbacks.runCallbacks(iDiscordCore);
-                updatePresence();
-                Thread.sleep(300L);
-            } catch (Exception e) {e.printStackTrace();}
-        }
-    }
-}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
index d2960b2a..d7759f92 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java
@@ -20,6 +20,8 @@ package kr.syeyoung.dungeonsguide.commands;
 
 import com.google.gson.JsonObject;
 import kr.syeyoung.dungeonsguide.DungeonsGuide;
+import kr.syeyoung.dungeonsguide.rpc.JDiscordRelation;
+import kr.syeyoung.dungeonsguide.rpc.RichPresenceManager;
 import kr.syeyoung.dungeonsguide.SkyblockStatus;
 import kr.syeyoung.dungeonsguide.config.guiconfig.GuiConfigV2;
 import kr.syeyoung.dungeonsguide.config.guiconfig.NestedCategory;
@@ -39,7 +41,7 @@ import kr.syeyoung.dungeonsguide.features.AbstractFeature;
 import kr.syeyoung.dungeonsguide.features.FeatureRegistry;
 import kr.syeyoung.dungeonsguide.features.impl.party.playerpreview.FeatureViewPlayerOnJoin;
 import kr.syeyoung.dungeonsguide.features.impl.party.api.ApiFetchur;
-import kr.syeyoung.dungeonsguide.party.PartyInviteViewer;
+import kr.syeyoung.dungeonsguide.features.impl.discord.inviteViewer.PartyInviteViewer;
 import kr.syeyoung.dungeonsguide.party.PartyManager;
 import kr.syeyoung.dungeonsguide.roomedit.EditingContext;
 import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonRoomEdit;
@@ -327,8 +329,11 @@ public class CommandDungeonsGuide extends CommandBase {
                 sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fToggled Ask to join to " + (PartyManager.INSTANCE.isAllowAskToJoin() ? "§eon" : "§coff")));
             }
 
-            if (!FeatureRegistry.ADVANCED_RICHPRESENCE.isEnabled()) {
-                sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cDiscord Rich Presence is disabled! Enable at /dg -> Advanced "));
+            if (!FeatureRegistry.DISCORD_RICHPRESENCE.isEnabled()) {
+                sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cDiscord Rich Presence is disabled! Enable at /dg -> Discord "));
+            }
+            if (!FeatureRegistry.DISCORD_ASKTOJOIN.isEnabled()) {
+                sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cDiscord Invite Viewer is disabled! Enable at /dg -> Discord ")); // how
             }
         } else if (args[0].equalsIgnoreCase("partymax") || args[0].equalsIgnoreCase("pm")) {
             if (args.length == 1) {
@@ -396,8 +401,8 @@ public class CommandDungeonsGuide extends CommandBase {
             cosmeticsManager.requestCosmeticsList();
             cosmeticsManager.requestActiveCosmetics();
             StaticResourceCache.INSTANCE.purgeCache();
-            PartyInviteViewer.INSTANCE.imageMap.clear();
-            PartyInviteViewer.INSTANCE.futureMap.clear();
+            FeatureRegistry.DISCORD_ASKTOJOIN.imageMap.clear();
+            FeatureRegistry.DISCORD_ASKTOJOIN.futureMap.clear();
 
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §fSuccessfully purged API Cache!"));
         } else if (args[0].equals("pbroadcast")) {
@@ -533,7 +538,11 @@ public class CommandDungeonsGuide extends CommandBase {
             }
             System.out.println(stringBuilder.toString());
             System.out.println(stringBuilder2.toString());
-        } else {
+        }  else if (args[0].equals("IDKTEST")) {
+            for (Map.Entry<Long, JDiscordRelation> longJDiscordRelationEntry : RichPresenceManager.INSTANCE.getRelationMap().entrySet()) {
+                System.out.println(longJDiscordRelationEntry.getValue());
+            }
+        } else{
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg §7-§fOpens configuration gui"));
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg gui §7-§fOpens configuration gui"));
             sender.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §e/dg help §7-§fShows command help"));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java b/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java
index ab7eae21..20aeb460 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java
@@ -92,6 +92,30 @@ public class FeatureListener {
         }
     }
     @SubscribeEvent
+    public void onDiscordUserUpdate(DiscordUserUpdateEvent discordUserUpdateEvent) {
+        try {
+            for (AbstractFeature abstractFeature : FeatureRegistry.getFeatureList()) {
+                if (abstractFeature instanceof DiscordUserUpdateListener) {
+                    ((DiscordUserUpdateListener) abstractFeature).onDiscordUserUpdate(discordUserUpdateEvent);
+                }
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+    @SubscribeEvent
+    public void onDiscordUserUpdate(DiscordUserJoinRequestEvent discordUserUpdateEvent) {
+        try {
+            for (AbstractFeature abstractFeature : FeatureRegistry.getFeatureList()) {
+                if (abstractFeature instanceof DiscordUserJoinRequestListener) {
+                    ((DiscordUserJoinRequestListener) abstractFeature).onDiscordUserJoinRequest(discordUserUpdateEvent);
+                }
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+    @SubscribeEvent
     public void onWindowUpdate(WindowUpdateEvent windowUpdateEvent) {
         try {
             SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/events/DiscordUserJoinRequestEvent.java b/src/main/java/kr/syeyoung/dungeonsguide/events/DiscordUserJoinRequestEvent.java
new file mode 100644
index 00000000..80a9315a
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/events/DiscordUserJoinRequestEvent.java
@@ -0,0 +1,30 @@
+/*
+ * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ * Copyright (C) 2021  cyoung06
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package kr.syeyoung.dungeonsguide.events;
+
+import kr.syeyoung.dungeonsguide.gamesdk.jna.datastruct.DiscordUser;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import net.minecraftforge.fml.common.eventhandler.Event;
+
+@Data @AllArgsConstructor
+public class DiscordUserJoinRequestEvent extends Event {
+    private DiscordUser discordUser;
+    private boolean isInvite;
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/events/DiscordUserUpdateEvent.java b/src/main/java/kr/syeyoung/dungeonsguide/events/DiscordUserUpdateEvent.java
new file mode 100644
index 00000000..f737b598
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/events/DiscordUserUpdateEvent.java
@@ -0,0 +1,30 @@
+/*
+ * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ * Copyright (C) 2021  cyoung06
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package kr.syeyoung.dungeonsguide.events;
+
+import kr.syeyoung.dungeonsguide.rpc.JDiscordRelation;
+import kr.syeyoung.dungeonsguide.rpc.JDiscordUser;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import net.minecraftforge.fml.common.eventhandler.Event;
+
+@Data @AllArgsConstructor
+public class DiscordUserUpdateEvent extends Event {
+    private JDiscordRelation prev, current;
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
index ee81ee2f..55e2753b 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
@@ -28,6 +28,8 @@ import kr.syeyoung.dungeonsguide.features.impl.boss.terminal.FeatureSimonSaysSol
 import kr.syeyoung.dungeonsguide.features.impl.boss.terminal.FeatureTerminalSolvers;
 import kr.syeyoung.dungeonsguide.features.impl.cosmetics.FeatureNicknameColor;
 import kr.syeyoung.dungeonsguide.features.impl.cosmetics.FeatureNicknamePrefix;
+import kr.syeyoung.dungeonsguide.features.impl.discord.inviteViewer.PartyInviteViewer;
+import kr.syeyoung.dungeonsguide.features.impl.discord.onlinealarm.PlayingDGAlarm;
 import kr.syeyoung.dungeonsguide.features.impl.dungeon.*;
 import kr.syeyoung.dungeonsguide.features.impl.etc.*;
 import kr.syeyoung.dungeonsguide.features.impl.etc.ability.FeatureAbilityCooldown;
@@ -76,11 +78,15 @@ public class FeatureRegistry {
     public static final FeatureRoomDebugInfo ADVANCED_DEBUG_ROOM = register(new FeatureRoomDebugInfo());
     public static final FeatureDebuggableMap ADVANCED_DEBUGGABLE_MAP = register(new FeatureDebuggableMap());
     public static final FeatureRoomCoordDisplay ADVANCED_COORDS = register(new FeatureRoomCoordDisplay());
-    public static final SimpleFeature ADVANCED_RICHPRESENCE = register(new SimpleFeature("Misc", "Discord RPC", "Discord rich presence with ASK-TO-JOIN Support!\n\nSimply type /dg asktojoin or /dg atj to toggle whether ask-to-join would be presented as option on discord!", "advanced.richpresence", true) {
+
+    public static final SimpleFeature DISCORD_RICHPRESENCE = register(new SimpleFeature("Discord", "Discord RPC", "Enable Discord rich presence", "advanced.richpresence", true) {
         {
             parameters.put("disablenotskyblock", new FeatureParameter<Boolean>("disablenotskyblock", "Disable When not on Skyblock", "Disable When not on skyblock", false, "boolean"));
         }
     });
+    public static final PartyInviteViewer DISCORD_ASKTOJOIN = register(new PartyInviteViewer());
+    public static final PlayingDGAlarm DISCORD_ONLINEALARM = register(new PlayingDGAlarm());
+
 
     public static final SimpleFeature SOLVER_RIDDLE = register(new SimpleFeature("Solver.Any Floor", "Riddle", "Highlights the correct box after clicking on all 3 weirdos",  "solver.riddle"));
     public static final SimpleFeature SOLVER_KAHOOT = register(new SimpleFeature("Solver.Floor 4+", "Quiz", "Highlights the correct solution for trivia puzzle",  "solver.trivia"));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/discord/inviteViewer/ImageTexture.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/discord/inviteViewer/ImageTexture.java
new file mode 100644
index 00000000..62ee2913
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/discord/inviteViewer/ImageTexture.java
@@ -0,0 +1,120 @@
+/*
+ * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ * Copyright (C) 2021  cyoung06
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package kr.syeyoung.dungeonsguide.features.impl.discord.inviteViewer;
+
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.ResourceLocation;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
+
+@Data
+public class ImageTexture {
+    private String url;
+    private BufferedImage image;
+    private DynamicTexture previewTexture;
+    private ResourceLocation resourceLocation;
+
+    private int width;
+    private int height;
+    private int frames;
+    private int size;
+
+    @Getter @Setter
+    private int lastFrame = 0;
+
+    public void buildGLThings() {
+        previewTexture = new DynamicTexture(image);
+        resourceLocation = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("dgurl/"+url, previewTexture);
+    }
+
+    public ImageTexture(String url) throws IOException {
+        this.url = url;
+
+        URL urlObj = new URL(url);
+        HttpURLConnection huc = (HttpURLConnection) urlObj.openConnection();
+        huc.addRequestProperty("User-Agent", "DungeonsGuideMod (dungeons.guide, 1.0)");
+        ImageInputStream imageInputStream = ImageIO.createImageInputStream(huc.getInputStream());
+        Iterator<ImageReader> readers = ImageIO.getImageReaders(imageInputStream);
+        if(!readers.hasNext()) throw new IOException("No image reader what" + url);
+        ImageReader reader = readers.next();
+        reader.setInput(imageInputStream);
+        frames = reader.getNumImages(true);
+        BufferedImage dummyFrame = reader.read(0);
+        width = dummyFrame.getWidth(); height = dummyFrame.getHeight();
+
+
+        image = new BufferedImage(width, height * frames, dummyFrame.getType());
+        Graphics2D graphics2D = image.createGraphics();
+
+        for (int i = 0; i < frames; i++) {
+            BufferedImage bufferedImage = reader.read(i);
+            graphics2D.drawImage(bufferedImage, 0, i*height, null);
+        }
+        reader.dispose(); imageInputStream.close(); huc.disconnect();
+    }
+
+    public void drawFrame(int frame, int x, int y, int width, int height) {
+        if (getResourceLocation() == null)
+            buildGLThings();
+
+        TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
+        textureManager.bindTexture(getResourceLocation());
+
+        GlStateManager.color(1, 1, 1, 1.0F);
+
+        Tessellator tessellator = Tessellator.getInstance();
+        WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+        worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
+        worldrenderer.pos((double)x, (double)(y + height), 0.0D)
+                .tex(0,((frame+1) * height)/ ((double)frames * height)).endVertex();
+        worldrenderer.pos((double)(x + width), (double)(y + height), 0.0D)
+                .tex(1, ((frame+1) * height)/ ((double)frames * height)).endVertex();
+        worldrenderer.pos((double)(x + width), (double)y, 0.0D)
+                .tex(1,(frame * height)/ ((double)frames * height)).endVertex();
+        worldrenderer.pos((double)x, (double)y, 0.0D)
+                .tex(0,  (frame * height) / ((double)frames * height)).endVertex();
+        tessellator.draw();
+    }
+
+    public void drawFrameAndIncrement(int x, int y, int width, int height) {
+        drawFrame(lastFrame, x,y,width,height);
+        lastFrame++;
+        if (lastFrame >= frames) lastFrame = 0;
+    }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyInviteViewer.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/discord/inviteViewer/PartyInviteViewer.java
index 8dbdf2bb..6676eae2 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/party/PartyInviteViewer.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/discord/inviteViewer/PartyInviteViewer.java
@@ -1,25 +1,28 @@
 /*
- *     Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
- *     Copyright (C) 2021  cyoung06
+ * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ * Copyright (C) 2021  cyoung06
  *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Affero General Public License as published
- *     by the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
  *
- *     You should have received a copy of the GNU Affero General Public License
- *