apply code formatting

This commit is contained in:
2024-07-10 11:15:08 +02:00
parent e699a758f3
commit cb2cd8e32c
36 changed files with 1331 additions and 1580 deletions

View File

@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.ActivityContexts;
namespace Pilz.Dalamud.ActivityContexts
{
public class ActivityContext
{
public ActivityType ActivityType { get; init; }
@@ -22,4 +16,3 @@ namespace Pilz.Dalamud.ActivityContexts
get => ZoneType != ZoneType.Overworld;
}
}
}

View File

@@ -1,14 +1,8 @@
using Dalamud.Logging;
using Lumina.Excel;
using Lumina.Excel;
using Lumina.Excel.GeneratedSheets;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.ActivityContexts
{
namespace Pilz.Dalamud.ActivityContexts;
public class ActivityContextManager : IDisposable
{
public delegate void ActivityContextChangedEventHandler(ActivityContextManager sender, ActivityContext activityContext);
@@ -86,4 +80,3 @@ namespace Pilz.Dalamud.ActivityContexts
ActivityContextChanged?.Invoke(this, CurrentActivityContext);
}
}
}

View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.ActivityContexts
{
namespace Pilz.Dalamud.ActivityContexts;
[JsonConverter(typeof(StringEnumConverter))]
public enum ActivityType
{
@@ -15,4 +10,3 @@ namespace Pilz.Dalamud.ActivityContexts
PveDuty = 0x1,
PvpDuty = 0x2
}
}

View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.ActivityContexts
{
namespace Pilz.Dalamud.ActivityContexts;
[Flags, JsonConverter(typeof(StringEnumConverter))]
public enum ZoneType
{
@@ -19,4 +14,3 @@ namespace Pilz.Dalamud.ActivityContexts
Pvp = 32,
Everywhere = int.MaxValue
}
}

View File

@@ -1,12 +1,7 @@
using Dalamud.Game.Text.SeStringHandling;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud
{
namespace Pilz.Dalamud;
public static class Extensions
{
/// <summary>
@@ -38,4 +33,3 @@ namespace Pilz.Dalamud
}
}
}
}

View File

@@ -1,14 +1,10 @@
using Dalamud.Game.Text.SeStringHandling;
using FFXIVClientStructs.FFXIV.Client.System.Memory;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud
{
namespace Pilz.Dalamud;
public static class GameInterfaceHelper
{
public static SeString ReadSeString(IntPtr ptr)
@@ -150,4 +146,3 @@ namespace Pilz.Dalamud
ptr = IntPtr.Zero;
}
}
}

View File

@@ -1,12 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Icons;
namespace Pilz.Dalamud.Icons
{
public class JobIconSet
{
private readonly int[] icons;
@@ -24,4 +17,3 @@ namespace Pilz.Dalamud.Icons
return icons[jobID - 1];
}
}
}

View File

@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Icons;
namespace Pilz.Dalamud.Icons
{
public enum JobIconSetName
{
Gold,
@@ -21,4 +15,3 @@ namespace Pilz.Dalamud.Icons
Grey,
Role
}
}

View File

@@ -1,15 +1,8 @@
using Lumina.Excel.GeneratedSheets;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Icons;
namespace Pilz.Dalamud.Icons
{
public class JobIconSets
{
private readonly Dictionary<JobIconSetName, JobIconSet> iconSets = new();
private readonly Dictionary<JobIconSetName, JobIconSet> iconSets = [];
public JobIconSets()
{
@@ -125,4 +118,3 @@ namespace Pilz.Dalamud.Icons
return iconSets[set].IconScale;
}
}
}

View File

@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.EventArgs;
namespace Pilz.Dalamud.Nameplates.EventArgs
{
public class AddonNamePlate_SetPlayerNameEventArgs : HookWithResultBaseEventArgs<IntPtr>
{
public IntPtr PlayerNameplateObjectPtr { get; set; }
@@ -17,4 +11,3 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
public bool IsTitleVisible { get; set; }
public int IconID { get; set; }
}
}

View File

