diff --git a/Luna b/Luna index 7e73834b..ece206ed 160000 --- a/Luna +++ b/Luna @@ -1 +1 @@ -Subproject commit 7e73834bb4c25fbd63e97f89951cd7d81306e6c7 +Subproject commit ece206edc96bc39844e4c6c314dd562fe1b1db55 diff --git a/Penumbra.GameData b/Penumbra.GameData index e50fa704..2183dc78 160000 --- a/Penumbra.GameData +++ b/Penumbra.GameData @@ -1 +1 @@ -Subproject commit e50fa7044e35742e57cc694e7fb36a2fc225a661 +Subproject commit 2183dc78c46dd9b72fd2d95370e1bf223eff93a3 diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs index b13832ea..655c5577 100644 --- a/Penumbra/Penumbra.cs +++ b/Penumbra/Penumbra.cs @@ -56,13 +56,14 @@ public class Penumbra : IDalamudPlugin try { 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. _services.GetService(); Messager = _services.GetService(); Dynamis = _services.GetService(); _validityChecker = _services.GetService(); _services.EnsureRequiredServices(); + _services.EnsureRequiredServices(); var startup = _services.GetService() .GetDalamudConfig(DalamudConfigService.WaitingForPluginsOption, out bool s) diff --git a/Penumbra/packages.lock.json b/Penumbra/packages.lock.json index 03543ab6..7bbba03f 100644 --- a/Penumbra/packages.lock.json +++ b/Penumbra/packages.lock.json @@ -126,20 +126,6 @@ "resolved": "2.0.1", "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": { "type": "Transitive", "resolved": "1.0.5", @@ -155,8 +141,8 @@ }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "9.0.0", - "contentHash": "seeO8icDfED/Qwl9PDFUx2Gf/7xv7dPsMnw5PnRwNZuz4EWMpy0wIVohC4MfCcTIoJgp+KUrWG4WH3NPSusQOA==" + "resolved": "9.0.8", + "contentHash": "5TJUS9EIYrp0VEcm06EPYxXmLmsVUakewFnM/CAxQfvlasI9fGkTKM9afSf2dodZcMCzFna/o7Fn+gYRt3uTiA==" }, "System.Memory": { "type": "Transitive", @@ -191,8 +177,7 @@ "dependencies": { "JetBrains.Annotations": "[2024.2.0, )", "Microsoft.Extensions.Logging": "[9.0.0, )", - "Serilog.Extensions.Logging": "[9.0.0, )", - "System.IO.Hashing": "[9.0.0, )" + "System.IO.Hashing": "[9.0.8, )" } }, "ottergui": {