Dalamud 13

MareSynchronos/MareSynchronos.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.Sdk/12.0.2">
+<Project Sdk="Dalamud.NET.Sdk/13.0.0">
   <PropertyGroup>
     <AssemblyName>LoporritSync</AssemblyName>
     <Version>9.9.0</Version>

MareSynchronos/Services/PluginWatcherService.cs

@@ -88,9 +88,11 @@ public class PluginWatcherService : MediatorSubscriberBase
                 Logger.LogError(e, "PluginWatcherService exception");
             }
         });
+
+        Update(publish: false);
     }
 
-    private void Update()
+    private void Update(bool publish = true)
     {
         if (!ExposedPluginsEqual(_pluginInterface.InstalledPlugins, _prevInstalledPluginState))
         {
@@ -111,20 +113,20 @@ public class PluginWatcherService : MediatorSubscriberBase
             foreach (var internalName in newDict.Keys.Except(oldDict.Keys, StringComparer.Ordinal))
             {
                 var p = newDict[internalName].OrderBy(p => (!p.IsLoaded, p.Version)).First();
-                Mediator.Publish(new PluginChangeMessage(internalName, p.Version, p.IsLoaded));
+                if (publish) Mediator.Publish(new PluginChangeMessage(internalName, p.Version, p.IsLoaded));
             }
 
             foreach (var internalName in oldDict.Keys.Except(newDict.Keys, StringComparer.Ordinal))
             {
                 var p = newDict[internalName].OrderBy(p => (!p.IsLoaded, p.Version)).First();
-                Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded));
+                if (publish) Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded));
             }
 
             foreach (var changedGroup in newDict.Where(p => oldDict.TryGetValue(p.Key, out var old) && !old.SequenceEqual(p.Value)))
             {
                 var internalName = changedGroup.Value.First().InternalName;
                 var p = newDict[internalName].OrderBy(p => (!p.IsLoaded, p.Version)).First();
-                Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded));
+                if (publish) Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded));
             }
         }
     }

MareSynchronos/Services/XivDataAnalyzer.cs

@@ -46,8 +46,8 @@ public sealed class XivDataAnalyzer
                 if ((nint)handle == nint.Zero) continue;
                 var curBones = handle->BoneCount;
                 // this is unrealistic, the filename shouldn't ever be that long
-                if (handle->ResourceHandle.FileName.Length > 1024) continue;
+                if (handle->FileName.Length > 1024) continue;
-                var skeletonName = handle->ResourceHandle.FileName.ToString();
+                var skeletonName = handle->FileName.ToString();
                 if (string.IsNullOrEmpty(skeletonName)) continue;
                 outputIndices[skeletonName] = new();
                 for (ushort boneIdx = 0; boneIdx < curBones; boneIdx++)

MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.Services.CharaData.Models;
 
 namespace MareSynchronos.UI;

MareSynchronos/UI/CharaDataHubUi.McdOnline.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Dto.CharaData;
 using MareSynchronos.Services.CharaData.Models;
 using System.Numerics;

MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using System.Numerics;
 
 namespace MareSynchronos.UI;

MareSynchronos/UI/CharaDataHubUi.cs

@@ -3,7 +3,7 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Dto.CharaData;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Models;

MareSynchronos/UI/CompactUI.cs

@@ -9,7 +9,7 @@ using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.API.Dto.User;
 using MareSynchronos.MareConfiguration;

MareSynchronos/UI/Components/DrawGroupPair.cs

@@ -1,7 +1,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.WebAPI;

MareSynchronos/UI/Components/DrawPairBase.cs

@@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.UI.Handlers;
 using MareSynchronos.WebAPI;

MareSynchronos/UI/Components/DrawUserPair.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using System.Numerics;
 using MareSynchronos.API.Data.Extensions;

MareSynchronos/UI/Components/GroupPanel.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.WebAPI;
 using System.Numerics;
 using System.Globalization;

MareSynchronos/UI/Components/PairGroupsUi.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.UI.Handlers;

MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs

@@ -1,5 +1,5 @@
 using Dalamud.Interface;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Dto.Group;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.Mediator;

MareSynchronos/UI/Components/Popup/PopupHandler.cs

@@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Mediator;
 using Microsoft.Extensions.Logging;

MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs

@@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.WebAPI;

MareSynchronos/UI/Components/SelectGroupForPairUi.cs

@@ -3,7 +3,7 @@ using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.UI.Handlers;
 

MareSynchronos/UI/Components/SelectPairForGroupUi.cs