@@ -1,13 +1,8 @@
using Dalamud.Game.Text.SeStringHandling;
using Pilz.Dalamud.Nameplates.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.EventArgs
{
namespace Pilz.Dalamud.Nameplates.EventArgs;
public class AddonNamePlate_SetPlayerNameManagedEventArgs : HookWithResultManagedBaseEventArgs<IntPtr>
{
public new AddonNamePlate_SetPlayerNameEventArgs OriginalEventArgs
@@ -40,4 +35,3 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
set => OriginalEventArgs.IconID = value;
}
}
}

View File

@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.EventArgs;
namespace Pilz.Dalamud.Nameplates.EventArgs
{
public abstract class HookBaseEventArgs
{
internal event Action CallOriginal;
@@ -15,4 +9,3 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
CallOriginal?.Invoke();
}
}
}

View File

@@ -1,13 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.EventArgs;
namespace Pilz.Dalamud.Nameplates.EventArgs
{
public abstract class HookManagedBaseEventArgs
{
public HookBaseEventArgs OriginalEventArgs { get; internal set; }
}
}

View File

@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.EventArgs;
namespace Pilz.Dalamud.Nameplates.EventArgs
{
public abstract class HookWithResultBaseEventArgs<TResult>
{
internal event Func<TResult> CallOriginal;
@@ -18,4 +12,3 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
return CallOriginal.Invoke();
}
}
}

View File

@@ -1,13 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.EventArgs;
namespace Pilz.Dalamud.Nameplates.EventArgs
{
public abstract class HookWithResultManagedBaseEventArgs<TResult>
{
public HookWithResultBaseEventArgs<TResult> OriginalEventArgs { get; internal set; }
}
}

View File

@@ -1,15 +1,8 @@
using Dalamud.Logging;
using Dalamud.Plugin;
using FFXIVClientStructs.FFXIV.Client.UI;
using System;
using System.Collections.Generic;
using System.Linq;
using FFXIVClientStructs.FFXIV.Client.UI;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Model
{
namespace Pilz.Dalamud.Nameplates.Model;
public class SafeAddonNameplate
{
private readonly DalamudPluginInterface Interface;
@@ -40,4 +33,3 @@ namespace Pilz.Dalamud.Nameplates.Model
return result;
}
}
}

View File

@@ -1,15 +1,9 @@
using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Model
{
namespace Pilz.Dalamud.Nameplates.Model;
public class SafeNameplateInfo
{
public readonly IntPtr Pointer;
@@ -54,4 +48,3 @@ namespace Pilz.Dalamud.Nameplates.Model
return Marshal.PtrToStringUTF8(stringPtr);
}
}
}

View File

@@ -1,15 +1,9 @@
using Dalamud.Logging;
using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.GUI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Model
{
namespace Pilz.Dalamud.Nameplates.Model;
public class SafeNameplateObject
{
public IntPtr Pointer { get; }
@@ -125,4 +119,3 @@ namespace Pilz.Dalamud.Nameplates.Model
Marshal.WriteInt16(iconYAdjustPtr, y);
}
}
}

View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Model
{
namespace Pilz.Dalamud.Nameplates.Model;
[JsonConverter(typeof(StringEnumConverter))]
public enum StatusIcons
{
@@ -28,4 +23,3 @@ namespace Pilz.Dalamud.Nameplates.Model
MentorPvP = 061544,
Returner = 061547,
}
}

View File

@@ -1,19 +1,10 @@
using Dalamud.Hooking;
using Pilz.Dalamud.Nameplates.EventArgs;
using Dalamud.Utility.Signatures;
using ImGuiNET;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Pilz.Dalamud.Nameplates.EventArgs;
using Pilz.Dalamud.Nameplates.Model;
using Lumina.Excel.GeneratedSheets;
using System.Xml.Linq;
using Dalamud.Plugin.Services;
namespace Pilz.Dalamud.Nameplates
{
namespace Pilz.Dalamud.Nameplates;
public class NameplateHooks : IDisposable
{
/// <summary>
@@ -237,4 +228,3 @@ namespace Pilz.Dalamud.Nameplates
return result;
}
}
}

View File

