diff --git a/.gitmodules b/.gitmodules index 34f6277..7879cd2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,15 @@ [submodule "LightlessAPI"] path = LightlessAPI url = https://git.lightless-sync.org/Lightless-Sync/LightlessAPI.git +[submodule "Penumbra.GameData"] + path = Penumbra.GameData + url = https://github.com/Ottermandias/Penumbra.GameData +[submodule "Penumbra.Api"] + path = Penumbra.Api + url = https://github.com/Ottermandias/Penumbra.Api +[submodule "Penumbra.String"] + path = Penumbra.String + url = https://github.com/Ottermandias/Penumbra.String +[submodule "OtterGui"] + path = OtterGui + url = https://github.com/Ottermandias/OtterGui diff --git a/LightlessSync.sln b/LightlessSync.sln index 6aba7e9..8d92b53 100644 --- a/LightlessSync.sln +++ b/LightlessSync.sln @@ -1,6 +1,7 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32328.378 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11217.181 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{585B740D-BA2C-429B-9CF3-B2D223423748}" ProjectSection(SolutionItems) = preProject @@ -11,90 +12,100 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightlessSync", "LightlessS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightlessSync.API", "LightlessAPI\LightlessSyncAPI\LightlessSync.API.csproj", "{A4E42AFA-5045-7E81-937F-3A320AC52987}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.GameData", "Penumbra.GameData\Penumbra.GameData.csproj", "{CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.String", "Penumbra.String\Penumbra.String.csproj", "{82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.Api", "Penumbra.Api\Penumbra.Api.csproj", "{65ACC53A-1D72-40D4-A99E-7D451D87E182}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.Api", "Penumbra.Api\Penumbra.Api.csproj", "{22AE06C8-5139-45D2-A5F9-E76C019050D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.String", "Penumbra.String\Penumbra.String.csproj", "{4D466894-0F1E-4808-A3E8-3FC9DE954AC6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Penumbra.GameData", "Penumbra.GameData\Penumbra.GameData.csproj", "{3C016B19-2A2C-4068-9378-B9B805605EFB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtterGui", "OtterGui\OtterGui.csproj", "{719723E1-8218-495A-98BA-4D0BDF7822EB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OtterGui", "OtterGui", "{F30CFB00-531B-5698-C50F-38FBF3471340}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtterGuiInternal", "OtterGui\OtterGuiInternal\OtterGuiInternal.csproj", "{DF590F45-F26C-4337-98DE-367C97253125}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtterGui", "OtterGui\OtterGui.csproj", "{C77A2833-3FE4-405B-811D-439B1FF859D9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Debug|Any CPU.ActiveCfg = Debug|x64 {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Debug|Any CPU.Build.0 = Debug|x64 {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Debug|x64.ActiveCfg = Debug|x64 {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Debug|x64.Build.0 = Debug|x64 + {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Debug|x86.ActiveCfg = Debug|Any CPU + {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Debug|x86.Build.0 = Debug|Any CPU {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Release|Any CPU.ActiveCfg = Release|x64 {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Release|Any CPU.Build.0 = Release|x64 {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Release|x64.ActiveCfg = Release|x64 {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Release|x64.Build.0 = Release|x64 + {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Release|x86.ActiveCfg = Release|Any CPU + {BB929046-4CD2-B174-EBAA-C756AC3AC8DA}.Release|x86.Build.0 = Release|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Debug|x64.ActiveCfg = Debug|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Debug|x64.Build.0 = Debug|Any CPU + {A4E42AFA-5045-7E81-937F-3A320AC52987}.Debug|x86.ActiveCfg = Debug|Any CPU + {A4E42AFA-5045-7E81-937F-3A320AC52987}.Debug|x86.Build.0 = Debug|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Release|Any CPU.Build.0 = Release|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Release|x64.ActiveCfg = Release|Any CPU {A4E42AFA-5045-7E81-937F-3A320AC52987}.Release|x64.Build.0 = Release|Any CPU - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Debug|Any CPU.ActiveCfg = Debug|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Debug|Any CPU.Build.0 = Debug|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Debug|x64.ActiveCfg = Debug|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Debug|x64.Build.0 = Debug|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Release|Any CPU.ActiveCfg = Release|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Release|Any CPU.Build.0 = Release|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Release|x64.ActiveCfg = Release|x64 - {CCB659C7-3D2D-4FB1-856E-98FDA8E5A6D3}.Release|x64.Build.0 = Release|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Debug|Any CPU.ActiveCfg = Debug|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Debug|Any CPU.Build.0 = Debug|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Debug|x64.ActiveCfg = Debug|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Debug|x64.Build.0 = Debug|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Release|Any CPU.ActiveCfg = Release|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Release|Any CPU.Build.0 = Release|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Release|x64.ActiveCfg = Release|x64 - {65ACC53A-1D72-40D4-A99E-7D451D87E182}.Release|x64.Build.0 = Release|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Debug|Any CPU.ActiveCfg = Debug|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Debug|Any CPU.Build.0 = Debug|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Debug|x64.ActiveCfg = Debug|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Debug|x64.Build.0 = Debug|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Release|Any CPU.ActiveCfg = Release|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Release|Any CPU.Build.0 = Release|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Release|x64.ActiveCfg = Release|x64 - {4D466894-0F1E-4808-A3E8-3FC9DE954AC6}.Release|x64.Build.0 = Release|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Debug|Any CPU.ActiveCfg = Debug|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Debug|Any CPU.Build.0 = Debug|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Debug|x64.ActiveCfg = Debug|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Debug|x64.Build.0 = Debug|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Release|Any CPU.ActiveCfg = Release|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Release|Any CPU.Build.0 = Release|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Release|x64.ActiveCfg = Release|x64 - {719723E1-8218-495A-98BA-4D0BDF7822EB}.Release|x64.Build.0 = Release|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Debug|Any CPU.ActiveCfg = Debug|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Debug|Any CPU.Build.0 = Debug|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Debug|x64.ActiveCfg = Debug|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Debug|x64.Build.0 = Debug|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Release|Any CPU.ActiveCfg = Release|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Release|Any CPU.Build.0 = Release|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Release|x64.ActiveCfg = Release|x64 - {DF590F45-F26C-4337-98DE-367C97253125}.Release|x64.Build.0 = Release|x64 + {A4E42AFA-5045-7E81-937F-3A320AC52987}.Release|x86.ActiveCfg = Release|Any CPU + {A4E42AFA-5045-7E81-937F-3A320AC52987}.Release|x86.Build.0 = Release|Any CPU + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Debug|Any CPU.ActiveCfg = Debug|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Debug|Any CPU.Build.0 = Debug|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Debug|x64.ActiveCfg = Debug|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Debug|x64.Build.0 = Debug|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Debug|x86.ActiveCfg = Debug|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Debug|x86.Build.0 = Debug|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Release|Any CPU.ActiveCfg = Release|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Release|Any CPU.Build.0 = Release|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Release|x64.ActiveCfg = Release|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Release|x64.Build.0 = Release|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Release|x86.ActiveCfg = Release|x64 + {82DFB180-DD4C-4C48-919C-B5C5C77FC0FD}.Release|x86.Build.0 = Release|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Debug|Any CPU.ActiveCfg = Debug|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Debug|Any CPU.Build.0 = Debug|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Debug|x64.ActiveCfg = Debug|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Debug|x64.Build.0 = Debug|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Debug|x86.ActiveCfg = Debug|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Debug|x86.Build.0 = Debug|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Release|Any CPU.ActiveCfg = Release|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Release|Any CPU.Build.0 = Release|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Release|x64.ActiveCfg = Release|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Release|x64.Build.0 = Release|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Release|x86.ActiveCfg = Release|x64 + {22AE06C8-5139-45D2-A5F9-E76C019050D9}.Release|x86.Build.0 = Release|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Debug|Any CPU.ActiveCfg = Debug|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Debug|Any CPU.Build.0 = Debug|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Debug|x64.ActiveCfg = Debug|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Debug|x64.Build.0 = Debug|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Debug|x86.ActiveCfg = Debug|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Debug|x86.Build.0 = Debug|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Release|Any CPU.ActiveCfg = Release|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Release|Any CPU.Build.0 = Release|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Release|x64.ActiveCfg = Release|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Release|x64.Build.0 = Release|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Release|x86.ActiveCfg = Release|x64 + {3C016B19-2A2C-4068-9378-B9B805605EFB}.Release|x86.Build.0 = Release|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Debug|Any CPU.ActiveCfg = Debug|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Debug|Any CPU.Build.0 = Debug|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Debug|x64.ActiveCfg = Debug|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Debug|x64.Build.0 = Debug|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Debug|x86.ActiveCfg = Debug|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Debug|x86.Build.0 = Debug|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Release|Any CPU.ActiveCfg = Release|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Release|Any CPU.Build.0 = Release|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Release|x64.ActiveCfg = Release|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Release|x64.Build.0 = Release|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Release|x86.ActiveCfg = Release|x64 + {C77A2833-3FE4-405B-811D-439B1FF859D9}.Release|x86.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {719723E1-8218-495A-98BA-4D0BDF7822EB} = {F30CFB00-531B-5698-C50F-38FBF3471340} - {DF590F45-F26C-4337-98DE-367C97253125} = {F30CFB00-531B-5698-C50F-38FBF3471340} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B17E85B1-5F60-4440-9F9A-3DDE877E8CDF} EndGlobalSection diff --git a/LightlessSync/LightlessSync.csproj b/LightlessSync/LightlessSync.csproj index ec722c5..13f5104 100644 --- a/LightlessSync/LightlessSync.csproj +++ b/LightlessSync/LightlessSync.csproj @@ -10,7 +10,7 @@ - net9.0-windows7.0 + net9.0-windows x64 enable latest diff --git a/LightlessSync/Services/ContextMenuService.cs b/LightlessSync/Services/ContextMenuService.cs index 4555f3a..8c45474 100644 --- a/LightlessSync/Services/ContextMenuService.cs +++ b/LightlessSync/Services/ContextMenuService.cs @@ -238,10 +238,6 @@ internal class ContextMenuService : IHostedService _mediator.Publish(new NotificationMessage(title, message, type, TimeSpan.FromSeconds(durationSeconds))); } - private HashSet VisibleUserIds => [.. _pairManager.DirectPairs - .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue) - .Select(u => (ulong)u.PlayerCharacterId)]; - private bool CanOpenLightfinderProfile(string hashedCid) { if (!_broadcastService.IsBroadcasting) diff --git a/LightlessSync/WebAPI/SignalR/ApiController.cs b/LightlessSync/WebAPI/SignalR/ApiController.cs index ec4025f..ff3e896 100644 --- a/LightlessSync/WebAPI/SignalR/ApiController.cs +++ b/LightlessSync/WebAPI/SignalR/ApiController.cs @@ -740,45 +740,5 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL ServerState = state; } - - public Task UserGetLightfinderProfile(string hashedCid) - { - throw new NotImplementedException(); - } - - public Task UpdateChatPresence(ChatPresenceUpdateDto presence) - { - throw new NotImplementedException(); - } - - public Task Client_ChatReceive(ChatMessageDto message) - { - throw new NotImplementedException(); - } - - public Task> GetZoneChatChannels() - { - throw new NotImplementedException(); - } - - public Task> GetGroupChatChannels() - { - throw new NotImplementedException(); - } - - public Task SendChatMessage(ChatSendRequestDto request) - { - throw new NotImplementedException(); - } - - public Task ReportChatMessage(ChatReportSubmitDto request) - { - throw new NotImplementedException(); - } - - public Task ResolveChatParticipant(ChatParticipantResolveRequestDto request) - { - throw new NotImplementedException(); - } } #pragma warning restore MA0040 diff --git a/OtterGui b/OtterGui new file mode 160000 index 0000000..18e62ab --- /dev/null +++ b/OtterGui @@ -0,0 +1 @@ +Subproject commit 18e62ab2d8b9ac7028a33707eb35f8f9c61f245a diff --git a/Penumbra.Api b/Penumbra.Api new file mode 160000 index 0000000..704d62f --- /dev/null +++ b/Penumbra.Api @@ -0,0 +1 @@ +Subproject commit 704d62f64f791b8cfd42363beaa464ad6f98ae48 diff --git a/Penumbra.GameData b/Penumbra.GameData new file mode 160000 index 0000000..1bb6210 --- /dev/null +++ b/Penumbra.GameData @@ -0,0 +1 @@ +Subproject commit 1bb6210d7cba0e3091bbb5a13b901c62e72280e9 diff --git a/Penumbra.String b/Penumbra.String new file mode 160000 index 0000000..4aac62e --- /dev/null +++ b/Penumbra.String @@ -0,0 +1 @@ +Subproject commit 4aac62e73b89a0c538a7a0a5c22822f15b13c0cc diff --git a/PenumbraAPI/packages.lock.json b/PenumbraAPI/packages.lock.json new file mode 100644 index 0000000..bd07e56 --- /dev/null +++ b/PenumbraAPI/packages.lock.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "dependencies": { + "net9.0-windows7.0": { + "DotNet.ReproducibleBuilds": { + "type": "Direct", + "requested": "[1.2.25, )", + "resolved": "1.2.25", + "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg==" + } + } + } +} \ No newline at end of file