From f29356836dfbb6efa24edb12fdd7dca32221beb8 Mon Sep 17 00:00:00 2001 From: Abelfreyja <96177659+Abelfreyja@users.noreply.github.com> Date: Mon, 25 Aug 2025 20:48:46 +0900 Subject: [PATCH] same thing.. --- LightlessSync.sln | 10 +++++ .../Interop/Ipc/IpcCallerPenumbra.cs | 2 +- LightlessSync/LightlessSync.csproj | 10 ++--- LightlessSync/packages.lock.json | 41 +++++++++---------- 4 files changed, 35 insertions(+), 28 deletions(-) diff --git a/LightlessSync.sln b/LightlessSync.sln index fbaab9e..5b7ca3c 100644 --- a/LightlessSync.sln +++ b/LightlessSync.sln @@ -12,6 +12,8 @@ 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.Api", "PenumbraAPI\Penumbra.Api.csproj", "{C104F6BE-9CC4-9CF7-271C-5C3A1F646601}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,6 +38,14 @@ Global {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 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Debug|Any CPU.ActiveCfg = Debug|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Debug|Any CPU.Build.0 = Debug|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Debug|x64.ActiveCfg = Debug|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Debug|x64.Build.0 = Debug|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Release|Any CPU.ActiveCfg = Release|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Release|Any CPU.Build.0 = Release|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Release|x64.ActiveCfg = Release|x64 + {C104F6BE-9CC4-9CF7-271C-5C3A1F646601}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs b/LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs index e7b23e3..fd92fca 100644 --- a/LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs +++ b/LightlessSync/Interop/Ipc/IpcCallerPenumbra.cs @@ -216,7 +216,7 @@ public sealed class IpcCallerPenumbra : DisposableMediatorSubscriberBase, IIpcCa return await _dalamudUtil.RunOnFrameworkThread(() => { var collName = "Lightless_" + uid; - var collId = _penumbraCreateNamedTemporaryCollection.Invoke(collName); + _penumbraCreateNamedTemporaryCollection.Invoke(collName, collName, out var collId); logger.LogTrace("Creating Temp Collection {collName}, GUID: {collId}", collName, collId); return collId; diff --git a/LightlessSync/LightlessSync.csproj b/LightlessSync/LightlessSync.csproj index 5609b63..57f8bcd 100644 --- a/LightlessSync/LightlessSync.csproj +++ b/LightlessSync/LightlessSync.csproj @@ -28,20 +28,19 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -75,6 +74,7 @@ + diff --git a/LightlessSync/packages.lock.json b/LightlessSync/packages.lock.json index eab8e85..1f0726a 100644 --- a/LightlessSync/packages.lock.json +++ b/LightlessSync/packages.lock.json @@ -16,18 +16,18 @@ }, "Downloader": { "type": "Direct", - "requested": "[3.3.4, )", - "resolved": "3.3.4", - "contentHash": "/M/c80e1L0WW1XrLSSiQhgFxk8rrfbpWiWDn2CeBg1tPD393Neo+v184yG/ThyhE9rrNp36yCrugiCmEbRf+VQ==", + "requested": "[4.0.3, )", + "resolved": "4.0.3", + "contentHash": "Vg1+UqPDstpMw2CKXV9XvB8jKHC95KQfbqPxQXvOMRMFnTov4Ixvvw6GZV5DXLnKuL2sfnmVYX9CaQtcURia1Q==", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "8.0.1" + "Microsoft.Extensions.Logging.Abstractions": "8.0.3" } }, "Glamourer.Api": { "type": "Direct", - "requested": "[2.4.0, )", - "resolved": "2.4.0", - "contentHash": "i8PEKb4R2tyunfHEHZHY+yCx2p6D0hsoQ24Q8UDVb7rNvynzDqMrRhGTQjuF+Tg2XGWA7sb32wJqHXCv0oKoeA==" + "requested": "[2.6.0, )", + "resolved": "2.6.0", + "contentHash": "zysCZgNBRm3k3qvibyw/31MmEckX0Uh0ZsT+Sax3ZHnYIRELr9Qhbz3cjJz7u0RHGIrNJiRpktu/LxgHEqDItw==" }, "K4os.Compression.LZ4.Legacy": { "type": "Direct", @@ -40,9 +40,9 @@ }, "Meziantou.Analyzer": { "type": "Direct", - "requested": "[2.0.189, )", - "resolved": "2.0.189", - "contentHash": "/e+dh95vDdvCTbViV2cWpXJEXAj+VHq7FsBXCTTTsLcffV0bkgXDFAPY0zMpy+Vt91Cl2cBoSOfaAoSdtn796Q==" + "requested": "[2.0.212, )", + "resolved": "2.0.212", + "contentHash": "U91ktjjTRTccUs3Lk+hrLD9vW+2+lhnsOf4G1GpRSJi1pLn3uK5CU6wGP9Bmz1KlJs6Oz1GGoMhxQBoqQsmAuQ==" }, "Microsoft.AspNetCore.SignalR.Client": { "type": "Direct", @@ -105,12 +105,6 @@ "Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0" } }, - "Penumbra.Api": { - "type": "Direct", - "requested": "[5.6.0, )", - "resolved": "5.6.0", - "contentHash": "zMmkxX1+7COn23aTeq0L+UMA79ocmvQdvj5RgksEfTKrKZLbtaqRPCe6NsChyfGvcj79sgfAW/9hJ+FAzzVcNg==" - }, "Penumbra.String": { "type": "Direct", "requested": "[1.0.5, )", @@ -119,9 +113,9 @@ }, "SixLabors.ImageSharp": { "type": "Direct", - "requested": "[3.1.7, )", - "resolved": "3.1.7", - "contentHash": "9fIOOAsyLFid6qKypM2Iy0Z3Q9yoanV8VoYAHtI2sYGMNKzhvRTjgFDHonIiVe+ANtxIxM6SuqUzj0r91nItpA==" + "requested": "[3.1.11, )", + "resolved": "3.1.11", + "contentHash": "JfPLyigLthuE50yi6tMt7Amrenr/fA31t2CvJyhy/kQmfulIBAqo5T/YFUSRHtuYPXRSaUHygFeh6Qd933EoSw==" }, "SonarAnalyzer.CSharp": { "type": "Direct", @@ -155,8 +149,8 @@ }, "MessagePack.Annotations": { "type": "Transitive", - "resolved": "3.1.3", - "contentHash": "XTy4njgTAf6UVBKFj7c7ad5R0WVKbvAgkbYZy4f00kplzX2T3VOQ34AUke/Vn/QgQZ7ETdd34/IDWS3KBInSGA==" + "resolved": "3.1.4", + "contentHash": "aVWrDAkCdqxwQsz/q0ldPh2EFn48M99YUzE9OvZjMq2RNLKz4o2z88iGFvSvbMqOWRweRvKPHBJZe22PRqzslQ==" }, "Microsoft.AspNetCore.Connections.Abstractions": { "type": "Transitive", @@ -521,8 +515,11 @@ "lightlesssync.api": { "type": "Project", "dependencies": { - "MessagePack.Annotations": "[3.1.3, )" + "MessagePack.Annotations": "[3.1.4, )" } + }, + "penumbra.api": { + "type": "Project" } } }