Initial API13 / 7.3 update.

2025-12-12 18:27:24 +01:00 · 2025-08-08 00:45:24 +02:00 · 2025-08-08 00:45:24 +02:00 · 3f18ad50de
commit 3f18ad50de
parent 6689e326ee
123 changed files with 158 additions and 160 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ad3bafa4f0af5b69833347f8c8ff2e178645e2f0
+Subproject commit 9523b7ac725656b21fa98faef96962652e86e64f
--- a/Penumbra.Api
+++ b/Penumbra.Api
@ -1 +1 @@
-Subproject commit ff7b3b4014a97455f823380c78b8a7c5107f8e2f
+Subproject commit c27a06004138f2ec80ccdb494bb6ddf6d39d2165
--- a/Penumbra.CrashHandler/Penumbra.CrashHandler.csproj
+++ b/Penumbra.CrashHandler/Penumbra.CrashHandler.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Dalamud.NET.Sdk/12.0.2">
+<Project Sdk="Dalamud.NET.Sdk/13.0.0">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
    </PropertyGroup>
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@ -1 +1 @@
-Subproject commit 82b446721a9b9c99d2470c54ad49fe19ff4987e3
+Subproject commit 65c5bf3f46569a54b0057c9015ab839b4e2a4350
--- a/Penumbra.String
+++ b/Penumbra.String
@ -1 +1 @@
-Subproject commit 0e5dcd1a5687ec5f8fa2ef2526b94b9a0ea1b5b5
+Subproject commit 878acce46e286867d6ef1f8ecedb390f7bac34fd
--- a/Penumbra/Api/IpcTester/CollectionsIpcTester.cs
+++ b/Penumbra/Api/IpcTester/CollectionsIpcTester.cs
@ -1,7 +1,7 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/Api/IpcTester/EditingIpcTester.cs
+++ b/Penumbra/Api/IpcTester/EditingIpcTester.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/Api/IpcTester/GameStateIpcTester.cs
+++ b/Penumbra/Api/IpcTester/GameStateIpcTester.cs
@ -1,6 +1,6 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui.Raii;
 using OtterGui.Services;
 using Penumbra.Api.Enums;
--- a/Penumbra/Api/IpcTester/IpcTester.cs
+++ b/Penumbra/Api/IpcTester/IpcTester.cs
@ -1,6 +1,6 @@
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Services;
 using Penumbra.Api.Api;

--- a/Penumbra/Api/IpcTester/MetaIpcTester.cs
+++ b/Penumbra/Api/IpcTester/MetaIpcTester.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui.Raii;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Penumbra/Api/IpcTester/ModSettingsIpcTester.cs
+++ b/Penumbra/Api/IpcTester/ModSettingsIpcTester.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/Api/IpcTester/ModsIpcTester.cs
+++ b/Penumbra/Api/IpcTester/ModsIpcTester.cs
@ -1,6 +1,6 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui.Raii;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Penumbra/Api/IpcTester/PluginStateIpcTester.cs
+++ b/Penumbra/Api/IpcTester/PluginStateIpcTester.cs
@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/Api/IpcTester/RedrawingIpcTester.cs
+++ b/Penumbra/Api/IpcTester/RedrawingIpcTester.cs
@ -1,6 +1,6 @@
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui.Services;
 using Penumbra.Api.Enums;
--- a/Penumbra/Api/IpcTester/ResolveIpcTester.cs
+++ b/Penumbra/Api/IpcTester/ResolveIpcTester.cs
@ -1,5 +1,5 @@
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui.Services;
 using Penumbra.Api.IpcSubscribers;
