diff --git a/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs b/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
index 85c6a4a39..e3ea74f2d 100644
--- a/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
+++ b/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
}
}
+///
+/// A scoped variant of the PartyFinderGui service.
+///
[PluginInterface]
[InterfaceVersion("1.0")]
[ServiceManager.ScopedService]
diff --git a/Dalamud/Interface/ColorHelpers.cs b/Dalamud/Interface/ColorHelpers.cs
index 71f959292..ad9eedaa9 100644
--- a/Dalamud/Interface/ColorHelpers.cs
+++ b/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;
///
public static class ColorHelpers
{
+ ///
+ /// A struct representing a color using HSVA coordinates.
+ ///
+ /// The hue represented by this struct.
+ /// The saturation represented by this struct.
+ /// The value represented by this struct.
+ /// The alpha represented by this struct.
+ [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);
+
///
/// Pack a vector4 color into a uint for use in ImGui APIs.
///
@@ -22,7 +33,7 @@ public static class ColorHelpers
return (uint)((a << 24) | (b << 16) | (g << 8) | r);
}
-
+
///
/// Convert a RGBA color in the range of 0.f to 1.f to a uint.
///
@@ -37,7 +48,7 @@ public static class ColorHelpers
return new Vector4(r, g, b, a);
}
-
+
///
/// Convert a RGBA color in the range of 0.f to 1.f to a HSV color.
///
@@ -146,7 +157,7 @@ public static class ColorHelpers
return new Vector4(r, g, b, hsv.A);
}
-
+
///
/// Lighten a color.
///
@@ -159,7 +170,7 @@ public static class ColorHelpers
hsv.V += amount;
return HsvToRgb(hsv);
}
-
+
///
/// Lighten a color.
///
@@ -168,7 +179,7 @@ public static class ColorHelpers
/// The lightened color.
public static uint Lighten(uint color, float amount)
=> RgbaVector4ToUint(Lighten(RgbaUintToVector4(color), amount));
-
+
///
/// Darken a color.
///
@@ -181,7 +192,7 @@ public static class ColorHelpers
hsv.V -= amount;
return HsvToRgb(hsv);
}
-
+
///
/// Darken a color.
///
@@ -190,7 +201,7 @@ public static class ColorHelpers
/// The darkened color.
public static uint Darken(uint color, float amount)
=> RgbaVector4ToUint(Darken(RgbaUintToVector4(color), amount));
-
+
///
/// Saturate a color.
///
@@ -203,7 +214,7 @@ public static class ColorHelpers
hsv.S += amount;
return HsvToRgb(hsv);
}
-
+
///
/// Saturate a color.
///
@@ -212,7 +223,7 @@ public static class ColorHelpers
/// The saturated color.
public static uint Saturate(uint color, float amount)
=> RgbaVector4ToUint(Saturate(RgbaUintToVector4(color), amount));
-
+
///
/// Desaturate a color.
///
@@ -225,7 +236,7 @@ public static class ColorHelpers
hsv.S -= amount;
return HsvToRgb(hsv);
}
-
+
///
/// Desaturate a color.
///
@@ -234,7 +245,7 @@ public static class ColorHelpers
/// The desaturated color.
public static uint Desaturate(uint color, float amount)
=> RgbaVector4ToUint(Desaturate(RgbaUintToVector4(color), amount));
-
+
///
/// Fade a color.
///
@@ -247,7 +258,7 @@ public static class ColorHelpers
hsv.A -= amount;
return HsvToRgb(hsv);
}
-
+
///
/// Fade a color.
///
@@ -256,6 +267,4 @@ public static class ColorHelpers
/// The faded color.
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);
}
diff --git a/Dalamud/Plugin/Services/IPluginLog.cs b/Dalamud/Plugin/Services/IPluginLog.cs
index 87876f36f..62f9e8728 100644
--- a/Dalamud/Plugin/Services/IPluginLog.cs
+++ b/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;
///