diff --git a/Dalamud/Hooking/Internal/HookProviderPluginScoped.cs b/Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs similarity index 78% rename from Dalamud/Hooking/Internal/HookProviderPluginScoped.cs rename to Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs index 6fa700cef..d6fc34b10 100644 --- a/Dalamud/Hooking/Internal/HookProviderPluginScoped.cs +++ b/Dalamud/Hooking/Internal/GameInteropProviderPluginScoped.cs @@ -19,9 +19,9 @@ namespace Dalamud.Hooking.Internal; [InterfaceVersion("1.0")] [ServiceManager.ScopedService] #pragma warning disable SA1015 -[ResolveVia] +[ResolveVia] #pragma warning restore SA1015 -internal class HookProviderPluginScoped : IHookProvider, IServiceType, IDisposable +internal class GameInteropProviderPluginScoped : IGameInteropProvider, IServiceType, IDisposable { private readonly LocalPlugin plugin; private readonly SigScanner scanner; @@ -29,11 +29,11 @@ internal class HookProviderPluginScoped : IHookProvider, IServiceType, IDisposab private readonly ConcurrentBag trackedHooks = new(); /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// Plugin this instance belongs to. /// SigScanner instance for target module. - public HookProviderPluginScoped(LocalPlugin plugin, SigScanner scanner) + public GameInteropProviderPluginScoped(LocalPlugin plugin, SigScanner scanner) { this.plugin = plugin; this.scanner = scanner; @@ -63,23 +63,23 @@ internal class HookProviderPluginScoped : IHookProvider, IServiceType, IDisposab } /// - public Hook FromSymbol(string moduleName, string exportName, T detour, IHookProvider.HookBackend backend = IHookProvider.HookBackend.Automatic) where T : Delegate + public Hook FromSymbol(string moduleName, string exportName, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate { - var hook = Hook.FromSymbol(moduleName, exportName, detour, backend == IHookProvider.HookBackend.MinHook); + var hook = Hook.FromSymbol(moduleName, exportName, detour, backend == IGameInteropProvider.HookBackend.MinHook); this.trackedHooks.Add(hook); return hook; } /// - public Hook FromAddress(IntPtr procAddress, T detour, IHookProvider.HookBackend backend = IHookProvider.HookBackend.Automatic) where T : Delegate + public Hook FromAddress(IntPtr procAddress, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate { - var hook = Hook.FromAddress(procAddress, detour, backend == IHookProvider.HookBackend.MinHook); + var hook = Hook.FromAddress(procAddress, detour, backend == IGameInteropProvider.HookBackend.MinHook); this.trackedHooks.Add(hook); return hook; } /// - public Hook FromSignature(string signature, T detour, IHookProvider.HookBackend backend = IHookProvider.HookBackend.Automatic) where T : Delegate + public Hook FromSignature(string signature, T detour, IGameInteropProvider.HookBackend backend = IGameInteropProvider.HookBackend.Automatic) where T : Delegate => this.FromAddress(this.scanner.ScanText(signature), detour, backend); /// diff --git a/Dalamud/Plugin/Services/IHookProvider.cs b/Dalamud/Plugin/Services/IGameInteropProvider.cs similarity index 99% rename from Dalamud/Plugin/Services/IHookProvider.cs rename to Dalamud/Plugin/Services/IGameInteropProvider.cs index dc7d29913..9451a60eb 100644 --- a/Dalamud/Plugin/Services/IHookProvider.cs +++ b/Dalamud/Plugin/Services/IGameInteropProvider.cs @@ -8,7 +8,7 @@ namespace Dalamud.Plugin.Services; /// /// Service responsible for the creation of hooks. /// -public interface IHookProvider +public interface IGameInteropProvider { /// /// Available hooking backends. diff --git a/Dalamud/Utility/Signatures/SignatureHelper.cs b/Dalamud/Utility/Signatures/SignatureHelper.cs index 1cfd18330..f011f8121 100755 --- a/Dalamud/Utility/Signatures/SignatureHelper.cs +++ b/Dalamud/Utility/Signatures/SignatureHelper.cs @@ -161,7 +161,7 @@ internal static class SignatureHelper continue; } - var hook = creator.Invoke(null, new object?[] { ptr, detour, IHookProvider.HookBackend.Automatic }) as IDalamudHook; + var hook = creator.Invoke(null, new object?[] { ptr, detour, IGameInteropProvider.HookBackend.Automatic }) as IDalamudHook; info.SetValue(self, hook); createdHooks.Add(hook);