@@ -1,5 +1,5 @@
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.UI.Handlers;
 using System.Numerics;

MareSynchronos/UI/DataAnalysisUi.cs

@@ -1,7 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.Interop.Ipc;
 using MareSynchronos.Services;

MareSynchronos/UI/DownloadUi.cs

@@ -1,5 +1,5 @@
 using Dalamud.Interface.Colors;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.PlayerData.Handlers;
 using MareSynchronos.Services;

MareSynchronos/UI/DtrEntry.cs

@@ -105,7 +105,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
     {
         _logger.LogTrace("Creating new DtrBar entry");
         var entry = _dtrBar.Get("Loporrit");
-        entry.OnClick = () => _mareMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
+        entry.OnClick = _ => _mareMediator.Publish(new UiToggleMessage(typeof(CompactUi)));
 
         return entry;
     }

MareSynchronos/UI/EditProfileUi.cs

@@ -3,7 +3,7 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.ImGuiFileDialog;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Dto.User;
 using MareSynchronos.Services;
@@ -89,14 +89,14 @@ public class EditProfileUi : WindowMediatorSubscriberBase
 
         if (_pfpTextureWrap != null)
         {
-            ImGui.Image(_pfpTextureWrap.ImGuiHandle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height));
+            ImGui.Image(_pfpTextureWrap.Handle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height));
         }
 
         var spacing = ImGui.GetStyle().ItemSpacing.X;
         ImGuiHelpers.ScaledRelativeSameLine(256, spacing);
         using (_uiSharedService.GameFont.Push())
         {
-            var descriptionTextSize = ImGui.CalcTextSize(profile.Description, 256f);
+            var descriptionTextSize = ImGui.CalcTextSize(profile.Description, hideTextAfterDoubleHash: false, 256f);
             var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256);
             if (descriptionTextSize.Y > childFrame.Y)
             {
@@ -178,7 +178,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
 
         using (_uiSharedService.GameFont.Push())
         {
-            var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, 256f);
+            var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, hideTextAfterDoubleHash: false, 256f);
             var childFrameLocal = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 200);
             if (descriptionTextSizeLocal.Y > childFrameLocal.Y)
             {

MareSynchronos/UI/EventViewerUI.cs

@@ -4,7 +4,7 @@ using Dalamud.Interface.Components;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.Services;
 using MareSynchronos.Services.Events;

MareSynchronos/UI/Handlers/UidDisplayHandler.cs

@@ -1,10 +1,9 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services.ServerConfiguration;
 using MareSynchronos.MareConfiguration;
-using ImGuiScene;
 using MareSynchronos.Services.Mediator;
 using MareSynchronos.UI.Components;
 
@@ -22,7 +21,6 @@ public class UidDisplayHandler
     private string _lastMouseOverUid = string.Empty;
     private bool _popupShown = false;
     private DateTime? _popupTime;
-    private TextureWrap? _textureWrap;
 
     public UidDisplayHandler(MareMediator mediator, PairManager pairManager,
         ServerConfigurationManager serverManager, MareConfigService mareConfigService)
@@ -96,8 +94,6 @@ public class UidDisplayHandler
                     _mediator.Publish(new ProfilePopoutToggle(null));
                     _lastMouseOverUid = string.Empty;
                     _popupShown = false;
-                    _textureWrap?.Dispose();
-                    _textureWrap = null;
                 }
             }
 

MareSynchronos/UI/IntroUI.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.FileCache;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.MareConfiguration.Models;

MareSynchronos/UI/PermissionWindowUI.cs

@@ -1,6 +1,6 @@
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.PlayerData.Pairs;

MareSynchronos/UI/PlayerAnalysisUI.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.Interop.Ipc;

MareSynchronos/UI/PopoutProfileUi.cs

@@ -1,7 +1,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.PlayerData.Pairs;
@@ -149,12 +149,12 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
             _uiSharedService.GameFont.Push();
             var remaining = ImGui.GetWindowContentRegionMax().Y - ImGui.GetCursorPosY();
             var descText = mareProfile.Description;
