Pilz.NET/Pilz.Dalamud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

apply code formatting

Browse Source
This commit is contained in:
Pascal
2024-07-10 11:15:08 +02:00
parent e699a758f3
commit cb2cd8e32c
36 changed files with 1331 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Pilz.Dalamud/ActivityContexts/ActivityContext.cs
View File

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

13
Pilz.Dalamud/ActivityContexts/ActivityContextManager.cs
View File

@@ -1,14 +1,8 @@
using Dalamud.Logging; using Lumina.Excel;
using Lumina.Excel;
using Lumina.Excel.GeneratedSheets; 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 class ActivityContextManager : IDisposable
{ {
public delegate void ActivityContextChangedEventHandler(ActivityContextManager sender, ActivityContext activityContext); public delegate void ActivityContextChangedEventHandler(ActivityContextManager sender, ActivityContext activityContext);
@@ -86,4 +80,3 @@ namespace Pilz.Dalamud.ActivityContexts
ActivityContextChanged?.Invoke(this, CurrentActivityContext); ActivityContextChanged?.Invoke(this, CurrentActivityContext);
} }
} }
}

10
Pilz.Dalamud/ActivityContexts/ActivityType.cs
View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; 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))] [JsonConverter(typeof(StringEnumConverter))]
public enum ActivityType public enum ActivityType
{ {
@@ -15,4 +10,3 @@ namespace Pilz.Dalamud.ActivityContexts
PveDuty = 0x1, PveDuty = 0x1,
PvpDuty = 0x2 PvpDuty = 0x2
} }
}

10
Pilz.Dalamud/ActivityContexts/ZoneType.cs
View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; 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))] [Flags, JsonConverter(typeof(StringEnumConverter))]
public enum ZoneType public enum ZoneType
{ {
@@ -19,4 +14,3 @@ namespace Pilz.Dalamud.ActivityContexts
Pvp = 32, Pvp = 32,
Everywhere = int.MaxValue Everywhere = int.MaxValue
} }
}

10
Pilz.Dalamud/Extensions.cs
View File

@@ -1,12 +1,7 @@
using Dalamud.Game.Text.SeStringHandling; 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 public static class Extensions
{ {
/// <summary> /// <summary>
@@ -38,4 +33,3 @@ namespace Pilz.Dalamud
} }
} }
} }
}

9
Pilz.Dalamud/GameInterfaceHelper.cs
View File

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

10
Pilz.Dalamud/Icons/JobIconSet.cs
View File

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

9
Pilz.Dalamud/Icons/JobIconSetName.cs
View File

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

12
Pilz.Dalamud/Icons/JobIconSets.cs
View File

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

9
Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameEventArgs.cs
View File

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

10
Pilz.Dalamud/Nameplates/EventArgs/AddonNamePlate_SetPlayerNameManagedEventArgs.cs
View File

@@ -1,13 +1,8 @@
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Pilz.Dalamud.Nameplates.Model; 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 class AddonNamePlate_SetPlayerNameManagedEventArgs : HookWithResultManagedBaseEventArgs<IntPtr>
{ {
public new AddonNamePlate_SetPlayerNameEventArgs OriginalEventArgs public new AddonNamePlate_SetPlayerNameEventArgs OriginalEventArgs
@@ -40,4 +35,3 @@ namespace Pilz.Dalamud.Nameplates.EventArgs
set => OriginalEventArgs.IconID = value; set => OriginalEventArgs.IconID = value;
} }
} }
}

9
Pilz.Dalamud/Nameplates/EventArgs/HookBaseEventArgs.cs
View File

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

9
Pilz.Dalamud/Nameplates/EventArgs/HookManagedBaseEventArgs.cs
View File

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

9
Pilz.Dalamud/Nameplates/EventArgs/HookWithResultBaseEventArgs.cs
View File

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

9
Pilz.Dalamud/Nameplates/EventArgs/HookWithResultManagedBaseEventArgs.cs
View File

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

14
Pilz.Dalamud/Nameplates/Model/SafeAddonNameplate.cs
View File

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

11
Pilz.Dalamud/Nameplates/Model/SafeNameplateInfo.cs
View File

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

13
Pilz.Dalamud/Nameplates/Model/SafeNameplateObject.cs
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 FFXIVClientStructs.FFXIV.Component.GUI;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices; 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 class SafeNameplateObject
{ {
public IntPtr Pointer { get; } public IntPtr Pointer { get; }
@@ -125,4 +119,3 @@ namespace Pilz.Dalamud.Nameplates.Model
Marshal.WriteInt16(iconYAdjustPtr, y); Marshal.WriteInt16(iconYAdjustPtr, y);
} }
} }
}

10
Pilz.Dalamud/Nameplates/Model/StatusIcons.cs
View File

@@ -1,13 +1,8 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; 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))] [JsonConverter(typeof(StringEnumConverter))]
public enum StatusIcons public enum StatusIcons
{ {
@@ -28,4 +23,3 @@ namespace Pilz.Dalamud.Nameplates.Model
MentorPvP = 061544, MentorPvP = 061544,
Returner = 061547, Returner = 061547,
} }
}

16
Pilz.Dalamud/Nameplates/NameplateHooks.cs
View File

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

13
Pilz.Dalamud/Nameplates/NameplateManager.cs
View File

