Implement Archive Peeking for Auto Import

Penumbra.CrashHandler/Penumbra.CrashHandler.csproj

@@ -1,19 +1,19 @@
-<Project Sdk="Dalamud.NET.Sdk/15.0.0">
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-      <DebugType>embedded</DebugType>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-      <DebugType>embedded</DebugType>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <Use_DalamudPackager>false</Use_DalamudPackager>
-    </PropertyGroup>
-
-</Project>
+<Project Sdk="Dalamud.NET.Sdk/15.0.0">
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+      <DebugType>embedded</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+      <DebugType>embedded</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <Use_DalamudPackager>false</Use_DalamudPackager>
+    </PropertyGroup>
+
+</Project>

Penumbra.slnx

@@ -12,10 +12,12 @@
   <Folder Name="/Solution Items/Schemas/">
     <File Path="schemas/default_mod.json" />
     <File Path="schemas/group.json" />
-    <File Path="schemas/local_mod_data-v3.json" />
+    <File Path="schemas/shpk_devkit.json" />
     <File Path="schemas/mod_meta-v3.json" />
+    <File Path="schemas/mod_meta-v4.json" />
   </Folder>
-  <Folder Name="/Solution Items/Schemas/structs/">
+  <Folder Name="/Solution Items/Schemas/Structs/">
+    <File Path="schemas/structs/option_condition.json" />
     <File Path="schemas/structs/container.json" />
     <File Path="schemas/structs/group_combining.json" />
     <File Path="schemas/structs/group_imc.json" />
@@ -35,6 +37,16 @@
     <File Path="schemas/structs/meta_shp.json" />
     <File Path="schemas/structs/option.json" />
   </Folder>
+  <Folder Name="/Solution Items/Schemas/Structs/Conditions/">
+    <File Path="schemas/structs/all_settings_condition.json" />
+    <File Path="schemas/structs/any_setting_condition.json" />
+    <File Path="schemas/structs/condition.json" />
+    <File Path="Luna/schemas/and_condition.json" />
+    <File Path="Luna/schemas/or_condition.json" />
+    <File Path="Luna/schemas/not_condition.json" />
+    <File Path="Luna/schemas/true_condition.json" />
+    <File Path="Luna/schemas/false_condition.json" />
+  </Folder>
   <Project Path="Luna/Luna.Generators/Luna.Generators.csproj">
     <Platform Project="x64" />
   </Project>

Penumbra/Api/Api/ModSettingsApi.cs

@@ -307,6 +307,7 @@ private void OnModOptionEdited(in ModOptionChanged.Arguments arguments)
             case ModOptionChangeType.OptionFilesAdded:
             case ModOptionChangeType.OptionSwapsChanged:
             case ModOptionChangeType.OptionMetaChanged:
+            case ModOptionChangeType.ConditionChanged:
                 TriggerSettingEdited(arguments.Mod);
                 break;
         }

Penumbra/Api/DalamudSubstitutionProvider.cs

@@ -1,5 +1,6 @@
 using Dalamud.Interface;
 using Dalamud.Plugin.Services;
+using Penumbra.Collections.Cache;
 using Penumbra.Collections.Manager;
 using Penumbra.Communication;
 using Penumbra.Services;
@@ -12,17 +13,19 @@ public class DalamudSubstitutionProvider : IDisposable, Luna.IApiService
     private readonly ITextureSubstitutionProvider _substitution;
     private readonly IUiBuilder                   _uiBuilder;
     private readonly ActiveCollectionData         _activeCollectionData;
+    private readonly CollectionCacheManager       _caches; // May be required to not be disposed on disposal.
     private readonly Configuration                _config;
     private readonly CommunicatorService          _communicator;
 
     public bool Enabled
         => _config.UseDalamudUiTextureRedirection;
 
     public DalamudSubstitutionProvider(ITextureSubstitutionProvider substitution, ActiveCollectionData activeCollectionData,
-        Configuration config, CommunicatorService communicator, IUiBuilder ui)
+        Configuration config, CommunicatorService communicator, IUiBuilder ui, CollectionCacheManager caches)
     {
         _substitution         = substitution;
         _uiBuilder            = ui;
+        _caches               = caches;
         _activeCollectionData = activeCollectionData;
         _config               = config;
         _communicator         = communicator;
@@ -43,10 +46,17 @@ public void ResetSubstitutions(IEnumerable<Utf8GamePath> paths)
         if (!_uiBuilder.UiPrepared)
             return;
 
-        var transformed = paths
-            .Where(p => (p.Path.StartsWith("ui/"u8) || p.Path.StartsWith("common/font/"u8)) && p.Path.EndsWith(".tex"u8))
-            .Select(p => p.ToString());
-        _substitution.InvalidatePaths(transformed);
+        try
+        {
+            var transformed = paths
+                .Where(p => (p.Path.StartsWith("ui/"u8) || p.Path.StartsWith("common/font/"u8)) && p.Path.EndsWith(".tex"u8))
+                .Select(p => p.ToString());
+            _substitution.InvalidatePaths(transformed);
+        }
+        catch (Exception ex)
+        {
+            Penumbra.Log.Error($"Failed to reset texture substitutions:\n{ex}");
+        }
     }
 
     public void Enable()

