diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs
index 3d1e496fc..953e575d4 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs
@@ -23,23 +23,7 @@ public class PartyFinderSlot
///
/// Gets a list of jobs that this slot is accepting.
///
- public IReadOnlyCollection Accepting
- {
- get
- {
- if (this.listAccepting != null)
- {
- return this.listAccepting;
- }
-
- this.listAccepting = Enum.GetValues(typeof(JobFlags))
- .Cast()
- .Where(flag => this[flag])
- .ToArray();
-
- return this.listAccepting;
- }
- }
+ public IReadOnlyCollection Accepting => this.listAccepting ??= Enum.GetValues().Where(flag => this[flag]).ToArray();
///
/// Tests if this slot is accepting a job.
diff --git a/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs b/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs
index cf34d736e..7a6960256 100644
--- a/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs
+++ b/Dalamud/Interface/FontAwesome/FontAwesomeHelpers.cs
@@ -16,14 +16,7 @@ public static class FontAwesomeHelpers
/// list of font awesome icons.
public static List GetIcons()
{
- var icons = new List();
- foreach (var icon in Enum.GetValues(typeof(FontAwesomeIcon)).Cast().ToList())
- {
- if (icon.IsObsolete()) continue;
- icons.Add(icon);
- }
-
- return icons;
+ return [.. Enum.GetValues().Where(icon => !icon.IsObsolete())];
}
///
diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index f2ffc7a4c..1b6995ba8 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -683,7 +683,7 @@ internal class DalamudInterface : IInternalDisposableService
if (ImGui.BeginMenu("Set log level..."u8))
{
- foreach (var logLevel in Enum.GetValues(typeof(LogEventLevel)).Cast())
+ foreach (var logLevel in Enum.GetValues())
{
if (ImGui.MenuItem(logLevel + "##logLevelSwitch", (byte*)null, EntryPoint.LogLevelSwitch.MinimumLevel == logLevel))
{
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
index 0b1dcb66c..6ff58d657 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
@@ -41,7 +41,7 @@ public unsafe partial class AddonTree
{
foreach (var t in from t in ClientStructsAssembly.GetTypes()
where t.IsPublic
- let xivAddonAttr = (AddonAttribute?)t.GetCustomAttribute(typeof(AddonAttribute), false)
+ let xivAddonAttr = t.GetCustomAttribute(false)
where xivAddonAttr != null
where xivAddonAttr.AddonIdentifiers.Contains(this.AddonName)
select t)
@@ -83,7 +83,7 @@ public unsafe partial class AddonTree
foreach (var field in baseType.GetFields(Static | Public | NonPublic | Instance))
{
- if (field.GetCustomAttribute(typeof(FieldOffsetAttribute)) is FieldOffsetAttribute offset)
+ if (field.GetCustomAttribute() is FieldOffsetAttribute offset)
{
try
{
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs
index fb2719868..66b061db2 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs
@@ -403,7 +403,7 @@ internal class ProfileManagerWidget
ImGui.Text(Locs.StartupBehavior);
if (ImGui.BeginCombo("##startupBehaviorPicker"u8, Locs.PolicyToLocalisedName(profile.StartupPolicy)))
{
- foreach (var policy in Enum.GetValues(typeof(ProfileModelV1.ProfileStartupPolicy)).Cast())
+ foreach (var policy in Enum.GetValues())
{
var name = Locs.PolicyToLocalisedName(policy);
if (ImGui.Selectable(name, profile.StartupPolicy == policy))
diff --git a/Dalamud/SafeMemory.cs b/Dalamud/SafeMemory.cs
index a8ac40a5d..997352850 100644
--- a/Dalamud/SafeMemory.cs
+++ b/Dalamud/SafeMemory.cs
@@ -292,7 +292,7 @@ public static class SafeMemory
return bytes;
}
- public T Read(int offset = 0) => (T)Marshal.PtrToStructure(this.hGlobal + offset, typeof(T));
+ public T Read(int offset = 0) => Marshal.PtrToStructure(this.hGlobal + offset);
public object? Read(Type type, int offset = 0) => Marshal.PtrToStructure(this.hGlobal + offset, type);
diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs
index 2a3733303..b57636e3b 100644
--- a/Dalamud/Utility/Util.cs
+++ b/Dalamud/Utility/Util.cs
@@ -1116,8 +1116,8 @@ public static partial class Util
foreach (var f in obj.GetType()
.GetFields(BindingFlags.Static | BindingFlags.Public | BindingFlags.Instance))
{
- var fixedBuffer = (FixedBufferAttribute)f.GetCustomAttribute(typeof(FixedBufferAttribute));
- var offset = (FieldOffsetAttribute)f.GetCustomAttribute(typeof(FieldOffsetAttribute));
+ var fixedBuffer = f.GetCustomAttribute();
+ var offset = f.GetCustomAttribute();
if (fixedBuffer != null)
{