Switch to ActorObjectManager provided by Penumbra.GameData

CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs

@@ -20,6 +20,7 @@ using CustomizePlus.Core.Extensions;
 using CustomizePlus.Configuration.Data;
 using CustomizePlus.Api.Data;
 using CustomizePlus.GameData.Extensions;
+using Penumbra.GameData.Interop;
 
 namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Debug;
 
@@ -33,7 +34,7 @@ public class IPCTestTab //: IDisposable
     private readonly ProfileManager _profileManager;
     private readonly PopupSystem _popupSystem;
     private readonly GameObjectService _gameObjectService;
-    private readonly ObjectManager _objectManager;
+    private readonly ActorObjectManager _objectManager;
     private readonly ActorManager _actorManager;
     private readonly Logger _logger;
 
@@ -92,7 +93,7 @@ public class IPCTestTab //: IDisposable
         IObjectTable objectTable,
         ProfileManager profileManager,
         PopupSystem popupSystem,
-        ObjectManager objectManager,
+        ActorObjectManager objectManager,
         GameObjectService gameObjectService,
         ActorManager actorManager,
         Logger logger,
@@ -115,8 +116,6 @@ public class IPCTestTab //: IDisposable
 
     public unsafe void Draw()
     {
-        _objectManager.Update();
-
         if (_targetCharacterName == null)
             _targetCharacterName = _gameObjectService.GetCurrentPlayerName();
 
@@ -136,7 +135,7 @@ public class IPCTestTab //: IDisposable
         if (ImGui.Button("Owned Actors Temporary Profile Test"))
         {
             bool found = false;
-            foreach(var obj  in _objectManager)
+            foreach(var obj  in _objectManager.Objects)
             {
                 if (!obj.Identifier(_actorManager, out var ownedIdent) ||
                     ownedIdent.Type != Penumbra.GameData.Enums.IdentifierType.Owned ||

CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs

@@ -13,6 +13,7 @@ using CustomizePlus.Core.Extensions;
 using System.Numerics;
 using CustomizePlus.Game.Services;
 using CustomizePlus.Core.Data;
+using Penumbra.GameData.Interop;
 
 namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Debug;
 
@@ -21,14 +22,14 @@ public class StateMonitoringTab
     private readonly ProfileManager _profileManager;
     private readonly TemplateManager _templateManager;
     private readonly ArmatureManager _armatureManager;
-    private readonly ObjectManager _objectManager;
+    private readonly ActorObjectManager _objectManager;
     private readonly GameObjectService _gameObjectService;
 
     public StateMonitoringTab(
         ProfileManager profileManager,
         TemplateManager templateManager,
         ArmatureManager armatureManager,
-        ObjectManager objectManager,
+        ActorObjectManager objectManager,
         GameObjectService gameObjectService)
     {
         _profileManager = profileManager;
@@ -55,7 +56,7 @@ public class StateMonitoringTab
         if (showArmatures)
             DrawArmatures();
 
-        var showObjectManager = ImGui.CollapsingHeader($"Object manager ({_objectManager.Identifiers.Count})###objectmanager_header");
+        var showObjectManager = ImGui.CollapsingHeader($"Object manager ({_objectManager.Count})###objectmanager_header");
 
         if (showObjectManager)
             DrawObjectManager();
@@ -93,7 +94,7 @@ public class StateMonitoringTab
 
     private void DrawObjectManager()
     {
-        foreach (var kvPair in _objectManager.Identifiers)
+        foreach (var kvPair in _objectManager)
         {
             var show = ImGui.CollapsingHeader($"{kvPair.Key} ({kvPair.Value.Objects.Count} objects)###object-{kvPair.Key}");