Update some Dalamud Services.

Author: Ottermandias

OtterGui

@@ -5,6 +5,7 @@
 using Dalamud.Game.Command;
 using Dalamud.Game.Gui;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Plugin.Services;
 using ImGuiNET;
 using OtterGui.Classes;
 using Penumbra.Api.Enums;
@@ -16,15 +17,14 @@
 using Penumbra.Mods.Manager;
 using Penumbra.Services;
 using Penumbra.UI;
-using Penumbra.Util;
 
 namespace Penumbra;
 
 public class CommandHandler : IDisposable
 {
     private const string CommandName = "/penumbra";
 
-    private readonly CommandManager    _commandManager;
+    private readonly ICommandManager   _commandManager;
     private readonly RedrawService     _redrawService;
     private readonly ChatGui           _chat;
     private readonly Configuration     _config;
@@ -35,7 +35,7 @@ public class CommandHandler : IDisposable
     private readonly Penumbra          _penumbra;
     private readonly CollectionEditor  _collectionEditor;
 
-    public CommandHandler(Framework framework, CommandManager commandManager, ChatGui chat, RedrawService redrawService, Configuration config,
+    public CommandHandler(Framework framework, ICommandManager commandManager, ChatGui chat, RedrawService redrawService, Configuration config,
         ConfigWindow configWindow, ModManager modManager, CollectionManager collectionManager, ActorService actors, Penumbra penumbra,
         CollectionEditor collectionEditor)
     {

Penumbra.GameData

@@ -6,8 +6,8 @@
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
-using Dalamud.Data;
 using Dalamud.Interface;
+using Dalamud.Plugin.Services;
 using ImGuiScene;
 using Lumina.Data.Files;
 using OtterGui.Log;
@@ -16,21 +16,20 @@
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
-using Swan;
 using Image = SixLabors.ImageSharp.Image;
 
 namespace Penumbra.Import.Textures;
 
 public sealed class TextureManager : SingleTaskQueue, IDisposable
 {
-    private readonly Logger      _logger;
-    private readonly UiBuilder   _uiBuilder;
-    private readonly DataManager _gameData;
+    private readonly Logger       _logger;
+    private readonly UiBuilder    _uiBuilder;
+    private readonly IDataManager _gameData;
 
     private readonly ConcurrentDictionary<IAction, (Task, CancellationTokenSource)> _tasks    = new();
     private          bool                                                           _disposed = false;
 
-    public TextureManager(UiBuilder uiBuilder, DataManager gameData, Logger logger)
+    public TextureManager(UiBuilder uiBuilder, IDataManager gameData, Logger logger)
     {
         _uiBuilder = uiBuilder;
         _gameData  = gameData;

Penumbra/CommandHandler.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Threading;
 using Dalamud.Game.ClientState.Conditions;
-using Dalamud.Game.ClientState.Objects;
 using Dalamud.Hooking;
+using Dalamud.Plugin.Services;
 using Dalamud.Utility.Signatures;
-using FFXIVClientStructs.FFXIV.Client.Game.Event;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using Penumbra.Collections;
 using Penumbra.GameData;
@@ -20,7 +19,7 @@ namespace Penumbra.Interop.PathResolving;
 public unsafe class AnimationHookService : IDisposable
 {
     private readonly PerformanceTracker _performance;
-    private readonly ObjectTable        _objects;
+    private readonly IObjectTable        _objects;
     private readonly CollectionResolver _collectionResolver;
     private readonly DrawObjectState    _drawObjectState;
     private readonly CollectionResolver _resolver;
@@ -29,7 +28,7 @@ public unsafe class AnimationHookService : IDisposable
     private readonly ThreadLocal<ResolveData> _animationLoadData  = new(() => ResolveData.Invalid, true);
     private readonly ThreadLocal<ResolveData> _characterSoundData = new(() => ResolveData.Invalid, true);
 
-    public AnimationHookService(PerformanceTracker performance, ObjectTable objects, CollectionResolver collectionResolver,
+    public AnimationHookService(PerformanceTracker performance, IObjectTable objects, CollectionResolver collectionResolver,
         DrawObjectState drawObjectState, CollectionResolver resolver, Condition conditions)
     {
         _performance        = performance;

Penumbra/Import/Textures/TextureManager.cs

@@ -1,6 +1,5 @@
 using System;
-using Dalamud.Game.ClientState;
-using Dalamud.Game.Gui;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using Penumbra.Collections;
 using Penumbra.Collections.Manager;
@@ -21,8 +20,8 @@ public unsafe class CollectionResolver
     private readonly IdentifiedCollectionCache _cache;
     private readonly HumanModelList            _humanModels;
 
-    private readonly ClientState     _clientState;
-    private readonly GameGui         _gameGui;
+    private readonly IClientState    _clientState;
+    private readonly IGameGui         _gameGui;
     private readonly ActorService    _actors;
     private readonly CutsceneService _cutscenes;
 
@@ -31,7 +30,7 @@ public unsafe class CollectionResolver
     private readonly TempCollectionManager _tempCollections;
     private readonly DrawObjectState       _drawObjectState;
 
-    public CollectionResolver(PerformanceTracker performance, IdentifiedCollectionCache cache, ClientState clientState, GameGui gameGui,
+    public CollectionResolver(PerformanceTracker performance, IdentifiedCollectionCache cache, IClientState clientState, IGameGui gameGui,
         ActorService actors, CutsceneService cutscenes, Configuration config, CollectionManager collectionManager,
         TempCollectionManager tempCollections, DrawObjectState drawObjectState, HumanModelList humanModels)
     {

Penumbra/Interop/PathResolving/AnimationHookService.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Dalamud.Game.ClientState.Objects;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using Penumbra.GameData.Actors;
 using Penumbra.Interop.Services;
@@ -16,15 +16,15 @@ public class CutsceneService : IDisposable
     public const int CutsceneSlots    = CutsceneEndIdx - CutsceneStartIdx;
 
     private readonly GameEventManager _events;
-    private readonly ObjectTable      _objects;
+    private readonly IObjectTable     _objects;
     private readonly short[]          _copiedCharacters = Enumerable.Repeat((short)-1, CutsceneSlots).ToArray();
 
     public IEnumerable<KeyValuePair<int, Dalamud.Game.ClientState.Objects.Types.GameObject>> Actors
         => Enumerable.Range(CutsceneStartIdx, CutsceneSlots)
             .Where(i => _objects[i] != null)
             .Select(i => KeyValuePair.Create(i, this[i] ?? _objects[i]!));
 
-    public unsafe CutsceneService(ObjectTable objects, GameEventManager events)
+    public unsafe CutsceneService(IObjectTable objects, GameEventManager events)
     {
         _objects                    =  objects;
         _events                     =  events;

Penumbra/Interop/PathResolving/CollectionResolver.cs

@@ -4,7 +4,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
-using Dalamud.Game.ClientState.Objects;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using Penumbra.GameData;
 using Penumbra.Interop.Services;
@@ -14,7 +14,7 @@ namespace Penumbra.Interop.PathResolving;
 
 public class DrawObjectState : IDisposable, IReadOnlyDictionary<nint, (nint, bool)>
 {
-    private readonly ObjectTable      _objects;
+    private readonly IObjectTable      _objects;
     private readonly GameEventManager _gameEvents;
 
     private readonly Dictionary<nint, (nint GameObject, bool IsChild)> _drawObjectToGameObject = new();
@@ -24,7 +24,7 @@ public class DrawObjectState : IDisposable, IReadOnlyDictionary<nint, (nint, boo
     public nint LastGameObject
         => _lastGameObject.IsValueCreated && _lastGameObject.Value!.Count > 0 ? _lastGameObject.Value.Peek() : nint.Zero;
 
-    public DrawObjectState(ObjectTable objects, GameEventManager gameEvents)
+    public DrawObjectState(IObjectTable objects, GameEventManager gameEvents)
     {
         SignatureHelper.Initialise(this);
         _enableDrawHook.Enable();

Penumbra/Interop/PathResolving/CutsceneService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Dalamud.Game.ClientState;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using Penumbra.Collections;
@@ -17,11 +17,11 @@ public unsafe class IdentifiedCollectionCache : IDisposable, IEnumerable<(nint A
 {
     private readonly CommunicatorService                                _communicator;
     private readonly GameEventManager                                   _events;
-    private readonly ClientState                                        _clientState;
+    private readonly IClientState                                       _clientState;
     private readonly Dictionary<nint, (ActorIdentifier, ModCollection)> _cache = new(317);
     private          bool                                               _dirty;
 
-    public IdentifiedCollectionCache(ClientState clientState, CommunicatorService communicator, GameEventManager events)
+    public IdentifiedCollectionCache(IClientState clientState, CommunicatorService communicator, GameEventManager events)
     {
         _clientState  = clientState;
         _communicator = communicator;

Penumbra/Interop/PathResolving/DrawObjectState.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Dalamud.Data;
-using Dalamud.Game.ClientState.Objects;
+using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using Penumbra.GameData.Actors;
@@ -12,14 +11,14 @@ namespace Penumbra.Interop.ResourceTree;
 
 public class ResourceTreeFactory
 {
-    private readonly DataManager        _gameData;
-    private readonly ObjectTable        _objects;
+    private readonly IDataManager       _gameData;
+    private readonly IObjectTable       _objects;
     private readonly CollectionResolver _collectionResolver;
     private readonly IdentifierService  _identifier;
     private readonly Configuration      _config;
     private readonly ActorService       _actors;
 
-    public ResourceTreeFactory(DataManager gameData, ObjectTable objects, CollectionResolver resolver, IdentifierService identifier,
+    public ResourceTreeFactory(IDataManager gameData, IObjectTable objects, CollectionResolver resolver, IdentifierService identifier,
         Configuration config, ActorService actors)
     {
         _gameData           = gameData;