From ad3b0f01949e73a567e24c70879656da22750bb3 Mon Sep 17 00:00:00 2001 From: goaaats Date: Tue, 8 Apr 2025 22:21:04 +0200 Subject: [PATCH] Fix some warnings --- Dalamud.CorePlugin/PluginWindow.cs | 2 +- Dalamud/AssemblyInfo.cs | 3 - Dalamud/EntryPoint.cs | 5 +- .../Game/ClientState/GamePad/GamepadState.cs | 4 +- Dalamud/Game/Gui/GameGui.cs | 4 +- .../Internal/FunctionPointerVariableHook.cs | 4 +- .../ImGuiComponents.ColorPickerWithPalette.cs | 3 +- .../ImGuiComponents.DisabledButton.cs | 3 +- .../Components/ImGuiComponents.HelpMarker.cs | 6 +- .../Components/ImGuiComponents.IconButton.cs | 3 +- .../ImGuiComponents.IconButtonSelect.cs | 3 +- .../ImGuiComponents.TextWithLabel.cs | 3 +- Dalamud/Interface/DragDrop/DragDropManager.cs | 3 +- Dalamud/Interface/DragDrop/DragDropTarget.cs | 2 +- .../DalamudAssetFontAndFamilyId.cs | 5 +- .../DalamudDefaultFontAndFamilyId.cs | 5 +- .../FontIdentifier/GameFontAndFamilyId.cs | 5 +- Dalamud/Interface/FontIdentifier/IFontId.cs | 3 +- Dalamud/Interface/FontIdentifier/IFontSpec.cs | 3 +- .../FontIdentifier/SingleFontSpec.cs | 4 +- .../Interface/FontIdentifier/SystemFontId.cs | 5 +- .../ImGuiBackend/Dx11Win32Backend.cs | 3 - .../Renderers/Dx11Renderer.ViewportHandler.cs | 4 +- .../ImGuiBackend/Renderers/Dx11Renderer.cs | 4 +- .../ImGuiBackend/Renderers/IImGuiRenderer.cs | 3 +- .../ImGuiFileDialog/FileDialog.UI.cs | 2 +- .../Internal/ActiveNotification.ImGui.cs | 5 +- .../Internal/NotificationManager.cs | 3 +- .../NotificationUtilities.cs | 3 +- .../Internal/SeStringRenderer.cs | 6 +- .../SeStringDrawParams.cs | 4 +- .../SeStringDrawState.cs | 5 +- .../Interface/Internal/DalamudInterface.cs | 7 +- .../DesignSystem/DalamudComponents.Buttons.cs | 3 +- .../DalamudComponents.PluginPicker.cs | 4 +- .../ImGuiClipboardFunctionProvider.cs | 5 +- .../Interface/Internal/InterfaceManager.cs | 7 +- Dalamud/Interface/Internal/UiDebug.cs | 4 +- .../UiDebug2/Browsing/AddonTree.AtkValues.cs | 4 +- .../Internal/UiDebug2/Browsing/AddonTree.cs | 5 +- .../Internal/UiDebug2/Browsing/Events.cs | 3 +- .../UiDebug2/Browsing/NodeTree.Component.cs | 2 +- .../UiDebug2/Browsing/NodeTree.Editor.cs | 11 +- .../UiDebug2/Browsing/NodeTree.Image.cs | 9 +- .../UiDebug2/Browsing/NodeTree.NineGrid.cs | 5 +- .../UiDebug2/Browsing/NodeTree.Text.cs | 3 +- .../UiDebug2/Browsing/TimelineTree.cs | 9 +- .../Internal/UiDebug2/ElementSelector.cs | 8 +- .../Internal/UiDebug2/Popout.Addon.cs | 2 +- .../Internal/UiDebug2/Popout.Node.cs | 2 +- .../Internal/UiDebug2/UiDebug2.Sidebar.cs | 4 +- .../Interface/Internal/UiDebug2/UiDebug2.cs | 4 +- .../Internal/UiDebug2/Utility/Gui.cs | 5 +- .../Internal/UiDebug2/Utility/NodeBounds.cs | 3 +- .../Internal/Windows/BranchSwitcherWindow.cs | 3 +- .../Internal/Windows/ChangelogWindow.cs | 5 +- .../Internal/Windows/ColorDemoWindow.cs | 2 +- .../Internal/Windows/ComponentDemoWindow.cs | 2 +- .../Internal/Windows/ConsoleWindow.cs | 4 +- .../Internal/Windows/Data/DataWindow.cs | 3 +- .../Data/DataWindowWidgetExtensions.cs | 3 +- .../Windows/Data/GameInventoryTestWidget.cs | 4 +- .../Internal/Windows/Data/WidgetUtil.cs | 3 +- .../Data/Widgets/AddonLifecycleWidget.cs | 3 +- .../Windows/Data/Widgets/AddonWidget.cs | 4 +- .../Windows/Data/Widgets/AddressesWidget.cs | 3 +- .../Windows/Data/Widgets/AetherytesWidget.cs | 3 +- .../Data/Widgets/AtkArrayDataBrowserWidget.cs | 5 +- .../Windows/Data/Widgets/BuddyListWidget.cs | 2 +- .../Windows/Data/Widgets/CommandWidget.cs | 3 +- .../Windows/Data/Widgets/ConditionWidget.cs | 5 +- .../Windows/Data/Widgets/DataShareWidget.cs | 4 +- .../Windows/Data/Widgets/DtrBarWidget.cs | 3 +- .../Windows/Data/Widgets/FateTableWidget.cs | 3 +- .../Windows/Data/Widgets/FlyTextWidget.cs | 3 +- .../Data/Widgets/FontAwesomeTestWidget.cs | 2 +- .../Windows/Data/Widgets/GamepadWidget.cs | 5 +- .../Windows/Data/Widgets/GaugeWidget.cs | 2 +- .../Windows/Data/Widgets/HookWidget.cs | 7 +- .../Windows/Data/Widgets/IconBrowserWidget.cs | 3 +- .../Windows/Data/Widgets/ImGuiWidget.cs | 3 +- .../Windows/Data/Widgets/InventoryWidget.cs | 5 +- .../Windows/Data/Widgets/KeyStateWidget.cs | 5 +- .../Windows/Data/Widgets/MarketBoardWidget.cs | 2 +- .../Data/Widgets/NetworkMonitorWidget.cs | 3 +- .../Data/Widgets/NounProcessorWidget.cs | 3 +- .../Windows/Data/Widgets/ObjectTableWidget.cs | 2 +- .../Windows/Data/Widgets/PartyListWidget.cs | 4 +- .../Windows/Data/Widgets/PluginIpcWidget.cs | 4 +- .../Windows/Data/Widgets/SeFontTestWidget.cs | 2 +- .../Data/Widgets/SeStringCreatorWidget.cs | 5 +- .../Widgets/SeStringRendererTestWidget.cs | 5 +- .../Windows/Data/Widgets/ServicesWidget.cs | 3 +- .../Windows/Data/Widgets/TargetWidget.cs | 4 +- .../Data/Widgets/TaskSchedulerWidget.cs | 7 +- .../Windows/Data/Widgets/TexWidget.cs | 4 +- .../Windows/Data/Widgets/ToastWidget.cs | 3 +- .../Windows/Data/Widgets/UIColorWidget.cs | 4 +- .../Windows/Data/Widgets/UldWidget.cs | 4 +- .../Windows/Data/Widgets/VfsWidget.cs | 2 +- .../Windows/GamepadModeNotifierWindow.cs | 2 +- .../Internal/Windows/HitchSettingsWindow.cs | 3 +- .../PluginInstaller/PluginInstallerWindow.cs | 4 +- .../PluginInstaller/ProfileManagerWidget.cs | 2 +- .../Internal/Windows/PluginStatWindow.cs | 2 +- .../Internal/Windows/ProfilerWindow.cs | 2 +- .../Windows/SelfTest/SelfTestWindow.cs | 2 +- .../SelfTest/Steps/ActorTableSelfTestStep.cs | 2 +- .../Steps/AddonLifecycleSelfTestStep.cs | 3 +- .../Steps/AetheryteListSelfTestStep.cs | 2 +- .../SelfTest/Steps/ChatSelfTestStep.cs | 3 +- .../SelfTest/Steps/ConditionSelfTestStep.cs | 3 +- .../SelfTest/Steps/ContextMenuSelfTestStep.cs | 2 +- .../SelfTest/Steps/DutyStateSelfTestStep.cs | 5 +- .../Steps/EnterTerritorySelfTestStep.cs | 3 +- .../SelfTest/Steps/FateTableSelfTestStep.cs | 2 +- .../SelfTest/Steps/GameConfigSelfTestStep.cs | 5 +- .../SelfTest/Steps/HoverSelfTestStep.cs | 3 +- .../SelfTest/Steps/ItemPayloadSelfTestStep.cs | 5 +- .../SelfTest/Steps/KeyStateSelfTestStep.cs | 3 +- .../SelfTest/Steps/LoginEventSelfTestStep.cs | 3 +- .../SelfTest/Steps/LogoutEventSelfTestStep.cs | 3 +- .../SelfTest/Steps/MarketBoardSelfTestStep.cs | 2 +- .../SelfTest/Steps/NamePlateSelfTestStep.cs | 3 +- .../Steps/NounProcessorSelfTestStep.cs | 3 +- .../SelfTest/Steps/PartyFinderSelfTestStep.cs | 3 +- .../Steps/SeStringEvaluatorSelfTestStep.cs | 4 +- .../SheetRedirectResolverSelfTestStep.cs | 4 +- .../SelfTest/Steps/TargetSelfTestStep.cs | 3 +- .../SelfTest/Steps/ToastSelfTestStep.cs | 3 +- .../Windows/Settings/SettingsWindow.cs | 4 +- .../Windows/Settings/Tabs/SettingsTabAbout.cs | 2 +- .../Settings/Tabs/SettingsTabAutoUpdate.cs | 3 +- .../Windows/Settings/Tabs/SettingsTabDtr.cs | 3 +- .../Windows/Settings/Tabs/SettingsTabLook.cs | 2 +- .../Settings/Widgets/ButtonSettingsEntry.cs | 2 +- .../Widgets/DevPluginsSettingsEntry.cs | 3 +- .../Settings/Widgets/EnumSettingsEntry{T}.cs | 4 +- .../Settings/Widgets/GapSettingsEntry.cs | 2 +- .../Widgets/LanguageChooserSettingsEntry.cs | 3 +- .../Settings/Widgets/SettingsEntry{T}.cs | 4 +- .../Widgets/ThirdRepoSettingsEntry.cs | 2 +- .../Windows/StyleEditor/StyleEditorWindow.cs | 3 +- .../Internal/Windows/TitleScreenMenuWindow.cs | 6 +- .../ManagedFontAtlas/FontAtlasBuildStep.cs | 2 + .../IFontAtlasBuildToolkitPreBuild.cs | 4 +- .../Interface/ManagedFontAtlas/IFontHandle.cs | 2 + .../Internals/DelegateFontHandle.cs | 3 +- .../FontAtlasFactory.BuildToolkit.cs | 13 +- .../Internals/FontAtlasFactory.cs | 5 +- .../ManagedFontAtlas/Internals/FontHandle.cs | 4 +- .../Internals/GamePrebakedFontHandle.cs | 4 +- Dalamud/Interface/Style/StyleModel.cs | 2 +- Dalamud/Interface/Style/StyleModelV1.cs | 2 +- .../Textures/ImGuiViewportTextureArgs.cs | 4 +- .../Internal/TextureManager.Drawer.cs | 4 +- .../Internal/ViewportTextureWrap.cs | 4 +- Dalamud/Interface/UiBuilder.cs | 4 +- Dalamud/Interface/Utility/ImGuiClip.cs | 2 +- Dalamud/Interface/Utility/ImGuiHelpers.cs | 33 ++-- Dalamud/Interface/Utility/ImGuiTable.cs | 2 +- Dalamud/Interface/Utility/ImVectorWrapper.cs | 2 +- .../Utility/Internal/DevTextureSaveMenu.cs | 5 +- .../Interface/Utility/Table/ColumnFlags.cs | 2 +- .../Interface/Utility/Table/ColumnString.cs | 2 +- Dalamud/Interface/Utility/Table/Table.cs | 2 +- Dalamud/Interface/Windowing/Window.cs | 6 +- Dalamud/Interface/Windowing/WindowSystem.cs | 3 +- Dalamud/Memory/MemoryHelper.cs | 5 +- Dalamud/NativeFunctions.cs | 2 +- .../Internal/AutoUpdate/AutoUpdateManager.cs | 4 +- Dalamud/Plugin/Services/IGamepadState.cs | 2 +- Dalamud/Utility/TypeExtensions.cs | 165 ------------------ Dalamud/Utility/Util.cs | 3 +- 174 files changed, 224 insertions(+), 597 deletions(-) delete mode 100644 Dalamud/AssemblyInfo.cs delete mode 100644 Dalamud/Utility/TypeExtensions.cs diff --git a/Dalamud.CorePlugin/PluginWindow.cs b/Dalamud.CorePlugin/PluginWindow.cs index 07c935f7d..3a17ea065 100644 --- a/Dalamud.CorePlugin/PluginWindow.cs +++ b/Dalamud.CorePlugin/PluginWindow.cs @@ -1,8 +1,8 @@ using System; using System.Numerics; -using Dalamud.Interface.Windowing; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Windowing; namespace Dalamud.CorePlugin { diff --git a/Dalamud/AssemblyInfo.cs b/Dalamud/AssemblyInfo.cs deleted file mode 100644 index a22fbd183..000000000 --- a/Dalamud/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Runtime.CompilerServices; - -//[assembly: DisableRuntimeMarshalling] diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index c870b23a8..463ff1967 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -6,9 +6,6 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Windows.Win32.Foundation; -using Windows.Win32.UI.WindowsAndMessaging; - using Dalamud.Common; using Dalamud.Configuration.Internal; using Dalamud.Interface.Internal.Windows; @@ -23,6 +20,8 @@ using PInvoke; using Serilog; using Serilog.Core; using Serilog.Events; +using Windows.Win32.Foundation; +using Windows.Win32.UI.WindowsAndMessaging; using static Dalamud.NativeFunctions; diff --git a/Dalamud/Game/ClientState/GamePad/GamepadState.cs b/Dalamud/Game/ClientState/GamePad/GamepadState.cs index 90484f0f1..ab4f8a03f 100644 --- a/Dalamud/Game/ClientState/GamePad/GamepadState.cs +++ b/Dalamud/Game/ClientState/GamePad/GamepadState.cs @@ -1,13 +1,11 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Hooking; using Dalamud.IoC; using Dalamud.IoC.Internal; using Dalamud.Plugin.Services; - using FFXIVClientStructs.FFXIV.Client.System.Input; - -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Game.ClientState.GamePad; diff --git a/Dalamud/Game/Gui/GameGui.cs b/Dalamud/Game/Gui/GameGui.cs index 9e161bcd3..a28221f86 100644 --- a/Dalamud/Game/Gui/GameGui.cs +++ b/Dalamud/Game/Gui/GameGui.cs @@ -1,5 +1,6 @@ using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Hooking; using Dalamud.Interface.Utility; @@ -8,7 +9,6 @@ using Dalamud.IoC.Internal; using Dalamud.Logging.Internal; using Dalamud.Plugin.Services; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game.Control; using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel; @@ -18,8 +18,6 @@ using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Common.Component.BGCollision; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; - using Vector2 = System.Numerics.Vector2; using Vector3 = System.Numerics.Vector3; using Vector4 = System.Numerics.Vector4; diff --git a/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs b/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs index 399643592..c60c922a5 100644 --- a/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs +++ b/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs @@ -2,12 +2,10 @@ using System.Collections.Generic; using System.Reflection; using System.Runtime.InteropServices; -using Windows.Win32.System.Memory; - using Dalamud.Memory; using JetBrains.Annotations; - using PInvoke; +using Windows.Win32.System.Memory; using Win32Exception = System.ComponentModel.Win32Exception; diff --git a/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs b/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs index 106938a9c..e2f9d9970 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs @@ -1,10 +1,9 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Components; /// diff --git a/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs b/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs index e864d13d4..a8c3c03a3 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs @@ -1,8 +1,7 @@ using System.Numerics; -using Dalamud.Interface.Utility.Raii; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; namespace Dalamud.Interface.Components; diff --git a/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs b/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs index 4312aed83..8ebb74935 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs @@ -1,8 +1,6 @@ -using Dalamud.Interface.Utility.Raii; - -using FFXIVClientStructs.FFXIV.Common.Math; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; +using FFXIVClientStructs.FFXIV.Common.Math; namespace Dalamud.Interface.Components; diff --git a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs index 20eda4ce8..03befd11f 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs @@ -1,10 +1,9 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Components; /// diff --git a/Dalamud/Interface/Components/ImGuiComponents.IconButtonSelect.cs b/Dalamud/Interface/Components/ImGuiComponents.IconButtonSelect.cs index 89442ca73..1dc454c9a 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.IconButtonSelect.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.IconButtonSelect.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; -using Dalamud.Interface.Utility; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; namespace Dalamud.Interface.Components; diff --git a/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs b/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs index 42c3a6e4b..3b1c27cbb 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs @@ -1,6 +1,5 @@ -using Dalamud.Interface.Utility.Raii; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; namespace Dalamud.Interface.Components; diff --git a/Dalamud/Interface/DragDrop/DragDropManager.cs b/Dalamud/Interface/DragDrop/DragDropManager.cs index 0f75d90af..4375ddea9 100644 --- a/Dalamud/Interface/DragDrop/DragDropManager.cs +++ b/Dalamud/Interface/DragDrop/DragDropManager.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Internal; using Dalamud.IoC; using Dalamud.IoC.Internal; - -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.DragDrop; diff --git a/Dalamud/Interface/DragDrop/DragDropTarget.cs b/Dalamud/Interface/DragDrop/DragDropTarget.cs index 344b7fbb8..c6b66e7e8 100644 --- a/Dalamud/Interface/DragDrop/DragDropTarget.cs +++ b/Dalamud/Interface/DragDrop/DragDropTarget.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Runtime.InteropServices.ComTypes; using System.Text; -using Dalamud.Utility; using Dalamud.Bindings.ImGui; +using Dalamud.Utility; using Serilog; namespace Dalamud.Interface.DragDrop; diff --git a/Dalamud/Interface/FontIdentifier/DalamudAssetFontAndFamilyId.cs b/Dalamud/Interface/FontIdentifier/DalamudAssetFontAndFamilyId.cs index eaf867924..c531dced5 100644 --- a/Dalamud/Interface/FontIdentifier/DalamudAssetFontAndFamilyId.cs +++ b/Dalamud/Interface/FontIdentifier/DalamudAssetFontAndFamilyId.cs @@ -1,12 +1,9 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ManagedFontAtlas; using Dalamud.Storage.Assets; - -using Dalamud.Bindings.ImGui; - using Newtonsoft.Json; - using TerraFX.Interop.DirectX; namespace Dalamud.Interface.FontIdentifier; diff --git a/Dalamud/Interface/FontIdentifier/DalamudDefaultFontAndFamilyId.cs b/Dalamud/Interface/FontIdentifier/DalamudDefaultFontAndFamilyId.cs index 7bad13f11..c45cf256b 100644 --- a/Dalamud/Interface/FontIdentifier/DalamudDefaultFontAndFamilyId.cs +++ b/Dalamud/Interface/FontIdentifier/DalamudDefaultFontAndFamilyId.cs @@ -1,11 +1,8 @@ using System.Collections.Generic; -using Dalamud.Interface.ManagedFontAtlas; - using Dalamud.Bindings.ImGui; - +using Dalamud.Interface.ManagedFontAtlas; using Newtonsoft.Json; - using TerraFX.Interop.DirectX; namespace Dalamud.Interface.FontIdentifier; diff --git a/Dalamud/Interface/FontIdentifier/GameFontAndFamilyId.cs b/Dalamud/Interface/FontIdentifier/GameFontAndFamilyId.cs index 065b71e33..e294c8813 100644 --- a/Dalamud/Interface/FontIdentifier/GameFontAndFamilyId.cs +++ b/Dalamud/Interface/FontIdentifier/GameFontAndFamilyId.cs @@ -1,12 +1,9 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.GameFonts; using Dalamud.Interface.ManagedFontAtlas; - -using Dalamud.Bindings.ImGui; - using Newtonsoft.Json; - using TerraFX.Interop.DirectX; namespace Dalamud.Interface.FontIdentifier; diff --git a/Dalamud/Interface/FontIdentifier/IFontId.cs b/Dalamud/Interface/FontIdentifier/IFontId.cs index 21b06f25b..7b457a95b 100644 --- a/Dalamud/Interface/FontIdentifier/IFontId.cs +++ b/Dalamud/Interface/FontIdentifier/IFontId.cs @@ -1,6 +1,5 @@ -using Dalamud.Interface.ManagedFontAtlas; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.ManagedFontAtlas; namespace Dalamud.Interface.FontIdentifier; diff --git a/Dalamud/Interface/FontIdentifier/IFontSpec.cs b/Dalamud/Interface/FontIdentifier/IFontSpec.cs index 7ae1e5914..c597ed4dd 100644 --- a/Dalamud/Interface/FontIdentifier/IFontSpec.cs +++ b/Dalamud/Interface/FontIdentifier/IFontSpec.cs @@ -1,6 +1,5 @@ -using Dalamud.Interface.ManagedFontAtlas; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.ManagedFontAtlas; namespace Dalamud.Interface.FontIdentifier; diff --git a/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs b/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs index e362f1308..070b1c1e1 100644 --- a/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs +++ b/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs @@ -3,11 +3,9 @@ using System.Diagnostics.CodeAnalysis; using System.Numerics; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ManagedFontAtlas; using Dalamud.Interface.Utility; - -using Dalamud.Bindings.ImGui; - using Newtonsoft.Json; namespace Dalamud.Interface.FontIdentifier; diff --git a/Dalamud/Interface/FontIdentifier/SystemFontId.cs b/Dalamud/Interface/FontIdentifier/SystemFontId.cs index 21ccccd3e..e11759a88 100644 --- a/Dalamud/Interface/FontIdentifier/SystemFontId.cs +++ b/Dalamud/Interface/FontIdentifier/SystemFontId.cs @@ -2,13 +2,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ManagedFontAtlas; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using Newtonsoft.Json; - using TerraFX.Interop.DirectX; using TerraFX.Interop.Windows; diff --git a/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs b/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs index a74c26858..f42588982 100644 --- a/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs +++ b/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs @@ -71,8 +71,6 @@ internal sealed unsafe class Dx11Win32Backend : IWin32Backend this.WindowHandle = desc.OutputWindow; var ctx = ImGui.CreateContext(); - Debug.Assert(!ctx.IsNull); - ImGuizmo.SetImGuiContext(ctx); ImPlot.SetImGuiContext(ctx); ImPlot.CreateContext(); @@ -251,4 +249,3 @@ internal sealed unsafe class Dx11Win32Backend : IWin32Backend this.swapChainPossiblyWrapped.Dispose(); } } - diff --git a/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.ViewportHandler.cs b/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.ViewportHandler.cs index ffe792964..fe83d58a9 100644 --- a/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.ViewportHandler.cs +++ b/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.ViewportHandler.cs @@ -2,11 +2,9 @@ using System.Diagnostics.CodeAnalysis; using System.Numerics; using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ImGuiBackend.Helpers; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.DirectX; using TerraFX.Interop.Windows; diff --git a/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs b/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs index faa4a945b..4e72e9c8f 100644 --- a/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs +++ b/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs @@ -7,6 +7,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ImGuiBackend.Helpers; using Dalamud.Interface.ImGuiBackend.Helpers.D3D11; using Dalamud.Interface.Textures; @@ -14,9 +15,6 @@ using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures.TextureWraps.Internal; using Dalamud.Interface.Utility; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.DirectX; using TerraFX.Interop.Windows; diff --git a/Dalamud/Interface/ImGuiBackend/Renderers/IImGuiRenderer.cs b/Dalamud/Interface/ImGuiBackend/Renderers/IImGuiRenderer.cs index 83149c960..2aa0cb086 100644 --- a/Dalamud/Interface/ImGuiBackend/Renderers/IImGuiRenderer.cs +++ b/Dalamud/Interface/ImGuiBackend/Renderers/IImGuiRenderer.cs @@ -1,10 +1,9 @@ using System.Runtime.CompilerServices; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Textures; using Dalamud.Interface.Textures.TextureWraps; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.ImGuiBackend.Renderers; /// A simple shared public interface that all ImGui render implementations follow. diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs index d9b681f3b..a15fce906 100644 --- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs +++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs @@ -3,9 +3,9 @@ using System.IO; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.ImGuiFileDialog; diff --git a/Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs b/Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs index 97750bb5e..dfecd55fe 100644 --- a/Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs +++ b/Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs @@ -1,12 +1,11 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Internal; using Dalamud.Interface.Utility; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.ImGuiNotification.Internal; /// Represents an active notification. @@ -152,7 +151,7 @@ internal sealed partial class ActiveNotification /// Calculates the effective expiry, taking ImGui window state into account. /// Notification will not dismiss while this paramter is true. /// The calculated effective expiry. - /// Expected to be called BETWEEN and . + /// Expected to be called BETWEEN and . private DateTime CalculateEffectiveExpiry(ref bool warrantsExtension) { DateTime expiry; diff --git a/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs b/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs index dd88d92f6..67cd0ca19 100644 --- a/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs +++ b/Dalamud/Interface/ImGuiNotification/Internal/NotificationManager.cs @@ -1,6 +1,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui; using Dalamud.Interface.GameFonts; using Dalamud.Interface.ManagedFontAtlas; @@ -11,8 +12,6 @@ using Dalamud.IoC.Internal; using Dalamud.Plugin.Internal.Types; using Dalamud.Plugin.Services; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.ImGuiNotification.Internal; /// Class handling notifications/toasts in ImGui. diff --git a/Dalamud/Interface/ImGuiNotification/NotificationUtilities.cs b/Dalamud/Interface/ImGuiNotification/NotificationUtilities.cs index 8b0b2e25c..4196c5351 100644 --- a/Dalamud/Interface/ImGuiNotification/NotificationUtilities.cs +++ b/Dalamud/Interface/ImGuiNotification/NotificationUtilities.cs @@ -3,6 +3,7 @@ using System.Numerics; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Text; using Dalamud.Interface.Internal; using Dalamud.Interface.Internal.Windows; @@ -13,8 +14,6 @@ using Dalamud.Interface.Utility; using Dalamud.Plugin.Internal.Types; using Dalamud.Storage.Assets; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.ImGuiNotification; /// Utilities for implementing stuff under . diff --git a/Dalamud/Interface/ImGuiSeStringRenderer/Internal/SeStringRenderer.cs b/Dalamud/Interface/ImGuiSeStringRenderer/Internal/SeStringRenderer.cs index 785e7deb8..bc56b25c4 100644 --- a/Dalamud/Interface/ImGuiSeStringRenderer/Internal/SeStringRenderer.cs +++ b/Dalamud/Interface/ImGuiSeStringRenderer/Internal/SeStringRenderer.cs @@ -4,19 +4,15 @@ using System.Runtime.InteropServices; using System.Text; using BitFaster.Caching.Lru; - +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Interface.ImGuiSeStringRenderer.Internal.TextProcessing; using Dalamud.Interface.Utility; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.UI; - -using Dalamud.Bindings.ImGui; - using Lumina.Excel.Sheets; using Lumina.Text; using Lumina.Text.Parse; diff --git a/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawParams.cs b/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawParams.cs index 62842b1ba..f3d4c44e9 100644 --- a/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawParams.cs +++ b/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawParams.cs @@ -21,7 +21,7 @@ public record struct SeStringDrawParams public SeStringReplacementEntity.GetEntityDelegate? GetEntity { get; set; } /// Gets or sets the screen offset of the left top corner. - /// Screen offset to draw at, or null to use . + /// Screen offset to draw at, or null to use . public Vector2? ScreenOffset { get; set; } /// Gets or sets the font to use. @@ -40,7 +40,7 @@ public record struct SeStringDrawParams /// Gets or sets the wrapping width. /// Width in pixels, or null to wrap at the end of available content region from - /// (the default). + /// (the default). public float? WrapWidth { get; set; } /// Gets or sets the thickness of underline under links. diff --git a/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawState.cs b/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawState.cs index 421837c4d..64a7f3db3 100644 --- a/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawState.cs +++ b/Dalamud/Interface/ImGuiSeStringRenderer/SeStringDrawState.cs @@ -3,13 +3,10 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ImGuiSeStringRenderer.Internal; using Dalamud.Interface.Utility; - using FFXIVClientStructs.FFXIV.Component.GUI; - -using Dalamud.Bindings.ImGui; - using Lumina.Text.Payloads; using Lumina.Text.ReadOnly; diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index 6fff5e851..7106c94e5 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -7,6 +7,8 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using CheapLoc; +using Dalamud.Bindings.ImGui; +using Dalamud.Bindings.ImPlot; using Dalamud.Configuration.Internal; using Dalamud.Console; using Dalamud.Data; @@ -35,14 +37,9 @@ using Dalamud.Logging.Internal; using Dalamud.Plugin.Internal; using Dalamud.Storage.Assets; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.System.Framework; using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Component.GUI; - -using Dalamud.Bindings.ImGui; -using Dalamud.Bindings.ImPlot; - using PInvoke; using Serilog.Events; diff --git a/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.Buttons.cs b/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.Buttons.cs index 1eb18e428..6e332e69c 100644 --- a/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.Buttons.cs +++ b/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.Buttons.cs @@ -1,11 +1,10 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.DesignSystem; /// diff --git a/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.PluginPicker.cs b/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.PluginPicker.cs index 0ff7b525c..420f358d8 100644 --- a/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.PluginPicker.cs +++ b/Dalamud/Interface/Internal/DesignSystem/DalamudComponents.PluginPicker.cs @@ -2,15 +2,13 @@ using System.Numerics; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal.Types; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.DesignSystem; /// diff --git a/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs b/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs index 651b8dcca..b7bfd21f1 100644 --- a/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs +++ b/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs @@ -3,13 +3,10 @@ using System.Runtime.InteropServices; using System.Text; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui.Toast; using Dalamud.Interface.Utility; using Dalamud.Logging.Internal; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.Windows; using static TerraFX.Interop.Windows.Windows; diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index 140189c6a..d6624e54e 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game; using Dalamud.Game.ClientState.GamePad; @@ -34,13 +34,8 @@ using Dalamud.Logging.Internal; using Dalamud.Plugin.Services; using Dalamud.Utility; using Dalamud.Utility.Timing; - using FFXIVClientStructs.FFXIV.Client.Graphics.Environment; - -using Dalamud.Bindings.ImGui; - using JetBrains.Annotations; - using TerraFX.Interop.DirectX; using TerraFX.Interop.Windows; diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs index fa45c505e..2c78457e7 100644 --- a/Dalamud/Interface/Internal/UiDebug.cs +++ b/Dalamud/Interface/Internal/UiDebug.cs @@ -1,17 +1,15 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Game.Gui; using Dalamud.Interface.ImGuiSeStringRenderer.Internal; using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Utility; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; - using Lumina.Text.ReadOnly; // Customised version of https://github.com/aers/FFXIVUIDebug diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs index d19633227..f9853d506 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs @@ -1,12 +1,10 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Internal.UiDebug2.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Memory; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; - using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType; namespace Dalamud.Interface.Internal.UiDebug2.Browsing; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs index 2d753611d..abb07e8b9 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; -using Dalamud.Interface.Components; - -using FFXIVClientStructs.FFXIV.Component.GUI; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Components; +using FFXIVClientStructs.FFXIV.Component.GUI; using static Dalamud.Interface.FontAwesomeIcon; using static Dalamud.Interface.Internal.UiDebug2.ElementSelector; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs index 0dd7a9a57..e091187d5 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs @@ -1,10 +1,9 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags; using static Dalamud.Bindings.ImGui.ImGuiTableFlags; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs index 003071baa..7b7902368 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; -using FFXIVClientStructs.FFXIV.Component.GUI; using Dalamud.Bindings.ImGui; +using FFXIVClientStructs.FFXIV.Component.GUI; using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui; using static Dalamud.Utility.Util; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs index 188045de7..b940dddea 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Components; using Dalamud.Interface.Internal.UiDebug2.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; -using static Dalamud.Interface.ColorHelpers; -using static Dalamud.Interface.FontAwesomeIcon; -using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui; -using static Dalamud.Interface.Utility.ImGuiHelpers; using static Dalamud.Bindings.ImGui.ImGuiColorEditFlags; using static Dalamud.Bindings.ImGui.ImGuiInputTextFlags; using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags; using static Dalamud.Bindings.ImGui.ImGuiTableFlags; +using static Dalamud.Interface.ColorHelpers; +using static Dalamud.Interface.FontAwesomeIcon; +using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui; +using static Dalamud.Interface.Utility.ImGuiHelpers; namespace Dalamud.Interface.Internal.UiDebug2.Browsing; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs index 77768a6f5..cd91e4a9f 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs @@ -1,19 +1,18 @@ using System.Numerics; using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; +using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags; +using static Dalamud.Bindings.ImGui.ImGuiTableFlags; +using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags; using static Dalamud.Interface.ColorHelpers; using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui; using static Dalamud.Utility.Util; using static FFXIVClientStructs.FFXIV.Component.GUI.TextureType; -using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags; -using static Dalamud.Bindings.ImGui.ImGuiTableFlags; -using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags; namespace Dalamud.Interface.Internal.UiDebug2.Browsing; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs index cca1c08a6..f2eb99351 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs @@ -1,7 +1,6 @@ -using Dalamud.Interface.Internal.UiDebug2.Utility; - -using FFXIVClientStructs.FFXIV.Component.GUI; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Internal.UiDebug2.Utility; +using FFXIVClientStructs.FFXIV.Component.GUI; using static Dalamud.Interface.ColorHelpers; using static Dalamud.Utility.Util; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs index 36bc78eed..a0368b945 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs @@ -1,15 +1,14 @@ using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Interface.ImGuiSeStringRenderer; using Dalamud.Interface.Internal.UiDebug2.Utility; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; using static Dalamud.Interface.ColorHelpers; using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui; diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs index 196b7571e..1a67ae9f5 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs @@ -2,20 +2,19 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Client.Graphics; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; +using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags; +using static Dalamud.Bindings.ImGui.ImGuiTableFlags; +using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags; using static Dalamud.Interface.ColorHelpers; using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui; using static Dalamud.Utility.Util; using static FFXIVClientStructs.FFXIV.Component.GUI.NodeType; -using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags; -using static Dalamud.Bindings.ImGui.ImGuiTableFlags; -using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags; // ReSharper disable SuggestBaseTypeForParameter namespace Dalamud.Interface.Internal.UiDebug2.Browsing; diff --git a/Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs b/Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs index ac03ffe8e..3f3169e67 100644 --- a/Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs +++ b/Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs @@ -3,23 +3,23 @@ using System.Globalization; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Components; using Dalamud.Interface.Internal.UiDebug2.Browsing; using Dalamud.Interface.Internal.UiDebug2.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; using static System.Globalization.NumberFormatInfo; +using static Dalamud.Bindings.ImGui.ImGuiCol; +using static Dalamud.Bindings.ImGui.ImGuiWindowFlags; using static Dalamud.Interface.FontAwesomeIcon; using static Dalamud.Interface.Internal.UiDebug2.UiDebug2; using static Dalamud.Interface.UiBuilder; using static Dalamud.Interface.Utility.ImGuiHelpers; using static FFXIVClientStructs.FFXIV.Component.GUI.NodeFlags; -using static Dalamud.Bindings.ImGui.ImGuiCol; -using static Dalamud.Bindings.ImGui.ImGuiWindowFlags; + // ReSharper disable StructLacksIEquatable.Global #pragma warning disable CS0659 diff --git a/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs b/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs index 31fb26f7c..4684caa60 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs @@ -1,9 +1,9 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Internal.UiDebug2.Browsing; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Windowing; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.UiDebug2; diff --git a/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs b/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs index 57217ea1f..da4b95256 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs @@ -1,10 +1,10 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Internal.UiDebug2.Browsing; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Windowing; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; using static Dalamud.Interface.Internal.UiDebug2.UiDebug2; diff --git a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs b/Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs index f7a392bb4..d72c3dd41 100644 --- a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs +++ b/Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Components; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; using static System.StringComparison; + using static Dalamud.Interface.FontAwesomeIcon; namespace Dalamud.Interface.Internal.UiDebug2; diff --git a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs b/Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs index cd92a7f59..b5f6547f4 100644 --- a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs +++ b/Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs @@ -1,16 +1,14 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui; using Dalamud.Interface.Internal.UiDebug2.Browsing; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Windowing; using Dalamud.Logging.Internal; using Dalamud.Plugin.Services; - using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; - using static Dalamud.Bindings.ImGui.ImGuiWindowFlags; namespace Dalamud.Interface.Internal.UiDebug2; diff --git a/Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs b/Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs index 7987d9a40..759c75587 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs @@ -1,13 +1,12 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Client.Graphics; -using Dalamud.Bindings.ImGui; -using static Dalamud.Interface.ColorHelpers; using static Dalamud.Bindings.ImGui.ImGuiCol; +using static Dalamud.Interface.ColorHelpers; namespace Dalamud.Interface.Internal.UiDebug2.Utility; diff --git a/Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs b/Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs index 55dabf539..832c7f357 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs @@ -2,11 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using FFXIVClientStructs.FFXIV.Component.GUI; -using Dalamud.Bindings.ImGui; using static System.MathF; + using static Dalamud.Interface.ColorHelpers; namespace Dalamud.Interface.Internal.UiDebug2.Utility; diff --git a/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs b/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs index a8dd6bd37..4af9b7cfd 100644 --- a/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs +++ b/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs @@ -5,13 +5,12 @@ using System.Linq; using System.Net.Http.Json; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing; using Dalamud.Networking.Http; - -using Dalamud.Bindings.ImGui; using Newtonsoft.Json; namespace Dalamud.Interface.Internal.Windows; diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs index 9e5f37884..bb53779c7 100644 --- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Numerics; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game; using Dalamud.Game.Gui; @@ -22,11 +22,8 @@ using Dalamud.Plugin.Internal.AutoUpdate; using Dalamud.Plugin.Services; using Dalamud.Storage.Assets; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.UI; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows; /// diff --git a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs index 93e62d15d..5e8ce1f12 100644 --- a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Numerics; using System.Reflection; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Windowing; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows; diff --git a/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs index 1d9cb863a..1d9f2f9e3 100644 --- a/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Animation; using Dalamud.Interface.Animation.EasingFunctions; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows; diff --git a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs index 1baa6f7fc..c0a50ddc9 100644 --- a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs @@ -7,6 +7,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Console; using Dalamud.Game; @@ -21,9 +22,6 @@ using Dalamud.Interface.Windowing; using Dalamud.Plugin.Internal; using Dalamud.Plugin.Services; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using Serilog; using Serilog.Events; diff --git a/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs b/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs index 0984b2a79..f37fee404 100644 --- a/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs +++ b/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs @@ -1,14 +1,13 @@ using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui; using Dalamud.Interface.Components; using Dalamud.Interface.Internal.Windows.Data.Widgets; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows.Data; diff --git a/Dalamud/Interface/Internal/Windows/Data/DataWindowWidgetExtensions.cs b/Dalamud/Interface/Internal/Windows/Data/DataWindowWidgetExtensions.cs index a2c519fca..662118fb5 100644 --- a/Dalamud/Interface/Internal/Windows/Data/DataWindowWidgetExtensions.cs +++ b/Dalamud/Interface/Internal/Windows/Data/DataWindowWidgetExtensions.cs @@ -1,10 +1,9 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data; /// Useful functions for implementing data window widgets. diff --git a/Dalamud/Interface/Internal/Windows/Data/GameInventoryTestWidget.cs b/Dalamud/Interface/Internal/Windows/Data/GameInventoryTestWidget.cs index dad98684c..097967e4b 100644 --- a/Dalamud/Interface/Internal/Windows/Data/GameInventoryTestWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/GameInventoryTestWidget.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game.Inventory; using Dalamud.Game.Inventory.InventoryEventArgTypes; @@ -7,9 +8,6 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Logging.Internal; - -using Dalamud.Bindings.ImGui; - using Serilog.Events; namespace Dalamud.Interface.Internal.Windows.Data; diff --git a/Dalamud/Interface/Internal/Windows/Data/WidgetUtil.cs b/Dalamud/Interface/Internal/Windows/Data/WidgetUtil.cs index 3d99c5d7c..57e654c44 100644 --- a/Dalamud/Interface/Internal/Windows/Data/WidgetUtil.cs +++ b/Dalamud/Interface/Internal/Windows/Data/WidgetUtil.cs @@ -1,6 +1,5 @@ -using Dalamud.Interface.Utility; - using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; namespace Dalamud.Interface.Internal.Windows.Data; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs index 8bf968dc8..81350f5b2 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs @@ -1,12 +1,11 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Addon.Lifecycle; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonWidget.cs index 38ca26b7c..8b63ab14a 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonWidget.cs @@ -1,7 +1,7 @@ -using Dalamud.Game.Gui; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.Gui; using Dalamud.Memory; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs index 183cb50e3..b46266e37 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs index 0e45f8ab6..20ffb816d 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.ClientState.Aetherytes; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.Aetherytes; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AtkArrayDataBrowserWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AtkArrayDataBrowserWidget.cs index 1a030ad54..d41b43fd5 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AtkArrayDataBrowserWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AtkArrayDataBrowserWidget.cs @@ -1,13 +1,10 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; - using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Component.GUI; - -using Dalamud.Bindings.ImGui; - using Lumina.Text.ReadOnly; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/BuddyListWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/BuddyListWidget.cs index 0298f879a..b221dda7f 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/BuddyListWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/BuddyListWidget.cs @@ -1,6 +1,6 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Buddy; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/CommandWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/CommandWidget.cs index 254bfc10c..feef82ce1 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/CommandWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/CommandWidget.cs @@ -1,10 +1,9 @@ using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Command; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs index f32db563d..eca1cffb2 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs @@ -1,8 +1,7 @@ -using Dalamud.Game.ClientState.Conditions; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.Conditions; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/DataShareWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/DataShareWidget.cs index ca697642f..534911708 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/DataShareWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/DataShareWidget.cs @@ -5,14 +5,12 @@ using System.Numerics; using System.Reflection; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin.Ipc.Internal; - -using Dalamud.Bindings.ImGui; - using Newtonsoft.Json; using Formatting = Newtonsoft.Json.Formatting; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs index a7965eb8f..fd23987b3 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs @@ -1,12 +1,11 @@ using System.Linq; using System.Threading; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game; using Dalamud.Game.Gui.Dtr; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs index 9e715f9bf..48f03f1d0 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs @@ -1,10 +1,9 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Fates; using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/FlyTextWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/FlyTextWidget.cs index da1dc071a..aa4718143 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/FlyTextWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/FlyTextWidget.cs @@ -1,8 +1,7 @@ using System.Numerics; -using Dalamud.Game.Gui.FlyText; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.Gui.FlyText; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/FontAwesomeTestWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/FontAwesomeTestWidget.cs index fd25e3025..3b8c29d9e 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/FontAwesomeTestWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/FontAwesomeTestWidget.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Numerics; -using Dalamud.Interface.Utility; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs index ccd9788c7..65e6cd3d6 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs @@ -1,8 +1,7 @@ -using Dalamud.Game.ClientState.GamePad; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.GamePad; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/GaugeWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/GaugeWidget.cs index 1dfb1a66b..a1770474f 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/GaugeWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/GaugeWidget.cs @@ -1,8 +1,8 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState; using Dalamud.Game.ClientState.JobGauge; using Dalamud.Game.ClientState.JobGauge.Types; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/HookWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/HookWidget.cs index 59cdfe1ab..d1b2d6612 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/HookWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/HookWidget.cs @@ -1,12 +1,11 @@ using System.Runtime.InteropServices; -using Windows.Win32.Foundation; -using Windows.Win32.UI.WindowsAndMessaging; - -using Dalamud.Hooking; using Dalamud.Bindings.ImGui; +using Dalamud.Hooking; using PInvoke; using Serilog; +using Windows.Win32.Foundation; +using Windows.Win32.UI.WindowsAndMessaging; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/IconBrowserWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/IconBrowserWidget.cs index d07117472..f0d1a355d 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/IconBrowserWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/IconBrowserWidget.cs @@ -2,14 +2,13 @@ using System.Numerics; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Internal; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs index 1dcf393f1..44a7eb719 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Text; using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; @@ -11,8 +12,6 @@ using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Windowing; using Dalamud.Storage.Assets; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs index dd54d4cdf..2d9c1ff52 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs @@ -2,6 +2,7 @@ using System.Buffers.Binary; using System.Numerics; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game.Inventory; using Dalamud.Game.Text; @@ -10,11 +11,7 @@ using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.Game; - -using Dalamud.Bindings.ImGui; - using Lumina.Excel.Sheets; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs index bf4c87306..fa615ed47 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs @@ -1,8 +1,7 @@ -using Dalamud.Game.ClientState.Keys; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.Keys; using Dalamud.Interface.Colors; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs index a5b7056d1..1c6c84b3e 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs @@ -1,11 +1,11 @@ using System.Collections.Concurrent; using System.Globalization; +using Dalamud.Bindings.ImGui; using Dalamud.Game.MarketBoard; using Dalamud.Game.Network.Structures; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; using ImGuiTable = Dalamud.Interface.Utility.ImGuiTable; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs index e6bd630ce..552400588 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Network; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Memory; -using Dalamud.Bindings.ImGui; - using ImGuiTable = Dalamud.Interface.Utility.ImGuiTable; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/NounProcessorWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/NounProcessorWidget.cs index 8c5e11d1c..f13a590b3 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/NounProcessorWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/NounProcessorWidget.cs @@ -1,14 +1,13 @@ using System.Linq; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game; using Dalamud.Game.ClientState; using Dalamud.Game.Text.Noun; using Dalamud.Game.Text.Noun.Enums; using Dalamud.Interface.Utility.Raii; - -using Dalamud.Bindings.ImGui; using Lumina.Data; using Lumina.Excel; using Lumina.Excel.Sheets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/ObjectTableWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/ObjectTableWidget.cs index 3fd67b057..f20c4db8d 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/ObjectTableWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/ObjectTableWidget.cs @@ -1,10 +1,10 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState; using Dalamud.Game.ClientState.Objects; using Dalamud.Game.Gui; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/PartyListWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/PartyListWidget.cs index 0f505746d..d4507328a 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/PartyListWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/PartyListWidget.cs @@ -1,6 +1,6 @@ -using Dalamud.Game.ClientState.Party; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.Party; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/PluginIpcWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/PluginIpcWidget.cs index 029fce1e0..1584705a9 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/PluginIpcWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/PluginIpcWidget.cs @@ -1,10 +1,10 @@ -using Dalamud.Game.ClientState; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState; using Dalamud.Game.ClientState.Objects; using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Plugin.Ipc; using Dalamud.Plugin.Ipc.Internal; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs index a3e1cbb11..56a0d0073 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs @@ -1,7 +1,7 @@ using System.Linq; -using Dalamud.Game.Text; using Dalamud.Bindings.ImGui; +using Dalamud.Game.Text; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs index 4fca97ea4..a49c01e92 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Numerics; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Data; using Dalamud.Game; @@ -13,14 +14,10 @@ using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Memory; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Component.Text; - -using Dalamud.Bindings.ImGui; - using Lumina.Data; using Lumina.Data.Files.Excel; using Lumina.Data.Structs.Excel; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringRendererTestWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringRendererTestWidget.cs index 8a000e55b..57501ff57 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringRendererTestWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringRendererTestWidget.cs @@ -1,6 +1,7 @@ using System.Numerics; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game.Gui; using Dalamud.Game.Text.SeStringHandling.Payloads; @@ -10,11 +11,7 @@ using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Utility; using Dalamud.Storage.Assets; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Component.GUI; - -using Dalamud.Bindings.ImGui; - using Lumina.Excel.Sheets; using Lumina.Text; using Lumina.Text.Payloads; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs index 61053ddb9..8971f7fc8 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs @@ -3,13 +3,12 @@ using System.Linq; using System.Numerics; using System.Reflection; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.IoC.Internal; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/TargetWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/TargetWidget.cs index bcea447f1..780d7e54f 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/TargetWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/TargetWidget.cs @@ -1,8 +1,8 @@ -using Dalamud.Game.ClientState; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState; using Dalamud.Game.ClientState.Objects; using Dalamud.Interface.Utility; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/TaskSchedulerWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/TaskSchedulerWidget.cs index f53f58495..adaff5496 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/TaskSchedulerWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/TaskSchedulerWidget.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; @@ -16,8 +17,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Logging.Internal; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; @@ -314,10 +313,10 @@ internal class TaskSchedulerWidget : IDataWindowWidget } catch (Exception e) { - Log.Error(e, "Failed to download {from} to {to}.", url, localPath); + Log.Error(e, "Failed to download {from} to {to}.", this.url, this.localPath); try { - File.Delete(localPath); + File.Delete(this.localPath); } catch { diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/TexWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/TexWidget.cs index e23324544..d46789c33 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/TexWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/TexWidget.cs @@ -6,6 +6,7 @@ using System.Reflection; using System.Runtime.Loader; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Components; using Dalamud.Interface.Textures; @@ -16,9 +17,6 @@ using Dalamud.Interface.Utility.Internal; using Dalamud.Plugin.Services; using Dalamud.Storage.Assets; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.DirectX; using TextureManager = Dalamud.Interface.Textures.Internal.TextureManager; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/ToastWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/ToastWidget.cs index 6917eb178..c9d3c119d 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/ToastWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/ToastWidget.cs @@ -1,10 +1,9 @@ using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui.Toast; using Dalamud.Interface.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Data.Widgets; /// diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs index 673303aac..8334db8e9 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs @@ -2,13 +2,11 @@ using System.Buffers.Binary; using System.Numerics; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; using Dalamud.Interface.ImGuiSeStringRenderer.Internal; - -using Dalamud.Bindings.ImGui; - using Lumina.Excel.Sheets; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/UldWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/UldWidget.cs index 4af7f9eec..1cf1f06c1 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/UldWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/UldWidget.cs @@ -5,6 +5,7 @@ using System.Numerics; using System.Threading; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game; using Dalamud.Interface.Colors; @@ -12,9 +13,6 @@ using Dalamud.Interface.Components; using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Utility; using Dalamud.Memory; - -using Dalamud.Bindings.ImGui; - using Lumina.Data.Files; using Lumina.Data.Parsing.Uld; diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/VfsWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/VfsWidget.cs index eb18a8bcf..e91bfd3fa 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/VfsWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/VfsWidget.cs @@ -1,9 +1,9 @@ using System.Diagnostics; using System.IO; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Storage; -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows.Data.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs b/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs index 12e676671..91f7f02d9 100644 --- a/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs +++ b/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs @@ -1,9 +1,9 @@ using System.Numerics; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows; diff --git a/Dalamud/Interface/Internal/Windows/HitchSettingsWindow.cs b/Dalamud/Interface/Internal/Windows/HitchSettingsWindow.cs index 9297ba28b..991237ad5 100644 --- a/Dalamud/Interface/Internal/Windows/HitchSettingsWindow.cs +++ b/Dalamud/Interface/Internal/Windows/HitchSettingsWindow.cs @@ -1,8 +1,7 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Windowing; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows; /// diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs index 33ba4fa12..929c2afa6 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Console; using Dalamud.Game.Command; @@ -34,8 +34,6 @@ using Dalamud.Plugin.Internal.Types.Manifest; using Dalamud.Support; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.PluginInstaller; /// diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs index 2031fde40..d1bb8031b 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs @@ -3,6 +3,7 @@ using System.Numerics; using System.Threading.Tasks; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; @@ -14,7 +15,6 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal.Profiles; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows.PluginInstaller; diff --git a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs index 554559910..0d24cb971 100644 --- a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Numerics; using System.Reflection; +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Hooking.Internal; using Dalamud.Interface.Components; @@ -12,7 +13,6 @@ using Dalamud.Interface.Windowing; using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal.Types; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows; diff --git a/Dalamud/Interface/Internal/Windows/ProfilerWindow.cs b/Dalamud/Interface/Internal/Windows/ProfilerWindow.cs index 036858c75..9ec184d6e 100644 --- a/Dalamud/Interface/Internal/Windows/ProfilerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ProfilerWindow.cs @@ -3,12 +3,12 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing; using Dalamud.Utility.Numerics; using Dalamud.Utility.Timing; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs index a678f8d4f..4ddb775e4 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; using Dalamud.Interface.Internal.Windows.SelfTest.Steps; @@ -9,7 +10,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Windowing; using Dalamud.Logging.Internal; -using Dalamud.Bindings.ImGui; using Lumina.Excel.Sheets; namespace Dalamud.Interface.Internal.Windows.SelfTest; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs index 2c1a7faab..cd1b2a6c9 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs @@ -1,6 +1,6 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Objects; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs index 230bf90e2..9a26ba2bf 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle.AddonArgTypes; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs index 4ae43729e..36cba1ec6 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs @@ -1,6 +1,6 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Aetherytes; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs index 0b7dbaa67..c2351cfd2 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs @@ -1,9 +1,8 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui; using Dalamud.Game.Text; using Dalamud.Game.Text.SeStringHandling; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs index ddd079559..c0ef97061 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.ClientState.Conditions; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.Conditions; using Serilog; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs index 92004b9f0..a829a8bdc 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.Gui.ContextMenu; using Dalamud.Game.Text; using Dalamud.Game.Text.SeStringHandling; -using Dalamud.Bindings.ImGui; using Lumina.Excel; using Lumina.Excel.Sheets; using Serilog; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs index 44a448fbb..70ca33e70 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.DutyState; - -using Dalamud.Bindings.ImGui; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.DutyState; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs index f81be3150..b5be2985c 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.ClientState; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs index edaa2febe..c3f3a3215 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs @@ -1,6 +1,6 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Fates; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs index 3a4c5e2ac..abeac2203 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.Config; - -using Dalamud.Bindings.ImGui; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.Config; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs index 7c6a7951b..bd0603cda 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.Gui; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.Gui; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs index 9e02742fe..7d16585d4 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs @@ -1,9 +1,8 @@ -using Dalamud.Game.Gui; +using Dalamud.Bindings.ImGui; +using Dalamud.Game.Gui; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling.Payloads; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs index e80aece76..230239b56 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.ClientState.Keys; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.Keys; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs index 876722d8c..b65fdfa6e 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.ClientState; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs index b15fcb42c..524c0df0d 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.ClientState; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs index ec5b57fb9..d44467577 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs @@ -1,9 +1,9 @@ using System.Globalization; using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Game.MarketBoard; using Dalamud.Game.Network.Structures; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs index 440819b67..c6d789d5b 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui.NamePlate; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling.Payloads; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs index 7a95f66ba..7b3c74aa5 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs @@ -1,9 +1,8 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Game.Text.Noun; using Dalamud.Game.Text.Noun.Enums; -using Dalamud.Bindings.ImGui; - using LSheets = Lumina.Excel.Sheets; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs index e8746c8b2..f431d5a3b 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs @@ -1,8 +1,7 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui.PartyFinder; using Dalamud.Game.Gui.PartyFinder.Types; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs index 329c96990..8830e7239 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs @@ -1,8 +1,6 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState; using Dalamud.Game.Text.Evaluator; - -using Dalamud.Bindings.ImGui; - using Lumina.Text.ReadOnly; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs index cb9782d5e..f28b658de 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs @@ -1,13 +1,11 @@ using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Game.Text.Evaluator.Internal; - using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.UI.Misc; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs index ae074c4f3..371cacdbc 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs @@ -1,9 +1,8 @@ +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Objects; using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.Types; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; /// diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs index 19b13f4a5..c3779865d 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs @@ -1,6 +1,5 @@ -using Dalamud.Game.Gui.Toast; - using Dalamud.Bindings.ImGui; +using Dalamud.Game.Gui.Toast; namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps; diff --git a/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs index 2548ef2ce..30aa62136 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Numerics; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Interface.Internal.Windows.Settings.Tabs; @@ -12,8 +12,6 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Windowing; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings; /// diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAbout.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAbout.cs index 55ea3638c..9d6c0d2be 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAbout.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAbout.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Numerics; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Gui; using Dalamud.Interface.GameFonts; using Dalamud.Interface.ManagedFontAtlas; @@ -15,7 +16,6 @@ using Dalamud.Plugin.Internal; using Dalamud.Storage.Assets; using Dalamud.Utility; using FFXIVClientStructs.FFXIV.Client.Game.UI; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Settings.Tabs; diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAutoUpdate.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAutoUpdate.cs index 66e3aa2ed..36bfdeb36 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAutoUpdate.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAutoUpdate.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Numerics; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; @@ -14,8 +15,6 @@ using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal.AutoUpdate; using Dalamud.Plugin.Internal.Types; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings.Tabs; [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Internals")] diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs index 5a7ad82ab..ff1df30c5 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs @@ -4,14 +4,13 @@ using System.Linq; using System.Numerics; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game.Gui.Dtr; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; using Dalamud.Interface.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings.Tabs; [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Internals")] diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabLook.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabLook.cs index 6db8cb6d1..78ffdc514 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabLook.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabLook.cs @@ -4,6 +4,7 @@ using System.Numerics; using System.Text; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game; using Dalamud.Game.Text; @@ -16,7 +17,6 @@ using Dalamud.Interface.Internal.Windows.Settings.Widgets; using Dalamud.Interface.ManagedFontAtlas.Internals; using Dalamud.Interface.Utility; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Internal.Windows.Settings.Tabs; diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/ButtonSettingsEntry.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/ButtonSettingsEntry.cs index a7f546390..8802963e3 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/ButtonSettingsEntry.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/ButtonSettingsEntry.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/DevPluginsSettingsEntry.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/DevPluginsSettingsEntry.cs index 4b8e50890..fb46554d6 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/DevPluginsSettingsEntry.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/DevPluginsSettingsEntry.cs @@ -6,6 +6,7 @@ using System.Numerics; using System.Threading.Tasks; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; @@ -15,8 +16,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin.Internal; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Internals")] diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/EnumSettingsEntry{T}.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/EnumSettingsEntry{T}.cs index a6fedc4c0..40a64ff68 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/EnumSettingsEntry{T}.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/EnumSettingsEntry{T}.cs @@ -2,14 +2,12 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; - using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Internals")] diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/GapSettingsEntry.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/GapSettingsEntry.cs index 58e4984e4..88982b825 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/GapSettingsEntry.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/GapSettingsEntry.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; -using Dalamud.Interface.Utility; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/LanguageChooserSettingsEntry.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/LanguageChooserSettingsEntry.cs index 816a34f0a..6589a9d64 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/LanguageChooserSettingsEntry.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/LanguageChooserSettingsEntry.cs @@ -3,12 +3,11 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Internals")] diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/SettingsEntry{T}.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/SettingsEntry{T}.cs index 751e262ef..a29967c96 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/SettingsEntry{T}.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/SettingsEntry{T}.cs @@ -2,14 +2,12 @@ using System.Diagnostics.CodeAnalysis; using System.IO; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; - using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Internals")] diff --git a/Dalamud/Interface/Internal/Windows/Settings/Widgets/ThirdRepoSettingsEntry.cs b/Dalamud/Interface/Internal/Windows/Settings/Widgets/ThirdRepoSettingsEntry.cs index d63718fa3..185fdea05 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Widgets/ThirdRepoSettingsEntry.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Widgets/ThirdRepoSettingsEntry.cs @@ -5,6 +5,7 @@ using System.Numerics; using System.Threading.Tasks; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; @@ -13,7 +14,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin.Internal; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Internal.Windows.Settings.Widgets; diff --git a/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs b/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs index ae01dab36..9f6dc3f32 100644 --- a/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs +++ b/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs @@ -4,6 +4,7 @@ using System.Numerics; using System.Reflection; using CheapLoc; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; @@ -11,8 +12,6 @@ using Dalamud.Interface.Style; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - using Serilog; namespace Dalamud.Interface.Internal.Windows.StyleEditor; diff --git a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs index 2b0284b68..0f7b354bc 100644 --- a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs +++ b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Console; using Dalamud.Game; @@ -21,13 +22,8 @@ using Dalamud.Plugin.Internal; using Dalamud.Plugin.Services; using Dalamud.Storage.Assets; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Component.GUI; - -using Dalamud.Bindings.ImGui; - using Lumina.Text.ReadOnly; - using Serilog; using LSeStringBuilder = Lumina.Text.SeStringBuilder; diff --git a/Dalamud/Interface/ManagedFontAtlas/FontAtlasBuildStep.cs b/Dalamud/Interface/ManagedFontAtlas/FontAtlasBuildStep.cs index 652b677b7..0449bbe09 100644 --- a/Dalamud/Interface/ManagedFontAtlas/FontAtlasBuildStep.cs +++ b/Dalamud/Interface/ManagedFontAtlas/FontAtlasBuildStep.cs @@ -1,3 +1,5 @@ +using Dalamud.Bindings.ImGui; + namespace Dalamud.Interface.ManagedFontAtlas; /// diff --git a/Dalamud/Interface/ManagedFontAtlas/IFontAtlasBuildToolkitPreBuild.cs b/Dalamud/Interface/ManagedFontAtlas/IFontAtlasBuildToolkitPreBuild.cs index ed6f14156..16cb83979 100644 --- a/Dalamud/Interface/ManagedFontAtlas/IFontAtlasBuildToolkitPreBuild.cs +++ b/Dalamud/Interface/ManagedFontAtlas/IFontAtlasBuildToolkitPreBuild.cs @@ -97,12 +97,12 @@ public interface IFontAtlasBuildToolkitPreBuild : IFontAtlasBuildToolkit /// Adds a font from memory region allocated using .
/// It WILL crash if you try to use a memory pointer allocated in some other way.
/// - /// Do NOT call on the once this function has + /// Do NOT call on the once this function has /// been called, unless is set and the function has thrown an error. /// /// /// Memory address for the data allocated using . - /// The size of the font file.. + /// The size of the font file. /// The font config. /// Free if an exception happens. /// A debug tag. diff --git a/Dalamud/Interface/ManagedFontAtlas/IFontHandle.cs b/Dalamud/Interface/ManagedFontAtlas/IFontHandle.cs index 82d3e0999..0e5a445cc 100644 --- a/Dalamud/Interface/ManagedFontAtlas/IFontHandle.cs +++ b/Dalamud/Interface/ManagedFontAtlas/IFontHandle.cs @@ -1,5 +1,7 @@ using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; + namespace Dalamud.Interface.ManagedFontAtlas; /// diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/DelegateFontHandle.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/DelegateFontHandle.cs index 2f9c9fa7c..199a7abcd 100644 --- a/Dalamud/Interface/ManagedFontAtlas/Internals/DelegateFontHandle.cs +++ b/Dalamud/Interface/ManagedFontAtlas/Internals/DelegateFontHandle.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility; using Dalamud.Logging.Internal; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Interface.ManagedFontAtlas.Internals; /// diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs index 8f77b8084..ae462bb8c 100644 --- a/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs +++ b/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.FontIdentifier; using Dalamud.Interface.GameFonts; @@ -14,11 +15,7 @@ using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; using Dalamud.Storage.Assets; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using SharpDX.DXGI; - using TerraFX.Interop.DirectX; namespace Dalamud.Interface.ManagedFontAtlas.Internals; @@ -265,14 +262,14 @@ internal sealed partial class FontAtlasFactory stream = ms; } - var length = checked((int)(uint)stream.Length); + var length = checked((uint)stream.Length); var memory = ImGuiHelpers.AllocateMemory(length); try { - stream.ReadExactly(new(memory, length)); + stream.ReadExactly(new(memory, checked((int)length))); return this.AddFontFromImGuiHeapAllocatedMemory( memory, - length, + checked((int)length), fontConfig, false, $"{nameof(this.AddFontFromStream)}({debugTag})"); @@ -291,7 +288,7 @@ internal sealed partial class FontAtlasFactory string debugTag) { var length = span.Length; - var memory = ImGuiHelpers.AllocateMemory(length); + var memory = ImGuiHelpers.AllocateMemory(checked((uint)length)); try { span.CopyTo(new(memory, length)); diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.cs index 5a326a9b1..c37434baf 100644 --- a/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.cs +++ b/Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Data; using Dalamud.Game; @@ -17,11 +18,7 @@ using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Plugin.Internal.Types; using Dalamud.Storage.Assets; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using Lumina.Data.Files; - using TerraFX.Interop.DirectX; namespace Dalamud.Interface.ManagedFontAtlas.Internals; diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs index aadea6aea..6fc17f390 100644 --- a/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs +++ b/Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs @@ -4,14 +4,12 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Internal; using Dalamud.Interface.Utility; using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal.Types; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using Serilog; namespace Dalamud.Interface.ManagedFontAtlas.Internals; diff --git a/Dalamud/Interface/ManagedFontAtlas/Internals/GamePrebakedFontHandle.cs b/Dalamud/Interface/ManagedFontAtlas/Internals/GamePrebakedFontHandle.cs index 61aab9e75..57b1e927d 100644 --- a/Dalamud/Interface/ManagedFontAtlas/Internals/GamePrebakedFontHandle.cs +++ b/Dalamud/Interface/ManagedFontAtlas/Internals/GamePrebakedFontHandle.cs @@ -5,15 +5,13 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reactive.Disposables; +using Dalamud.Bindings.ImGui; using Dalamud.Game.Text; using Dalamud.Interface.GameFonts; using Dalamud.Interface.Internal; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using Lumina.Data.Files; using Vector4 = System.Numerics.Vector4; diff --git a/Dalamud/Interface/Style/StyleModel.cs b/Dalamud/Interface/Style/StyleModel.cs index 0dad9a47e..bfce480f2 100644 --- a/Dalamud/Interface/Style/StyleModel.cs +++ b/Dalamud/Interface/Style/StyleModel.cs @@ -2,10 +2,10 @@ using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Colors; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; using Newtonsoft.Json; using Serilog; diff --git a/Dalamud/Interface/Style/StyleModelV1.cs b/Dalamud/Interface/Style/StyleModelV1.cs index 4fc413f5d..2197fd12f 100644 --- a/Dalamud/Interface/Style/StyleModelV1.cs +++ b/Dalamud/Interface/Style/StyleModelV1.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Numerics; -using Dalamud.Interface.Colors; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Newtonsoft.Json; namespace Dalamud.Interface.Style; diff --git a/Dalamud/Interface/Textures/ImGuiViewportTextureArgs.cs b/Dalamud/Interface/Textures/ImGuiViewportTextureArgs.cs index c5274daaa..d04688fe4 100644 --- a/Dalamud/Interface/Textures/ImGuiViewportTextureArgs.cs +++ b/Dalamud/Interface/Textures/ImGuiViewportTextureArgs.cs @@ -1,11 +1,9 @@ using System.Numerics; using System.Text; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Internal; using Dalamud.Interface.Textures.TextureWraps; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.DirectX; namespace Dalamud.Interface.Textures; diff --git a/Dalamud/Interface/Textures/Internal/TextureManager.Drawer.cs b/Dalamud/Interface/Textures/Internal/TextureManager.Drawer.cs index 27cf68b32..41ef761f8 100644 --- a/Dalamud/Interface/Textures/Internal/TextureManager.Drawer.cs +++ b/Dalamud/Interface/Textures/Internal/TextureManager.Drawer.cs @@ -2,11 +2,9 @@ using System.Buffers; using System.Diagnostics.CodeAnalysis; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Storage.Assets; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.DirectX; using TerraFX.Interop.Windows; diff --git a/Dalamud/Interface/Textures/TextureWraps/Internal/ViewportTextureWrap.cs b/Dalamud/Interface/Textures/TextureWraps/Internal/ViewportTextureWrap.cs index 998668f45..946549d52 100644 --- a/Dalamud/Interface/Textures/TextureWraps/Internal/ViewportTextureWrap.cs +++ b/Dalamud/Interface/Textures/TextureWraps/Internal/ViewportTextureWrap.cs @@ -2,15 +2,13 @@ using System.Diagnostics; using System.Threading; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Game; using Dalamud.Interface.Internal; using Dalamud.Interface.Textures.Internal; using Dalamud.Plugin.Internal.Types; using Dalamud.Storage.Assets; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using TerraFX.Interop.DirectX; using TerraFX.Interop.Windows; diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs index 6bc4d9a37..3193cb6bc 100644 --- a/Dalamud/Interface/UiBuilder.cs +++ b/Dalamud/Interface/UiBuilder.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Game; using Dalamud.Game.ClientState; @@ -13,9 +14,6 @@ using Dalamud.Interface.ManagedFontAtlas; using Dalamud.Interface.ManagedFontAtlas.Internals; using Dalamud.Plugin.Internal.Types; using Dalamud.Utility; - -using Dalamud.Bindings.ImGui; - using Serilog; namespace Dalamud.Interface; diff --git a/Dalamud/Interface/Utility/ImGuiClip.cs b/Dalamud/Interface/Utility/ImGuiClip.cs index 261f235b4..73a56d47b 100644 --- a/Dalamud/Interface/Utility/ImGuiClip.cs +++ b/Dalamud/Interface/Utility/ImGuiClip.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; -using Dalamud.Interface.Utility.Raii; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; namespace Dalamud.Interface.Utility; diff --git a/Dalamud/Interface/Utility/ImGuiHelpers.cs b/Dalamud/Interface/Utility/ImGuiHelpers.cs index 18a15a5e0..ac3cfff47 100644 --- a/Dalamud/Interface/Utility/ImGuiHelpers.cs +++ b/Dalamud/Interface/Utility/ImGuiHelpers.cs @@ -465,37 +465,24 @@ public static partial class ImGuiHelpers ImGui.SetCursorPosX((int)((ImGui.GetWindowWidth() - itemWidth) / 2)); /// - /// Allocates memory on the heap using
- /// Memory must be freed using . + /// Allocates memory on the heap using
+ /// Memory must be freed using . ///
/// Note that null is a valid return value when is 0. /// /// The length of allocated memory. /// The allocated memory. - /// If returns null. - public static unsafe void* AllocateMemory(int length) + /// If returns null. + public static unsafe void* AllocateMemory(nuint length) { - // TODO: igMemAlloc takes size_t, which is nint; ImGui.NET apparently interpreted that as uint. - // fix that in ImGui.NET. - switch (length) + var memory = ImGui.MemAlloc((uint)length); + if (memory is null) { - case 0: - return null; - case < 0: - throw new ArgumentOutOfRangeException( - nameof(length), - length, - $"{nameof(length)} cannot be a negative number."); - default: - var memory = ImGui.MemAlloc((uint)length); - if (memory is null) - { - throw new OutOfMemoryException( - $"Failed to allocate {length} bytes using {nameof(ImGui.MemAlloc)}"); - } - - return memory; + throw new OutOfMemoryException( + $"Failed to allocate {length} bytes using {nameof(ImGui.MemAlloc)}"); } + + return memory; } /// diff --git a/Dalamud/Interface/Utility/ImGuiTable.cs b/Dalamud/Interface/Utility/ImGuiTable.cs index 40040a9b5..98df9652e 100644 --- a/Dalamud/Interface/Utility/ImGuiTable.cs +++ b/Dalamud/Interface/Utility/ImGuiTable.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Dalamud.Interface.Utility.Raii; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; namespace Dalamud.Interface.Utility; diff --git a/Dalamud/Interface/Utility/ImVectorWrapper.cs b/Dalamud/Interface/Utility/ImVectorWrapper.cs index 66e7fa070..d501563b1 100644 --- a/Dalamud/Interface/Utility/ImVectorWrapper.cs +++ b/Dalamud/Interface/Utility/ImVectorWrapper.cs @@ -25,7 +25,7 @@ public unsafe struct ImVectorWrapper : IList, IList, IReadOnlyList, IDi /// Initializes a new instance of the struct.
/// If is set to true, you must call after use, /// and the underlying memory for must have been allocated using - /// . Otherwise, it will crash. + /// . Otherwise, it will crash. /// /// The underlying vector. /// The destroyer function to call on item removal. diff --git a/Dalamud/Interface/Utility/Internal/DevTextureSaveMenu.cs b/Dalamud/Interface/Utility/Internal/DevTextureSaveMenu.cs index 2c4bb3799..95143e099 100644 --- a/Dalamud/Interface/Utility/Internal/DevTextureSaveMenu.cs +++ b/Dalamud/Interface/Utility/Internal/DevTextureSaveMenu.cs @@ -4,17 +4,14 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.ImGuiFileDialog; using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification.Internal; using Dalamud.Interface.Internal; using Dalamud.Interface.Textures.Internal; using Dalamud.Interface.Textures.TextureWraps; - -using Dalamud.Bindings.ImGui; - using Serilog; - using TerraFX.Interop.Windows; namespace Dalamud.Interface.Utility.Internal; diff --git a/Dalamud/Interface/Utility/Table/ColumnFlags.cs b/Dalamud/Interface/Utility/Table/ColumnFlags.cs index cc22e17c9..93d40e434 100644 --- a/Dalamud/Interface/Utility/Table/ColumnFlags.cs +++ b/Dalamud/Interface/Utility/Table/ColumnFlags.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Dalamud.Interface.Utility.Raii; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; namespace Dalamud.Interface.Utility.Table; diff --git a/Dalamud/Interface/Utility/Table/ColumnString.cs b/Dalamud/Interface/Utility/Table/ColumnString.cs index 587e3beaf..a6cfc2462 100644 --- a/Dalamud/Interface/Utility/Table/ColumnString.cs +++ b/Dalamud/Interface/Utility/Table/ColumnString.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; -using Dalamud.Interface.Utility.Raii; using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility.Raii; namespace Dalamud.Interface.Utility.Table; diff --git a/Dalamud/Interface/Utility/Table/Table.cs b/Dalamud/Interface/Utility/Table/Table.cs index 5b8e867e7..3507a5540 100644 --- a/Dalamud/Interface/Utility/Table/Table.cs +++ b/Dalamud/Interface/Utility/Table/Table.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; +using Dalamud.Bindings.ImGui; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using Dalamud.Bindings.ImGui; namespace Dalamud.Interface.Utility.Table; diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs index e14f798b5..2694d63fd 100644 --- a/Dalamud/Interface/Windowing/Window.cs +++ b/Dalamud/Interface/Windowing/Window.cs @@ -6,7 +6,7 @@ using System.Numerics; using System.Runtime.InteropServices; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Keys; using Dalamud.Interface.Colors; using Dalamud.Interface.Components; @@ -14,11 +14,7 @@ using Dalamud.Interface.Internal; using Dalamud.Interface.Utility; using Dalamud.Interface.Windowing.Persistence; using Dalamud.Logging.Internal; - using FFXIVClientStructs.FFXIV.Client.UI; - -using Dalamud.Bindings.ImGui; - using PInvoke; namespace Dalamud.Interface.Windowing; diff --git a/Dalamud/Interface/Windowing/WindowSystem.cs b/Dalamud/Interface/Windowing/WindowSystem.cs index ca602b001..3f881d89d 100644 --- a/Dalamud/Interface/Windowing/WindowSystem.cs +++ b/Dalamud/Interface/Windowing/WindowSystem.cs @@ -1,10 +1,9 @@ using System.Collections.Generic; using System.Linq; +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Interface.Windowing.Persistence; - -using Dalamud.Bindings.ImGui; using Serilog; namespace Dalamud.Interface.Windowing; diff --git a/Dalamud/Memory/MemoryHelper.cs b/Dalamud/Memory/MemoryHelper.cs index a5497898f..aeee84f7a 100644 --- a/Dalamud/Memory/MemoryHelper.cs +++ b/Dalamud/Memory/MemoryHelper.cs @@ -3,16 +3,13 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; -using Windows.Win32.System.Memory; - using Dalamud.Game.Text.SeStringHandling; using Dalamud.Memory.Exceptions; using Dalamud.Utility; - using FFXIVClientStructs.FFXIV.Client.System.Memory; using FFXIVClientStructs.FFXIV.Client.System.String; - using Microsoft.Extensions.ObjectPool; +using Windows.Win32.System.Memory; using static Dalamud.NativeFunctions; diff --git a/Dalamud/NativeFunctions.cs b/Dalamud/NativeFunctions.cs index ef415137d..fd45ffba9 100644 --- a/Dalamud/NativeFunctions.cs +++ b/Dalamud/NativeFunctions.cs @@ -939,7 +939,6 @@ internal static partial class NativeFunctions [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1629:Documentation text should end with a period", Justification = "Stupid rule")] internal static partial class NativeFunctions { - /// /// SEM_* from errhandlingapi. /// @@ -1428,6 +1427,7 @@ internal static partial class NativeFunctions /// [DllImport("kernel32.dll", SetLastError=false)] public static extern nint HeapAlloc(nint hHeap, HeapOptions dwFlags, nuint dwBytes); + /// /// Writes data to an area of memory in a specified process. The entire area to be written to must be accessible or /// the operation fails. diff --git a/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs b/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs index d19af5efa..413c9a171 100644 --- a/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs +++ b/Dalamud/Plugin/Internal/AutoUpdate/AutoUpdateManager.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading.Tasks; using CheapLoc; - +using Dalamud.Bindings.ImGui; using Dalamud.Configuration.Internal; using Dalamud.Console; using Dalamud.Game; @@ -24,8 +24,6 @@ using Dalamud.Logging.Internal; using Dalamud.Plugin.Internal.Types; using Dalamud.Plugin.Services; -using Dalamud.Bindings.ImGui; - namespace Dalamud.Plugin.Internal.AutoUpdate; /// diff --git a/Dalamud/Plugin/Services/IGamepadState.cs b/Dalamud/Plugin/Services/IGamepadState.cs index e7d57df0b..2816c927e 100644 --- a/Dalamud/Plugin/Services/IGamepadState.cs +++ b/Dalamud/Plugin/Services/IGamepadState.cs @@ -1,7 +1,7 @@ using System.Numerics; -using Dalamud.Game.ClientState.GamePad; using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState.GamePad; namespace Dalamud.Plugin.Services; diff --git a/Dalamud/Utility/TypeExtensions.cs b/Dalamud/Utility/TypeExtensions.cs deleted file mode 100644 index 10ae049d4..000000000 --- a/Dalamud/Utility/TypeExtensions.cs +++ /dev/null @@ -1,165 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; - -using InteropGenerator.Runtime; -using InteropGenerator.Runtime.Attributes; -// ReSharper disable LoopCanBeConvertedToQuery -// Linq can be a performance hit in most cases -namespace Dalamud.Utility; - -public static partial class TypeExtensions { - private static readonly BindingFlags BindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance; - - [GeneratedRegex(@"^`[1-9]\+Node", RegexOptions.Compiled)] - public static partial Regex StdNodeRegex(); - - public static bool IsFixedBuffer(this Type type) { - return type.Name.EndsWith("e__FixedBuffer"); - } - - public static bool IsStruct(this Type type) { - return type != typeof(decimal) && type is { IsValueType: true, IsPrimitive: false, IsEnum: false }; - } - - public static bool IsBaseType(this Type type) { - while (true) { - if (type.IsPointer) { - type = type.GetElementType()!; - continue; - } - return type == typeof(void) || type == typeof(bool) || type == typeof(char) || - type == typeof(sbyte) || type == typeof(byte) || type == typeof(short) || - type == typeof(ushort) || type == typeof(int) || type == typeof(uint) || - type == typeof(long) || type == typeof(ulong) || type == typeof(float) || - type == typeof(double) || type == typeof(decimal) || type == typeof(nint) || - type == typeof(nuint) || type == typeof(Half) || type == typeof(CStringPointer); - } - } - - public static Type[] GetInheritsTypes(this Type type) { - const string inheritsAttribute = "InheritsAttribute`1"; - Type[] inheritances = []; - foreach (var attr in type.GetCustomAttributes()) { - if (attr.GetType().Name.Contains(inheritsAttribute)) { - inheritances = [.. inheritances, attr.GetType().GetGenericArguments()[0]]; - } - } - return inheritances; - } - - public static bool IsInheritance(this Type type, FieldInfo field) { - var inheritances = type.GetInheritsTypes(); - if (inheritances.Length == 0) return false; - foreach (var inheritance in inheritances) { - if (inheritance.IsFieldInType(field)) return true; - if (IsInheritance(inheritance, field)) return true; - } - return false; - } - - public static bool IsFieldInType(this Type type, FieldInfo field) { - var nameStrings = field.Name.Split('_'); - var index = Array.IndexOf(nameStrings, type.Name); - if (index <= 0) return type.GetFields(BindingFlags).Any(f => f.Name == field.Name && f.FieldType == field.FieldType); - var name = string.Join("_", nameStrings[(index + 1)..]); - return type.GetFields(BindingFlags).Any(f => f.Name == name && f.FieldType == field.FieldType) || type.GetFields(BindingFlags).Any(f => f.Name == field.Name && f.FieldType == field.FieldType); - } - - public static bool IsDirectBase(this FieldInfo field) { - var bases = field.DeclaringType?.GetInheritsTypes() ?? []; - return bases.Any(b => field.FieldType == b && field.Name == (b.Name == field.DeclaringType?.Name ? b.Name + "Base" : b.Name)); - } - - public static int SizeOf(this Type type) { - return type switch { - _ when type == typeof(sbyte) || type == typeof(byte) || type == typeof(bool) => 1, - _ when type == typeof(char) || type == typeof(short) || type == typeof(ushort) || type == typeof(Half) => 2, - _ when type == typeof(int) || type == typeof(uint) || type == typeof(float) => 4, - _ when type == typeof(long) || type == typeof(ulong) || type == typeof(double) || type.IsPointer || type.IsFunctionPointer || type.IsUnmanagedFunctionPointer || type == typeof(CStringPointer) => 8, - _ when type.Name.StartsWith("FixedSizeArray") => type.GetGenericArguments()[0].SizeOf() * int.Parse(type.Name[14..type.Name.IndexOf('`')]), - _ when type.GetCustomAttribute() is { Length: var length } => type.GetGenericArguments()[0].SizeOf() * length, - _ when type.IsStruct() && !type.IsGenericType && (type.StructLayoutAttribute?.Value ?? LayoutKind.Sequential) != LayoutKind.Sequential => type.StructLayoutAttribute?.Size ?? (int?)typeof(Unsafe).GetMethod("SizeOf")?.MakeGenericMethod(type).Invoke(null, null) ?? 0, - _ when type.IsEnum => Enum.GetUnderlyingType(type).SizeOf(), - _ when type.IsGenericType => Marshal.SizeOf(Activator.CreateInstance(type)!), - _ => GetSizeOf(type) - }; - } - - private static int GetSizeOf(this Type type) { - try { - return Marshal.SizeOf(Activator.CreateInstance(type)!); - } catch { - return 0; - } - } - - public static string GetNamespace(this Type type) { - var ns = type.Namespace!; - var offset = ns.IndexOf('.', ns.IndexOf('.') + 1) + 1; - return offset == 0 ? "" : ns[offset..]; - } - - public static string GetFullname(this Type type) { - return type.Namespace + "." + type.Name; - } - - public static Type GetPointerType(this Type type) { - while (type.IsPointer()) { - if (type.IsPointer) type = type.GetElementType()!; - else if (type.IsFunctionPointer) type = type.GetFunctionPointerReturnType(); - else if (type.IsUnmanagedFunctionPointer) type = type.GetFunctionPointerReturnType(); - } - return type; - } - - public static bool IsPointer(this Type type) { - return type.IsPointer || type.IsFunctionPointer || type.IsUnmanagedFunctionPointer; - } - - public static int PackSize(this Type type) { - if (type.GetCustomAttribute() != null) return 1; // FixedSizeArrayAttribute is always packed to 1 as the generated struct gets generated with Pack = 1 - if (!type.IsStruct()) return type.SizeOf(); - var pack = type.StructLayoutAttribute?.Pack ?? 8; - if (pack == 0) pack = 8; - var fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); - return fields.Max(t => Math.Min(pack, t.FieldType.PackSize())); - } -} - -public static class FieldInfoExtensions { - public static int GetFieldOffset(this FieldInfo info) { - var attrs = info.GetCustomAttributes(typeof(FieldOffsetAttribute), false); - return attrs.Length != 0 ? attrs.Cast().Single().Value : GetFieldOffsetSequential(info); - } - - public static int GetFieldOffsetSequential(this FieldInfo info) { - if (info.DeclaringType is not { } declaring) - throw new Exception($"Unable to access declaring type of field {info.Name}"); - var pack = declaring.StructLayoutAttribute?.Pack ?? 0; // Default to 0 if no pack is specified - var fields = declaring.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); - var offset = 0; - foreach (var field in fields) { - if (pack != 0) { - var actualPack = Math.Min(pack, field.FieldType.PackSize()); - offset = (offset + actualPack - 1) / actualPack * actualPack; - } - if (field == info) { - return offset; - } - offset += field.FieldType.SizeOf(); - } - throw new Exception("Field not found"); - } -} -public static class Extensions { - public static void WriteFile(this FileInfo file, string content) { - using var stream = file.CreateText(); - stream.Write(content); - } -} diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs index e893cc8b9..6ec2fbd4e 100644 --- a/Dalamud/Utility/Util.cs +++ b/Dalamud/Utility/Util.cs @@ -11,6 +11,7 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; +using Dalamud.Bindings.ImGui; using Dalamud.Data; using Dalamud.Game; using Dalamud.Game.ClientState.Objects.SubKinds; @@ -26,8 +27,6 @@ using Windows.Win32.System.Memory; using Windows.Win32.System.Ole; using Windows.Win32.UI.WindowsAndMessaging; -using Dalamud.Bindings.ImGui; - using static TerraFX.Interop.Windows.Windows; using HWND = Windows.Win32.Foundation.HWND;