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

Replace MultiDictionary.
Some checks failed
.NET Build / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
Ottermandias 2025-09-12 11:56:07 +02:00
parent c423ce1d47
commit c5d09d7cd1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Penumbra/Mods/Editor/ModMetaEditor.cs
View file

@ -1,5 +1,5 @@
using System.Collections.Frozen; using System.Collections.Frozen;
using OtterGui.Classes; using Luna;
using Penumbra.Collections.Cache; using Penumbra.Collections.Cache;
using Penumbra.Meta; using Penumbra.Meta;
using Penumbra.Meta.Files; using Penumbra.Meta.Files;
@ -13,7 +13,7 @@ namespace Penumbra.Mods.Editor;
public class ModMetaEditor( public class ModMetaEditor(
ModGroupEditor groupEditor, ModGroupEditor groupEditor,
MetaFileManager metaFileManager) : MetaDictionary, Luna.IService MetaFileManager metaFileManager) : MetaDictionary, IService
{ {
public sealed class OtherOptionData : HashSet<string> public sealed class OtherOptionData : HashSet<string>
{ {
@ -89,7 +89,7 @@ public class ModMetaEditor(
return changes; return changes;
} }
var defaultEntries = new MultiDictionary<IMetaIdentifier, IModDataContainer>(); var defaultEntries = new ListDictionary<IMetaIdentifier, IModDataContainer>();
var actualEntries = new HashSet<IMetaIdentifier>(); var actualEntries = new HashSet<IMetaIdentifier>();
if (!FilterDefaultValues(mod.AllDataContainers, metaFileManager, defaultEntries, actualEntries)) if (!FilterDefaultValues(mod.AllDataContainers, metaFileManager, defaultEntries, actualEntries))
return false; return false;
@ -138,7 +138,7 @@ public class ModMetaEditor(
} }
private static bool FilterDefaultValues(IEnumerable<IModDataContainer> containers, MetaFileManager metaFileManager, private static bool FilterDefaultValues(IEnumerable<IModDataContainer> containers, MetaFileManager metaFileManager,
MultiDictionary<IMetaIdentifier, IModDataContainer> defaultEntries, HashSet<IMetaIdentifier> actualEntries) ListDictionary<IMetaIdentifier, IModDataContainer> defaultEntries, HashSet<IMetaIdentifier> actualEntries)
{ {
if (!metaFileManager.CharacterUtility.Ready) if (!metaFileManager.CharacterUtility.Ready)
{ {

6
Penumbra/Services/ModMigrator.cs
View file

@ -1,5 +1,5 @@
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using OtterGui.Classes; using Luna;
using Penumbra.Api.Enums; using Penumbra.Api.Enums;
using Penumbra.GameData.Data; using Penumbra.GameData.Data;
using Penumbra.GameData.Files; using Penumbra.GameData.Files;
@ -12,9 +12,9 @@ using Penumbra.String.Classes;
namespace Penumbra.Services; namespace Penumbra.Services;
public class ModMigrator(IDataManager gameData, TextureManager textures) : Luna.IService public class ModMigrator(IDataManager gameData, TextureManager textures) : IService
{ {
private sealed class FileDataDict : MultiDictionary<string, (string GamePath, IModDataContainer Container)>; private sealed class FileDataDict : ListDictionary<string, (string GamePath, IModDataContainer Container)>;
private readonly Lazy<MtrlFile> _glassReferenceMaterial = new(() => private readonly Lazy<MtrlFile> _glassReferenceMaterial = new(() =>
{ {