MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Fix casing inconsistencies and remove unused showRightmostSeparator property

Browse Source
This commit is contained in:
Jacobwasbeast 2024-12-12 13:33:11 -06:00
parent 35a62be2b1
commit 46e5f566b9
4 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ryujinx.HLE/HOS/Horizon.cs
View File

@ -339,10 +339,10 @@ namespace Ryujinx.HLE.HOS
public void ScanAmiibo(int nfpDeviceId, string amiiboId, bool useRandomUuid) public void ScanAmiibo(int nfpDeviceId, string amiiboId, bool useRandomUuid)
{ {
if (VirtualAmiibo.applicationBytes.Length > 0) if (VirtualAmiibo.ApplicationBytes.Length > 0)
{ {
VirtualAmiibo.applicationBytes = new byte[0]; VirtualAmiibo.ApplicationBytes = new byte[0];
VirtualAmiibo.inputBin = string.Empty; VirtualAmiibo.InputBin = string.Empty;
} }
if (NfpDevices[nfpDeviceId].State == NfpDeviceState.SearchingForTag) if (NfpDevices[nfpDeviceId].State == NfpDeviceState.SearchingForTag)
{ {
@ -353,10 +353,10 @@ namespace Ryujinx.HLE.HOS
} }
public void ScanAmiiboFromBin(string path) public void ScanAmiiboFromBin(string path)
{ {
VirtualAmiibo.inputBin = path; VirtualAmiibo.InputBin = path;
if (VirtualAmiibo.applicationBytes.Length > 0) if (VirtualAmiibo.ApplicationBytes.Length > 0)
{ {
VirtualAmiibo.applicationBytes = new byte[0]; VirtualAmiibo.ApplicationBytes = new byte[0];
} }
byte[] encryptedData = File.ReadAllBytes(path); byte[] encryptedData = File.ReadAllBytes(path);
VirtualAmiiboFile newFile = AmiiboBinReader.ReadBinFile(encryptedData); VirtualAmiiboFile newFile = AmiiboBinReader.ReadBinFile(encryptedData);

4
src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs
View File

@ -140,9 +140,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
}; };
if (writeCounterValue > 0) if (writeCounterValue > 0)
{ {
VirtualAmiibo.applicationBytes = applicationAreas; VirtualAmiibo.ApplicationBytes = applicationAreas;
} }
VirtualAmiibo.nickName = nickName; VirtualAmiibo.NickName = nickName;
return virtualAmiiboFile; return virtualAmiiboFile;
} }
public static bool SaveBinFile(string inputFile, byte[] appData) public static bool SaveBinFile(string inputFile, byte[] appData)

44
src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
View File

