From c5d09d7cd1cc916efd33a467082707af20631d5f Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Fri, 12 Sep 2025 11:56:07 +0200 Subject: [PATCH] Replace MultiDictionary. --- Penumbra/Mods/Editor/ModMetaEditor.cs | 8 ++++---- Penumbra/Services/ModMigrator.cs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Penumbra/Mods/Editor/ModMetaEditor.cs b/Penumbra/Mods/Editor/ModMetaEditor.cs index 086e9f6c..96915376 100644 --- a/Penumbra/Mods/Editor/ModMetaEditor.cs +++ b/Penumbra/Mods/Editor/ModMetaEditor.cs @@ -1,5 +1,5 @@ using System.Collections.Frozen; -using OtterGui.Classes; +using Luna; using Penumbra.Collections.Cache; using Penumbra.Meta; using Penumbra.Meta.Files; @@ -13,7 +13,7 @@ namespace Penumbra.Mods.Editor; public class ModMetaEditor( ModGroupEditor groupEditor, - MetaFileManager metaFileManager) : MetaDictionary, Luna.IService + MetaFileManager metaFileManager) : MetaDictionary, IService { public sealed class OtherOptionData : HashSet { @@ -89,7 +89,7 @@ public class ModMetaEditor( return changes; } - var defaultEntries = new MultiDictionary(); + var defaultEntries = new ListDictionary(); var actualEntries = new HashSet(); if (!FilterDefaultValues(mod.AllDataContainers, metaFileManager, defaultEntries, actualEntries)) return false; @@ -138,7 +138,7 @@ public class ModMetaEditor( } private static bool FilterDefaultValues(IEnumerable containers, MetaFileManager metaFileManager, - MultiDictionary defaultEntries, HashSet actualEntries) + ListDictionary defaultEntries, HashSet actualEntries) { if (!metaFileManager.CharacterUtility.Ready) { diff --git a/Penumbra/Services/ModMigrator.cs b/Penumbra/Services/ModMigrator.cs index 57919674..aadfdb97 100644 --- a/Penumbra/Services/ModMigrator.cs +++ b/Penumbra/Services/ModMigrator.cs @@ -1,5 +1,5 @@ using Dalamud.Plugin.Services; -using OtterGui.Classes; +using Luna; using Penumbra.Api.Enums; using Penumbra.GameData.Data; using Penumbra.GameData.Files; @@ -12,9 +12,9 @@ using Penumbra.String.Classes; 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; + private sealed class FileDataDict : ListDictionary; private readonly Lazy _glassReferenceMaterial = new(() => {