From 067a9d8038e19cb718d44acfa37f56a73dfd1cdd Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sun, 11 Jun 2023 00:16:49 +0200
Subject: [PATCH] Update for new Penumbra changes for glamourer rework, make
 auto name for fixed design sane.

---
 Glamourer/Gui/InterfaceEquipment.cs    | 15 +++++++++++++--
 Glamourer/Gui/InterfaceFixedDesigns.cs |  9 ++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Glamourer/Gui/InterfaceEquipment.cs b/Glamourer/Gui/InterfaceEquipment.cs
index 731526c..3bd94c4 100644
--- a/Glamourer/Gui/InterfaceEquipment.cs
+++ b/Glamourer/Gui/InterfaceEquipment.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using ImGuiNET;
 using Lumina.Text;
 using Penumbra.GameData.Enums;
@@ -133,10 +135,19 @@ namespace Glamourer.Gui
             {
                 0    => SmallClothes,
                 9903 => SmallClothesNpc,
-                _    => _identifier.Identify(set, weapon, variant, slot.ToSlot()).FirstOrDefault() ?? Unknown,
+                _    => ToItem(_identifier.Identify(set, weapon, variant, slot.ToSlot())),
             };
         }
 
+        private Lumina.Excel.GeneratedSheets.Item ToItem(IEnumerable<EquipItem> items)
+        {
+            var item = items.FirstOrDefault();
+            if (item.Valid)
+                return Dalamud.GameData.GetExcelSheet<Lumina.Excel.GeneratedSheets.Item>()!.GetRow(item.Id) ?? Unknown;
+
+            return Unknown;
+        }
+
         private bool DrawEquipSlot(EquipSlot slot, CharacterArmor equip)
         {
             var (equipCombo, stainCombo) = _combos[slot];
diff --git a/Glamourer/Gui/InterfaceFixedDesigns.cs b/Glamourer/Gui/InterfaceFixedDesigns.cs
index 1f08a84..7fbe11e 100644
--- a/Glamourer/Gui/InterfaceFixedDesigns.cs
+++ b/Glamourer/Gui/InterfaceFixedDesigns.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using Dalamud.Interface;
 using Glamourer.Designs;
 using Glamourer.FileSystem;
@@ -130,12 +129,8 @@ namespace Glamourer.Gui
                 _newFixDesignGroup   = _plugin.FixedDesigns.JobGroups[1];
             }
 
-            if (_newFixCharacterName == string.Empty) {
-                var player = CharacterFactory.Convert(Dalamud.Objects[0]);
-                if (player != null)
-                    _newFixCharacterName = player.Name.ToString();
-
-            }
+            if (_newFixCharacterName == string.Empty)
+                _newFixCharacterName = Dalamud.ClientState.LocalPlayer?.Name.ToString() ?? string.Empty;
 
             raii.PopFonts();
             ImGui.TableNextColumn();