Use more Luna, fix issues.

This commit is contained in:
Ottermandias 2025-09-09 18:33:00 +02:00
parent 6f5903600e
commit f51af2dd65
4 changed files with 7 additions and 21 deletions

2
Luna

@ -1 +1 @@
Subproject commit 7e73834bb4c25fbd63e97f89951cd7d81306e6c7 Subproject commit ece206edc96bc39844e4c6c314dd562fe1b1db55

@ -1 +1 @@
Subproject commit e50fa7044e35742e57cc694e7fb36a2fc225a661 Subproject commit 2183dc78c46dd9b72fd2d95370e1bf223eff93a3

View file

@ -56,13 +56,14 @@ public class Penumbra : IDalamudPlugin
try try
{ {
HookOverrides.Instance = HookOverrides.LoadFile(pluginInterface); HookOverrides.Instance = HookOverrides.LoadFile(pluginInterface);
_services = StaticServiceManager.CreateProvider(this, pluginInterface, new()); _services = StaticServiceManager.CreateProvider(this, pluginInterface, new("Penumbra"));
// Invoke the IPC Penumbra.Launching method before any hooks or other services are created. // Invoke the IPC Penumbra.Launching method before any hooks or other services are created.
_services.GetService<IpcLaunchingProvider>(); _services.GetService<IpcLaunchingProvider>();
Messager = _services.GetService<MessageService>(); Messager = _services.GetService<MessageService>();
Dynamis = _services.GetService<DynamisIpc>(); Dynamis = _services.GetService<DynamisIpc>();
_validityChecker = _services.GetService<ValidityChecker>(); _validityChecker = _services.GetService<ValidityChecker>();
_services.EnsureRequiredServices(); _services.EnsureRequiredServices();
_services.EnsureRequiredServices<OtterGui.Services.IRequiredService>();
var startup = _services.GetService<DalamudConfigService>() var startup = _services.GetService<DalamudConfigService>()
.GetDalamudConfig(DalamudConfigService.WaitingForPluginsOption, out bool s) .GetDalamudConfig(DalamudConfigService.WaitingForPluginsOption, out bool s)

View file

@ -126,20 +126,6 @@
"resolved": "2.0.1", "resolved": "2.0.1",
"contentHash": "YR2O2YokSAYB+7CXkCDN3bd6/p0K3/AicCPkOJHKUz500v1D/hulCuVlggguqNc3M0LgSfOZKGvVYg2ud1GA9A==" "contentHash": "YR2O2YokSAYB+7CXkCDN3bd6/p0K3/AicCPkOJHKUz500v1D/hulCuVlggguqNc3M0LgSfOZKGvVYg2ud1GA9A=="
}, },
"Serilog": {
"type": "Transitive",
"resolved": "4.2.0",
"contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
},
"Serilog.Extensions.Logging": {
"type": "Transitive",
"resolved": "9.0.0",
"contentHash": "NwSSYqPJeKNzl5AuXVHpGbr6PkZJFlNa14CdIebVjK3k/76kYj/mz5kiTRNVSsSaxM8kAIa1kpy/qyT9E4npRQ==",
"dependencies": {
"Microsoft.Extensions.Logging": "9.0.0",
"Serilog": "4.2.0"
}
},
"SharpGLTF.Runtime": { "SharpGLTF.Runtime": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.5", "resolved": "1.0.5",
@ -155,8 +141,8 @@
}, },
"System.IO.Hashing": { "System.IO.Hashing": {
"type": "Transitive", "type": "Transitive",
"resolved": "9.0.0", "resolved": "9.0.8",
"contentHash": "seeO8icDfED/Qwl9PDFUx2Gf/7xv7dPsMnw5PnRwNZuz4EWMpy0wIVohC4MfCcTIoJgp+KUrWG4WH3NPSusQOA==" "contentHash": "5TJUS9EIYrp0VEcm06EPYxXmLmsVUakewFnM/CAxQfvlasI9fGkTKM9afSf2dodZcMCzFna/o7Fn+gYRt3uTiA=="
}, },
"System.Memory": { "System.Memory": {
"type": "Transitive", "type": "Transitive",
@ -191,8 +177,7 @@
"dependencies": { "dependencies": {
"JetBrains.Annotations": "[2024.2.0, )", "JetBrains.Annotations": "[2024.2.0, )",
"Microsoft.Extensions.Logging": "[9.0.0, )", "Microsoft.Extensions.Logging": "[9.0.0, )",
"Serilog.Extensions.Logging": "[9.0.0, )", "System.IO.Hashing": "[9.0.8, )"
"System.IO.Hashing": "[9.0.0, )"
} }
}, },
"ottergui": { "ottergui": {