@@ -1,13 +1,9 @@
using Dalamud.Hooking;
using Pilz.Dalamud.Nameplates.EventArgs;
using Dalamud.Utility.Signatures;
using FFXIVClientStructs.FFXIV.Client.UI;
using System.Runtime.InteropServices;
using Dalamud.Game.ClientState.Objects.Types;
using FFXIVClientStructs.FFXIV.Client.UI;
using Pilz.Dalamud.Nameplates.Model;
using System.Runtime.InteropServices;
namespace Pilz.Dalamud.Nameplates;
namespace Pilz.Dalamud.Nameplates
{
public class NameplateManager : IDisposable
{
/// <summary>
@@ -79,4 +75,3 @@ namespace Pilz.Dalamud.Nameplates
return PluginServices.ObjectTable.SearchById(objectId) as T;
}
}
}

View File

@@ -1,16 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Pilz.Dalamud.Nameplates.EventArgs;
using Pilz.Dalamud.Nameplates.EventArgs;
using Pilz.Dalamud.Tools.Strings;
namespace Pilz.Dalamud.Nameplates.Tools
{
namespace Pilz.Dalamud.Nameplates.Tools;
public class NameplateChanges
{
private readonly Dictionary<NameplateElements, StringChangesProps> changes = new();
private readonly Dictionary<NameplateElements, StringChangesProps> changes = [];
public NameplateChanges()
{
@@ -57,4 +52,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
return GetChanges(element).GetChange(position);
}
}
}

View File

@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Tools;
namespace Pilz.Dalamud.Nameplates.Tools
{
public class NameplateChangesProps
{
/// <summary>
@@ -22,4 +16,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
Changes = changes;
}
}
}

View File

@@ -1,15 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Tools;
namespace Pilz.Dalamud.Nameplates.Tools
{
public enum NameplateElements
{
Name,
Title,
FreeCompany
}
}

View File

@@ -1,17 +1,11 @@
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.Nameplates.Model;
using Pilz.Dalamud.Tools;
using Pilz.Dalamud.Tools.Strings;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Tools
{
namespace Pilz.Dalamud.Nameplates.Tools;
public static class NameplateUpdateFactory
{
public static void ApplyNameplateChanges(NameplateChangesProps props)
@@ -49,4 +43,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
return isPrio.Value;
}
}
}

View File

@@ -1,14 +1,8 @@
using Lumina.Excel.GeneratedSheets;
using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.Nameplates.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Tools
{
namespace Pilz.Dalamud.Nameplates.Tools;
public class StatusIconPriorizer
{
private static StatusIconPriorizerSettings DefaultSettings { get; } = new();
@@ -64,4 +58,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
return Settings.GetConditionSet(set).Select(n => (int)n);
}
}
}

View File

@@ -1,15 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Tools;
namespace Pilz.Dalamud.Nameplates.Tools
{
public enum StatusIconPriorizerConditionSets
{
Overworld,
InDuty,
InForay
}
}

View File

@@ -1,18 +1,12 @@
using Newtonsoft.Json;
using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.Nameplates.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Nameplates.Tools
{
namespace Pilz.Dalamud.Nameplates.Tools;
public class StatusIconPriorizerSettings
{
[JsonProperty("IconConditionSets")]
private Dictionary<StatusIconPriorizerConditionSets, List<StatusIcons>> iconConditionSets = new();
private Dictionary<StatusIconPriorizerConditionSets, List<StatusIcons>> iconConditionSets = [];
public bool UsePriorizedIcons { get; set; } = true;
[JsonConstructor]
@@ -27,7 +21,7 @@ namespace Pilz.Dalamud.Nameplates.Tools
public StatusIconPriorizerSettings(bool fillWithDefaultSettings)
{
foreach (StatusIconPriorizerConditionSets set in Enum.GetValues(typeof(StatusIconPriorizerConditionSets)))
iconConditionSets.Add(set, new List<StatusIcons>());
iconConditionSets.Add(set, []);
if (fillWithDefaultSettings)
FillWithDefaultSettings();
@@ -107,4 +101,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
});
}
}
}

View File

