Merge remote-tracking branch 'origin/master' into net8-rollup

.github/workflows/rollup.yml

@@ -1,8 +1,8 @@
 name: Rollup changes to next version
 on:
-#  push:
+  push:
-#    branches:
+    branches:
-#      - master
+      - master
   workflow_dispatch:
 
 jobs:
@@ -11,7 +11,8 @@ jobs:
     strategy:
       matrix:
         branches:
-          - v9
+          - net8
+          #- new_im_hooks # Unmergeable
 
     defaults:
       run:

Dalamud/Dalamud.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Feature">
-        <DalamudVersion>9.0.0.12</DalamudVersion>
+        <DalamudVersion>9.0.0.13</DalamudVersion>
         <Description>XIV Launcher addon framework</Description>
         <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
         <Version>$(DalamudVersion)</Version>

Dalamud/Game/Gui/FlyText/FlyTextGui.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
@@ -113,32 +112,26 @@ internal sealed class FlyTextGui : IDisposable, IServiceType, IFlyTextGui
         numArray->IntArray[numOffset + 2] = unchecked((int)val1);
         numArray->IntArray[numOffset + 3] = unchecked((int)val2);
         numArray->IntArray[numOffset + 4] = unchecked((int)damageTypeIcon); // Icons for damage type
-        numArray->IntArray[numOffset + 5] = 5; // Unknown
+        numArray->IntArray[numOffset + 5] = 5;                              // Unknown
         numArray->IntArray[numOffset + 6] = unchecked((int)color);
         numArray->IntArray[numOffset + 7] = unchecked((int)icon);
         numArray->IntArray[numOffset + 8] = 0; // Unknown
         numArray->IntArray[numOffset + 9] = 0; // Unknown, has something to do with yOffset
 
-        fixed (byte* pText1 = text1.Encode())
+        strArray->SetValue((int)strOffset + 0, text1.Encode(), false, true, false);
-        {
+        strArray->SetValue((int)strOffset + 1, text2.Encode(), false, true, false);
-            fixed (byte* pText2 = text2.Encode())
-            {
-                strArray->StringArray[strOffset + 0] = pText1;
-                strArray->StringArray[strOffset + 1] = pText2;
 
-                this.addFlyTextNative(
+        this.addFlyTextNative(
-                    flytext,
+            flytext,
-                    actorIndex,
+            actorIndex,
-                    1,
+            1,
-                    (IntPtr)numArray,
+            (IntPtr)numArray,
-                    numOffset,
+            numOffset,
-                    10,
+            10,
-                    (IntPtr)strArray,
+            (IntPtr)strArray,
-                    strOffset,
+            strOffset,
-                    2,
+            2,
-                    0);
+            0);
-            }
-        }
     }
 
     private static byte[] Terminate(byte[] source)
@@ -230,7 +223,8 @@ internal sealed class FlyTextGui : IDisposable, IServiceType, IFlyTextGui
             if (!dirty)
             {
                 Log.Verbose("[FlyText] Calling flytext with original args.");
-                return this.createFlyTextHook.Original(addonFlyText, kind, val1, val2, text2, color, icon, damageTypeIcon, text1, yOffset);
+                return this.createFlyTextHook.Original(addonFlyText, kind, val1, val2, text2, color, icon,
+                                                       damageTypeIcon, text1, yOffset);
             }
 
             var terminated1 = Terminate(tmpText1.Encode());
@@ -299,10 +293,10 @@ internal class FlyTextGuiPluginScoped : IDisposable, IServiceType, IFlyTextGui
     {
         this.flyTextGuiService.FlyTextCreated += this.FlyTextCreatedForward;
     }
-        
+
     /// <inheritdoc/>
     public event IFlyTextGui.OnFlyTextCreatedDelegate? FlyTextCreated;
-    
+
     /// <inheritdoc/>
     public void Dispose()
     {

global.json

@@ -4,4 +4,4 @@
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }
-}
+}