From 1d5c3cee1114bc6d9f762d9c61089a6c8527c34b Mon Sep 17 00:00:00 2001
From: MidoriKami <9083275+MidoriKami@users.noreply.github.com>
Date: Sat, 24 Jun 2023 17:10:53 -0700
Subject: [PATCH] Add IJobGauges (#1265)

---
 .../Game/ClientState/JobGauge/JobGauges.cs    | 16 +++++++-------
 Dalamud/Plugin/Services/IJobGauges.cs         | 21 +++++++++++++++++++
 2 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 Dalamud/Plugin/Services/IJobGauges.cs

diff --git a/Dalamud/Game/ClientState/JobGauge/JobGauges.cs b/Dalamud/Game/ClientState/JobGauge/JobGauges.cs
index bf5c4b525..683f5c61f 100644
--- a/Dalamud/Game/ClientState/JobGauge/JobGauges.cs
+++ b/Dalamud/Game/ClientState/JobGauge/JobGauges.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using Dalamud.Game.ClientState.JobGauge.Types;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
+using Dalamud.Plugin.Services;
 using Serilog;
 
 namespace Dalamud.Game.ClientState.JobGauge;
@@ -15,7 +16,10 @@ namespace Dalamud.Game.ClientState.JobGauge;
 [PluginInterface]
 [InterfaceVersion("1.0")]
 [ServiceManager.BlockingEarlyLoadedService]
-public class JobGauges : IServiceType
+#pragma warning disable SA1015
+[ResolveVia<IJobGauges>]
+#pragma warning restore SA1015
+public class JobGauges : IServiceType, IJobGauges
 {
     private Dictionary<Type, JobGaugeBase> cache = new();
 
@@ -27,16 +31,10 @@ public class JobGauges : IServiceType
         Log.Verbose($"JobGaugeData address 0x{this.Address.ToInt64():X}");
     }
 
-    /// <summary>
-    /// Gets the address of the JobGauge data.
-    /// </summary>
+    /// <inheritdoc/>
     public IntPtr Address { get; }
 
-    /// <summary>
-    /// Get the JobGauge for a given job.
-    /// </summary>
-    /// <typeparam name="T">A JobGauge struct from ClientState.Structs.JobGauge.</typeparam>
-    /// <returns>A JobGauge.</returns>
+    /// <inheritdoc/>
     public T Get<T>() where T : JobGaugeBase
     {
         // This is cached to mitigate the effects of using activator for instantiation.
diff --git a/Dalamud/Plugin/Services/IJobGauges.cs b/Dalamud/Plugin/Services/IJobGauges.cs
new file mode 100644
index 000000000..4489a7be7
--- /dev/null
+++ b/Dalamud/Plugin/Services/IJobGauges.cs
@@ -0,0 +1,21 @@
+using Dalamud.Game.ClientState.JobGauge.Types;
+
+namespace Dalamud.Plugin.Services;
+
+/// <summary>
+/// This class converts in-memory Job gauge data to structs.
+/// </summary>
+public interface IJobGauges
+{
+    /// <summary>
+    /// Gets the address of the JobGauge data.
+    /// </summary>
+    public nint Address { get; }
+
+    /// <summary>
+    /// Get the JobGauge for a given job.
+    /// </summary>
+    /// <typeparam name="T">A JobGauge struct from ClientState.Structs.JobGauge.</typeparam>
+    /// <returns>A JobGauge.</returns>
+    public T Get<T>() where T : JobGaugeBase;
+}