@@ -1,18 +1,9 @@
using Dalamud.Data;
using Dalamud.Game.ClientState;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.Gui;
using Dalamud.IoC;
using Dalamud.IoC;
using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud
{
namespace Pilz.Dalamud;
public class PluginServices
{
[PluginService] public static IDalamudPluginInterface PluginInterface { get; set; } = null;
@@ -27,4 +18,3 @@ namespace Pilz.Dalamud
dalamudPluginInterface.Create<PluginServices>();
}
}
}

View File

@@ -1,13 +1,8 @@
using Dalamud.Game.Text.SeStringHandling;
using Pilz.Dalamud.Nameplates.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Tools
{
namespace Pilz.Dalamud.Tools;
public static class StatusIconFontConverter
{
public static StatusIcons? GetStatusIconFromBitmapFontIcon(BitmapFontIcon fontIcon)
@@ -38,4 +33,3 @@ namespace Pilz.Dalamud.Tools
};
}
}
}

View File

@@ -1,18 +1,13 @@
using Dalamud.Game.Text.SeStringHandling;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Tools.Strings
{
namespace Pilz.Dalamud.Tools.Strings;
public class StringChange
{
/// <summary>
/// The payloads to use for inserting/replacing.
/// </summary>
public List<Payload> Payloads { get; init; } = new();
public List<Payload> Payloads { get; init; } = [];
/// <summary>
/// Defines if only one anchor payload should be used, if using anchor payloads.
@@ -21,4 +16,3 @@ namespace Pilz.Dalamud.Tools.Strings
/// </summary>
public bool ForceUsingSingleAnchorPayload { get; set; } = false;
}
}

View File

@@ -1,15 +1,8 @@
using Dalamud.Game.Text.SeStringHandling;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Tools.Strings;
namespace Pilz.Dalamud.Tools.Strings
{
public class StringChanges
{
private readonly Dictionary<StringPosition, StringChange> changes = new();
private readonly Dictionary<StringPosition, StringChange> changes = [];
public StringChanges()
{
@@ -37,4 +30,3 @@ namespace Pilz.Dalamud.Tools.Strings
return changes.Sum(n => n.Value.Payloads.Count) != 0;
}
}
}

View File

@@ -1,13 +1,7 @@
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Game.Text.SeStringHandling;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Dalamud.Game.Text.SeStringHandling;
namespace Pilz.Dalamud.Tools.Strings;
namespace Pilz.Dalamud.Tools.Strings
{
public class StringChangesProps
{
/// <summary>
@@ -21,11 +15,10 @@ namespace Pilz.Dalamud.Tools.Strings
/// <summary>
/// Payloads to use as anchor where the changes should be applied to.
/// </summary>
public List<Payload> AnchorPayloads { get; set; } = new();
public List<Payload> AnchorPayloads { get; set; } = [];
/// <summary>
/// A single payload to use as anchor where the changes should be applied to.
/// This property will only be used if StringChange.ForceSingleAnchorPayload is true.
/// </summary>
public Payload AnchorPayload { get; set; }
}
}

View File

@@ -1,15 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Tools.Strings;
namespace Pilz.Dalamud.Tools.Strings
{
public enum StringPosition
{
Before,
After,
Replace
}
}

View File

@@ -1,14 +1,8 @@
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Lumina.Text;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Dalamud.Tools.Strings
{
namespace Pilz.Dalamud.Tools.Strings;
public static class StringUpdateFactory
{
public static void ApplyStringChanges(StringChangesProps props)
@@ -129,4 +123,3 @@ namespace Pilz.Dalamud.Tools.Strings
return tagPositionsOrdered;
}
}
}

View File

@@ -1,13 +1,8 @@
using FFXIVClientStructs.FFXIV.Client.System.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Pilz.Dalamud.Nameplates.Model;
namespace Pilz.Dalamud
{
namespace Pilz.Dalamud;
public class XivApi
{
private static IntPtr _RaptureAtkModulePtr = IntPtr.Zero;
@@ -36,4 +31,3 @@ namespace Pilz.Dalamud
return new(PluginServices.PluginInterface);
}
}
}