--- a/Penumbra/Api/IpcTester/ResourceTreeIpcTester.cs
+++ b/Penumbra/Api/IpcTester/ResourceTreeIpcTester.cs
@ -1,8 +1,8 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/Api/IpcTester/TemporaryIpcTester.cs
+++ b/Penumbra/Api/IpcTester/TemporaryIpcTester.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
@ -282,7 +282,7 @@ public class TemporaryIpcTester(
            foreach (var mod in list)
            {
                ImGui.TableNextColumn();
-                ImGui.TextUnformatted(mod.Name);
+                ImGui.TextUnformatted(mod.Name.Text);
                ImGui.TableNextColumn();
                ImGui.TextUnformatted(mod.Priority.ToString());
                ImGui.TableNextColumn();
--- a/Penumbra/Api/IpcTester/UiIpcTester.cs
+++ b/Penumbra/Api/IpcTester/UiIpcTester.cs
@ -1,5 +1,5 @@
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui.Services;
 using Penumbra.Api.Enums;
--- a/Penumbra/ChangedItemMode.cs
+++ b/Penumbra/ChangedItemMode.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Text;

 namespace Penumbra;
--- a/Penumbra/CommandHandler.cs
+++ b/Penumbra/CommandHandler.cs
@ -1,7 +1,7 @@
 using Dalamud.Game.Command;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Classes;
 using OtterGui.Services;
 using Penumbra.Api.Api;
--- a/Penumbra/Import/TexToolsImporter.Gui.cs
+++ b/Penumbra/Import/TexToolsImporter.Gui.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using Penumbra.Import.Structs;
--- a/Penumbra/Import/Textures/CombinedTexture.Manipulation.cs
+++ b/Penumbra/Import/Textures/CombinedTexture.Manipulation.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui;
 using SixLabors.ImageSharp.PixelFormats;
--- a/Penumbra/Import/Textures/TextureDrawer.cs
+++ b/Penumbra/Import/Textures/TextureDrawer.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using ImGuiNET;
 using Lumina.Data.Files;
 using OtterGui;
 using OtterGui.Raii;
@ -20,7 +20,7 @@ public static class TextureDrawer
        {
            size = texture.TextureWrap.Size.Contain(size);

-            ImGui.Image(texture.TextureWrap.ImGuiHandle, size);
+            ImGui.Image(texture.TextureWrap.Handle, size);
            DrawData(texture);
        }
        else if (texture.LoadError != null)
--- a/Penumbra/Import/Textures/TextureManager.cs
+++ b/Penumbra/Import/Textures/TextureManager.cs
@ -406,7 +406,7 @@ public sealed class TextureManager(IDataManager gameData, Logger logger, ITextur
        // See https://github.com/microsoft/DirectXTex/wiki/Compress#parameters for the format condition.
        if (format is DXGIFormat.BC6HUF16 or DXGIFormat.BC6HSF16 or DXGIFormat.BC7UNorm or DXGIFormat.BC7UNormSRGB)
        {
-            var device     = uiBuilder.Device;
+            var device     = new Device(uiBuilder.DeviceHandle);
            var dxgiDevice = device.QueryInterface<DxgiDevice>();

            using var deviceClone = new Device(dxgiDevice.Adapter, device.CreationFlags, device.FeatureLevel);
--- a/Penumbra/Interop/Hooks/Meta/ChangeCustomize.cs
+++ b/Penumbra/Interop/Hooks/Meta/ChangeCustomize.cs
@ -16,7 +16,7 @@ public sealed unsafe class ChangeCustomize : FastHook<ChangeCustomize.Delegate>
    {
        _collectionResolver = collectionResolver;
        _metaState          = metaState;
-        Task                = hooks.CreateHook<Delegate>("Change Customize", Sigs.ChangeCustomize, Detour, !HookOverrides.Instance.Meta.ChangeCustomize);
+        Task                = hooks.CreateHook<Delegate>("Change Customize", Sigs.UpdateDrawData, Detour, !HookOverrides.Instance.Meta.ChangeCustomize);
    }

    public delegate bool Delegate(Human* human, CustomizeArray* data, byte skipEquipment);
--- a/Penumbra/Interop/MaterialPreview/MaterialInfo.cs
+++ b/Penumbra/Interop/MaterialPreview/MaterialInfo.cs
@ -85,7 +85,7 @@ public readonly record struct MaterialInfo(ObjectIndex ObjectIndex, DrawObjectTy
                        if (mtrlHandle == null)
                            continue;

-                        PathDataHandler.Split(mtrlHandle->ResourceHandle.FileName.AsSpan(), out var path, out _);
+                        PathDataHandler.Split(mtrlHandle->FileName.AsSpan(), out var path, out _);
                        var fileName = CiByteString.FromSpanUnsafe(path, true);
                        if (fileName == needle)
                            result.Add(new MaterialInfo(index, type, i, j));
--- a/Penumbra/Interop/ResourceTree/ResolveContext.cs
+++ b/Penumbra/Interop/ResourceTree/ResolveContext.cs
@ -59,7 +59,7 @@ internal unsafe partial record ResolveContext(
        if (!Utf8GamePath.FromByteString(CiByteString.Join((byte)'/', ShpkPrefix, gamePath), out var path))
            return null;

-        return GetOrCreateNode(ResourceType.Shpk, (nint)resourceHandle->ShaderPackage, &resourceHandle->ResourceHandle, path);
+        return GetOrCreateNode(ResourceType.Shpk, (nint)resourceHandle->ShaderPackage, (ResourceHandle*)resourceHandle, path);
    }

    [SkipLocalsInit]
@ -245,7 +245,7 @@ internal unsafe partial record ResolveContext(
        if (Global.Nodes.TryGetValue((path, (nint)resource), out var cached))
            return cached;

-        var node     = CreateNode(ResourceType.Mtrl, (nint)mtrl, &resource->ResourceHandle, path, false);
+        var node     = CreateNode(ResourceType.Mtrl, (nint)mtrl, (ResourceHandle*)resource, path, false);
        var shpkNode = CreateNodeFromShpk(resource->ShaderPackageResourceHandle, new CiByteString(resource->ShpkName.Value));
        if (shpkNode is not null)
        {
--- a/Penumbra/Interop/ResourceTree/ResourceTree.cs
+++ b/Penumbra/Interop/ResourceTree/ResourceTree.cs
@ -72,15 +72,14 @@ public class ResourceTree(

        var mpapArrayPtr = model->MaterialAnimationPacks;
        var mpapArray    = mpapArrayPtr is not null ? new ReadOnlySpan<Pointer<ResourceHandle>>(mpapArrayPtr, model->SlotCount) : [];
-        // TODO ClientStructs-ify (aers/FFXIVClientStructs#1474)
        var skinMtrlArray = modelType switch
        {
-            ModelType.Human => new ReadOnlySpan<Pointer<MaterialResourceHandle>>((MaterialResourceHandle**)((nint)model + 0xB48), 5),
+            ModelType.Human => ((Human*) model)->SlotSkinMaterials,
            _               => [],
        };
        var decalArray = modelType switch
        {
-            ModelType.Human     => human->SlotDecalsSpan,
+            ModelType.Human     => human->SlotDecals,
            ModelType.DemiHuman => ((Demihuman*)model)->SlotDecals,
            ModelType.Weapon    => [((Weapon*)model)->Decal],
            ModelType.Monster   => [((Monster*)model)->Decal],
--- a/Penumbra/Interop/Services/TextureArraySlicer.cs
+++ b/Penumbra/Interop/Services/TextureArraySlicer.cs
@ -1,3 +1,4 @@
+using Dalamud.Bindings.ImGui;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 using OtterGui.Services;
 using SharpDX.Direct3D;
@ -16,7 +17,7 @@ public sealed unsafe class TextureArraySlicer : IUiService, IDisposable
    private readonly HashSet<(nint XivTexture, byte SliceIndex)>                _expiredKeys  = [];

    /// <remarks> Caching this across frames will cause a crash to desktop. </remarks>
-    public nint GetImGuiHandle(Texture* texture, byte sliceIndex)
+    public ImTextureID GetImGuiHandle(Texture* texture, byte sliceIndex)
    {
        if (texture == null)
            throw new ArgumentNullException(nameof(texture));
@ -25,7 +26,7 @@ public sealed unsafe class TextureArraySlicer : IUiService, IDisposable
        if (_activeSlices.TryGetValue(((nint)texture, sliceIndex), out var state))
        {
            state.Refresh();
-            return (nint)state.ShaderResourceView;
+            return new ImTextureID((nint)state.ShaderResourceView);
        }
        var srv = (ShaderResourceView)(nint)texture->D3D11ShaderResourceView;
        var description = srv.Description;
@ -60,7 +61,7 @@ public sealed unsafe class TextureArraySlicer : IUiService, IDisposable
        }
        state = new SliceState(new ShaderResourceView(srv.Device, srv.Resource, description));
        _activeSlices.Add(((nint)texture, sliceIndex), state);
-        return (nint)state.ShaderResourceView;
+        return new ImTextureID((nint)state.ShaderResourceView);
    }

    public void Tick()
--- a/Penumbra/Meta/ShapeAttributeManager.cs
+++ b/Penumbra/Meta/ShapeAttributeManager.cs
@ -1,4 +1,3 @@
-using System.Collections.Frozen;
 using OtterGui.Services;
 using Penumbra.Collections;
 using Penumbra.Collections.Cache;
@ -6,8 +5,6 @@ using Penumbra.GameData.Enums;
 using Penumbra.GameData.Interop;
 using Penumbra.GameData.Structs;
 using Penumbra.Interop.Hooks.PostProcessing;
-using Penumbra.Interop.Structs;
-using Penumbra.Meta.Files;
 using Penumbra.Meta.Manipulations;

 namespace Penumbra.Meta;
--- a/Penumbra/Mods/FeatureChecker.cs
+++ b/Penumbra/Mods/FeatureChecker.cs
@ -1,7 +1,7 @@
 using System.Collections.Frozen;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Text;
 using Penumbra.Mods.Manager;
 using Penumbra.UI.Classes;
--- a/Penumbra/Penumbra.cs
+++ b/Penumbra/Penumbra.cs
@ -1,5 +1,6 @@
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
+using Dalamud.Game;
 using OtterGui;
 using OtterGui.Log;
 using OtterGui.Services;
@ -20,6 +21,7 @@ using Penumbra.UI;
 using ResidentResourceManager = Penumbra.Interop.Services.ResidentResourceManager;
 using Dalamud.Plugin.Services;
 using Lumina.Excel.Sheets;
+using Penumbra.GameData;
 using Penumbra.GameData.Data;
 using Penumbra.Interop.Hooks;
 using Penumbra.Interop.Hooks.PostProcessing;
--- a/Penumbra/Penumbra.csproj
+++ b/Penumbra/Penumbra.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Dalamud.NET.Sdk/12.0.2">
+<Project Sdk="Dalamud.NET.Sdk/13.0.0">
    <PropertyGroup>
        <AssemblyTitle>Penumbra</AssemblyTitle>
        <Company>absolute gangstas</Company>
--- a/Penumbra/Penumbra.json
+++ b/Penumbra/Penumbra.json
@ -8,7 +8,7 @@
    "RepoUrl": "https://github.com/xivdev/Penumbra",
    "ApplicableVersion": "any",
    "Tags": [ "modding" ],
-    "DalamudApiLevel": 12,
+    "DalamudApiLevel": 13,
    "LoadPriority": 69420,
    "LoadRequiredState": 2,
    "LoadSync": true,
--- a/Penumbra/Services/StainService.cs
+++ b/Penumbra/Services/StainService.cs
@ -1,7 +1,7 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
 using OtterGui.Services;
 using OtterGui.Widgets;
 using Penumbra.GameData.DataContainers;
--- a/Penumbra/UI/AdvancedWindow/FileEditor.cs
+++ b/Penumbra/UI/AdvancedWindow/FileEditor.cs
@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Compression;
--- a/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
+++ b/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface.ImGuiNotification;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Raii;
--- a/Penumbra/UI/AdvancedWindow/Materials/MaterialTemplatePickers.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MaterialTemplatePickers.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using FFXIVClientStructs.Interop;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ColorTable.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.CommonColorTable.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.CommonColorTable.cs
@ -1,6 +1,6 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 using Penumbra.GameData.Files.MaterialStructs;
 using Penumbra.GameData.Files;
 using OtterGui.Text;
@ -338,10 +338,10 @@ public partial class MtrlTab
        var tmp       = inputSqrt;
        if (ImUtf8.ColorEdit(label, ref tmp,
                ImGuiColorEditFlags.NoInputs
-              | ImGuiColorEditFlags.DisplayRGB
-              | ImGuiColorEditFlags.InputRGB
+              | ImGuiColorEditFlags.DisplayRgb
+              | ImGuiColorEditFlags.InputRgb
              | ImGuiColorEditFlags.NoTooltip
-              | ImGuiColorEditFlags.HDR)
+              | ImGuiColorEditFlags.Hdr)
         && tmp != inputSqrt)
        {
            setter((HalfColor)PseudoSquareRgb(tmp));
@ -373,10 +373,10 @@ public partial class MtrlTab
            var tmp = Vector4.Zero;
            ImUtf8.ColorEdit(label, ref tmp,
                ImGuiColorEditFlags.NoInputs
-              | ImGuiColorEditFlags.DisplayRGB
-              | ImGuiColorEditFlags.InputRGB
+              | ImGuiColorEditFlags.DisplayRgb
+              | ImGuiColorEditFlags.InputRgb
              | ImGuiColorEditFlags.NoTooltip
-              | ImGuiColorEditFlags.HDR
+              | ImGuiColorEditFlags.Hdr
              | ImGuiColorEditFlags.AlphaPreview);

            if (letter.Length > 0 && ImGui.IsItemVisible())
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.Constants.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.Constants.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Extensions;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LegacyColorTable.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Text;
 using Penumbra.GameData.Files.MaterialStructs;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LivePreview.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.LivePreview.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
-using ImGuiNET;
 using OtterGui.Raii;
 using OtterGui.Text;
 using Penumbra.GameData.Files.MaterialStructs;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ShaderPackage.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.ShaderPackage.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui;
 using OtterGui.Classes;
@ -384,7 +384,7 @@ public partial class MtrlTab
        var shpkFlags = (int)Mtrl.ShaderPackage.Flags;
        ImGui.SetNextItemWidth(UiHelpers.Scale * 250.0f);
        if (!ImGui.InputInt("Shader Flags", ref shpkFlags, 0, 0,
-                ImGuiInputTextFlags.CharsHexadecimal | (disabled ? ImGuiInputTextFlags.ReadOnly : ImGuiInputTextFlags.None)))
+                flags: ImGuiInputTextFlags.CharsHexadecimal | (disabled ? ImGuiInputTextFlags.ReadOnly : ImGuiInputTextFlags.None)))
            return false;

        Mtrl.ShaderPackage.Flags = (uint)shpkFlags;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.Textures.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.Textures.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.cs
+++ b/Penumbra/UI/AdvancedWindow/Materials/MtrlTab.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface.Components;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/Meta/AtchMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/AtchMetaDrawer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/UI/AdvancedWindow/Meta/AtrMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/AtrMetaDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/EqdpMetaDrawer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/EqpMetaDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/EstMetaDrawer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/GlobalEqpMetaDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/GmpMetaDrawer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Services;
 using OtterGui.Text;
 using Penumbra.GameData.Structs;
--- a/Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/ImcMetaDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/AdvancedWindow/Meta/MetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/MetaDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui;
 using OtterGui.Raii;
--- a/Penumbra/UI/AdvancedWindow/Meta/RspMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/RspMetaDrawer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/Meta/ShpMetaDrawer.cs
+++ b/Penumbra/UI/AdvancedWindow/Meta/ShpMetaDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Newtonsoft.Json.Linq;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Deformers.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Deformers.cs
@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Files.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Extensions;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Meta.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Models.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Models.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
-using ImGuiNET;
 using Lumina.Data.Parsing;
 using OtterGui;
 using OtterGui.Custom;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.QuickImport.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.QuickImport.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Lumina.Data;
 using OtterGui.Text;
 using Penumbra.Api.Enums;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.ShaderPackages.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.ShaderPackages.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui;
 using OtterGui.Classes;
@ -147,7 +147,7 @@ public partial class ModEditWindow

        using var font = ImRaii.PushFont(UiBuilder.MonoFont);
        var       size = new Vector2(ImGui.GetContentRegionAvail().X, ImGui.GetTextLineHeight() * 20);
-        ImGuiNative.igInputTextMultiline(DisassemblyLabel.Path, shader.Disassembly!.RawDisassembly.Path,
+        ImGuiNative.InputTextMultiline(DisassemblyLabel.Path, shader.Disassembly!.RawDisassembly.Path,
            (uint)shader.Disassembly!.RawDisassembly.Length + 1, size,
            ImGuiInputTextFlags.ReadOnly, null, null);
    }
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.Textures.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.Textures.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/UI/AdvancedWindow/ModEditWindow.cs
+++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.cs
@ -4,7 +4,7 @@ using Dalamud.Interface.DragDrop;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Log;
--- a/Penumbra/UI/AdvancedWindow/ModMergeTab.cs
+++ b/Penumbra/UI/AdvancedWindow/ModMergeTab.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/UI/AdvancedWindow/OptionSelectCombo.cs
+++ b/Penumbra/UI/AdvancedWindow/OptionSelectCombo.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui.Text;
 using OtterGui.Widgets;
--- a/Penumbra/UI/AdvancedWindow/ResourceTreeViewer.cs
+++ b/Penumbra/UI/AdvancedWindow/ResourceTreeViewer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui;
 using OtterGui.Text;
--- a/Penumbra/UI/ChangedItemDrawer.cs
+++ b/Penumbra/UI/ChangedItemDrawer.cs
@ -3,7 +3,7 @@ using Dalamud.Interface.Textures;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Lumina.Data.Files;
 using OtterGui;
 using OtterGui.Classes;
@ -107,11 +107,11 @@ public class ChangedItemDrawer : IDisposable, IUiService
            return;
        }

-        ImGui.Image(icon.ImGuiHandle, new Vector2(height));
+        ImGui.Image(icon.Handle, new Vector2(height));
        if (ImGui.IsItemHovered())
        {
            using var tt = ImRaii.Tooltip();
-            ImGui.Image(icon.ImGuiHandle, new Vector2(_smallestIconWidth));
+            ImGui.Image(icon.Handle, new Vector2(_smallestIconWidth));
            ImGui.SameLine();
            ImGuiUtil.DrawTextButton(iconFlagType.ToDescription(), new Vector2(0, _smallestIconWidth), 0);
        }
@ -193,7 +193,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
        }

        ImGui.SetCursorPosX(ImGui.GetContentRegionMax().X - size.X);
-        ImGui.Image(_icons[ChangedItemFlagExtensions.AllFlags].ImGuiHandle, size, Vector2.Zero, Vector2.One,
+        ImGui.Image(_icons[ChangedItemFlagExtensions.AllFlags].Handle, size, Vector2.Zero, Vector2.One,
            typeFilter switch
            {
                0                                  => new Vector4(0.6f,  0.3f,  0.3f,  1f),
@ -213,7 +213,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
            var localRet = false;
            var icon     = _icons[type];
            var flag     = typeFilter.HasFlag(type);
-            ImGui.Image(icon.ImGuiHandle, size, Vector2.Zero, Vector2.One, flag ? Vector4.One : new Vector4(0.6f, 0.3f, 0.3f, 1f));
+            ImGui.Image(icon.Handle, size, Vector2.Zero, Vector2.One, flag ? Vector4.One : new Vector4(0.6f, 0.3f, 0.3f, 1f));
            if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
            {
                typeFilter = flag ? typeFilter & ~type : typeFilter | type;
@ -232,7 +232,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
            if (ImGui.IsItemHovered())
            {
                using var tt = ImRaii.Tooltip();
-                ImGui.Image(icon.ImGuiHandle, new Vector2(_smallestIconWidth));
+                ImGui.Image(icon.Handle, new Vector2(_smallestIconWidth));
                ImGui.SameLine();
                ImGuiUtil.DrawTextButton(type.ToDescription(), new Vector2(0, _smallestIconWidth), 0);
            }
--- a/Penumbra/UI/Classes/CollectionSelectHeader.cs
+++ b/Penumbra/UI/Classes/CollectionSelectHeader.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/Classes/Colors.cs
+++ b/Penumbra/UI/Classes/Colors.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Custom;

 namespace Penumbra.UI.Classes;
--- a/Penumbra/UI/Classes/MigrationSectionDrawer.cs
+++ b/Penumbra/UI/Classes/MigrationSectionDrawer.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Services;
 using OtterGui.Text;
 using Penumbra.Services;
--- a/Penumbra/UI/CollectionTab/CollectionCombo.cs
+++ b/Penumbra/UI/CollectionTab/CollectionCombo.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/CollectionTab/CollectionPanel.cs
+++ b/Penumbra/UI/CollectionTab/CollectionPanel.cs
@ -6,7 +6,7 @@ using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.ManagedFontAtlas;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Extensions;
@ -346,7 +346,7 @@ public sealed class CollectionPanel(
        if (!source)
            return;

-        ImGui.SetDragDropPayload("DragIndividual", nint.Zero, 0);
+        ImGui.SetDragDropPayload("DragIndividual", null, 0);
        ImGui.TextUnformatted($"Re-ordering {text}...");
        _draggedIndividualAssignment = _active.Individuals.Index(id);
    }
--- a/Penumbra/UI/CollectionTab/CollectionSelector.cs
+++ b/Penumbra/UI/CollectionTab/CollectionSelector.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using Penumbra.Collections;
@ -85,7 +85,7 @@ public sealed class CollectionSelector : ItemSelector<ModCollection>, IDisposabl
        if (source)
        {
            _dragging = Items[idx];
-            ImGui.SetDragDropPayload(PayloadString, nint.Zero, 0);
+            ImGui.SetDragDropPayload(PayloadString, null, 0);
            ImGui.TextUnformatted($"Assigning {Name(_dragging)} to...");
        }

--- a/Penumbra/UI/CollectionTab/IndividualAssignmentUi.cs
+++ b/Penumbra/UI/CollectionTab/IndividualAssignmentUi.cs
@ -1,5 +1,5 @@
 using Dalamud.Game.ClientState.Objects.Enums;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Custom;
 using Penumbra.Collections;
 using Penumbra.Collections.Manager;
--- a/Penumbra/UI/CollectionTab/InheritanceUi.cs
+++ b/Penumbra/UI/CollectionTab/InheritanceUi.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
@ -288,7 +288,7 @@ public class InheritanceUi(CollectionManager collectionManager, IncognitoService
        if (!source)
            return;

-        ImGui.SetDragDropPayload(InheritanceDragDropLabel, nint.Zero, 0);
+        ImGui.SetDragDropPayload(InheritanceDragDropLabel, null, 0);
        _movedInheritance = collection;
        ImGui.TextUnformatted($"Moving {(_movedInheritance != null ? Name(_movedInheritance) : "Unknown")}...");
    }
--- a/Penumbra/UI/ConfigWindow.cs
+++ b/Penumbra/UI/ConfigWindow.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Custom;
 using OtterGui.Raii;
--- a/Penumbra/UI/FileDialogService.cs
+++ b/Penumbra/UI/FileDialogService.cs
@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Services;
--- a/Penumbra/UI/ImportPopup.cs
+++ b/Penumbra/UI/ImportPopup.cs
@ -1,7 +1,7 @@
 using Dalamud.Game.ClientState.Keys;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui.Services;
 using Penumbra.Import.Structs;
--- a/Penumbra/UI/IncognitoService.cs
+++ b/Penumbra/UI/IncognitoService.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using Penumbra.UI.Classes;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/Knowledge/KnowledgeWindow.cs
+++ b/Penumbra/UI/Knowledge/KnowledgeWindow.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Services;
 using OtterGui.Text;
 using Penumbra.String;
--- a/Penumbra/UI/Knowledge/RaceCodeTab.cs
+++ b/Penumbra/UI/Knowledge/RaceCodeTab.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Text;
 using Penumbra.GameData.Enums;

--- a/Penumbra/UI/ModsTab/DescriptionEditPopup.cs
+++ b/Penumbra/UI/ModsTab/DescriptionEditPopup.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Services;
 using OtterGui.Text;
 using Penumbra.Mods;
--- a/Penumbra/UI/ModsTab/Groups/AddGroupDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/AddGroupDrawer.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Services;
 using OtterGui.Text;
 using Penumbra.Api.Enums;
--- a/Penumbra/UI/ModsTab/Groups/CombiningModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/CombiningModGroupEditDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/UI/ModsTab/Groups/ImcModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/ImcModGroupEditDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/ModsTab/Groups/ModGroupDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/ModGroupDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface.Components;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
--- a/Penumbra/UI/ModsTab/Groups/ModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/ModGroupEditDrawer.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Extensions;
--- a/Penumbra/UI/ModsTab/Groups/SingleModGroupEditDrawer.cs
+++ b/Penumbra/UI/ModsTab/Groups/SingleModGroupEditDrawer.cs
@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
--- a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
+++ b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs
@ -2,7 +2,7 @@ using Dalamud.Interface;
 using Dalamud.Interface.DragDrop;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Services;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Filesystem;
--- a/Penumbra/UI/ModsTab/ModPanel.cs
+++ b/Penumbra/UI/ModsTab/ModPanel.cs
@ -1,6 +1,6 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui.Services;
 using Penumbra.Mods;
 using Penumbra.Services;
--- a/Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs
@ -1,6 +1,6 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
 using OtterGui.Services;
--- a/Penumbra/UI/ModsTab/ModPanelCollectionsTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelCollectionsTab.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Services;
--- a/Penumbra/UI/ModsTab/ModPanelConflictsTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelConflictsTab.cs
@ -1,6 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Extensions;
 using OtterGui.Raii;
@ -73,7 +73,7 @@ public class ModPanelConflictsTab(CollectionManager collectionManager, ModFileSy
        ImGui.TableNextColumn();
        using var c = ImRaii.PushColor(ImGuiCol.Text, ColorId.FolderLine.Value());
        ImGui.AlignTextToFramePadding();
-        ImGui.TextUnformatted(selector.Selected!.Name);
+        ImGui.TextUnformatted(selector.Selected!.Name.Text);
        ImGui.TableNextColumn();
        var actualSettings = collectionManager.Active.Current.GetActualSettings(selector.Selected!.Index).Settings!;
        var priority       = actualSettings.Priority.Value;
@ -81,7 +81,7 @@ public class ModPanelConflictsTab(CollectionManager collectionManager, ModFileSy
        using (ImRaii.Disabled(actualSettings is TemporaryModSettings))
        {
            ImGui.SetNextItemWidth(priorityWidth);
-            if (ImGui.InputInt("##priority", ref priority, 0, 0, ImGuiInputTextFlags.EnterReturnsTrue))
+            if (ImGui.InputInt("##priority", ref priority, 0, 0, flags: ImGuiInputTextFlags.EnterReturnsTrue))
                _currentPriority = priority;

            if (ImGui.IsItemDeactivatedAfterEdit() && _currentPriority.HasValue)
@ -104,7 +104,7 @@ public class ModPanelConflictsTab(CollectionManager collectionManager, ModFileSy
    private void DrawConflictSelectable(ModConflicts conflict)
    {
        ImGui.AlignTextToFramePadding();
-        if (ImGui.Selectable(conflict.Mod2.Name) && conflict.Mod2 is Mod otherMod)
+        if (ImGui.Selectable(conflict.Mod2.Name.Text) && conflict.Mod2 is Mod otherMod)
            selector.SelectByValue(otherMod);
        var hovered      = ImGui.IsItemHovered();
        var rightClicked = ImGui.IsItemClicked(ImGuiMouseButton.Right);
@ -172,7 +172,7 @@ public class ModPanelConflictsTab(CollectionManager collectionManager, ModFileSy
        var       priority = _currentPriority ?? GetPriority(conflict).Value;

        ImGui.SetNextItemWidth(priorityWidth);
-        if (ImGui.InputInt("##priority", ref priority, 0, 0, ImGuiInputTextFlags.EnterReturnsTrue))
+        if (ImGui.InputInt("##priority", ref priority, 0, 0, flags: ImGuiInputTextFlags.EnterReturnsTrue))
            _currentPriority = priority;

        if (ImGui.IsItemDeactivatedAfterEdit() && _currentPriority.HasValue)
--- a/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs
@ -1,5 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
 using OtterGui.Raii;
 using OtterGui;
 using OtterGui.Services;
--- a/Penumbra/UI/ModsTab/ModPanelEditTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelEditTab.cs
@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.ImGuiNotification;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Widgets;
@ -325,7 +325,7 @@ public class ModPanelEditTab(
            var tmp = field == _currentField && option == _optionIndex ? _currentEdit ?? oldValue : oldValue;
            ImGui.SetNextItemWidth(width);

-            if (ImGui.InputText(label, ref tmp, maxLength))
+            if (ImGui.InputText(label, ref tmp))
            {
                _currentEdit  = tmp;
                _optionIndex  = option;
--- a/Penumbra/UI/ModsTab/ModPanelHeader.cs
+++ b/Penumbra/UI/ModsTab/ModPanelHeader.cs
@ -1,7 +1,7 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.GameFonts;
 using Dalamud.Interface.ManagedFontAtlas;
 using Dalamud.Plugin;
-using ImGuiNET;
 using OtterGui;
 using OtterGui.Raii;
 using Penumbra.Communication;
--- a/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
@ -1,4 +1,4 @@
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using OtterGui.Raii;
 using OtterGui.Services;
 using OtterGui.Text;
--- a/Show more
+++ b/Show more