diff --git a/Ryujinx/Configuration/DiscordIntegrationModule.cs b/Ryujinx/Configuration/DiscordIntegrationModule.cs
index 87cff00806..ec45f6affd 100644
--- a/Ryujinx/Configuration/DiscordIntegrationModule.cs
+++ b/Ryujinx/Configuration/DiscordIntegrationModule.cs
@@ -1,14 +1,13 @@
using DiscordRPC;
using Ryujinx.Common;
using System;
-using System.IO;
using System.Linq;
namespace Ryujinx.Configuration
{
static class DiscordIntegrationModule
{
- private static DiscordRpcClient DiscordClient;
+ private static DiscordRpcClient _discordClient;
private static string LargeDescription = "Ryujinx is a Nintendo Switch emulator.";
@@ -38,25 +37,25 @@ namespace Ryujinx.Configuration
// If the integration was active, disable it and unload everything
if (e.OldValue)
{
- DiscordClient?.Dispose();
+ _discordClient?.Dispose();
- DiscordClient = null;
+ _discordClient = null;
}
// If we need to activate it and the client isn't active, initialize it
- if (e.NewValue && DiscordClient == null)
+ if (e.NewValue && _discordClient == null)
{
- DiscordClient = new DiscordRpcClient("568815339807309834");
+ _discordClient = new DiscordRpcClient("568815339807309834");
- DiscordClient.Initialize();
- DiscordClient.SetPresence(DiscordPresence);
+ _discordClient.Initialize();
+ _discordClient.SetPresence(DiscordPresence);
}
}
}
public static void SwitchToPlayingState(string titleId, string titleName)
{
- if (File.ReadAllLines(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "RPsupported.dat")).Contains(titleId))
+ if (SupportedTitles.Contains(titleId))
{
DiscordPresence.Assets.LargeImageKey = titleId;
}
@@ -86,7 +85,7 @@ namespace Ryujinx.Configuration
DiscordPresence.Assets.SmallImageText = LargeDescription;
DiscordPresence.Timestamps = new Timestamps(DateTime.UtcNow);
- DiscordClient?.SetPresence(DiscordPresence);
+ _discordClient?.SetPresence(DiscordPresence);
}
public static void SwitchToMainMenu()
@@ -99,12 +98,75 @@ namespace Ryujinx.Configuration
DiscordPresence.Assets.SmallImageText = null;
DiscordPresence.Timestamps = new Timestamps(DateTime.UtcNow);
- DiscordClient?.SetPresence(DiscordPresence);
+ _discordClient?.SetPresence(DiscordPresence);
}
public static void Exit()
{
- DiscordClient?.Dispose();
+ _discordClient?.Dispose();
}
+
+ private static readonly string[] SupportedTitles =
+ {
+ "0100000000010000",
+ "01000B900D8B0000",
+ "01000d200ac0c000",
+ "01000d700be88000",
+ "01000dc007e90000",
+ "01000e2003fa0000",
+ "0100225000fee000",
+ "010028d0045ce000",
+ "01002b30028f6000",
+ "01002fc00c6d0000",
+ "010034e005c9c000",
+ "010036B0034E4000",
+ "01003D200BAA2000",
+ "01004f8006a78000",
+ "010051f00ac5e000",
+ "010055D009F78000",
+ "010056e00853a000",
+ "0100574009f9e000",
+ "01005D700E742000",
+ "0100628004bce000",
+ "0100633007d48000",
+ "010065500b218000",
+ "010068f00aa78000",
+ "01006BB00C6F0000",
+ "01006F8002326000",
+ "01006a800016e000",
+ "010072800cbe8000",
+ "01007300020fa000",
+ "01007330027ee000",
+ "0100749009844000",
+ "01007a4008486000",
+ "01007ef00011e000",
+ "010080b00ad66000",
+ "010082400BCC6000",
+ "01008db008c2c000",
+ "010094e00b52e000",
+ "01009aa000faa000",
+ "01009b90006dc000",
+ "01009cc00c97c000",
+ "0100EA80032EA000",
+ "0100a4200a284000",
+ "0100a5c00d162000",
+ "0100abf008968000",
+ "0100ae000aebc000",
+ "0100b3f000be2000",
+ "0100bc2004ff4000",
+ "0100cf3007578000",
+ "0100d5d00c6be000",
+ "0100d6b00cd88000",
+ "0100d870045b6000",
+ "0100e0c00adac000",
+ "0100e46006708000",
+ "0100e7200b272000",
+ "0100e9f00b882000",
+ "0100eab00605c000",
+ "0100efd00a4fa000",
+ "0100f6a00a684000",
+ "0100f9f00c696000",
+ "051337133769a000"
+ };
}
}
diff --git a/Ryujinx/RPsupported.dat b/Ryujinx/RPsupported.dat
deleted file mode 100644
index c58195bab9..0000000000
--- a/Ryujinx/RPsupported.dat
+++ /dev/null
@@ -1,49 +0,0 @@
-01000d200ac0c000
-01000d700be88000
-01000dc007e90000
-01000e2003fa0000
-0100225000fee000
-010028d0045ce000
-01002b30028f6000
-01002fc00c6d0000
-010034e005c9c000
-01004f8006a78000
-010051f00ac5e000
-010056e00853a000
-0100574009f9e000
-0100628004bce000
-0100633007d48000
-010065500b218000
-010068f00aa78000
-01006a800016e000
-010072800cbe8000
-01007300020fa000
-01007330027ee000
-0100749009844000
-01007a4008486000
-01007ef00011e000
-010080b00ad66000
-01008db008c2c000
-010094e00b52e000
-01009aa000faa000
-01009b90006dc000
-01009cc00c97c000
-0100a4200a284000
-0100a5c00d162000
-0100abf008968000
-0100ae000aebc000
-0100b3f000be2000
-0100bc2004ff4000
-0100cf3007578000
-0100d5d00c6be000
-0100d6b00cd88000
-0100d870045b6000
-0100e0c00adac000
-0100e46006708000
-0100e7200b272000
-0100e9f00b882000
-0100eab00605c000
-0100efd00a4fa000
-0100f6a00a684000
-0100f9f00c696000
-051337133769a000
\ No newline at end of file
diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj
index c896742bb4..d82c62f70d 100644
--- a/Ryujinx/Ryujinx.csproj
+++ b/Ryujinx/Ryujinx.csproj
@@ -93,9 +93,6 @@
PreserveNewest
-
- PreserveNewest
-