-            var textSize = ImGui.CalcTextSize(descText, 256f * ImGuiHelpers.GlobalScale);
+            var textSize = ImGui.CalcTextSize(descText, hideTextAfterDoubleHash: false, 256f * ImGuiHelpers.GlobalScale);
             bool trimmed = textSize.Y > remaining;
             while (textSize.Y > remaining && descText.Contains(' '))
             {
                 descText = descText[..descText.LastIndexOf(' ')].TrimEnd();
-                textSize = ImGui.CalcTextSize(descText + $"...{Environment.NewLine}[Open Full Profile for complete description]", 256f * ImGuiHelpers.GlobalScale);
+                textSize = ImGui.CalcTextSize(descText + $"...{Environment.NewLine}[Open Full Profile for complete description]", hideTextAfterDoubleHash: false, 256f * ImGuiHelpers.GlobalScale);
             }
             UiSharedService.TextWrapped(trimmed ? descText + $"...{Environment.NewLine}[Open Full Profile for complete description]" : mareProfile.Description);
 
@@ -167,12 +167,12 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
             var newHeight = _textureWrap.Height * stretchFactor;
             var remainingWidth = (256f * ImGuiHelpers.GlobalScale - newWidth) / 2f;
             var remainingHeight = (256f * ImGuiHelpers.GlobalScale - newHeight) / 2f;
-            drawList.AddImage(_textureWrap.ImGuiHandle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + imagePos.Y + remainingHeight),
+            drawList.AddImage(_textureWrap.Handle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + imagePos.Y + remainingHeight),
                 new Vector2(rectMin.X + padding + remainingWidth + newWidth, rectMin.Y + spacing.Y + imagePos.Y + remainingHeight + newHeight));
             if (_supporterTextureWrap != null)
             {
                 const float iconSize = 38;
-                drawList.AddImage(_supporterTextureWrap.ImGuiHandle,
+                drawList.AddImage(_supporterTextureWrap.Handle,
                     new Vector2(rectMax.X - iconSize - spacing.X, rectMin.Y + (textPos / 2) - (iconSize / 2)),
                     new Vector2(rectMax.X - spacing.X, rectMin.Y + iconSize + (textPos / 2) - (iconSize / 2)));
             }

MareSynchronos/UI/SettingsUi.cs

@@ -4,7 +4,7 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Comparer;
 using MareSynchronos.API.Dto.Account;

MareSynchronos/UI/StandaloneProfileUi.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.PlayerData.Pairs;
 using MareSynchronos.Services;
@@ -79,7 +79,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
             ImGuiHelpers.ScaledDummy(new Vector2(256, 256 + spacing.Y));
             var postDummy = ImGui.GetCursorPosY();
             ImGui.SameLine();
-            var descriptionTextSize = ImGui.CalcTextSize(mareProfile.Description, 256f);
+            var descriptionTextSize = ImGui.CalcTextSize(mareProfile.Description, hideTextAfterDoubleHash: false, 256f);
             var descriptionChildHeight = rectMax.Y - pos.Y - rectMin.Y - spacing.Y * 2;
             if (descriptionTextSize.Y > descriptionChildHeight && !_adjustedForScrollBars)
             {
@@ -151,7 +151,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
             var newHeight = _textureWrap.Height * stretchFactor;
             var remainingWidth = (256f * ImGuiHelpers.GlobalScale - newWidth) / 2f;
             var remainingHeight = (256f * ImGuiHelpers.GlobalScale - newHeight) / 2f;
-            drawList.AddImage(_textureWrap.ImGuiHandle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + pos.Y + remainingHeight),
+            drawList.AddImage(_textureWrap.Handle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + pos.Y + remainingHeight),
                 new Vector2(rectMin.X + padding + remainingWidth + newWidth, rectMin.Y + spacing.Y + pos.Y + remainingHeight + newHeight));
         }
         catch (Exception ex)

MareSynchronos/UI/SyncshellAdminUI.cs

@@ -2,7 +2,7 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.API.Data.Enum;
 using MareSynchronos.API.Data.Extensions;
 using MareSynchronos.API.Dto.Group;

MareSynchronos/UI/UISharedService.cs

@@ -10,7 +10,7 @@ using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 using MareSynchronos.FileCache;
 using MareSynchronos.Interop.Ipc;
 using MareSynchronos.MareConfiguration;
@@ -237,7 +237,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
     public static void DrawGroupedCenteredColorText(string text, Vector4 color, float? maxWidth = null)
     {
         var availWidth = ImGui.GetContentRegionAvail().X;
-        var textWidth = ImGui.CalcTextSize(text, availWidth).X;
+        var textWidth = ImGui.CalcTextSize(text, hideTextAfterDoubleHash: false, availWidth).X;
         if (maxWidth != null && textWidth > maxWidth * ImGuiHelpers.GlobalScale) textWidth = maxWidth.Value * ImGuiHelpers.GlobalScale;
         ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (availWidth / 2f) - (textWidth / 2f));
         DrawGrouped(() =>