From 4e2d371f105b90f97c44e32bc07132f4deed85a4 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Thu, 25 Aug 2022 14:09:50 +0200
Subject: [PATCH] check for glamourer api and if not present do not use
 glamourer

---
 MareSynchronos/Managers/CachedPlayer.cs | 57 ++++++++++++++++++-------
 MareSynchronos/UI/UIShared.cs           |  1 -
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs
index a25849e..7741180 100644
--- a/MareSynchronos/Managers/CachedPlayer.cs
+++ b/MareSynchronos/Managers/CachedPlayer.cs
@@ -235,9 +235,14 @@ public class CachedPlayer
             RequestedPenumbraRedraw = true;
             Logger.Debug(
                 $"Request Redraw for {PlayerName}");
-            _ipcManager.GlamourerApplyAll(glamourerData, PlayerCharacter.Address);
-            // todo: remove
-            _ipcManager.PenumbraRedraw(PlayerCharacter.Address);
+            if (_ipcManager.CheckGlamourerApi())
+            {
+                _ipcManager.GlamourerApplyAll(glamourerData, PlayerCharacter.Address);
+            }
+            else
+            {
+                _ipcManager.PenumbraRedraw(PlayerCharacter.Address);
+            }
         }
         else if (objectKind == ObjectKind.MinionOrMount)
         {
@@ -245,9 +250,14 @@ public class CachedPlayer
             if (minionOrMount != null)
             {
                 Logger.Debug($"Request Redraw for Minion/Mount");
-                _ipcManager.GlamourerApplyAll(glamourerData, obj: (IntPtr)minionOrMount);
-                // todo: remove
-                _ipcManager.PenumbraRedraw((IntPtr)minionOrMount);
+                if (_ipcManager.CheckGlamourerApi())
+                {
+                    _ipcManager.GlamourerApplyAll(glamourerData, obj: (IntPtr)minionOrMount);
+                }
+                else
+                {
+                    _ipcManager.PenumbraRedraw((IntPtr)minionOrMount);
+                }
             }
         }
         else if (objectKind == ObjectKind.Pet)
@@ -256,9 +266,14 @@ public class CachedPlayer
             if (pet != IntPtr.Zero)
             {
                 Logger.Debug("Request Redraw for Pet");
-                _ipcManager.GlamourerApplyAll(glamourerData, pet);
-                // todo: remove
-                _ipcManager.PenumbraRedraw(pet);
+                if (_ipcManager.CheckGlamourerApi())
+                {
+                    _ipcManager.GlamourerApplyAll(glamourerData, pet);
+                }
+                else
+                {
+                    _ipcManager.PenumbraRedraw(pet);
+                }
             }
         }
         else if (objectKind == ObjectKind.Companion)
@@ -267,9 +282,14 @@ public class CachedPlayer
             if (companion != IntPtr.Zero)
             {
                 Logger.Debug("Request Redraw for Companion");
-                _ipcManager.GlamourerApplyAll(glamourerData, companion);
-                // todo: remove
-                _ipcManager.PenumbraRedraw(companion);
+                if (_ipcManager.CheckGlamourerApi())
+                {
+                    _ipcManager.GlamourerApplyAll(glamourerData, companion);
+                }
+                else
+                {
+                    _ipcManager.PenumbraRedraw(companion);
+                }
             }
         }
     }
@@ -280,10 +300,15 @@ public class CachedPlayer
 
         if (objectKind == ObjectKind.Player)
         {
-            _ipcManager.GlamourerApplyOnlyCustomization(_originalGlamourerData, PlayerCharacter);
-            _ipcManager.GlamourerApplyOnlyEquipment(_lastGlamourerData, PlayerCharacter);
-            // todo: remove
-            _ipcManager.PenumbraRedraw(PlayerCharacter.Address);
+            if (_ipcManager.CheckGlamourerApi())
+            {
+                _ipcManager.GlamourerApplyOnlyCustomization(_originalGlamourerData, PlayerCharacter);
+                _ipcManager.GlamourerApplyOnlyEquipment(_lastGlamourerData, PlayerCharacter);
+            }
+            else
+            {
+                _ipcManager.PenumbraRedraw(PlayerCharacter.Address);
+            }
         }
         else if (objectKind == ObjectKind.MinionOrMount)
         {
diff --git a/MareSynchronos/UI/UIShared.cs b/MareSynchronos/UI/UIShared.cs
index d4ff9c5..e6226ad 100644
--- a/MareSynchronos/UI/UIShared.cs
+++ b/MareSynchronos/UI/UIShared.cs
@@ -40,7 +40,6 @@ namespace MareSynchronos.UI
 
         public static bool CtrlPressed() => (GetKeyState(0xA2) & 0x8000) != 0 || (GetKeyState(0xA3) & 0x8000) != 0;
 
-        // todo remove after rework
         public ApiController ApiController => _apiController;
 
         public UiShared(IpcManager ipcManager, ApiController apiController, FileCacheManager fileCacheManager, FileDialogManager fileDialogManager, Configuration pluginConfiguration, DalamudUtil dalamudUtil, DalamudPluginInterface pluginInterface, Dalamud.Localization localization)