From 9abd7f27671b44a039ea34b9f007f28209ad0d9f Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Thu, 8 May 2025 23:44:16 +0200
Subject: [PATCH] Make Dynamis IPC working.

---
 Glamourer/Gui/Equipment/ItemCopyService.cs    |  9 ++-------
 Glamourer/Gui/Tabs/DebugTab/DebugTabHeader.cs |  2 +-
 Glamourer/Gui/Tabs/DebugTab/DynamisPanel.cs   | 16 ++++++++++++++++
 Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs  |  6 ++++--
 OtterGui                                      |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 Glamourer/Gui/Tabs/DebugTab/DynamisPanel.cs

diff --git a/Glamourer/Gui/Equipment/ItemCopyService.cs b/Glamourer/Gui/Equipment/ItemCopyService.cs
index e72a54b..ea37963 100644
--- a/Glamourer/Gui/Equipment/ItemCopyService.cs
+++ b/Glamourer/Gui/Equipment/ItemCopyService.cs
@@ -1,18 +1,13 @@
-using Dalamud.Game.ClientState.Keys;
-using Dalamud.Plugin.Services;
-using Glamourer.Services;
+using Glamourer.Services;
 using ImGuiNET;
-using OtterGui.OtterGuiInternal.Enums;
 using OtterGui.Services;
-using OtterGuiInternal;
-using Penumbra.GameData.Data;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
 
 namespace Glamourer.Gui.Equipment;
 
-public class ItemCopyService(ItemManager items, IKeyState keyState, DictStain stainData) : IUiService
+public class ItemCopyService(ItemManager items, DictStain stainData) : IUiService
 {
     public EquipItem? Item  { get; private set; }
     public Stain?     Stain { get; private set; }
diff --git a/Glamourer/Gui/Tabs/DebugTab/DebugTabHeader.cs b/Glamourer/Gui/Tabs/DebugTab/DebugTabHeader.cs
index 90282e8..3df425f 100644
--- a/Glamourer/Gui/Tabs/DebugTab/DebugTabHeader.cs
+++ b/Glamourer/Gui/Tabs/DebugTab/DebugTabHeader.cs
@@ -1,5 +1,4 @@
 using Glamourer.Gui.Tabs.DebugTab.IpcTester;
-using ImGuiNET;
 using Microsoft.Extensions.DependencyInjection;
 using OtterGui.Raii;
 using Penumbra.GameData.Gui.Debug;
@@ -36,6 +35,7 @@ public class DebugTabHeader(string label, params IGameDataDrawer[] subTrees)
             provider.GetRequiredService<ModelEvaluationPanel>(),
             provider.GetRequiredService<ObjectManagerPanel>(),
             provider.GetRequiredService<PenumbraPanel>(),
+            provider.GetRequiredService<DynamisPanel>(),
             provider.GetRequiredService<IpcTesterPanel>(),
             provider.GetRequiredService<DatFilePanel>(),
             provider.GetRequiredService<GlamourPlatePanel>(),
diff --git a/Glamourer/Gui/Tabs/DebugTab/DynamisPanel.cs b/Glamourer/Gui/Tabs/DebugTab/DynamisPanel.cs
new file mode 100644
index 0000000..92cd777
--- /dev/null
+++ b/Glamourer/Gui/Tabs/DebugTab/DynamisPanel.cs
@@ -0,0 +1,16 @@
+using OtterGui.Services;
+using Penumbra.GameData.Gui.Debug;
+
+namespace Glamourer.Gui.Tabs.DebugTab;
+
+public class DynamisPanel(DynamisIpc dynamis) : IGameDataDrawer
+{
+    public string Label
+        => "Dynamis Interop";
+
+    public void Draw()
+        => dynamis.DrawDebugInfo();
+
+    public bool Disabled
+        => false;
+}
diff --git a/Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs b/Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs
index 3714c82..012e5ba 100644
--- a/Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs
+++ b/Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs
@@ -61,7 +61,7 @@ public unsafe class PenumbraPanel(PenumbraService _penumbra, PenumbraChangedItem
         ImGui.SetNextItemWidth(200 * ImGuiHelpers.GlobalScale);
         ImGui.InputInt("##CutsceneIndex", ref _gameObjectIndex, 0, 0);
         ImGuiUtil.DrawTableColumn(_penumbra.Available
-            ? _penumbra.CutsceneParent((ushort) _gameObjectIndex).ToString()
+            ? _penumbra.CutsceneParent((ushort)_gameObjectIndex).ToString()
             : "Penumbra Unavailable");
 
         ImGuiUtil.DrawTableColumn("Redraw Object");
@@ -76,7 +76,9 @@ public unsafe class PenumbraPanel(PenumbraService _penumbra, PenumbraChangedItem
         }
 
         ImGuiUtil.DrawTableColumn("Last Tooltip Date");
-        ImGuiUtil.DrawTableColumn(_penumbraTooltip.LastTooltip > DateTime.MinValue ? $"{_penumbraTooltip.LastTooltip.ToLongTimeString()} ({_penumbraTooltip.LastType} {_penumbraTooltip.LastId})" : "Never");
+        ImGuiUtil.DrawTableColumn(_penumbraTooltip.LastTooltip > DateTime.MinValue
+            ? $"{_penumbraTooltip.LastTooltip.ToLongTimeString()} ({_penumbraTooltip.LastType} {_penumbraTooltip.LastId})"
+            : "Never");
         ImGui.TableNextColumn();
 
         ImGuiUtil.DrawTableColumn("Last Click Date");
diff --git a/OtterGui b/OtterGui
index 9235599..ce8f88e 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit 9235599dd6efd17067a06ad98066a6c0d5b625e0
+Subproject commit ce8f88ee892536016756769e86bdf48132351d80