@@ -1,13 +1,9 @@
using Dalamud.Hooking; using FFXIVClientStructs.FFXIV.Client.UI;
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 Pilz.Dalamud.Nameplates.Model; using Pilz.Dalamud.Nameplates.Model;
using System.Runtime.InteropServices;
namespace Pilz.Dalamud.Nameplates;
namespace Pilz.Dalamud.Nameplates
{
public class NameplateManager : IDisposable public class NameplateManager : IDisposable
{ {
/// <summary> /// <summary>
@@ -79,4 +75,3 @@ namespace Pilz.Dalamud.Nameplates
return PluginServices.ObjectTable.SearchById(objectId) as T; return PluginServices.ObjectTable.SearchById(objectId) as T;
} }
} }
}

14
Pilz.Dalamud/Nameplates/Tools/NameplateChanges.cs
View File

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

9
Pilz.Dalamud/Nameplates/Tools/NameplateChangesProps.cs
View File

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

9
Pilz.Dalamud/Nameplates/Tools/NameplateElements.cs
View File

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

13
Pilz.Dalamud/Nameplates/Tools/NameplateUpdateFactory.cs
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.ActivityContexts;
using Pilz.Dalamud.Nameplates.Model; using Pilz.Dalamud.Nameplates.Model;
using Pilz.Dalamud.Tools; using Pilz.Dalamud.Tools;
using Pilz.Dalamud.Tools.Strings; 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 class NameplateUpdateFactory
{ {
public static void ApplyNameplateChanges(NameplateChangesProps props) public static void ApplyNameplateChanges(NameplateChangesProps props)
@@ -49,4 +43,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
return isPrio.Value; return isPrio.Value;
} }
} }
}

13
Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizer.cs
View File

@@ -1,14 +1,8 @@
using Lumina.Excel.GeneratedSheets; using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.ActivityContexts;
using Pilz.Dalamud.Nameplates.Model; 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 public class StatusIconPriorizer
{ {
private static StatusIconPriorizerSettings DefaultSettings { get; } = new(); private static StatusIconPriorizerSettings DefaultSettings { get; } = new();
@@ -64,4 +58,3 @@ namespace Pilz.Dalamud.Nameplates.Tools
return Settings.GetConditionSet(set).Select(n => (int)n); return Settings.GetConditionSet(set).Select(n => (int)n);
} }
} }
}

9
Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizerConditionSets.cs
View File

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

15
Pilz.Dalamud/Nameplates/Tools/StatusIconPriorizerSettings.cs
View File

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

16
Pilz.Dalamud/PluginServices.cs
View File

@@ -1,18 +1,9 @@
using Dalamud.Data; using Dalamud.IoC;
using Dalamud.Game.ClientState;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.Gui;
using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services; 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 public class PluginServices
{ {
[PluginService] public static IDalamudPluginInterface PluginInterface { get; set; } = null; [PluginService] public static IDalamudPluginInterface PluginInterface { get; set; } = null;
@@ -27,4 +18,3 @@ namespace Pilz.Dalamud
dalamudPluginInterface.Create<PluginServices>(); dalamudPluginInterface.Create<PluginServices>();
} }
} }
}

10
Pilz.Dalamud/Tools/StatusIconFontConverter.cs
View File

@@ -1,13 +1,8 @@
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Pilz.Dalamud.Nameplates.Model; 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 class StatusIconFontConverter
{ {
public static StatusIcons? GetStatusIconFromBitmapFontIcon(BitmapFontIcon fontIcon) public static StatusIcons? GetStatusIconFromBitmapFontIcon(BitmapFontIcon fontIcon)
@@ -38,4 +33,3 @@ namespace Pilz.Dalamud.Tools
}; };
} }
} }
}

12
Pilz.Dalamud/Tools/Strings/StringChange.cs
View File

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

12
Pilz.Dalamud/Tools/Strings/StringChanges.cs
View File

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

15
Pilz.Dalamud/Tools/Strings/StringChangesProps.cs
View File

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

9
Pilz.Dalamud/Tools/Strings/StringPosition.cs
View File

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

11
Pilz.Dalamud/Tools/Strings/StringUpdateFactory.cs
View File

@@ -1,14 +1,8 @@
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; 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 class StringUpdateFactory
{ {
public static void ApplyStringChanges(StringChangesProps props) public static void ApplyStringChanges(StringChangesProps props)
@@ -129,4 +123,3 @@ namespace Pilz.Dalamud.Tools.Strings
return tagPositionsOrdered; return tagPositionsOrdered;
} }
} }
}

10
Pilz.Dalamud/XivApi.cs
View File

@@ -1,13 +1,8 @@
using FFXIVClientStructs.FFXIV.Client.System.Framework; 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; using Pilz.Dalamud.Nameplates.Model;
namespace Pilz.Dalamud namespace Pilz.Dalamud;
{
public class XivApi public class XivApi
{ {
private static IntPtr _RaptureAtkModulePtr = IntPtr.Zero; private static IntPtr _RaptureAtkModulePtr = IntPtr.Zero;
@@ -36,4 +31,3 @@ namespace Pilz.Dalamud
return new(PluginServices.PluginInterface); return new(PluginServices.PluginInterface);
} }
} }
}