Update Discord Game SDK code to target the new stable Everest only

Author: maddie480

LobbyHelper.cs

@@ -29,9 +29,6 @@ public static class LobbyHelper {
         private static ILHook hookOnLevelSetSwitch;
         private static ILHook hookOnOuiFileSelectSlotRender;
 
-        // TODO: replace this with On.Celeste once Discord Game SDK reached stable
-        private static Hook hookDiscordGameSDKIcon;
-
         private static HashSet<string> collabNames = new HashSet<string>();
 
         internal static void OnInitialize() {
@@ -196,11 +193,7 @@ internal static void Load() {
             hookOnOuiFileSelectSlotGolden = new ILHook(typeof(OuiFileSelectSlot).GetMethod("get_Golden", BindingFlags.NonPublic | BindingFlags.Instance), modSelectSlotCollectedStrawberries);
             hookOnOuiFileSelectSlotRender = new ILHook(typeof(OuiFileSelectSlot).GetMethod("orig_Render"), modOuiFileSelectSlotRender);
 
-            MethodInfo discordRichPresence = typeof(EverestModule).Assembly.GetType("Celeste.Mod.Everest+DiscordSDK")?.GetMethod("GetMapIconURLCached", BindingFlags.NonPublic | BindingFlags.Instance);
-            if (discordRichPresence != null) {
-                hookDiscordGameSDKIcon = new Hook(discordRichPresence, typeof(LobbyHelper)
-                    .GetMethod("onDiscordGetPresenceIcon", BindingFlags.NonPublic | BindingFlags.Static));
-            }
+            On.Celeste.Mod.Everest.DiscordSDK.GetMapIconURLCached += onDiscordGetPresenceIcon;
 
             typeof(ModExports).ModInterop();
         }
@@ -231,7 +224,7 @@ internal static void Unload() {
             hookOnOuiFileSelectSlotGolden?.Dispose();
             hookOnOuiFileSelectSlotRender?.Dispose();
 
-            hookDiscordGameSDKIcon?.Dispose();
+            On.Celeste.Mod.Everest.DiscordSDK.GetMapIconURLCached -= onDiscordGetPresenceIcon;
 
             if (Everest.Loader.DependencyLoaded(new EverestModuleMetadata() { Name = "CelesteNet.Client", Version = new Version(2, 0, 0) })) {
                 teardownAdjustCollabIcon();
@@ -256,7 +249,7 @@ internal static void adjustCollabIcon(CelesteNetPlayerListComponent.BlobPlayer b
             }
         }
 
-        private static string onDiscordGetPresenceIcon(Func<object, AreaData, string> orig, object self, AreaData areaData) {
+        private static string onDiscordGetPresenceIcon(On.Celeste.Mod.Everest.DiscordSDK.orig_GetMapIconURLCached orig, Everest.DiscordSDK self, AreaData areaData) {
             // if we are in a collab map, change the icon displayed in Discord Rich Presence to the lobby icon.
             string lobbySID = GetLobbyForMap(areaData.SID);
             if (lobbySID != null) {

UI/InGameOverworldHelper.cs

@@ -41,8 +41,6 @@ public static class InGameOverworldHelper {
             { "grandmaster", Calc.HexToColor("DD87FF") }
         };
 
-        private static Hook hookOnDiscordRichPresenceChange;
-
         private static bool presenceLock = false;
 
         internal static void Load() {
@@ -65,20 +63,7 @@ internal static void Load() {
             IL.Celeste.OuiChapterPanel._FixTitleLength += ModFixTitleLength;
             On.Celeste.OuiMainMenu.CreateButtons += OnOuiMainMenuCreateButtons;
 
-            // hooks the Discord rich presence update method of stable version 3650
-            // TODO: this should be replace with On.Celeste when this will have reached stable
-            MethodInfo discordRichPresence = typeof(EverestModule).Assembly.GetType("Celeste.Mod.Everest+Discord")?.GetMethod("UpdateText");
-            if (discordRichPresence != null) {
-                hookOnDiscordRichPresenceChange = new Hook(discordRichPresence, typeof(InGameOverworldHelper)
-                    .GetMethod("OnDiscordChangePresenceOld", BindingFlags.NonPublic | BindingFlags.Static));
-            }
-
-            // hooks the Discord rich presence update method of pull request https://github.com/EverestAPI/Everest/pull/543
-            discordRichPresence = typeof(EverestModule).Assembly.GetType("Celeste.Mod.Everest+DiscordSDK")?.GetMethod("UpdatePresence", BindingFlags.NonPublic | BindingFlags.Instance);
-            if (discordRichPresence != null) {
-                hookOnDiscordRichPresenceChange = new Hook(discordRichPresence, typeof(InGameOverworldHelper)
-                    .GetMethod("OnDiscordChangePresenceNew", BindingFlags.NonPublic | BindingFlags.Static));
-            }
+            On.Celeste.Mod.Everest.DiscordSDK.UpdatePresence += OnDiscordChangePresence;
 
             hookOnMapDataOrigLoad = new Hook(
                 typeof(MapData).GetMethod("orig_Load", BindingFlags.NonPublic | BindingFlags.Instance),
@@ -129,8 +114,7 @@ internal static void Unload() {
             hookOnMapDataOrigLoad?.Dispose();
             hookOnMapDataOrigLoad = null;
 
-            hookOnDiscordRichPresenceChange?.Dispose();
-            hookOnDiscordRichPresenceChange = null;
+            On.Celeste.Mod.Everest.DiscordSDK.UpdatePresence -= OnDiscordChangePresence;
         }
 
         private static void OnOuiChapterPanelStart(On.Celeste.OuiChapterPanel.orig_Start orig, OuiChapterPanel self, string checkpoint) {
@@ -217,14 +201,8 @@ private static void OnReloadLevel(On.Celeste.Mod.AssetReloadHelper.orig_ReloadLe
             orig();
         }
 
-        private static void OnDiscordChangePresenceOld(Action<string, string, Session> orig, string details, string state, Session session) {
-            if (!presenceLock) {
-                orig(details, state, session);
-            }
-        }
-
 
-        private static void OnDiscordChangePresenceNew(Action<object, Session> orig, object self, Session session) {
+        private static void OnDiscordChangePresence(On.Celeste.Mod.Everest.DiscordSDK.orig_UpdatePresence orig, Everest.DiscordSDK self, Session session) {
             if (!presenceLock) {
                 orig(self, session);
             }

everest.yaml

@@ -3,4 +3,4 @@
   DLL: bin/Release/net452/CollabUtils2.dll
   Dependencies:
     - Name: Everest
-      Version: 1.3471.0
+      Version: 1.3847.0