ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some necessary updates.

Browse source
This commit is contained in:
Ottermandias 2023-01-09 10:53:40 +01:00
parent 8d137bdfd0
commit e65b7454fe
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Glamourer/Api/PenumbraAttach.cs
View file

@ -4,6 +4,7 @@ using Dalamud.Logging;
using Dalamud.Plugin.Ipc; using Dalamud.Plugin.Ipc;
using Glamourer.Gui; using Glamourer.Gui;
using ImGuiNET; using ImGuiNET;
using Penumbra.Api.Enums;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
namespace Glamourer.Api; namespace Glamourer.Api;
@ -98,7 +99,7 @@ public class PenumbraAttach : IDisposable
var gPose = Dalamud.Objects[Interface.GPoseObjectId] as Character; var gPose = Dalamud.Objects[Interface.GPoseObjectId] as Character;
var player = Dalamud.Objects[0] 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); var writeItem = new Item(item, string.Empty);
if (gPose != null) if (gPose != null)
{ {

1
Glamourer/Designs/FixedDesigns.cs
View file

@ -5,6 +5,7 @@ using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Logging; using Dalamud.Logging;
using Glamourer.FileSystem; using Glamourer.FileSystem;
using Penumbra.Api.Enums;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
using Penumbra.PlayerWatch; using Penumbra.PlayerWatch;

2
Glamourer/Gui/Interface.cs
View file

@ -45,7 +45,7 @@ namespace Glamourer.Gui
_stains = GameData.Stains(Dalamud.GameData); _stains = GameData.Stains(Dalamud.GameData);
_models = GameData.Models(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()); var stainCombo = CreateDefaultStainCombo(_stains.Values.ToArray());

5
Glamourer/Gui/InterfaceEquipment.cs
View file

@ -1,4 +1,5 @@
using Dalamud.Interface; using System.Linq;
using Dalamud.Interface;
using ImGuiNET; using ImGuiNET;
using Lumina.Text; using Lumina.Text;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
@ -93,7 +94,7 @@ namespace Glamourer.Gui
{ {
0 => SmallClothes, 0 => SmallClothes,
9903 => SmallClothesNpc, 9903 => SmallClothesNpc,
_ => _identifier.Identify(set, weapon, variant, slot) ?? Unknown, _ => _identifier.Identify(set, weapon, variant, slot).FirstOrDefault() ?? Unknown,
}; };
} }