mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 13:43:17 +02:00
Add Discord Rich Presence (#681)
This commit is contained in:
parent
29a9c5f0b8
commit
e7be60b6c6
@ -98,6 +98,10 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
public string CurrentTitle { get; private set; }
|
public string CurrentTitle { get; private set; }
|
||||||
|
|
||||||
|
public string TitleName { get; private set; }
|
||||||
|
|
||||||
|
public string TitleID { get; private set; }
|
||||||
|
|
||||||
public IntegrityCheckLevel FsIntegrityCheckLevel { get; set; }
|
public IntegrityCheckLevel FsIntegrityCheckLevel { get; set; }
|
||||||
|
|
||||||
internal long HidBaseAddress { get; private set; }
|
internal long HidBaseAddress { get; private set; }
|
||||||
@ -233,7 +237,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
||||||
|
|
||||||
LoadNso("rtld");
|
LoadNso("rtld");
|
||||||
LoadNso("main");
|
LoadNso("main");
|
||||||
@ -431,7 +435,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
||||||
|
|
||||||
LoadNso("rtld");
|
LoadNso("rtld");
|
||||||
LoadNso("main");
|
LoadNso("main");
|
||||||
@ -522,11 +526,12 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
Nacp controlData = new Nacp(controlFile.AsStream());
|
Nacp controlData = new Nacp(controlFile.AsStream());
|
||||||
|
|
||||||
CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
|
TitleName = CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
|
||||||
|
TitleID = metaData.Aci0.TitleId.ToString("x16");
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(CurrentTitle))
|
if (string.IsNullOrWhiteSpace(CurrentTitle))
|
||||||
{
|
{
|
||||||
CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title;
|
TitleName = CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title;
|
||||||
}
|
}
|
||||||
|
|
||||||
return controlData;
|
return controlData;
|
||||||
@ -538,7 +543,7 @@ namespace Ryujinx.HLE.HOS
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadNso("rtld");
|
LoadNso("rtld");
|
||||||
@ -608,6 +613,9 @@ namespace Ryujinx.HLE.HOS
|
|||||||
|
|
||||||
ContentManager.LoadEntries();
|
ContentManager.LoadEntries();
|
||||||
|
|
||||||
|
TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16");
|
||||||
|
TitleName = metaData.TitleName;
|
||||||
|
|
||||||
ProgramLoader.LoadStaticObjects(this, metaData, new IExecutable[] { staticObject });
|
ProgramLoader.LoadStaticObjects(this, metaData, new IExecutable[] { staticObject });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +42,8 @@ namespace Ryujinx.HLE.HOS.SystemState
|
|||||||
|
|
||||||
internal string ActiveAudioOutput { get; private set; }
|
internal string ActiveAudioOutput { get; private set; }
|
||||||
|
|
||||||
|
public bool DiscordIntergrationEnabled { get; set; }
|
||||||
|
|
||||||
public bool DockedMode { get; set; }
|
public bool DockedMode { get; set; }
|
||||||
|
|
||||||
public ColorSet ThemeColor { get; set; }
|
public ColorSet ThemeColor { get; set; }
|
||||||
|
@ -32,6 +32,9 @@
|
|||||||
// Enable or disable Docked Mode
|
// Enable or disable Docked Mode
|
||||||
"docked_mode": false,
|
"docked_mode": false,
|
||||||
|
|
||||||
|
// Enable or disable Discord Rich Presense
|
||||||
|
"enable_discord_intergration": true,
|
||||||
|
|
||||||
// Enable or disable Game Vsync
|
// Enable or disable Game Vsync
|
||||||
"enable_vsync": true,
|
"enable_vsync": true,
|
||||||
|
|
||||||
|
@ -72,6 +72,11 @@ namespace Ryujinx
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool DockedMode { get; private set; }
|
public bool DockedMode { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Enables or disables Discord Rich Presense
|
||||||
|
/// </summary>
|
||||||
|
public bool EnableDiscordIntergration { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Enables or disables Vertical Sync
|
/// Enables or disables Vertical Sync
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -198,6 +203,8 @@ namespace Ryujinx
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
device.System.State.DiscordIntergrationEnabled = Instance.EnableDiscordIntergration;
|
||||||
|
|
||||||
device.EnableDeviceVsync = Instance.EnableVsync;
|
device.EnableDeviceVsync = Instance.EnableVsync;
|
||||||
|
|
||||||
device.System.State.DockedMode = Instance.DockedMode;
|
device.System.State.DockedMode = Instance.DockedMode;
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using Ryujinx.Audio;
|
using DiscordRPC;
|
||||||
|
using Ryujinx.Audio;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Graphics.Gal;
|
using Ryujinx.Graphics.Gal;
|
||||||
using Ryujinx.Graphics.Gal.OpenGL;
|
using Ryujinx.Graphics.Gal.OpenGL;
|
||||||
@ -6,11 +7,16 @@ using Ryujinx.HLE;
|
|||||||
using Ryujinx.Profiler;
|
using Ryujinx.Profiler;
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace Ryujinx
|
namespace Ryujinx
|
||||||
{
|
{
|
||||||
class Program
|
class Program
|
||||||
{
|
{
|
||||||
|
public static DiscordRpcClient DiscordClient;
|
||||||
|
|
||||||
|
public static RichPresence DiscordPresence;
|
||||||
|
|
||||||
public static string ApplicationDirectory => AppDomain.CurrentDomain.BaseDirectory;
|
public static string ApplicationDirectory => AppDomain.CurrentDomain.BaseDirectory;
|
||||||
|
|
||||||
static void Main(string[] args)
|
static void Main(string[] args)
|
||||||
@ -31,6 +37,22 @@ namespace Ryujinx
|
|||||||
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
||||||
AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit;
|
AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit;
|
||||||
|
|
||||||
|
if (device.System.State.DiscordIntergrationEnabled == true)
|
||||||
|
{
|
||||||
|
DiscordClient = new DiscordRpcClient("568815339807309834");
|
||||||
|
DiscordPresence = new RichPresence
|
||||||
|
{
|
||||||
|
Assets = new Assets
|
||||||
|
{
|
||||||
|
LargeImageKey = "ryujinx",
|
||||||
|
LargeImageText = "Ryujinx is an emulator for the Nintendo Switch"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
DiscordClient.Initialize();
|
||||||
|
DiscordClient.SetPresence(DiscordPresence);
|
||||||
|
}
|
||||||
|
|
||||||
if (args.Length == 1)
|
if (args.Length == 1)
|
||||||
{
|
{
|
||||||
if (Directory.Exists(args[0]))
|
if (Directory.Exists(args[0]))
|
||||||
@ -45,13 +67,11 @@ namespace Ryujinx
|
|||||||
if (romFsFiles.Length > 0)
|
if (romFsFiles.Length > 0)
|
||||||
{
|
{
|
||||||
Logger.PrintInfo(LogClass.Application, "Loading as cart with RomFS.");
|
Logger.PrintInfo(LogClass.Application, "Loading as cart with RomFS.");
|
||||||
|
|
||||||
device.LoadCart(args[0], romFsFiles[0]);
|
device.LoadCart(args[0], romFsFiles[0]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Logger.PrintInfo(LogClass.Application, "Loading as cart WITHOUT RomFS.");
|
Logger.PrintInfo(LogClass.Application, "Loading as cart WITHOUT RomFS.");
|
||||||
|
|
||||||
device.LoadCart(args[0]);
|
device.LoadCart(args[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -88,6 +108,23 @@ namespace Ryujinx
|
|||||||
Logger.PrintWarning(LogClass.Application, "Please specify the folder with the NSOs/IStorage or a NSO/NRO.");
|
Logger.PrintWarning(LogClass.Application, "Please specify the folder with the NSOs/IStorage or a NSO/NRO.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (device.System.State.DiscordIntergrationEnabled == true)
|
||||||
|
{
|
||||||
|
if (File.ReadAllLines(Path.Combine(ApplicationDirectory, "RPsupported.dat")).Contains(device.System.TitleID))
|
||||||
|
{
|
||||||
|
DiscordPresence.Assets.LargeImageKey = device.System.TitleID;
|
||||||
|
}
|
||||||
|
|
||||||
|
DiscordPresence.Details = $"Playing {device.System.TitleName}";
|
||||||
|
DiscordPresence.State = device.System.TitleID.ToUpper();
|
||||||
|
DiscordPresence.Assets.LargeImageText = device.System.TitleName;
|
||||||
|
DiscordPresence.Assets.SmallImageKey = "ryujinx";
|
||||||
|
DiscordPresence.Assets.SmallImageText = "Ryujinx is an emulator for the Nintendo Switch";
|
||||||
|
DiscordPresence.Timestamps = new Timestamps(DateTime.UtcNow);
|
||||||
|
|
||||||
|
DiscordClient.SetPresence(DiscordPresence);
|
||||||
|
}
|
||||||
|
|
||||||
using (GlScreen screen = new GlScreen(device, renderer))
|
using (GlScreen screen = new GlScreen(device, renderer))
|
||||||
{
|
{
|
||||||
screen.MainLoop();
|
screen.MainLoop();
|
||||||
@ -100,11 +137,15 @@ namespace Ryujinx
|
|||||||
audioOut.Dispose();
|
audioOut.Dispose();
|
||||||
|
|
||||||
Logger.Shutdown();
|
Logger.Shutdown();
|
||||||
|
|
||||||
|
DiscordClient.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void CurrentDomain_ProcessExit(object sender, EventArgs e)
|
private static void CurrentDomain_ProcessExit(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Logger.Shutdown();
|
Logger.Shutdown();
|
||||||
|
|
||||||
|
DiscordClient.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
|
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
|
||||||
@ -116,6 +157,8 @@ namespace Ryujinx
|
|||||||
if (e.IsTerminating)
|
if (e.IsTerminating)
|
||||||
{
|
{
|
||||||
Logger.Shutdown();
|
Logger.Shutdown();
|
||||||
|
|
||||||
|
DiscordClient.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
38
Ryujinx/RPsupported.dat
Normal file
38
Ryujinx/RPsupported.dat
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
01000d200ac0c000
|
||||||
|
01000d700be88000
|
||||||
|
01000dc007e90000
|
||||||
|
01000e2003fa0000
|
||||||
|
01002fc00c6d0000
|
||||||
|
0100225000fee000
|
||||||
|
010028d0045ce000
|
||||||
|
01002b30028f6000
|
||||||
|
010034e005c9c000
|
||||||
|
01004f8006a78000
|
||||||
|
010051f00ac5e000
|
||||||
|
0100574009f9e000
|
||||||
|
0100628004bce000
|
||||||
|
0100633007d48000
|
||||||
|
010065500b218000
|
||||||
|
010068f00aa78000
|
||||||
|
01006a800016e000
|
||||||
|
01007330027ee000
|
||||||
|
0100749009844000
|
||||||
|
01007a4008486000
|
||||||
|
010080b00ad66000
|
||||||
|
010094e00b52e000
|
||||||
|
01009aa000faa000
|
||||||
|
0100a4200a284000
|
||||||
|
0100a5c00d162000
|
||||||
|
0100ae000aebc000
|
||||||
|
0100b3f000be2000
|
||||||
|
0100bc2004ff4000
|
||||||
|
0100cf3007578000
|
||||||
|
0100d5d00c6be000
|
||||||
|
0100d6b00cd88000
|
||||||
|
0100d870045b6000
|
||||||
|
0100e0c00adac000
|
||||||
|
0100e7200b272000
|
||||||
|
0100e9f00b882000
|
||||||
|
0100eab00605c000
|
||||||
|
0100efd00a4fa000
|
||||||
|
0100f6a00a684000
|
@ -19,6 +19,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="DiscordRichPresence" Version="1.0.108" />
|
||||||
<PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
|
<PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
@ -35,6 +36,9 @@
|
|||||||
<None Update="Config.jsonc">
|
<None Update="Config.jsonc">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
<None Update="RPsupported.dat">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -368,6 +368,17 @@
|
|||||||
false
|
false
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"enable_discord_intergration": {
|
||||||
|
"$id": "#/properties/enable_discord_intergration",
|
||||||
|
"type": "boolean",
|
||||||
|
"title": "Enable Discord Rich Presense",
|
||||||
|
"description": "Enable or disable Discord Rich Presense",
|
||||||
|
"default": true,
|
||||||
|
"examples": [
|
||||||
|
true,
|
||||||
|
false
|
||||||
|
]
|
||||||
|
},
|
||||||
"enable_vsync": {
|
"enable_vsync": {
|
||||||
"$id": "#/properties/enable_vsync",
|
"$id": "#/properties/enable_vsync",
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
|
Loading…
Reference in New Issue
Block a user