ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some stupidly introduced ambiguities.

Browse source
This commit is contained in:
Ottermandias 2023-07-05 16:18:49 +02:00
parent 823b195cb1
commit 81dae22936
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra/Collections/Manager/IndividualCollections.Files.cs
View file

@ -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;

15
Penumbra/Collections/Manager/IndividualCollections.cs
View file

@ -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<ActorIdentifier> Identifiers, ModCollection Collection)> _assignments = new();
private readonly Dictionary<ActorIdentifier, ModCollection> _individuals = new();
public record struct IndividualAssignment(string DisplayName, IReadOnlyList<ActorIdentifier> Identifiers, ModCollection Collection);
private readonly Configuration _config;
private readonly ActorService _actorService;
private readonly Dictionary<ActorIdentifier, ModCollection> _individuals = new();
private readonly List<IndividualAssignment> _assignments = new();
public event Action Loaded;
public bool IsLoaded { get; private set; }
public IReadOnlyList<(string DisplayName, IReadOnlyList<ActorIdentifier> Identifiers, ModCollection Collection)> Assignments
public IReadOnlyList<IndividualAssignment> 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;
}

1
Penumbra/Interop/ResourceTree/ResourceTreeFactory.cs
View file

@ -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;