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

Api 13 grunt work

Browse source
This commit is contained in:
Karou 2025-08-07 21:50:23 -04:00
parent d6df9885dc
commit 2c3bed6ba5
92 changed files with 102 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer.Api

@ -1 +1 @@
Subproject commit 64897c069d3b6c3fe027b3ae0e832828728b9108
Subproject commit 6589ecdde5dac55730797fcc594be301e820bfcc

2
Glamourer/DesignPanelFlag.cs
View file

@ -1,5 +1,5 @@
using Glamourer.Designs;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Text;
using OtterGui.Text.EndObjects;

2
Glamourer/Designs/ApplicationCollection.cs
View file

@ -1,6 +1,6 @@
using Glamourer.Api.Enums;
using Glamourer.GameData;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Penumbra.GameData.Enums;
namespace Glamourer.Designs;

2
Glamourer/Designs/ApplicationRules.cs
View file

@ -1,7 +1,7 @@
using Glamourer.Api.Enums;
using Glamourer.GameData;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Penumbra.GameData.Enums;
namespace Glamourer.Designs;

2
Glamourer/Designs/DesignColors.cs
View file

@ -3,7 +3,7 @@ using Dalamud.Interface.ImGuiNotification;
using Dalamud.Interface.Utility.Raii;
using Glamourer.Gui;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui;

3
Glamourer/Glamourer.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Dalamud.NET.Sdk/12.0.2">
<Project Sdk="Dalamud.NET.Sdk/13.0.0">
<PropertyGroup>
<RootNamespace>Glamourer</RootNamespace>
<AssemblyName>Glamourer</AssemblyName>
@ -29,6 +29,7 @@
<ProjectReference Include="..\Penumbra.String\Penumbra.String.csproj" />
<ProjectReference Include="..\Penumbra.GameData\Penumbra.GameData.csproj" />
<PackageReference Include="Vortice.Direct3D11" Version="3.4.2-beta" />
<PackageReference Update="DalamudPackager" Version="13.0.0" />
</ItemGroup>
<ItemGroup>

2
Glamourer/Gui/Colors.cs
View file

@ -1,4 +1,4 @@
using ImGuiNET;
using Dalamud.Bindings.ImGui;
namespace Glamourer.Gui;

2
Glamourer/Gui/Customization/CustomizationDrawer.Color.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface;
using Dalamud.Interface.Utility;
using Glamourer.GameData;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Text;

2
Glamourer/Gui/Customization/CustomizationDrawer.GenderRace.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Interface;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;

