Update to scoped services

WorkingRobot · Aug 22, 2023 · 9dd7698 · 9dd7698
1 parent 5f0a8fa
commit 9dd7698
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Craftimizer/Icons.cs b/Craftimizer/Icons.cs
@@ -1,19 +1,17 @@
+using Dalamud.Interface.Internal;
 using ImGuiScene;
 using System.Collections.Generic;
 
 namespace Craftimizer.Plugin;
 
 internal static class Icons
 {
-    private static readonly Dictionary<string, TextureWrap> Cache = new();
+    private static readonly Dictionary<ushort, IDalamudTextureWrap> Cache = new();
 
-    public static TextureWrap GetIconFromPath(string path)
+    public static TextureWrap GetIconFromId(ushort id)
     {
-        if (!Cache.TryGetValue(path, out var ret))
-            Cache.Add(path, ret = Service.DataManager.GetImGuiTexture(path)!);
+        if (!Cache.TryGetValue(id, out var ret))
+            Cache.Add(id, ret = Service.TextureProvider.GetIcon(id)!);
         return ret;
     }
-
-    public static TextureWrap GetIconFromId(ushort id) =>
-        GetIconFromPath($"ui/icon/{id / 1000 * 1000:000000}/{id:000000}_hr1.tex");
 }
diff --git a/Craftimizer/Service.cs b/Craftimizer/Service.cs
@@ -8,22 +8,24 @@
 using Dalamud.Interface.Windowing;
 using Dalamud.IoC;
 using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 
 namespace Craftimizer.Plugin;
 
 public sealed class Service
 {
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     [PluginService] public static DalamudPluginInterface PluginInterface { get; private set; }
-    [PluginService] public static CommandManager CommandManager { get; private set; }
-    [PluginService] public static ObjectTable Objects { get; private set; }
-    [PluginService] public static SigScanner SigScanner { get; private set; }
-    [PluginService] public static GameGui GameGui { get; private set; }
-    [PluginService] public static ClientState ClientState { get; private set; }
-    [PluginService] public static DataManager DataManager { get; private set; }
-    [PluginService] public static TargetManager TargetManager { get; private set; }
+    [PluginService] public static ICommandManager CommandManager { get; private set; }
+    [PluginService] public static IObjectTable Objects { get; private set; }
+    [PluginService] public static ISigScanner SigScanner { get; private set; }
+    [PluginService] public static IGameGui GameGui { get; private set; }
+    [PluginService] public static IClientState ClientState { get; private set; }
+    [PluginService] public static IDataManager DataManager { get; private set; }
+    [PluginService] public static ITargetManager TargetManager { get; private set; }
     [PluginService] public static Condition Condition { get; private set; }
     [PluginService] public static Framework Framework { get; private set; }
+    [PluginService] public static ITextureProvider TextureProvider { get; private set; }
 
     public static Plugin Plugin { get; internal set; }
     public static Configuration Configuration { get; internal set; }

diff --git a/Craftimizer/Utils/Hooks.cs b/Craftimizer/Utils/Hooks.cs
@@ -11,7 +11,7 @@ namespace Craftimizer.Utils;
 public sealed unsafe class Hooks : IDisposable
 {
     public delegate void OnActionUsedDelegate(ActionType action);
-
+    
     public event OnActionUsedDelegate? OnActionUsed;
 
     public delegate bool UseActionDelegate(ActionManager* manager, CSActionType actionType, uint actionId, ulong targetId, uint param, uint useType, int pvp, nint a8);