From e65b7454feabdb49aad66a09f60826a025c3ba10 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Mon, 9 Jan 2023 10:53:40 +0100
Subject: [PATCH] Some necessary updates.

---
 Glamourer/Api/PenumbraAttach.cs     | 3 ++-
 Glamourer/Designs/FixedDesigns.cs   | 1 +
 Glamourer/Gui/Interface.cs          | 2 +-
 Glamourer/Gui/InterfaceEquipment.cs | 5 +++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Glamourer/Api/PenumbraAttach.cs b/Glamourer/Api/PenumbraAttach.cs
index 83302b1..bcb6e8e 100644
--- a/Glamourer/Api/PenumbraAttach.cs
+++ b/Glamourer/Api/PenumbraAttach.cs
@@ -4,6 +4,7 @@ using Dalamud.Logging;
 using Dalamud.Plugin.Ipc;
 using Glamourer.Gui;
 using ImGuiNET;
+using Penumbra.Api.Enums;
 using Penumbra.GameData.Enums;
 
 namespace Glamourer.Api;
@@ -98,7 +99,7 @@ public class PenumbraAttach : IDisposable
 
         var gPose     = Dalamud.Objects[Interface.GPoseObjectId] as Character;
         var player    = Dalamud.Objects[0] as Character;
-        var item      = (Lumina.Excel.GeneratedSheets.Item)type.GetObject(id)!;
+        var item      = (Lumina.Excel.GeneratedSheets.Item)type.GetObject(Dalamud.GameData, id)!;
         var writeItem = new Item(item, string.Empty);
         if (gPose != null)
         {
diff --git a/Glamourer/Designs/FixedDesigns.cs b/Glamourer/Designs/FixedDesigns.cs
index 5d0804f..70b4318 100644
--- a/Glamourer/Designs/FixedDesigns.cs
+++ b/Glamourer/Designs/FixedDesigns.cs
@@ -5,6 +5,7 @@ using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Logging;
 using Glamourer.FileSystem;
+using Penumbra.Api.Enums;
 using Penumbra.GameData.Enums;
 using Penumbra.PlayerWatch;
 
diff --git a/Glamourer/Gui/Interface.cs b/Glamourer/Gui/Interface.cs
index b9ac6bb..9f2a4d0 100644
--- a/Glamourer/Gui/Interface.cs
+++ b/Glamourer/Gui/Interface.cs
@@ -45,7 +45,7 @@ namespace Glamourer.Gui
 
             _stains     = GameData.Stains(Dalamud.GameData);
             _models     = GameData.Models(Dalamud.GameData);
-            _identifier = Penumbra.GameData.GameData.GetIdentifier(Dalamud.GameData);
+            _identifier = Penumbra.GameData.GameData.GetIdentifier(Dalamud.PluginInterface, Dalamud.GameData);
 
 
             var stainCombo = CreateDefaultStainCombo(_stains.Values.ToArray());
diff --git a/Glamourer/Gui/InterfaceEquipment.cs b/Glamourer/Gui/InterfaceEquipment.cs
index 22cd084..10c7dcf 100644
--- a/Glamourer/Gui/InterfaceEquipment.cs
+++ b/Glamourer/Gui/InterfaceEquipment.cs
@@ -1,4 +1,5 @@
-using Dalamud.Interface;
+using System.Linq;
+using Dalamud.Interface;
 using ImGuiNET;
 using Lumina.Text;
 using Penumbra.GameData.Enums;
@@ -93,7 +94,7 @@ namespace Glamourer.Gui
             {
                 0    => SmallClothes,
                 9903 => SmallClothesNpc,
-                _    => _identifier.Identify(set, weapon, variant, slot) ?? Unknown,
+                _    => _identifier.Identify(set, weapon, variant, slot).FirstOrDefault() ?? Unknown,
             };
         }