From 010ded5aee108292b8e285e1e4a57911d4d50aba Mon Sep 17 00:00:00 2001 From: Andrew Gilewsky Date: Fri, 7 Jun 2024 00:12:08 +0100 Subject: [PATCH] Use unmodified module for resolving CS addresses. --- BossMod/Framework/Plugin.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BossMod/Framework/Plugin.cs b/BossMod/Framework/Plugin.cs index 41906a519f..ce688da25e 100644 --- a/BossMod/Framework/Plugin.cs +++ b/BossMod/Framework/Plugin.cs @@ -1,4 +1,5 @@ using Dalamud.Common; +using Dalamud.Game; using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.Command; using Dalamud.IoC; @@ -30,9 +31,7 @@ public sealed class Plugin : IDalamudPlugin private readonly ReplayManagementWindow _wndReplay; private readonly MainDebugWindow _wndDebug; - public unsafe Plugin( - [RequiredVersion("1.0")] DalamudPluginInterface dalamud, - [RequiredVersion("1.0")] ICommandManager commandManager) + public unsafe Plugin(DalamudPluginInterface dalamud, ICommandManager commandManager, ISigScanner sigScanner) { if (!dalamud.ConfigDirectory.Exists) dalamud.ConfigDirectory.Create(); @@ -41,7 +40,7 @@ public unsafe Plugin( GetMethod("Get")!.Invoke(null, BindingFlags.Default, null, [], null); var dalamudStartInfo = dalamudRoot?.GetType().GetProperty("StartInfo", BindingFlags.NonPublic | BindingFlags.Instance)?.GetValue(dalamudRoot) as DalamudStartInfo; var gameVersion = dalamudStartInfo?.GameVersion?.ToString() ?? "unknown"; - InteropGenerator.Runtime.Resolver.GetInstance.Setup(0, gameVersion, new(dalamud.ConfigDirectory.FullName + "/cs.json")); + InteropGenerator.Runtime.Resolver.GetInstance.Setup(sigScanner.SearchBase, gameVersion, new(dalamud.ConfigDirectory.FullName + "/cs.json")); FFXIVClientStructs.Interop.Generated.Addresses.Register(); InteropGenerator.Runtime.Resolver.GetInstance.Resolve();