Move editors into folder.

OtterGui

@@ -1 +1 @@
-Subproject commit 3460a817fc5e01a6b60eb834c3c59031938388fc
+Subproject commit 20c4a6c53103d9fa8dec63babc628c9d01f094c0

Penumbra/Api/Api/ModSettingsApi.cs

@@ -10,6 +10,7 @@ using Penumbra.Mods;
 using Penumbra.Mods.Editor;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;

Penumbra/Collections/Cache/CollectionCacheManager.cs

@@ -9,6 +9,7 @@ using Penumbra.Meta;
 using Penumbra.Mods;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;

Penumbra/Collections/Manager/CollectionStorage.cs

@@ -6,6 +6,7 @@ using Penumbra.Mods;
 using Penumbra.Mods.Editor;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;

Penumbra/Communication/ModOptionChanged.cs

@@ -3,6 +3,7 @@ using Penumbra.Api.Api;
 using Penumbra.Mods;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.SubMods;
 using static Penumbra.Communication.ModOptionChanged;
 

Penumbra/Mods/Editor/ModMerger.cs

@@ -5,6 +5,7 @@ using OtterGui.Classes;
 using Penumbra.Api.Enums;
 using Penumbra.Communication;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 using Penumbra.String.Classes;

Penumbra/Mods/Manager/ModCacheManager.cs

@@ -3,6 +3,7 @@ using Penumbra.GameData.Data;
 using Penumbra.GameData.Enums;
 using Penumbra.Meta.Manipulations;
 using Penumbra.Mods.Groups;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 

Penumbra/Mods/Manager/ModManager.cs

@@ -1,5 +1,6 @@
 using Penumbra.Communication;
 using Penumbra.Mods.Editor;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Services;
 
 namespace Penumbra.Mods.Manager;

Penumbra/Mods/Manager/OptionEditor/ImcModGroupEditor.cs

@@ -6,7 +6,7 @@ using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 
-namespace Penumbra.Mods.Manager;
+namespace Penumbra.Mods.Manager.OptionEditor;
 
 public sealed class ImcModGroupEditor(CommunicatorService communicator, SaveService saveService, Configuration config)
     : ModOptionEditor<ImcModGroup, ImcSubMod>(communicator, saveService, config), IService

Penumbra/Mods/Manager/OptionEditor/ModGroupEditor.cs

@@ -1,10 +1,8 @@
-using System.Text.RegularExpressions;
 using Dalamud.Interface.Internal.Notifications;
 using OtterGui.Classes;
 using OtterGui.Filesystem;
 using OtterGui.Services;
 using Penumbra.Api.Enums;
-using Penumbra.GameData.Data;
 using Penumbra.Meta.Manipulations;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.Settings;
@@ -12,9 +10,8 @@ using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 using Penumbra.String.Classes;
 using Penumbra.Util;
-using static FFXIVClientStructs.FFXIV.Client.UI.Misc.ConfigModule;
 
-namespace Penumbra.Mods.Manager;
+namespace Penumbra.Mods.Manager.OptionEditor;
 
 public enum ModOptionChangeType
 {

Penumbra/Mods/Manager/OptionEditor/ModOptionEditor.cs

@@ -5,7 +5,7 @@ using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 
-namespace Penumbra.Mods.Manager;
+namespace Penumbra.Mods.Manager.OptionEditor;
 
 public abstract class ModOptionEditor<TGroup, TOption>(
     CommunicatorService communicator,

Penumbra/Mods/Manager/OptionEditor/MultiModGroupEditor.cs

@@ -6,7 +6,7 @@ using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 
-namespace Penumbra.Mods.Manager;
+namespace Penumbra.Mods.Manager.OptionEditor;
 
 public sealed class MultiModGroupEditor(CommunicatorService communicator, SaveService saveService, Configuration config)
     : ModOptionEditor<MultiModGroup, MultiSubMod>(communicator, saveService, config), IService

Penumbra/Mods/Manager/OptionEditor/SingleModGroupEditor.cs

@@ -6,7 +6,7 @@ using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;
 
-namespace Penumbra.Mods.Manager;
+namespace Penumbra.Mods.Manager.OptionEditor;
 
 public sealed class SingleModGroupEditor(CommunicatorService communicator, SaveService saveService, Configuration config)
     : ModOptionEditor<SingleModGroup, SingleSubMod>(communicator, saveService, config), IService

Penumbra/Mods/Settings/ModSettings.cs

@@ -3,7 +3,7 @@ using OtterGui.Filesystem;
 using Penumbra.Api.Enums;
 using Penumbra.Mods.Editor;
 using Penumbra.Mods.Groups;
-using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.SubMods;
 
 namespace Penumbra.Mods.Settings;

Penumbra/Penumbra.csproj

@@ -75,7 +75,7 @@
 
     <ItemGroup>
         <PackageReference Include="EmbedIO" Version="3.4.3" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
         <PackageReference Include="SharpCompress" Version="0.33.0" />
         <PackageReference Include="SharpGLTF.Core" Version="1.0.0-alpha0030" />
         <PackageReference Include="SharpGLTF.Toolkit" Version="1.0.0-alpha0030" />

Penumbra/UI/AdvancedWindow/ItemSwapTab.cs

@@ -16,6 +16,7 @@ using Penumbra.Mods;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.ItemSwap;
 using Penumbra.Mods.Manager;
+using Penumbra.Mods.Manager.OptionEditor;
 using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
 using Penumbra.Services;

Penumbra/UI/ModsTab/ModPanelEditTab.cs

@@ -16,6 +16,7 @@ using Penumbra.UI.AdvancedWindow;
 using Penumbra.Mods.Groups;
 using Penumbra.Mods.Settings;
 using Penumbra.Mods.SubMods;
+using Penumbra.Mods.Manager.OptionEditor;
 
 namespace Penumbra.UI.ModsTab;
 

Penumbra/packages.lock.json

@@ -34,9 +34,14 @@
       },
       "SixLabors.ImageSharp": {
         "type": "Direct",
-        "requested": "[3.1.3, )",
+        "requested": "[3.1.4, )",
-        "resolved": "3.1.3",
+        "resolved": "3.1.4",
-        "contentHash": "wybtaqZQ1ZRZ4ZeU+9h+PaSeV14nyiGKIy7qRbDfSHzHq4ybqyOcjoifeaYbiKLO1u+PVxLBuy7MF/DMmwwbfg=="
+        "contentHash": "lFIdxgGDA5iYkUMRFOze7BGLcdpoLFbR+a20kc1W7NepvzU7ejtxtWOg9RvgG7kb9tBoJ3ONYOK6kLil/dgF1w=="
+      },
+      "JetBrains.Annotations": {
+        "type": "Transitive",
+        "resolved": "2023.3.0",
+        "contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA=="
       },
       "Microsoft.Extensions.DependencyInjection": {
         "type": "Transitive",
@@ -75,6 +80,7 @@
       "ottergui": {
         "type": "Project",
         "dependencies": {
+          "JetBrains.Annotations": "[2023.3.0, )",
           "Microsoft.Extensions.DependencyInjection": "[8.0.0, )"
         }
       },
@@ -88,7 +94,7 @@
         "type": "Project",
         "dependencies": {
           "OtterGui": "[1.0.0, )",
-          "Penumbra.Api": "[1.0.15, )",
+          "Penumbra.Api": "[5.0.0, )",
           "Penumbra.String": "[1.0.4, )"
         }
       },