Penumbra/Api/IpcProviders.cs

@@ -9,8 +9,13 @@ namespace Penumbra.Api;
 
 public sealed class IpcProviders : IDisposable, IApiService, IRequiredService
 {
+    private static readonly HashSet<CallerPlugin> InternalCallers = [];
+
     private readonly List<IDisposable> _providers;
 
+    public static IReadOnlySet<CallerPlugin> Callers
+        => InternalCallers;
+
     private readonly EventProvider    _disposedProvider;
     private readonly EventProvider    _initializedProvider;
     private readonly CharacterUtility _characterUtility;
@@ -77,9 +82,10 @@ public IpcProviders(IDalamudPluginInterface pi, IPenumbraApi api, CharacterUtili
             IpcSubscribers.ModSettingChanged.Provider(pi, api.ModSettings),
             IpcSubscribers.CopyModSettings.Provider(pi, api.ModSettings),
 
-            IpcSubscribers.ApiVersion.Provider(pi, api),
-            new FuncProvider<(int Major, int Minor)>(pi, "Penumbra.ApiVersions", () => api.ApiVersion), // backward compatibility
-            new FuncProvider<int>(pi, "Penumbra.ApiVersion", () => api.ApiVersion.Breaking),            // backward compatibility
+            IpcSubscribers.ApiVersion.Provider(pi, InternalCallers, api),
+            new FuncProvider<(int Major, int Minor)>(pi, InternalCallers, "Penumbra.ApiVersions",
+                () => api.ApiVersion),                                                                        // backward compatibility
+            new FuncProvider<int>(pi, InternalCallers, "Penumbra.ApiVersion", () => api.ApiVersion.Breaking), // backward compatibility
             IpcSubscribers.GetModDirectory.Provider(pi, api.PluginState),
             IpcSubscribers.GetConfiguration.Provider(pi, api.PluginState),
             IpcSubscribers.ModDirectoryChanged.Provider(pi, api.PluginState),
@@ -111,11 +117,11 @@ public IpcProviders(IDalamudPluginInterface pi, IPenumbraApi api, CharacterUtili
             IpcSubscribers.GetGameObjectResourceTrees.Provider(pi, api.ResourceTree),
             IpcSubscribers.GetPlayerResourceTrees.Provider(pi, api.ResourceTree),
 
-            IpcSubscribers.CreateTemporaryCollection.Provider(pi, api.Temporary),
+            IpcSubscribers.CreateTemporaryCollection.Provider(pi, InternalCallers, api.Temporary),
             IpcSubscribers.DeleteTemporaryCollection.Provider(pi, api.Temporary),
             IpcSubscribers.AssignTemporaryCollection.Provider(pi, api.Temporary),
-            IpcSubscribers.AddTemporaryModAll.Provider(pi, api.Temporary),
-            IpcSubscribers.AddTemporaryMod.Provider(pi, api.Temporary),
+            IpcSubscribers.AddTemporaryModAll.Provider(pi, InternalCallers, api.Temporary),
+            IpcSubscribers.AddTemporaryMod.Provider(pi, InternalCallers, api.Temporary),
             IpcSubscribers.RemoveTemporaryModAll.Provider(pi, api.Temporary),
             IpcSubscribers.RemoveTemporaryMod.Provider(pi, api.Temporary),
             IpcSubscribers.SetTemporaryModSettings.Provider(pi, api.Temporary),

Penumbra/Collections/Cache/CustomResourceCache.cs

@@ -1,7 +1,7 @@
 using FFXIVClientStructs.FFXIV.Client.System.Resource;
+using Luna;
 using Penumbra.Api.Enums;
 using Penumbra.Interop.Hooks.ResourceLoading;
-using Penumbra.Interop.SafeHandles;
 using Penumbra.String.Classes;
 
 namespace Penumbra.Collections.Cache;

Penumbra/Collections/Manager/ActiveCollectionMigration.cs

@@ -3,7 +3,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Penumbra.Files;
-using Penumbra.Services;
 
 namespace Penumbra.Collections.Manager;
 
@@ -19,7 +18,7 @@ public static void MigrateUngenderedCollections(FilenameService fileNames)
         {
             var oldName = type.ToString()[4..];
             var value   = jObject[oldName];
-            if (value == null)
+            if (value is null)
                 continue;
 
             jObject.Remove(oldName);

Penumbra/Collections/Manager/ActiveCollections.cs

@@ -80,7 +80,7 @@ public ModCollection Interface
 
     /// <summary> Get the collection assigned to an individual or Default if unassigned. </summary>
     public ModCollection Individual(ActorIdentifier identifier)
-        => Individuals.TryGetCollection(identifier, out var c) ? c : Default;
+        => Individuals.TryGetCollection(identifier, out var c, false) ? c : Default;
 
     /// <summary> The list of group assignments. </summary>
     private ModCollection?[] SpecialCollections
@@ -547,16 +547,16 @@ public string RedundancyCheck(CollectionType type, ActorIdentifier id)
                     return
                         $"Assignment is redundant due to overwriting Male Players and Female Players{racialString} with an identical collection.\nYou can remove it.";
 
-                if (male == null)
+                if (male is null)
                 {
-                    if (female == null && @base == yourself)
+                    if (female is null && @base == yourself)
                         return
                             $"Assignment is redundant due to overwriting Base{racialString} with an identical collection.\nYou can remove it.";
                     if (female == yourself && @base == yourself)
                         return
                             $"Assignment is redundant due to overwriting Base and Female Players{racialString} with an identical collection.\nYou can remove it.";
                 }
-                else if (male == yourself && female == null && @base == yourself)
+                else if (male == yourself && female is null && @base == yourself)
                 {
                     return
                         $"Assignment is redundant due to overwriting Base and Male Players{racialString} with an identical collection.\nYou can remove it.";
@@ -570,7 +570,7 @@ public string RedundancyCheck(CollectionType type, ActorIdentifier id)
                     case IdentifierType.Player when id.HomeWorld != ushort.MaxValue:
                     {
                         var global = ByType(CollectionType.Individual, _actors.CreatePlayer(id.PlayerName, ushort.MaxValue));
-                        return (global != null ? global.Identity.Index : null) == checkAssignment.Identity.Index
+                        return global?.Identity.Index == checkAssignment.Identity.Index
                             ? "Assignment is redundant due to an identical Any-World assignment existing.\nYou can remove it."
                             : string.Empty;
                     }
@@ -579,12 +579,12 @@ public string RedundancyCheck(CollectionType type, ActorIdentifier id)
                         {
                             var global = ByType(CollectionType.Individual,
                                 _actors.CreateOwned(id.PlayerName, ushort.MaxValue, id.Kind, id.DataId));
-                            if ((global != null ? global.Identity.Index : null) == checkAssignment.Identity.Index)
+                            if (global?.Identity.Index == checkAssignment.Identity.Index)
                                 return "Assignment is redundant due to an identical Any-World assignment existing.\nYou can remove it.";
                         }
 
                         var unowned = ByType(CollectionType.Individual, _actors.CreateNpc(id.Kind, id.DataId));
-                        return (unowned != null ? unowned.Identity.Index : null) == checkAssignment.Identity.Index
+                        return unowned?.Identity.Index == checkAssignment.Identity.Index
                             ? "Assignment is redundant due to an identical unowned NPC assignment existing.\nYou can remove it."
                             : string.Empty;
                 }
@@ -606,7 +606,7 @@ public string RedundancyCheck(CollectionType type, ActorIdentifier id)
                     collection1 = CollectionType.Default;
                 }
 
-                if (femaleNpc == null)
+                if (femaleNpc is null)
                 {
                     femaleNpc = Default;
                     if (femaleNpc.Identity.Index != checkAssignment.Identity.Index)
@@ -626,7 +626,7 @@ public string RedundancyCheck(CollectionType type, ActorIdentifier id)
                 foreach (var parentType in group)
                 {
                     var assignment = ByType(parentType);
-                    if (assignment == null)
+                    if (assignment is null)
                         continue;
 
                     if (assignment.Identity.Index == checkAssignment.Identity.Index)

Penumbra/Collections/Manager/IndividualCollections.Access.cs

@@ -2,6 +2,7 @@
 using Dalamud.Game.ClientState.Objects.Types;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;
+using Penumbra.GameData.Interop;
 using Penumbra.String;
 
 namespace Penumbra.Collections.Manager;
@@ -20,9 +21,9 @@ public int Count
     public (string DisplayName, ModCollection Collection) this[int index]
         => (_assignments[index].DisplayName, _assignments[index].Collection);
 
-    public bool TryGetCollection(ActorIdentifier identifier, [NotNullWhen(true)] out ModCollection? collection)
+    public bool TryGetCollection(ActorIdentifier identifier, [NotNullWhen(true)] out ModCollection? collection, bool hostile)
     {
-        if (Count == 0)
+        if (Count is 0)
         {
             collection = null;
             return false;
@@ -53,7 +54,7 @@ public bool TryGetCollection(ActorIdentifier identifier, [NotNullWhen(true)] out
                     return true;
 
                 // Handle Ownership.
-                if (!_config.UseOwnerNameForCharacterCollection)
+                if (!_config.UseOwnerNameForCharacterCollection || hostile && !_config.UseOwnerForHostiles)
                     return false;
 
                 identifier = _actors.CreateIndividualUnchecked(IdentifierType.Player, identifier.PlayerName,
@@ -85,7 +86,7 @@ public enum SpecialResult
 
     public (ActorIdentifier, SpecialResult) ConvertSpecialIdentifier(ActorIdentifier identifier)
     {
-        if (identifier.Type != IdentifierType.Special)
+        if (identifier.Type is not IdentifierType.Special)
             return (identifier, SpecialResult.Invalid);
 
         if (_actors.ResolvePartyBannerPlayer(identifier.Special, out var id))
@@ -105,8 +106,7 @@ public enum SpecialResult
                 return (_actors.GetCurrentPlayer(), SpecialResult.FittingRoom);
             case ScreenActor.DyePreview when _config.UseCharacterCollectionInTryOn:
                 return (_actors.GetCurrentPlayer(), SpecialResult.DyePreview);
-            case ScreenActor.Portrait when _config.UseCharacterCollectionsInCards:
-                return (_actors.GetCurrentPlayer(), SpecialResult.Portrait);
+            case ScreenActor.Portrait when _config.UseCharacterCollectionsInCards: return (_actors.GetCurrentPlayer(), SpecialResult.Portrait);
             case ScreenActor.ExamineScreen:
             {
                 identifier = _actors.GetInspectPlayer();
@@ -126,10 +126,11 @@ public enum SpecialResult
     }
 
     public bool TryGetCollection(IGameObject? gameObject, out ModCollection? collection)
-        => TryGetCollection(_actors.FromObject(gameObject, true, false, false), out collection);
+        => TryGetCollection(_actors.FromObject(gameObject, true, false, false), out collection,
+            gameObject is ICharacter c && c.StatusFlags.HasFlag(StatusFlags.Hostile));
 
     public unsafe bool TryGetCollection(FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* gameObject, out ModCollection? collection)
-        => TryGetCollection(_actors.FromObject(gameObject, out _, true, false, false), out collection);
+        => TryGetCollection(_actors.FromObject(gameObject, out _, true, false, false), out collection, ((Actor)gameObject).IsHostile);
 
     private bool CheckWorlds(ActorIdentifier identifier, out ModCollection? collection)
     {

Penumbra/Collections/ModCollectionSave.cs

@@ -4,7 +4,6 @@
 using Penumbra.Files;
 using Penumbra.Mods.Manager;
 using Penumbra.Mods.Settings;
-using Penumbra.Services;
 
 namespace Penumbra.Collections;
 
@@ -29,10 +28,9 @@ public void Save(Stream stream)
         j.WriteNumber("Version"u8, ModCollection.CurrentVersion);
         j.WriteString("Id"u8, modCollection.Identity.Identifier);
         j.WriteString("Name"u8, modCollection.Identity.Name);
-        j.WritePropertyName("Settings"u8);
 
         // Write all used and unused settings by mod directory name.
-        j.WriteStartObject();
+        j.WriteStartObject("Settings"u8);
         var list = new List<(string, ModSettings.SavedSettings)>(modCollection.Settings.Count + modCollection.Settings.Unused.Count);
         for (var i = 0; i < modCollection.Settings.Count; ++i)
         {

Penumbra/Communication/ModDataChanged.cs

@@ -9,7 +9,7 @@ public sealed class ModDataChanged(LunaLogger log) : EventBase<ModDataChanged.Ar
 {
     public enum Priority
     {
-        /// <seealso cref="UI.ModsTab.ModFileSystemSelector.OnModDataChange"/>
+        /// <seealso cref="UI.ModsTab.Selector.ModFileSystemCache.OnModDataChange"/>
         ModFileSystemCache = -10,
 
         /// <seealso cref="Mods.Manager.ModCacheManager.OnModDataChange"/>
@@ -20,6 +20,9 @@ public enum Priority
 
         /// <seealso cref="UI.ModsTab.ModPanelHeader.OnModDataChange"/>
         ModPanelHeader = 0,
+
+        /// <seealso cref="UI.ModsTab.Groups.GroupNameCache.OnModDataChange"/>
+        GroupNameCache = 0,
     }
 
     /// <summary> The arguments for a ModDataChanged event. </summary>