@ -14,10 +14,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{ {
static class VirtualAmiibo static class VirtualAmiibo
{ {
public static uint _openedApplicationAreaId; public static uint OpenedApplicationAreaId;
public static byte[] applicationBytes = new byte[0]; public static byte[] ApplicationBytes = new byte[0];
public static string inputBin = string.Empty; public static string InputBin = string.Empty;
public static string nickName = string.Empty; public static string NickName = string.Empty;
private static readonly AmiiboJsonSerializerContext _serializerContext = AmiiboJsonSerializerContext.Default; private static readonly AmiiboJsonSerializerContext _serializerContext = AmiiboJsonSerializerContext.Default;
public static byte[] GenerateUuid(string amiiboId, bool useRandomUuid) public static byte[] GenerateUuid(string amiiboId, bool useRandomUuid)
{ {
@ -70,10 +70,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{ {
VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId); VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId);
string nickname = amiiboFile.NickName ?? "Ryujinx"; string nickname = amiiboFile.NickName ?? "Ryujinx";
if (nickName != string.Empty) if (NickName != string.Empty)
{ {
nickname = nickName; nickname = NickName;
nickName = string.Empty; NickName = string.Empty;
} }
UtilityImpl utilityImpl = new(tickSource); UtilityImpl utilityImpl = new(tickSource);
CharInfo charInfo = new(); CharInfo charInfo = new();
@ -104,9 +104,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
{ {
VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId); VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
virtualAmiiboFile.NickName = newNickName; virtualAmiiboFile.NickName = newNickName;
if (inputBin != string.Empty) if (InputBin != string.Empty)
{ {
AmiiboBinReader.SaveBinFile(inputBin, virtualAmiiboFile.NickName); AmiiboBinReader.SaveBinFile(InputBin, virtualAmiiboFile.NickName);
return; return;
} }
SaveAmiiboFile(virtualAmiiboFile); SaveAmiiboFile(virtualAmiiboFile);
@ -115,15 +115,15 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
public static bool OpenApplicationArea(string amiiboId, uint applicationAreaId) public static bool OpenApplicationArea(string amiiboId, uint applicationAreaId)
{ {
VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId); VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
if (applicationBytes.Length > 0) if (ApplicationBytes.Length > 0)
{ {
_openedApplicationAreaId = applicationAreaId; OpenedApplicationAreaId = applicationAreaId;
return true; return true;
} }
if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == applicationAreaId)) if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == applicationAreaId))
{ {
_openedApplicationAreaId = applicationAreaId; OpenedApplicationAreaId = applicationAreaId;
return true; return true;
} }
@ -133,17 +133,17 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
public static byte[] GetApplicationArea(string amiiboId) public static byte[] GetApplicationArea(string amiiboId)
{ {
if (applicationBytes.Length > 0) if (ApplicationBytes.Length > 0)
{ {
byte[] bytes = applicationBytes; byte[] bytes = ApplicationBytes;
applicationBytes = new byte[0]; ApplicationBytes = new byte[0];
return bytes; return bytes;
} }
VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId); VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
foreach (VirtualAmiiboApplicationArea applicationArea in virtualAmiiboFile.ApplicationAreas) foreach (VirtualAmiiboApplicationArea applicationArea in virtualAmiiboFile.ApplicationAreas)
{ {
if (applicationArea.ApplicationAreaId == _openedApplicationAreaId) if (applicationArea.ApplicationAreaId == OpenedApplicationAreaId)
{ {
return applicationArea.ApplicationArea; return applicationArea.ApplicationArea;
} }
@ -174,22 +174,22 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
public static void SetApplicationArea(string amiiboId, byte[] applicationAreaData) public static void SetApplicationArea(string amiiboId, byte[] applicationAreaData)
{ {
if (inputBin != string.Empty) if (InputBin != string.Empty)
{ {
AmiiboBinReader.SaveBinFile(inputBin, applicationAreaData); AmiiboBinReader.SaveBinFile(InputBin, applicationAreaData);
return; return;
} }
VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId); VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == _openedApplicationAreaId)) if (virtualAmiiboFile.ApplicationAreas.Exists(item => item.ApplicationAreaId == OpenedApplicationAreaId))
{ {
for (int i = 0; i < virtualAmiiboFile.ApplicationAreas.Count; i++) for (int i = 0; i < virtualAmiiboFile.ApplicationAreas.Count; i++)
{ {
if (virtualAmiiboFile.ApplicationAreas[i].ApplicationAreaId == _openedApplicationAreaId) if (virtualAmiiboFile.ApplicationAreas[i].ApplicationAreaId == OpenedApplicationAreaId)
{ {
virtualAmiiboFile.ApplicationAreas[i] = new VirtualAmiiboApplicationArea() virtualAmiiboFile.ApplicationAreas[i] = new VirtualAmiiboApplicationArea()
{ {
ApplicationAreaId = _openedApplicationAreaId, ApplicationAreaId = OpenedApplicationAreaId,
ApplicationArea = applicationAreaData, ApplicationArea = applicationAreaData,
}; };
@ -240,7 +240,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
public static bool SaveFileExists(VirtualAmiiboFile virtualAmiiboFile) public static bool SaveFileExists(VirtualAmiiboFile virtualAmiiboFile)
{ {
if (inputBin != string.Empty) if (InputBin != string.Empty)
{ {
SaveAmiiboFile(virtualAmiiboFile); SaveAmiiboFile(virtualAmiiboFile);
return true; return true;

1
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View File

@ -74,7 +74,6 @@ namespace Ryujinx.Ava.UI.ViewModels
private string _shaderCountText; private string _shaderCountText;
private bool _isAmiiboRequested; private bool _isAmiiboRequested;
private bool _isAmiiboBinRequested; private bool _isAmiiboBinRequested;
private bool _showRightmostSeparator;
private bool _showShaderCompilationHint; private bool _showShaderCompilationHint;
private bool _isGameRunning; private bool _isGameRunning;
private bool _isFullScreen; private bool _isFullScreen;