ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Let IDalamudPluginInterface inherit from IServiceProvider

Browse source
This commit is contained in:
Haselnussbomber 2025-10-19 22:45:50 +02:00
parent 05f31265eb
commit 7ec1de4c76
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/IoC/Internal/ServiceScope.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Concurrent;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
@ -12,7 +12,7 @@ namespace Dalamud.IoC.Internal;
/// <summary>
/// Container enabling the creation of scoped services.
/// </summary>
internal interface IServiceScope : IAsyncDisposable
internal interface IServiceScope : IServiceProvider, IAsyncDisposable
{
/// <summary>
/// Register objects that may be injected to scoped services,
@ -57,6 +57,12 @@ internal class ServiceScopeImpl : IServiceScope
/// <param name="container">The container this scope will use to create services.</param>
public ServiceScopeImpl(ServiceContainer container) => this.container = container;
/// <inheritdoc/>
object? IServiceProvider.GetService(Type serviceType)
{
return ((IServiceProvider)this.container).GetService(serviceType);
}
/// <inheritdoc/>
public void RegisterPrivateScopes(params object[] scopes)
{

6
Dalamud/Plugin/DalamudPluginInterface.cs
View file

@ -454,6 +454,12 @@ internal sealed class DalamudPluginInterface : IDalamudPluginInterface, IDisposa
#region Dependency Injection
/// <inheritdoc/>
public object? GetService(Type serviceType)
{
return this.plugin.ServiceScope.GetService(serviceType);
}
/// <inheritdoc/>
public T? Create<T>(params object[] scopedObjects) where T : class
{

4
Dalamud/Plugin/IDalamudPluginInterface.cs
View file

@ -8,8 +8,6 @@ using System.Threading.Tasks;
using Dalamud.Configuration;
using Dalamud.Game.Text;
using Dalamud.Game.Text.Sanitizer;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface;
using Dalamud.Interface.Internal.Windows.PluginInstaller;
using Dalamud.Interface.Internal.Windows.Settings;
@ -24,7 +22,7 @@ namespace Dalamud.Plugin;
/// <summary>
/// This interface acts as an interface to various objects needed to interact with Dalamud and the game.
/// </summary>
public interface IDalamudPluginInterface
public interface IDalamudPluginInterface : IServiceProvider
{
/// <summary>
/// Delegate for localization change with two-letter iso lang code.