Merge branch 'refs/heads/goat/master' into otter/master

# Conflicts:
#	lib/FFXIVClientStructs

Author: MapleRecall

Dalamud/Dalamud.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup Label="Feature">
         <Description>XIV Launcher addon framework</Description>
-        <DalamudVersion>14.0.0.1</DalamudVersion>
+        <DalamudVersion>14.0.0.2</DalamudVersion>
         <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
         <Version>$(DalamudVersion)</Version>
         <FileVersion>$(DalamudVersion)</FileVersion>

Dalamud/Game/ClientState/Party/PartyMember.cs

@@ -6,6 +6,7 @@
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Statuses;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Utility;
 
 using Lumina.Excel;
 
@@ -124,6 +125,7 @@ internal unsafe readonly struct PartyMember(CSPartyMember* ptr) : IPartyMember
     public Vector3 Position => ptr->Position;
 
     /// <inheritdoc/>
+    [Api15ToDo("Change type to ulong.")]
     public long ContentId => (long)ptr->ContentId;
 
     /// <inheritdoc/>

Dalamud/Game/Gui/ChatGui.cs

@@ -26,7 +26,6 @@
 using Lumina.Text.Payloads;
 using Lumina.Text.ReadOnly;
 
-using LSeStringBuilder = Lumina.Text.SeStringBuilder;
 using SeString = Dalamud.Game.Text.SeStringHandling.SeString;
 using SeStringBuilder = Dalamud.Game.Text.SeStringHandling.SeStringBuilder;
 
@@ -207,21 +206,21 @@ public void UpdateQueue()
         if (this.chatQueue.Count == 0)
             return;
 
-        var sb = LSeStringBuilder.SharedPool.Get();
+        using var rssb = new RentedSeStringBuilder();
         Span<byte> namebuf = stackalloc byte[256];
         using var sender = new Utf8String();
         using var message = new Utf8String();
         while (this.chatQueue.TryDequeue(out var chat))
         {
-            sb.Clear();
+            rssb.Builder.Clear();
             foreach (var c in UtfEnumerator.From(chat.MessageBytes, UtfEnumeratorFlags.Utf8SeString))
             {
                 if (c.IsSeStringPayload)
-                    sb.Append((ReadOnlySeStringSpan)chat.MessageBytes.AsSpan(c.ByteOffset, c.ByteLength));
+                    rssb.Builder.Append((ReadOnlySeStringSpan)chat.MessageBytes.AsSpan(c.ByteOffset, c.ByteLength));
                 else if (c.Value.IntValue == 0x202F)
-                    sb.BeginMacro(MacroCode.NonBreakingSpace).EndMacro();
+                    rssb.Builder.BeginMacro(MacroCode.NonBreakingSpace).EndMacro();
                 else
-                    sb.Append(c);
+                    rssb.Builder.Append(c);
             }
 
             if (chat.NameBytes.Length + 1 < namebuf.Length)
@@ -235,7 +234,7 @@ public void UpdateQueue()
                 sender.SetString(chat.NameBytes.NullTerminate());
             }
 
-            message.SetString(sb.GetViewAsSpan());
+            message.SetString(rssb.Builder.GetViewAsSpan());
 
             var targetChannel = chat.Type ?? this.configuration.GeneralChatType;
 
@@ -247,8 +246,6 @@ public void UpdateQueue()
                 chat.Timestamp,
                 (byte)(chat.Silent ? 1 : 0));
         }
-
-        LSeStringBuilder.SharedPool.Return(sb);
     }
 
     /// <summary>
@@ -326,29 +323,28 @@ private void PrintTagged(SeString message, XivChatType channel, string? tag, ush
 
     private void PrintTagged(ReadOnlySpan<byte> message, XivChatType channel, string? tag, ushort? color)
     {
-        var sb = LSeStringBuilder.SharedPool.Get();
+        using var rssb = new RentedSeStringBuilder();
 
         if (!tag.IsNullOrEmpty())
         {
             if (color is not null)
             {
-                sb.PushColorType(color.Value);
-                sb.Append($"[{tag}] ");
-                sb.PopColorType();
+                rssb.Builder
+                    .PushColorType(color.Value)
+                    .Append($"[{tag}] ")
+                    .PopColorType();
             }
             else
             {
-                sb.Append($"[{tag}] ");
+                rssb.Builder.Append($"[{tag}] ");
             }
         }
 
         this.Print(new XivChatEntry
         {
-            MessageBytes = sb.Append((ReadOnlySeStringSpan)message).ToArray(),
+            MessageBytes = rssb.Builder.Append((ReadOnlySeStringSpan)message).ToArray(),
             Type = channel,
         });
-
-        LSeStringBuilder.SharedPool.Return(sb);
     }
 
     private void InventoryItemCopyDetour(InventoryItem* thisPtr, InventoryItem* otherPtr)
@@ -457,15 +453,16 @@ private void HandleLinkClickDetour(LogViewer* thisPtr, LinkData* linkData)
 
         Log.Verbose($"InteractableLinkClicked: {Payload.EmbeddedInfoType.DalamudLink}");
 
-        var sb = LSeStringBuilder.SharedPool.Get();
+        using var rssb = new RentedSeStringBuilder();
+
         try
         {
             var seStringSpan = new ReadOnlySeStringSpan(linkData->Payload);
 
             // read until link terminator
             foreach (var payload in seStringSpan)
             {
-                sb.Append(payload);
+                rssb.Builder.Append(payload);
 
                 if (payload.Type == ReadOnlySePayloadType.Macro &&
                     payload.MacroCode == MacroCode.Link &&
@@ -477,7 +474,7 @@ private void HandleLinkClickDetour(LogViewer* thisPtr, LinkData* linkData)
                 }
             }
 
-            var seStr = SeString.Parse(sb.ToArray());
+            var seStr = SeString.Parse(rssb.Builder.ToArray());
             if (seStr.Payloads.Count == 0 || seStr.Payloads[0] is not DalamudLinkPayload link)
                 return;
 
@@ -495,10 +492,6 @@ private void HandleLinkClickDetour(LogViewer* thisPtr, LinkData* linkData)
         {
             Log.Error(ex, "Exception in HandleLinkClickDetour");
         }
-        finally
-        {
-            LSeStringBuilder.SharedPool.Return(sb);
-        }
     }
 }
 

Dalamud/Game/Internal/DalamudCompletion.cs

@@ -12,8 +12,6 @@
 using FFXIVClientStructs.FFXIV.Component.Completion;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-using Lumina.Text;
-
 namespace Dalamud.Game.Internal;
 
 /// <summary>
@@ -271,16 +269,14 @@ private class EntryStrings : IDisposable
     {
         public EntryStrings(string command)
         {
-            var rssb = SeStringBuilder.SharedPool.Get();
+            using var rssb = new RentedSeStringBuilder();
 
-            this.Display = Utf8String.FromSequence(rssb
+            this.Display = Utf8String.FromSequence(rssb.Builder
                 .PushColorType(539)
                 .Append(command)
                 .PopColorType()
                 .GetViewAsSpan());
 
-            SeStringBuilder.SharedPool.Return(rssb);
-
             this.Match = Utf8String.FromString(command);
         }