8
Glamourer/Gui/Customization/CustomizationDrawer.Icon.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface.Textures.TextureWraps;
using Glamourer.GameData;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Raii;
@ -35,7 +35,7 @@ public partial class CustomizationDrawer
var hasIcon = icon.TryGetWrap(out var wrap, out _);
using (_ = ImRaii.Disabled(_locked || _currentIndex is CustomizeIndex.Face && _lockedRedraw))
{
if (ImGui.ImageButton(wrap?.ImGuiHandle ?? icon.GetWrapOrEmpty().ImGuiHandle, _iconSize))
if (ImGui.ImageButton(wrap?.Handle ?? icon.GetWrapOrEmpty().Handle, _iconSize))
{
ImGui.OpenPopup(IconSelectorPopup);
}
@ -89,7 +89,7 @@ public partial class CustomizationDrawer
: ImRaii.PushColor(ImGuiCol.Button, ColorId.FavoriteStarOn.Value(), isFavorite);
var hasIcon = icon.TryGetWrap(out var wrap, out var _);
if (ImGui.ImageButton(wrap?.ImGuiHandle ?? icon.GetWrapOrEmpty().ImGuiHandle, _iconSize))
if (ImGui.ImageButton(wrap?.Handle ?? icon.GetWrapOrEmpty().Handle, _iconSize))
{
UpdateValue(custom.Value);
ImGui.CloseCurrentPopup();
@ -215,7 +215,7 @@ public partial class CustomizationDrawer
hasIcon = icon.TryGetWrap(out wrap, out _);
}
if (ImGui.ImageButton(wrap?.ImGuiHandle ?? icon.GetWrapOrEmpty().ImGuiHandle, _iconSize, Vector2.Zero, Vector2.One,
if (ImGui.ImageButton(wrap?.Handle ?? icon.GetWrapOrEmpty().Handle, _iconSize, Vector2.Zero, Vector2.One,
(int)ImGui.GetStyle().FramePadding.X, Vector4.Zero, enabled ? Vector4.One : _redTint))
{
_customize.Set(featureIdx, enabled ? CustomizeValue.Zero : CustomizeValue.Max);

2
Glamourer/Gui/Customization/CustomizationDrawer.Simple.cs
View file

@ -1,4 +1,4 @@
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGuiInternal;

2
Glamourer/Gui/Customization/CustomizationDrawer.cs
View file

@ -4,7 +4,7 @@ using Dalamud.Plugin.Services;
using Glamourer.GameData;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Customization/CustomizeParameterDrawer.cs
View file

@ -3,7 +3,7 @@ using Glamourer.Designs;
using Glamourer.GameData;
using Glamourer.Interop.PalettePlus;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/DesignCombo.cs
View file

@ -5,7 +5,7 @@ using Glamourer.Designs;
using Glamourer.Designs.History;
using Glamourer.Designs.Special;
using Glamourer.Events;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Extensions;

2
Glamourer/Gui/DesignQuickBar.cs
View file

@ -8,7 +8,7 @@ using Glamourer.Automation;
using Glamourer.Designs;
using Glamourer.Interop.Penumbra;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Classes;
using OtterGui.Text;
using Penumbra.GameData.Actors;

2
Glamourer/Gui/Equipment/BonusItemCombo.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Plugin.Services;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Lumina.Excel.Sheets;
using OtterGui;
using OtterGui.Classes;

2
Glamourer/Gui/Equipment/EquipmentDrawer.cs
View file

@ -5,7 +5,7 @@ using Glamourer.Events;
using Glamourer.Gui.Materials;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Extensions;
using OtterGui.Raii;
using OtterGui.Text;

2
Glamourer/Gui/Equipment/GlamourerColorCombo.cs
View file

@ -2,7 +2,7 @@
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Widgets;
using Penumbra.GameData.DataContainers;
using Penumbra.GameData.Structs;

2
Glamourer/Gui/Equipment/ItemCombo.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Plugin.Services;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Lumina.Excel.Sheets;
using OtterGui.Classes;
using OtterGui.Extensions;

2
Glamourer/Gui/Equipment/ItemCopyService.cs
View file

@ -1,5 +1,5 @@
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Services;
using Penumbra.GameData.DataContainers;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Equipment/WeaponCombo.cs
View file

@ -1,6 +1,6 @@
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Classes;
using OtterGui.Extensions;
using OtterGui.Log;

2
Glamourer/Gui/GenericPopupWindow.cs
View file

@ -3,7 +3,7 @@ using Dalamud.Interface.Utility;
using Dalamud.Interface.Windowing;
using Dalamud.Plugin.Services;
using Glamourer.Gui.Materials;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;

2
Glamourer/Gui/MainWindow.cs
View file

@ -12,7 +12,7 @@ using Glamourer.Gui.Tabs.NpcTab;
using Glamourer.Gui.Tabs.SettingsTab;
using Glamourer.Gui.Tabs.UnlocksTab;
using Glamourer.Interop.Penumbra;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Custom;

2
Glamourer/Gui/Materials/AdvancedDyePopup.cs
View file

@ -8,7 +8,7 @@ using FFXIVClientStructs.Interop;
using Glamourer.Designs;
using Glamourer.Interop.Material;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui.Services;
using OtterGui.Text;

2
Glamourer/Gui/Materials/MaterialDrawer.cs
View file

@ -3,7 +3,7 @@ using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Glamourer.Designs;
using Glamourer.Interop.Material;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Services;
using OtterGui.Text;

2
Glamourer/Gui/PenumbraChangedItemTooltip.cs
View file

@ -3,7 +3,7 @@ using Glamourer.Events;
using Glamourer.Interop.Penumbra;
using Glamourer.Services;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using Penumbra.Api.Enums;
using Penumbra.GameData.Data;

2
Glamourer/Gui/Tabs/ActorTab/ActorPanel.cs
View file

@ -11,7 +11,7 @@ using Glamourer.Gui.Equipment;
using Glamourer.Gui.Materials;
using Glamourer.Interop;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/ActorTab/ActorSelector.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Interface;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/ActorTab/ActorTab.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Interface.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Widgets;
namespace Glamourer.Gui.Tabs.ActorTab;

2
Glamourer/Gui/Tabs/AutomationTab/AutomationTab.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Interface.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Widgets;
namespace Glamourer.Gui.Tabs.AutomationTab;

2
Glamourer/Gui/Tabs/AutomationTab/HumanNpcCombo.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Custom;
using OtterGui.Extensions;

2
Glamourer/Gui/Tabs/AutomationTab/IdentifierDrawer.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Game.ClientState.Objects.Enums;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Penumbra.GameData.Actors;
using Penumbra.GameData.DataContainers;
using Penumbra.GameData.Gui;

2
Glamourer/Gui/Tabs/AutomationTab/RandomRestrictionDrawer.cs
View file

@ -4,7 +4,7 @@ using Glamourer.Automation;
using Glamourer.Designs;
using Glamourer.Designs.Special;
using Glamourer.Events;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs
View file

@ -6,7 +6,7 @@ using Glamourer.Designs.Special;
using Glamourer.Interop;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Log;

2
Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs
View file

@ -2,7 +2,7 @@
using Dalamud.Interface.Utility;
using Glamourer.Automation;
using Glamourer.Events;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Extensions;

2
Glamourer/Gui/Tabs/DebugTab/ActiveStatePanel.cs
View file

@ -2,7 +2,7 @@
using Glamourer.GameData;
using Glamourer.Designs;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Tabs/DebugTab/AdvancedCustomizationDrawer.cs
View file

@ -1,5 +1,5 @@
using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui.Text;
using Penumbra.GameData.Gui.Debug;

2
Glamourer/Gui/Tabs/DebugTab/AutoDesignPanel.cs
View file

@ -1,5 +1,5 @@
using Glamourer.Automation;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/DebugTab/CustomizationServicePanel.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface;
using Glamourer.GameData;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Text;

2
Glamourer/Gui/Tabs/DebugTab/CustomizationUnlockPanel.cs
View file

@ -1,5 +1,5 @@
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Tabs/DebugTab/DatFilePanel.cs
View file

@ -1,5 +1,5 @@
using Glamourer.Interop;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using Penumbra.GameData.Files;
using Penumbra.GameData.Gui.Debug;

2
Glamourer/Gui/Tabs/DebugTab/DebugTab.cs
View file

@ -1,4 +1,4 @@
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui.Services;
using OtterGui.Widgets;

2
Glamourer/Gui/Tabs/DebugTab/DesignConverterPanel.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface;
using Glamourer.Designs;
using Glamourer.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Newtonsoft.Json.Linq;
using OtterGui;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/DebugTab/DesignManagerPanel.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Interface;
using Glamourer.Designs;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Filesystem;

2
Glamourer/Gui/Tabs/DebugTab/DesignTesterPanel.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface;
using Glamourer.Designs;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/DebugTab/FunPanel.cs
View file

@ -1,5 +1,5 @@
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Penumbra.GameData.Gui.Debug;
namespace Glamourer.Gui.Tabs.DebugTab;

2
Glamourer/Gui/Tabs/DebugTab/GlamourPlatePanel.cs
View file

@ -5,7 +5,7 @@ using FFXIVClientStructs.FFXIV.Client.Game;
using Glamourer.Designs;
using Glamourer.Services;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Text;

2
Glamourer/Gui/Tabs/DebugTab/InventoryPanel.cs
View file

@ -1,5 +1,5 @@
using FFXIVClientStructs.FFXIV.Client.Game;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Gui.Debug;

2
Glamourer/Gui/Tabs/DebugTab/IpcTester/DesignIpcTester.cs
View file

@ -3,7 +3,7 @@ using Dalamud.Interface.Utility;
using Dalamud.Plugin;
using Glamourer.Api.Enums;
using Glamourer.Api.IpcSubscribers;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/Tabs/DebugTab/IpcTester/IpcTesterHelpers.cs
View file

@ -1,6 +1,6 @@
using Glamourer.Api.Enums;
using Glamourer.Designs;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using static Penumbra.GameData.Files.ShpkFile;

2
Glamourer/Gui/Tabs/DebugTab/IpcTester/IpcTesterPanel.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using Glamourer.Api.IpcSubscribers;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Penumbra.GameData.Gui.Debug;
namespace Glamourer.Gui.Tabs.DebugTab.IpcTester;

2
Glamourer/Gui/Tabs/DebugTab/IpcTester/ItemsIpcTester.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Plugin;
using Glamourer.Api.Enums;
using Glamourer.Api.IpcSubscribers;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/Tabs/DebugTab/IpcTester/StateIpcTester.cs
View file

@ -5,7 +5,7 @@ using Glamourer.Api.Enums;
using Glamourer.Api.Helpers;
using Glamourer.Api.IpcSubscribers;
using Glamourer.Designs;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui;

2
Glamourer/Gui/Tabs/DebugTab/ItemUnlockPanel.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface.Utility;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Tabs/DebugTab/ModelEvaluationPanel.cs
View file

@ -2,7 +2,7 @@
using Glamourer.GameData;
using Glamourer.Interop;
using Glamourer.Interop.Structs;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Text;

2
Glamourer/Gui/Tabs/DebugTab/NpcAppearancePanel.cs
View file

@ -4,7 +4,7 @@ using FFXIVClientStructs.FFXIV.Client.Game.Object;
using Glamourer.Designs;
using Glamourer.GameData;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui.Text;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Tabs/DebugTab/ObjectManagerPanel.cs
View file

@ -1,4 +1,4 @@
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Text;
using Penumbra.GameData.Actors;

2
Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Interface.Utility;
using Glamourer.Interop.Penumbra;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.Api.Enums;

2
Glamourer/Gui/Tabs/DebugTab/UnlockableItemsPanel.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface.Utility;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Tabs/DesignTab/DesignColorCombo.cs
View file

@ -1,5 +1,5 @@
using Glamourer.Designs;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Widgets;

2
Glamourer/Gui/Tabs/DesignTab/DesignDetailTab.cs
View file

@ -2,7 +2,7 @@
using Dalamud.Interface.ImGuiNotification;
using Glamourer.Designs;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/DesignTab/DesignFileSystemSelector.cs
View file

@ -5,7 +5,7 @@ using Glamourer.Designs;
using Glamourer.Designs.History;
using Glamourer.Events;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Filesystem;

2
Glamourer/Gui/Tabs/DesignTab/DesignLinkDrawer.cs
View file

@ -3,7 +3,7 @@ using Dalamud.Interface.Utility;
using Glamourer.Automation;
using Glamourer.Designs;
using Glamourer.Designs.Links;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/Tabs/DesignTab/DesignPanel.cs
View file

@ -12,7 +12,7 @@ using Glamourer.Gui.Equipment;
using Glamourer.Gui.Materials;
using Glamourer.Interop;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/DesignTab/DesignTab.cs
View file

@ -2,7 +2,7 @@
using Dalamud.Interface.Utility;
using Glamourer.Designs;
using Glamourer.Interop;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Classes;
using OtterGui.Widgets;

2
Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs
View file

@ -5,7 +5,7 @@ using Dalamud.Utility;
using Glamourer.Designs;
using Glamourer.Interop.Penumbra;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Extensions;

2
Glamourer/Gui/Tabs/DesignTab/ModCombo.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Interface.Utility;
using Glamourer.Interop.Penumbra;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Classes;
using OtterGui.Log;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/DesignTab/MultiDesignPanel.cs
View file

@ -2,7 +2,7 @@
using Dalamud.Interface.Utility;
using Glamourer.Designs;
using Glamourer.Interop.Material;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Extensions;
using OtterGui.Raii;
using OtterGui.Text;

2
Glamourer/Gui/Tabs/HeaderDrawer.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Interface;
using Dalamud.Interface.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/NpcTab/LocalNpcAppearanceData.cs
View file

@ -2,7 +2,7 @@
using Glamourer.Designs;
using Glamourer.GameData;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

2
Glamourer/Gui/Tabs/NpcTab/NpcPanel.cs
View file

@ -6,7 +6,7 @@ using Glamourer.Gui.Customization;
using Glamourer.Gui.Equipment;
using Glamourer.Gui.Tabs.DesignTab;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/NpcTab/NpcSelector.cs
View file

@ -1,5 +1,5 @@
using Glamourer.GameData;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Extensions;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/NpcTab/NpcTab.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Interface.Utility;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Widgets;
namespace Glamourer.Gui.Tabs.NpcTab;

2
Glamourer/Gui/Tabs/SettingsTab/CodeDrawer.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface;
using Glamourer.Services;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Filesystem;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/Tabs/SettingsTab/CollectionCombo.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Interface;
using Glamourer.Interop.Penumbra;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Log;
using OtterGui.Raii;

2
Glamourer/Gui/Tabs/SettingsTab/CollectionOverrideDrawer.cs
View file

@ -1,7 +1,7 @@
using Dalamud.Interface;
using Glamourer.Interop.Penumbra;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Services;

2
Glamourer/Gui/Tabs/SettingsTab/SettingsTab.cs
View file

@ -8,7 +8,7 @@ using Glamourer.Designs;
using Glamourer.Gui.Tabs.DesignTab;
using Glamourer.Interop;
using Glamourer.Interop.PalettePlus;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui.Text;
using OtterGui.Widgets;

2
Glamourer/Gui/Tabs/UnlocksTab/UnlockOverview.cs
View file

@ -5,7 +5,7 @@ using Glamourer.Interop;
using Glamourer.Interop.Penumbra;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui.Text;
using Penumbra.GameData.Enums;

2
Glamourer/Gui/Tabs/UnlocksTab/UnlockTable.cs
View file

@ -6,7 +6,7 @@ using Glamourer.Interop;
using Glamourer.Interop.Penumbra;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Table;

2
Glamourer/Gui/Tabs/UnlocksTab/UnlocksTab.cs
View file

@ -1,6 +1,6 @@
using Dalamud.Interface;
using Dalamud.Interface.Windowing;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Raii;
using OtterGui;
using OtterGui.Widgets;

2
Glamourer/Gui/UiHelpers.cs
View file

@ -2,7 +2,7 @@ using Dalamud.Interface;
using Dalamud.Interface.Utility;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using Lumina.Misc;
using OtterGui;
using OtterGui.Raii;

4
Glamourer/Interop/CrestService.cs
View file

@ -122,7 +122,7 @@ public sealed unsafe class CrestService : EventWrapperRef3<Actor, CrestFlag, boo
if (!model.IsHuman)
return false;
return model.AsHuman->IsFreeCompanyCrestVisibleOnSlot(index) != 0;
return model.AsHuman->IsFreeCompanyCrestVisibleOnSlot(index);
}
case CrestType.Offhand:
{
@ -130,7 +130,7 @@ public sealed unsafe class CrestService : EventWrapperRef3<Actor, CrestFlag, boo
if (!model.IsWeapon)
return false;
return model.AsWeapon->IsFreeCompanyCrestVisibleOnSlot(index) != 0;
return model.AsWeapon->IsFreeCompanyCrestVisibleOnSlot(index);
}
}

2
Glamourer/Interop/ImportService.cs
View file

@ -3,7 +3,7 @@ using Dalamud.Interface.ImGuiNotification;
using Glamourer.Designs;
using Glamourer.Interop.CharaFile;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Classes;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Files;

5
Glamourer/Interop/Material/LiveColorTablePreviewer.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Plugin.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Services;
using Penumbra.GameData.Files.MaterialStructs;
using Penumbra.GameData.Structs;
@ -114,7 +114,8 @@ public sealed unsafe class LiveColorTablePreviewer : IService, IDisposable
var frame = DateTimeOffset.UtcNow.UtcTicks;
var hueByte = frame % (steps * frameLength) / frameLength;
var hue = (float)hueByte / steps;
ImGui.ColorConvertHSVtoRGB(hue, 1, 1, out var r, out var g, out var b);
float r, g, b = 0;
ImGui.ColorConvertHSVtoRGB(hue, 1, 1, &r, &g, &b);
return new Vector3(r, g, b);
}

2
Glamourer/Services/CommandService.cs
View file

@ -9,7 +9,7 @@ using Glamourer.Gui;
using Glamourer.Gui.Tabs.DesignTab;
using Glamourer.Interop.Penumbra;
using Glamourer.State;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Extensions;

2
Glamourer/Services/DesignResolver.cs
View file

@ -4,7 +4,7 @@ using Glamourer.Designs;
using Glamourer.Designs.Special;
using Glamourer.Gui;
using Glamourer.Gui.Tabs.DesignTab;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui.Services;
using OtterGui.Classes;

2
Glamourer/State/FunModule.cs
View file

@ -4,7 +4,7 @@ using Glamourer.Designs;
using Glamourer.GameData;
using Glamourer.Gui;
using Glamourer.Services;
using ImGuiNET;
using Dalamud.Bindings.ImGui;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Extensions;

8
Glamourer/packages.lock.json
View file

@ -4,9 +4,9 @@
"net9.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[12.0.0, )",
"resolved": "12.0.0",
"contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw=="
"requested": "[13.0.0, )",
"resolved": "13.0.0",
"contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
@ -96,7 +96,7 @@
"type": "Project",
"dependencies": {
"OtterGui": "[1.0.0, )",
"Penumbra.Api": "[5.6.1, )",
"Penumbra.Api": "[5.10.0, )",
"Penumbra.String": "[1.0.6, )"
}
},

2
OtterGui

@ -1 +1 @@
Subproject commit 78528f93ac253db0061d9a8244cfa0cee5c2f873
Subproject commit 9523b7ac725656b21fa98faef96962652e86e64f

2
Penumbra.Api

@ -1 +1 @@
Subproject commit ff7b3b4014a97455f823380c78b8a7c5107f8e2f
Subproject commit c27a06004138f2ec80ccdb494bb6ddf6d39d2165

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 82b446721a9b9c99d2470c54ad49fe19ff4987e3
Subproject commit 65c5bf3f46569a54b0057c9015ab839b4e2a4350

2
Penumbra.String

@ -1 +1 @@
Subproject commit 2896c0561f60827f97408650d52a15c38f4d9d10
Subproject commit 878acce46e286867d6ef1f8ecedb390f7bac34fd