diff --git a/Penumbra/Collections/Manager/IndividualCollections.Files.cs b/Penumbra/Collections/Manager/IndividualCollections.Files.cs index c719891e..d670fc42 100644 --- a/Penumbra/Collections/Manager/IndividualCollections.Files.cs +++ b/Penumbra/Collections/Manager/IndividualCollections.Files.cs @@ -4,7 +4,6 @@ using System.Linq; using Dalamud.Game.ClientState.Objects.Enums; using Dalamud.Interface.Internal.Notifications; using Newtonsoft.Json.Linq; -using OtterGui.Custom; using Penumbra.GameData.Actors; using Penumbra.Services; using Penumbra.String; diff --git a/Penumbra/Collections/Manager/IndividualCollections.cs b/Penumbra/Collections/Manager/IndividualCollections.cs index 91ab49c3..8c58722d 100644 --- a/Penumbra/Collections/Manager/IndividualCollections.cs +++ b/Penumbra/Collections/Manager/IndividualCollections.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Dalamud.Game.ClientState.Objects.Enums; -using OtterGui.Custom; using OtterGui.Filesystem; using Penumbra.GameData.Actors; using Penumbra.Services; @@ -13,15 +12,17 @@ namespace Penumbra.Collections.Manager; public sealed partial class IndividualCollections { - private readonly Configuration _config; - private readonly ActorService _actorService; - private readonly List<(string DisplayName, IReadOnlyList Identifiers, ModCollection Collection)> _assignments = new(); - private readonly Dictionary _individuals = new(); + public record struct IndividualAssignment(string DisplayName, IReadOnlyList Identifiers, ModCollection Collection); + + private readonly Configuration _config; + private readonly ActorService _actorService; + private readonly Dictionary _individuals = new(); + private readonly List _assignments = new(); public event Action Loaded; public bool IsLoaded { get; private set; } - public IReadOnlyList<(string DisplayName, IReadOnlyList Identifiers, ModCollection Collection)> Assignments + public IReadOnlyList Assignments => _assignments; public IndividualCollections(ActorService actorService, Configuration config, bool temporary) @@ -183,7 +184,7 @@ public sealed partial class IndividualCollections } } - _assignments.Add((displayName, identifiers, collection)); + _assignments.Add(new IndividualAssignment(displayName, identifiers, collection)); return true; } diff --git a/Penumbra/Interop/ResourceTree/ResourceTreeFactory.cs b/Penumbra/Interop/ResourceTree/ResourceTreeFactory.cs index 9189327c..965769a7 100644 --- a/Penumbra/Interop/ResourceTree/ResourceTreeFactory.cs +++ b/Penumbra/Interop/ResourceTree/ResourceTreeFactory.cs @@ -4,7 +4,6 @@ using Dalamud.Data; using Dalamud.Game.ClientState.Objects; using FFXIVClientStructs.FFXIV.Client.Game.Character; using FFXIVClientStructs.FFXIV.Client.Game.Object; -using OtterGui.Custom; using Penumbra.GameData.Actors; using Penumbra.Interop.PathResolving; using Penumbra.Services;