From 113078af9040ae1772ea602b22e430c42b9d395d Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Fri, 31 Mar 2023 20:44:17 +0200 Subject: [PATCH] Namespace movement. --- Penumbra/Api/IpcTester.cs | 1 + Penumbra/Api/PenumbraApi.cs | 1 + Penumbra/Api/PenumbraIpcProviders.cs | 1 + Penumbra/Collections/CollectionManager.cs | 1 + Penumbra/Collections/ModCollection.Cache.cs | 3 +- Penumbra/CommandHandler.cs | 1 + Penumbra/Import/TexToolsImport.cs | 3 +- Penumbra/Mods/Editor/DuplicateManager.cs | 1 + Penumbra/Mods/Editor/ModBackup.cs | 1 + Penumbra/Mods/Editor/ModMetaEditor.cs | 1 + Penumbra/Mods/Editor/ModNormalizer.cs | 1 + Penumbra/Mods/Editor/ModSwapEditor.cs | 1 + Penumbra/Mods/ItemSwap/ItemSwapContainer.cs | 1 + Penumbra/Mods/Manager/ExportManager.cs | 2 +- .../Mods/{ => Manager}/ModCacheManager.cs | 0 Penumbra/Mods/Manager/ModDataChangeType.cs | 21 ------- Penumbra/Mods/Manager/ModDataEditor.cs | 18 ++++++ Penumbra/Mods/Manager/ModOptionChangeType.cs | 54 ------------------ Penumbra/Mods/Manager/ModOptionEditor.cs | 55 ++++++++++++++++++- Penumbra/Mods/Manager/ModStorage.cs | 2 +- Penumbra/Mods/Mod.BasePath.cs | 1 + Penumbra/Mods/ModCache.cs | 22 ++++---- Penumbra/Mods/ModFileSystem.cs | 1 + Penumbra/Mods/Subclasses/ModSettings.cs | 1 + Penumbra/Mods/TemporaryMod.cs | 1 + Penumbra/Penumbra.cs | 3 +- Penumbra/Penumbra.csproj.DotSettings | 5 -- Penumbra/PenumbraNew.cs | 3 +- Penumbra/Services/CommunicatorService.cs | 1 + Penumbra/UI/AdvancedWindow/ItemSwapTab.cs | 1 + Penumbra/UI/AdvancedWindow/ModEditWindow.cs | 1 + Penumbra/UI/ModsTab/ModFileSystemSelector.cs | 1 + .../UI/ModsTab/ModPanelChangedItemsTab.cs | 2 +- Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs | 1 + Penumbra/UI/ModsTab/ModPanelEditTab.cs | 1 + Penumbra/UI/ModsTab/ModPanelSettingsTab.cs | 1 + Penumbra/UI/ModsTab/ModPanelTabBar.cs | 1 + Penumbra/UI/Tabs/DebugTab.cs | 3 +- Penumbra/UI/Tabs/ModsTab.cs | 1 + Penumbra/UI/Tabs/SettingsTab.cs | 1 + 40 files changed, 121 insertions(+), 100 deletions(-) rename Penumbra/Mods/{ => Manager}/ModCacheManager.cs (100%) delete mode 100644 Penumbra/Mods/Manager/ModDataChangeType.cs delete mode 100644 Penumbra/Mods/Manager/ModOptionChangeType.cs delete mode 100644 Penumbra/Penumbra.csproj.DotSettings diff --git a/Penumbra/Api/IpcTester.cs b/Penumbra/Api/IpcTester.cs index c98ac854..da348667 100644 --- a/Penumbra/Api/IpcTester.cs +++ b/Penumbra/Api/IpcTester.cs @@ -16,6 +16,7 @@ using Penumbra.Collections; using Penumbra.String; using Penumbra.String.Classes; using Penumbra.Meta.Manipulations; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI; diff --git a/Penumbra/Api/PenumbraApi.cs b/Penumbra/Api/PenumbraApi.cs index 8b6adafc..4e49ab0a 100644 --- a/Penumbra/Api/PenumbraApi.cs +++ b/Penumbra/Api/PenumbraApi.cs @@ -18,6 +18,7 @@ using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using Penumbra.Api.Enums; using Penumbra.GameData.Actors; using Penumbra.Interop.ResourceLoading; +using Penumbra.Mods.Manager; using Penumbra.String; using Penumbra.String.Classes; using Penumbra.Services; diff --git a/Penumbra/Api/PenumbraIpcProviders.cs b/Penumbra/Api/PenumbraIpcProviders.cs index e6d135bb..0a28f0de 100644 --- a/Penumbra/Api/PenumbraIpcProviders.cs +++ b/Penumbra/Api/PenumbraIpcProviders.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Penumbra.Api.Enums; using Penumbra.Api.Helpers; using Penumbra.Mods; +using Penumbra.Mods.Manager; namespace Penumbra.Api; diff --git a/Penumbra/Collections/CollectionManager.cs b/Penumbra/Collections/CollectionManager.cs index 0f2694ba..d3628c27 100644 --- a/Penumbra/Collections/CollectionManager.cs +++ b/Penumbra/Collections/CollectionManager.cs @@ -10,6 +10,7 @@ using System.Linq; using Penumbra.Api; using Penumbra.GameData.Actors; using Penumbra.Interop.Services; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.Util; using CharacterUtility = Penumbra.Interop.Services.CharacterUtility; diff --git a/Penumbra/Collections/ModCollection.Cache.cs b/Penumbra/Collections/ModCollection.Cache.cs index 576652ed..7c7fa08a 100644 --- a/Penumbra/Collections/ModCollection.Cache.cs +++ b/Penumbra/Collections/ModCollection.Cache.cs @@ -9,7 +9,8 @@ using System.IO; using System.Linq; using Penumbra.Api.Enums; using Penumbra.String.Classes; - +using Penumbra.Mods.Manager; + namespace Penumbra.Collections; public record struct ModPath( IMod Mod, FullPath Path ); diff --git a/Penumbra/CommandHandler.cs b/Penumbra/CommandHandler.cs index bb1ce79a..44415ff9 100644 --- a/Penumbra/CommandHandler.cs +++ b/Penumbra/CommandHandler.cs @@ -11,6 +11,7 @@ using Penumbra.Collections; using Penumbra.GameData.Actors; using Penumbra.Interop.Services; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI; using Penumbra.Util; diff --git a/Penumbra/Import/TexToolsImport.cs b/Penumbra/Import/TexToolsImport.cs index 56b39f6e..a1478e5b 100644 --- a/Penumbra/Import/TexToolsImport.cs +++ b/Penumbra/Import/TexToolsImport.cs @@ -8,8 +8,9 @@ using System.Threading; using System.Threading.Tasks; using Newtonsoft.Json; using Penumbra.Api; -using Penumbra.Import.Structs; +using Penumbra.Import.Structs; using Penumbra.Mods; +using Penumbra.Mods.Manager; using FileMode = System.IO.FileMode; using ZipArchive = SharpCompress.Archives.Zip.ZipArchive; using ZipArchiveEntry = SharpCompress.Archives.Zip.ZipArchiveEntry; diff --git a/Penumbra/Mods/Editor/DuplicateManager.cs b/Penumbra/Mods/Editor/DuplicateManager.cs index 0472bb09..20b6e019 100644 --- a/Penumbra/Mods/Editor/DuplicateManager.cs +++ b/Penumbra/Mods/Editor/DuplicateManager.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Security.Cryptography; using System.Threading.Tasks; +using Penumbra.Mods.Manager; using Penumbra.String.Classes; using Penumbra.Util; diff --git a/Penumbra/Mods/Editor/ModBackup.cs b/Penumbra/Mods/Editor/ModBackup.cs index 991927f5..72162b95 100644 --- a/Penumbra/Mods/Editor/ModBackup.cs +++ b/Penumbra/Mods/Editor/ModBackup.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; using System.Threading.Tasks; +using Penumbra.Mods.Manager; namespace Penumbra.Mods; diff --git a/Penumbra/Mods/Editor/ModMetaEditor.cs b/Penumbra/Mods/Editor/ModMetaEditor.cs index b1dced58..dbd42aa3 100644 --- a/Penumbra/Mods/Editor/ModMetaEditor.cs +++ b/Penumbra/Mods/Editor/ModMetaEditor.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using Penumbra.Meta.Manipulations; +using Penumbra.Mods.Manager; namespace Penumbra.Mods; diff --git a/Penumbra/Mods/Editor/ModNormalizer.cs b/Penumbra/Mods/Editor/ModNormalizer.cs index 604fc9e5..395d71dd 100644 --- a/Penumbra/Mods/Editor/ModNormalizer.cs +++ b/Penumbra/Mods/Editor/ModNormalizer.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Dalamud.Interface.Internal.Notifications; using OtterGui; +using Penumbra.Mods.Manager; using Penumbra.String.Classes; namespace Penumbra.Mods; diff --git a/Penumbra/Mods/Editor/ModSwapEditor.cs b/Penumbra/Mods/Editor/ModSwapEditor.cs index e411ad70..58ef10a0 100644 --- a/Penumbra/Mods/Editor/ModSwapEditor.cs +++ b/Penumbra/Mods/Editor/ModSwapEditor.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.String.Classes; using Penumbra.Util; diff --git a/Penumbra/Mods/ItemSwap/ItemSwapContainer.cs b/Penumbra/Mods/ItemSwap/ItemSwapContainer.cs index 964aee70..c6f1b607 100644 --- a/Penumbra/Mods/ItemSwap/ItemSwapContainer.cs +++ b/Penumbra/Mods/ItemSwap/ItemSwapContainer.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using Penumbra.Mods.Manager; namespace Penumbra.Mods.ItemSwap; diff --git a/Penumbra/Mods/Manager/ExportManager.cs b/Penumbra/Mods/Manager/ExportManager.cs index f4078098..a59315d6 100644 --- a/Penumbra/Mods/Manager/ExportManager.cs +++ b/Penumbra/Mods/Manager/ExportManager.cs @@ -2,7 +2,7 @@ using System; using System.IO; using Penumbra.Services; -namespace Penumbra.Mods; +namespace Penumbra.Mods.Manager; public class ExportManager : IDisposable { diff --git a/Penumbra/Mods/ModCacheManager.cs b/Penumbra/Mods/Manager/ModCacheManager.cs similarity index 100% rename from Penumbra/Mods/ModCacheManager.cs rename to Penumbra/Mods/Manager/ModCacheManager.cs diff --git a/Penumbra/Mods/Manager/ModDataChangeType.cs b/Penumbra/Mods/Manager/ModDataChangeType.cs deleted file mode 100644 index eccf83cb..00000000 --- a/Penumbra/Mods/Manager/ModDataChangeType.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; - -namespace Penumbra.Mods; - -[Flags] -public enum ModDataChangeType : ushort -{ - None = 0x0000, - Name = 0x0001, - Author = 0x0002, - Description = 0x0004, - Version = 0x0008, - Website = 0x0010, - Deletion = 0x0020, - Migration = 0x0040, - ModTags = 0x0080, - ImportDate = 0x0100, - Favorite = 0x0200, - LocalTags = 0x0400, - Note = 0x0800, -} diff --git a/Penumbra/Mods/Manager/ModDataEditor.cs b/Penumbra/Mods/Manager/ModDataEditor.cs index 09a24bba..48f13514 100644 --- a/Penumbra/Mods/Manager/ModDataEditor.cs +++ b/Penumbra/Mods/Manager/ModDataEditor.cs @@ -9,6 +9,24 @@ using Penumbra.Util; namespace Penumbra.Mods; +[Flags] +public enum ModDataChangeType : ushort +{ + None = 0x0000, + Name = 0x0001, + Author = 0x0002, + Description = 0x0004, + Version = 0x0008, + Website = 0x0010, + Deletion = 0x0020, + Migration = 0x0040, + ModTags = 0x0080, + ImportDate = 0x0100, + Favorite = 0x0200, + LocalTags = 0x0400, + Note = 0x0800, +} + public class ModDataEditor { private readonly FilenameService _filenameService; diff --git a/Penumbra/Mods/Manager/ModOptionChangeType.cs b/Penumbra/Mods/Manager/ModOptionChangeType.cs deleted file mode 100644 index 3e6ff5c6..00000000 --- a/Penumbra/Mods/Manager/ModOptionChangeType.cs +++ /dev/null @@ -1,54 +0,0 @@ -namespace Penumbra.Mods; - -public enum ModOptionChangeType -{ - GroupRenamed, - GroupAdded, - GroupDeleted, - GroupMoved, - GroupTypeChanged, - PriorityChanged, - OptionAdded, - OptionDeleted, - OptionMoved, - OptionFilesChanged, - OptionFilesAdded, - OptionSwapsChanged, - OptionMetaChanged, - DisplayChange, - PrepareChange, - DefaultOptionChanged, -} - -public static class ModOptionChangeTypeExtension -{ - /// - /// Give information for each type of change. - /// If requiresSaving, collections need to be re-saved after this change. - /// If requiresReloading, caches need to be manipulated after this change. - /// If wasPrepared, caches have already removed the mod beforehand, then need add it again when this event is fired. - /// Otherwise, caches need to reload the mod itself. - /// - public static void HandlingInfo( this ModOptionChangeType type, out bool requiresSaving, out bool requiresReloading, out bool wasPrepared ) - { - ( requiresSaving, requiresReloading, wasPrepared ) = type switch - { - ModOptionChangeType.GroupRenamed => ( true, false, false ), - ModOptionChangeType.GroupAdded => ( true, false, false ), - ModOptionChangeType.GroupDeleted => ( true, true, false ), - ModOptionChangeType.GroupMoved => ( true, false, false ), - ModOptionChangeType.GroupTypeChanged => ( true, true, true ), - ModOptionChangeType.PriorityChanged => ( true, true, true ), - ModOptionChangeType.OptionAdded => ( true, true, true ), - ModOptionChangeType.OptionDeleted => ( true, true, false ), - ModOptionChangeType.OptionMoved => ( true, false, false ), - ModOptionChangeType.OptionFilesChanged => ( false, true, false ), - ModOptionChangeType.OptionFilesAdded => ( false, true, true ), - ModOptionChangeType.OptionSwapsChanged => ( false, true, false ), - ModOptionChangeType.OptionMetaChanged => ( false, true, false ), - ModOptionChangeType.DisplayChange => ( false, false, false ), - ModOptionChangeType.DefaultOptionChanged => ( true, false, false ), - _ => ( false, false, false ), - }; - } -} \ No newline at end of file diff --git a/Penumbra/Mods/Manager/ModOptionEditor.cs b/Penumbra/Mods/Manager/ModOptionEditor.cs index 8e96b3e2..b1029822 100644 --- a/Penumbra/Mods/Manager/ModOptionEditor.cs +++ b/Penumbra/Mods/Manager/ModOptionEditor.cs @@ -10,7 +10,27 @@ using Penumbra.Services; using Penumbra.String.Classes; using Penumbra.Util; -namespace Penumbra.Mods; +namespace Penumbra.Mods.Manager; + +public enum ModOptionChangeType +{ + GroupRenamed, + GroupAdded, + GroupDeleted, + GroupMoved, + GroupTypeChanged, + PriorityChanged, + OptionAdded, + OptionDeleted, + OptionMoved, + OptionFilesChanged, + OptionFilesAdded, + OptionSwapsChanged, + OptionMetaChanged, + DisplayChange, + PrepareChange, + DefaultOptionChanged, +} public class ModOptionEditor { @@ -380,3 +400,36 @@ public class ModOptionEditor }; } } + +public static class ModOptionChangeTypeExtension +{ + /// + /// Give information for each type of change. + /// If requiresSaving, collections need to be re-saved after this change. + /// If requiresReloading, caches need to be manipulated after this change. + /// If wasPrepared, caches have already removed the mod beforehand, then need add it again when this event is fired. + /// Otherwise, caches need to reload the mod itself. + /// + public static void HandlingInfo(this ModOptionChangeType type, out bool requiresSaving, out bool requiresReloading, out bool wasPrepared) + { + (requiresSaving, requiresReloading, wasPrepared) = type switch + { + ModOptionChangeType.GroupRenamed => (true, false, false), + ModOptionChangeType.GroupAdded => (true, false, false), + ModOptionChangeType.GroupDeleted => (true, true, false), + ModOptionChangeType.GroupMoved => (true, false, false), + ModOptionChangeType.GroupTypeChanged => (true, true, true), + ModOptionChangeType.PriorityChanged => (true, true, true), + ModOptionChangeType.OptionAdded => (true, true, true), + ModOptionChangeType.OptionDeleted => (true, true, false), + ModOptionChangeType.OptionMoved => (true, false, false), + ModOptionChangeType.OptionFilesChanged => (false, true, false), + ModOptionChangeType.OptionFilesAdded => (false, true, true), + ModOptionChangeType.OptionSwapsChanged => (false, true, false), + ModOptionChangeType.OptionMetaChanged => (false, true, false), + ModOptionChangeType.DisplayChange => (false, false, false), + ModOptionChangeType.DefaultOptionChanged => (true, false, false), + _ => (false, false, false), + }; + } +} diff --git a/Penumbra/Mods/Manager/ModStorage.cs b/Penumbra/Mods/Manager/ModStorage.cs index dbf5c46a..3aa6d31f 100644 --- a/Penumbra/Mods/Manager/ModStorage.cs +++ b/Penumbra/Mods/Manager/ModStorage.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Penumbra.Mods; +namespace Penumbra.Mods.Manager; public class ModStorage : IReadOnlyList { diff --git a/Penumbra/Mods/Mod.BasePath.cs b/Penumbra/Mods/Mod.BasePath.cs index e7f1da0b..eb9571c2 100644 --- a/Penumbra/Mods/Mod.BasePath.cs +++ b/Penumbra/Mods/Mod.BasePath.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using Penumbra.Mods.Manager; namespace Penumbra.Mods; diff --git a/Penumbra/Mods/ModCache.cs b/Penumbra/Mods/ModCache.cs index 3fb6d3f0..7602fb95 100644 --- a/Penumbra/Mods/ModCache.cs +++ b/Penumbra/Mods/ModCache.cs @@ -1,26 +1,26 @@ using System.Collections.Generic; -namespace Penumbra.Mods; +namespace Penumbra.Mods.Manager; public class ModCache { - public int TotalFileCount; - public int TotalSwapCount; - public int TotalManipulations; + public int TotalFileCount; + public int TotalSwapCount; + public int TotalManipulations; public bool HasOptions; - public SortedList ChangedItems = new(); - public string LowerChangedItemsString = string.Empty; - public string AllTagsLower = string.Empty; + public SortedList ChangedItems = new(); + public string LowerChangedItemsString = string.Empty; + public string AllTagsLower = string.Empty; public void Reset() { - TotalFileCount = 0; - TotalSwapCount = 0; + TotalFileCount = 0; + TotalSwapCount = 0; TotalManipulations = 0; - HasOptions = false; + HasOptions = false; ChangedItems.Clear(); LowerChangedItemsString = string.Empty; - AllTagsLower = string.Empty; + AllTagsLower = string.Empty; } } diff --git a/Penumbra/Mods/ModFileSystem.cs b/Penumbra/Mods/ModFileSystem.cs index 42ff4381..3ee5fa66 100644 --- a/Penumbra/Mods/ModFileSystem.cs +++ b/Penumbra/Mods/ModFileSystem.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using OtterGui.Filesystem; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.Util; diff --git a/Penumbra/Mods/Subclasses/ModSettings.cs b/Penumbra/Mods/Subclasses/ModSettings.cs index a9239078..441ffea9 100644 --- a/Penumbra/Mods/Subclasses/ModSettings.cs +++ b/Penumbra/Mods/Subclasses/ModSettings.cs @@ -6,6 +6,7 @@ using OtterGui; using OtterGui.Filesystem; using Penumbra.Api.Enums; using Penumbra.Meta.Manipulations; +using Penumbra.Mods.Manager; using Penumbra.String.Classes; namespace Penumbra.Mods; diff --git a/Penumbra/Mods/TemporaryMod.cs b/Penumbra/Mods/TemporaryMod.cs index b7c0d6c9..d7265093 100644 --- a/Penumbra/Mods/TemporaryMod.cs +++ b/Penumbra/Mods/TemporaryMod.cs @@ -5,6 +5,7 @@ using System.Linq; using OtterGui.Classes; using Penumbra.Collections; using Penumbra.Meta.Manipulations; +using Penumbra.Mods.Manager; using Penumbra.String.Classes; namespace Penumbra.Mods; diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs index dc7f78a6..c13ede76 100644 --- a/Penumbra/Penumbra.cs +++ b/Penumbra/Penumbra.cs @@ -30,7 +30,8 @@ using DalamudUtil = Dalamud.Utility.Util; using ResidentResourceManager = Penumbra.Interop.Services.ResidentResourceManager; using Penumbra.Services; using Penumbra.Interop.Services; - +using Penumbra.Mods.Manager; + namespace Penumbra; public class Penumbra : IDalamudPlugin diff --git a/Penumbra/Penumbra.csproj.DotSettings b/Penumbra/Penumbra.csproj.DotSettings deleted file mode 100644 index d89860c0..00000000 --- a/Penumbra/Penumbra.csproj.DotSettings +++ /dev/null @@ -1,5 +0,0 @@ - - True - True - True - True \ No newline at end of file diff --git a/Penumbra/PenumbraNew.cs b/Penumbra/PenumbraNew.cs index 23bfefe5..93abde46 100644 --- a/Penumbra/PenumbraNew.cs +++ b/Penumbra/PenumbraNew.cs @@ -20,7 +20,8 @@ using Penumbra.UI.Tabs; using Penumbra.Util; using CharacterUtility = Penumbra.Interop.Services.CharacterUtility; using ModFileSystemSelector = Penumbra.UI.ModsTab.ModFileSystemSelector; - +using Penumbra.Mods.Manager; + namespace Penumbra; public class PenumbraNew diff --git a/Penumbra/Services/CommunicatorService.cs b/Penumbra/Services/CommunicatorService.cs index 55f057a3..fea11316 100644 --- a/Penumbra/Services/CommunicatorService.cs +++ b/Penumbra/Services/CommunicatorService.cs @@ -2,6 +2,7 @@ using System; using System.IO; using Penumbra.Collections; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Util; namespace Penumbra.Services; diff --git a/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs b/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs index 3182dd30..35737920 100644 --- a/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs +++ b/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs @@ -16,6 +16,7 @@ using Penumbra.GameData.Enums; using Penumbra.GameData.Structs; using Penumbra.Mods; using Penumbra.Mods.ItemSwap; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI.Classes; diff --git a/Penumbra/UI/AdvancedWindow/ModEditWindow.cs b/Penumbra/UI/AdvancedWindow/ModEditWindow.cs index c59d4784..d996be65 100644 --- a/Penumbra/UI/AdvancedWindow/ModEditWindow.cs +++ b/Penumbra/UI/AdvancedWindow/ModEditWindow.cs @@ -14,6 +14,7 @@ using Penumbra.GameData.Files; using Penumbra.Import.Textures; using Penumbra.Interop.ResourceTree; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.String.Classes; using Penumbra.UI.Classes; using Penumbra.Util; diff --git a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs index d03cfab2..bc84f757 100644 --- a/Penumbra/UI/ModsTab/ModFileSystemSelector.cs +++ b/Penumbra/UI/ModsTab/ModFileSystemSelector.cs @@ -17,6 +17,7 @@ using Penumbra.Collections; using Penumbra.Import; using Penumbra.Import.Structs; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI.Classes; using Penumbra.Util; diff --git a/Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs b/Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs index 2bb78f04..e70ddd57 100644 --- a/Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs +++ b/Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs @@ -6,7 +6,7 @@ using OtterGui.Classes; using OtterGui.Raii; using OtterGui.Widgets; using Penumbra.Api; -using Penumbra.Mods; +using Penumbra.Mods.Manager; namespace Penumbra.UI.ModsTab; diff --git a/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs b/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs index 1728acfa..9cb229d1 100644 --- a/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs +++ b/Penumbra/UI/ModsTab/ModPanelDescriptionTab.cs @@ -5,6 +5,7 @@ using OtterGui.Raii; using OtterGui; using OtterGui.Widgets; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.UI.Classes; namespace Penumbra.UI.ModsTab; diff --git a/Penumbra/UI/ModsTab/ModPanelEditTab.cs b/Penumbra/UI/ModsTab/ModPanelEditTab.cs index 4b207281..6e9bd34c 100644 --- a/Penumbra/UI/ModsTab/ModPanelEditTab.cs +++ b/Penumbra/UI/ModsTab/ModPanelEditTab.cs @@ -12,6 +12,7 @@ using OtterGui.Raii; using OtterGui.Widgets; using Penumbra.Api.Enums; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI.AdvancedWindow; using Penumbra.Util; diff --git a/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs b/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs index 26702c5a..ffae30d2 100644 --- a/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs +++ b/Penumbra/UI/ModsTab/ModPanelSettingsTab.cs @@ -12,6 +12,7 @@ using Penumbra.Mods; using Penumbra.UI.Classes; using Dalamud.Interface.Components; using Dalamud.Interface; +using Penumbra.Mods.Manager; namespace Penumbra.UI.ModsTab; diff --git a/Penumbra/UI/ModsTab/ModPanelTabBar.cs b/Penumbra/UI/ModsTab/ModPanelTabBar.cs index 77f2b1f2..59dce714 100644 --- a/Penumbra/UI/ModsTab/ModPanelTabBar.cs +++ b/Penumbra/UI/ModsTab/ModPanelTabBar.cs @@ -6,6 +6,7 @@ using OtterGui; using OtterGui.Raii; using OtterGui.Widgets; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.UI.AdvancedWindow; namespace Penumbra.UI.ModsTab; diff --git a/Penumbra/UI/Tabs/DebugTab.cs b/Penumbra/UI/Tabs/DebugTab.cs index 09dbc097..f9259861 100644 --- a/Penumbra/UI/Tabs/DebugTab.cs +++ b/Penumbra/UI/Tabs/DebugTab.cs @@ -6,7 +6,7 @@ using FFXIVClientStructs.FFXIV.Client.Game.Character; using FFXIVClientStructs.FFXIV.Client.Game.Group; using FFXIVClientStructs.FFXIV.Client.Game.Object; using FFXIVClientStructs.FFXIV.Client.System.Resource; -using FFXIVClientStructs.Interop; +using FFXIVClientStructs.Interop; using ImGuiNET; using OtterGui; using OtterGui.Widgets; @@ -18,6 +18,7 @@ using Penumbra.Interop.ResourceLoading; using Penumbra.Interop.PathResolving; using Penumbra.Interop.Structs; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.String; using Penumbra.Util; diff --git a/Penumbra/UI/Tabs/ModsTab.cs b/Penumbra/UI/Tabs/ModsTab.cs index 5c1340a5..37e0c24a 100644 --- a/Penumbra/UI/Tabs/ModsTab.cs +++ b/Penumbra/UI/Tabs/ModsTab.cs @@ -12,6 +12,7 @@ using Penumbra.Api.Enums; using Penumbra.Interop; using Penumbra.Interop.Services; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI.ModsTab; using ModFileSystemSelector = Penumbra.UI.ModsTab.ModFileSystemSelector; diff --git a/Penumbra/UI/Tabs/SettingsTab.cs b/Penumbra/UI/Tabs/SettingsTab.cs index a920e723..8d51ec65 100644 --- a/Penumbra/UI/Tabs/SettingsTab.cs +++ b/Penumbra/UI/Tabs/SettingsTab.cs @@ -11,6 +11,7 @@ using OtterGui.Raii; using OtterGui.Widgets; using Penumbra.Interop.Services; using Penumbra.Mods; +using Penumbra.Mods.Manager; using Penumbra.Services; using Penumbra.UI.Classes; using CharacterUtility = Penumbra.Interop.Services.CharacterUtility;