more fixes

MKhayle · May 16, 2024 · 9a0bbc9 · 9a0bbc9
1 parent 6faa0d5
commit 9a0bbc9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/XIVComboPlugin/IconReplacer.cs b/XIVComboPlugin/IconReplacer.cs
@@ -21,16 +21,15 @@ public class IconReplacer
         private readonly IClientState clientState;
         private IntPtr comboTimer;
 
-        private readonly Dictionary<uint, CustomCombo> combos = new();
+        private readonly Dictionary<uint, CustomCombo> combos = [];
         private readonly Hook<OnGetIconDelegate> iconHook;
         private IntPtr lastComboMove;
 
         public unsafe IconReplacer(ISigScanner scanner, IClientState clientState, IJobGauges jobGauges, IGameInteropProvider hookProvider)
         {
             this.clientState = clientState;
 
-            Address = new IconReplacerAddressResolver();
-            Address.Setup(scanner);
+            Address = new IconReplacerAddressResolver(scanner);
 
             if (!clientState.IsLoggedIn)
                 clientState.Login += SetupComboData;
@@ -40,7 +39,7 @@ public unsafe IconReplacer(ISigScanner scanner, IClientState clientState, IJobGa
             iconHook = hookProvider.HookFromAddress<OnGetIconDelegate>(Address.GetIcon, GetIconDetour);
             checkerHook = hookProvider.HookFromAddress<OnCheckIsIconReplaceableDelegate>(Address.IsIconReplaceable, (_) => 1);
 
-            CustomCombo[] comboList = {
+            CustomCombo[] comboList = [
                 // Tanks
                 new PLD.Combo(clientState, jobGauges),
                 new WAR.Combo(clientState, jobGauges),
@@ -69,7 +68,7 @@ public unsafe IconReplacer(ISigScanner scanner, IClientState clientState, IJobGa
                 new SCH.Combo(clientState, jobGauges),
                 new AST.Combo(clientState, jobGauges),
                 new SGE.Combo(clientState, jobGauges),
-            };
+            ];
 
             foreach (var item in comboList)
             {

diff --git a/XIVComboPlugin/IconReplacerAddressResolver.cs b/XIVComboPlugin/IconReplacerAddressResolver.cs
@@ -3,12 +3,12 @@
 
 namespace XIVComboPlugin
 {
-    class IconReplacerAddressResolver : BaseAddressResolver
+    class IconReplacerAddressResolver
     {
         public IntPtr GetIcon { get; private set; }
         public IntPtr IsIconReplaceable { get; private set; }
 
-        protected override void Setup64Bit(ISigScanner sig)
+        public IconReplacerAddressResolver(ISigScanner sig)
         {
             this.GetIcon = sig.ScanText("E8 ?? ?? ?? ?? 8B F8 3B DF");
             this.IsIconReplaceable = sig.ScanText("E8 ?? ?? ?? ?? 84 C0 74 4C 8B D3");

diff --git a/XIVComboPlugin/XIVComboPlugin.cs b/XIVComboPlugin/XIVComboPlugin.cs
@@ -7,17 +7,11 @@ namespace XIVComboPlugin
     class XIVComboPlugin : IDalamudPlugin
     {
         public string Name => "XIV Combo Plugin";
-
-        public ISigScanner TargetModuleScanner { get; init; }
-        public IClientState ClientState { get; init; }
-        public IJobGauges JobGauges { get; init; }
-        public IGameInteropProvider HookProvider { get; init; }
-
         private readonly IconReplacer iconReplacer;
 
-        public XIVComboPlugin()
+        public XIVComboPlugin(ISigScanner scanner, IClientState clientState, IJobGauges jobGauges, IGameInteropProvider hookProvider)
         {
-            this.iconReplacer = new IconReplacer(TargetModuleScanner, ClientState, JobGauges, HookProvider);
+            this.iconReplacer = new IconReplacer(scanner, clientState, jobGauges, hookProvider);
             this.iconReplacer.Enable();
         }