Merge pull request #1394 from KazWolfe/v9-cs-rollup

.editorconfig

@@ -101,7 +101,7 @@ resharper_braces_for_ifelse = required_for_multiline
 resharper_can_use_global_alias = false
 resharper_csharp_align_multiline_parameter = true
 resharper_csharp_align_multiple_declaration = true
-resharper_csharp_empty_block_style = together_same_line
+resharper_csharp_empty_block_style = multiline
 resharper_csharp_int_align_comments = true
 resharper_csharp_new_line_before_while = true
 resharper_csharp_wrap_after_declaration_lpar = true

Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Enums;
 
 namespace Dalamud.Game.ClientState.Objects.Types;
@@ -25,5 +23,5 @@ public unsafe class BattleNpc : BattleChara
     public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
 
     /// <inheritdoc/>
-    public override ulong TargetObjectId => this.Struct->Character.TargetObjectID;
+    public override ulong TargetObjectId => this.Struct->Character.TargetId;
 }

Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;
 
@@ -33,5 +31,5 @@ public unsafe class PlayerCharacter : BattleChara
     /// <summary>
     /// Gets the target actor ID of the PlayerCharacter.
     /// </summary>
-    public override ulong TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
+    public override ulong TargetObjectId => this.Struct->Character.LookTargetId;
 }

Dalamud/Game/ClientState/Objects/Types/Character.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Resolvers;
 using Dalamud.Game.Text.SeStringHandling;
@@ -87,7 +85,7 @@ public unsafe class Character : GameObject
     /// <summary>
     /// Gets the target object ID of the character.
     /// </summary>
-    public override ulong TargetObjectId => this.Struct->TargetObjectID;
+    public override ulong TargetObjectId => this.Struct->TargetId;
 
     /// <summary>
     /// Gets the name ID of the character.
@@ -115,5 +113,6 @@ public unsafe class Character : GameObject
     /// <summary>
     /// Gets the underlying structure.
     /// </summary>
-    protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.Character* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)this.Address;
+    protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.Character* Struct =>
+        (FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)this.Address;
 }

Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Runtime.InteropServices;
-
 using Dalamud.Game.Gui.PartyFinder.Internal;
 using Dalamud.Game.Gui.PartyFinder.Types;
 using Dalamud.Hooking;
@@ -128,6 +126,9 @@ internal sealed class PartyFinderGui : IDisposable, IServiceType, IPartyFinderGu
     }
 }
 
+/// <summary>
+/// A scoped variant of the PartyFinderGui service.
+/// </summary>
 [PluginInterface]
 [InterfaceVersion("1.0")]
 [ServiceManager.ScopedService]

Dalamud/Interface/ColorHelpers.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 
 namespace Dalamud.Interface;
@@ -8,6 +8,17 @@ namespace Dalamud.Interface;
 /// </summary>
 public static class ColorHelpers
 {
+    /// <summary>
+    /// A struct representing a color using HSVA coordinates.
+    /// </summary>
+    /// <param name="H">The hue represented by this struct.</param>
+    /// <param name="S">The saturation represented by this struct.</param>
+    /// <param name="V">The value represented by this struct.</param>
+    /// <param name="A">The alpha represented by this struct.</param>
+    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1313:Parameter names should begin with lower-case letter",
+                     Justification = "I don't like it.")]
+    public record struct HsvaColor(float H, float S, float V, float A);
+
     /// <summary>
     /// Pack a vector4 color into a uint for use in ImGui APIs.
     /// </summary>
@@ -256,6 +267,4 @@ public static class ColorHelpers
     /// <returns>The faded color.</returns>
     public static uint Fade(uint color, float amount)
         => RgbaVector4ToUint(Fade(RgbaUintToVector4(color), amount));
-    
-    public record struct HsvaColor(float H, float S, float V, float A);
 }

Dalamud/Plugin/Services/IPluginLog.cs

@@ -1,8 +1,8 @@
-using System;
-
-using Serilog;
+using Serilog;
 using Serilog.Events;
 
+#pragma warning disable CS1573 // See https://github.com/dotnet/roslyn/issues/40325
+
 namespace Dalamud.Plugin.Services;
 
 /// <summary>

lib/FFXIVClientStructs

@@ -1 +1 @@
-Subproject commit 7279a8f3ca6b79490184b05532af509781a89415
+Subproject commit 06e3ca2336031ba86ef95d022a2af722e5d00a7e