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

Misc.

Browse source
This commit is contained in:
Ottermandias 2024-02-23 21:44:49 +01:00
parent 529788d2e5
commit add4b8aa83
2 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Penumbra/Collections/ModCollectionSave.cs
View file

@ -1,32 +1,21 @@
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Penumbra.Mods;
using Penumbra.Services; using Penumbra.Services;
using Newtonsoft.Json; using Newtonsoft.Json;
using Penumbra.Mods.Manager; using Penumbra.Mods.Manager;
using Penumbra.Mods.Subclasses; using Penumbra.Mods.Subclasses;
using Penumbra.Util;
namespace Penumbra.Collections; namespace Penumbra.Collections;
/// <summary> /// <summary>
/// Handle saving and loading a collection. /// Handle saving and loading a collection.
/// </summary> /// </summary>
internal readonly struct ModCollectionSave : ISavable internal readonly struct ModCollectionSave(ModStorage modStorage, ModCollection modCollection) : ISavable
{ {
private readonly ModStorage _modStorage;
private readonly ModCollection _modCollection;
public ModCollectionSave(ModStorage modStorage, ModCollection modCollection)
{
_modStorage = modStorage;
_modCollection = modCollection;
}
public string ToFilename(FilenameService fileNames) public string ToFilename(FilenameService fileNames)
=> fileNames.CollectionFile(_modCollection); => fileNames.CollectionFile(modCollection);
public string LogName(string _) public string LogName(string _)
=> _modCollection.AnonymizedName; => modCollection.AnonymizedName;
public string TypeName public string TypeName
=> "Collection"; => "Collection";
@ -40,20 +29,20 @@ internal readonly struct ModCollectionSave : ISavable
j.WritePropertyName("Version"); j.WritePropertyName("Version");
j.WriteValue(ModCollection.CurrentVersion); j.WriteValue(ModCollection.CurrentVersion);
j.WritePropertyName(nameof(ModCollection.Name)); j.WritePropertyName(nameof(ModCollection.Name));
j.WriteValue(_modCollection.Name); j.WriteValue(modCollection.Name);
j.WritePropertyName(nameof(ModCollection.Settings)); j.WritePropertyName(nameof(ModCollection.Settings));
// Write all used and unused settings by mod directory name. // Write all used and unused settings by mod directory name.
j.WriteStartObject(); j.WriteStartObject();
var list = new List<(string, ModSettings.SavedSettings)>(_modCollection.Settings.Count + _modCollection.UnusedSettings.Count); var list = new List<(string, ModSettings.SavedSettings)>(modCollection.Settings.Count + modCollection.UnusedSettings.Count);
for (var i = 0; i < _modCollection.Settings.Count; ++i) for (var i = 0; i < modCollection.Settings.Count; ++i)
{ {
var settings = _modCollection.Settings[i]; var settings = modCollection.Settings[i];
if (settings != null) if (settings != null)
list.Add((_modStorage[i].ModPath.Name, new ModSettings.SavedSettings(settings, _modStorage[i]))); list.Add((modStorage[i].ModPath.Name, new ModSettings.SavedSettings(settings, modStorage[i])));
} }
list.AddRange(_modCollection.UnusedSettings.Select(kvp => (kvp.Key, kvp.Value))); list.AddRange(modCollection.UnusedSettings.Select(kvp => (kvp.Key, kvp.Value)));
list.Sort((a, b) => string.Compare(a.Item1, b.Item1, StringComparison.OrdinalIgnoreCase)); list.Sort((a, b) => string.Compare(a.Item1, b.Item1, StringComparison.OrdinalIgnoreCase));
foreach (var (modDir, settings) in list) foreach (var (modDir, settings) in list)
@ -66,7 +55,7 @@ internal readonly struct ModCollectionSave : ISavable
// Inherit by collection name. // Inherit by collection name.
j.WritePropertyName("Inheritance"); j.WritePropertyName("Inheritance");
x.Serialize(j, _modCollection.InheritanceByName ?? _modCollection.DirectlyInheritsFrom.Select(c => c.Name)); x.Serialize(j, modCollection.InheritanceByName ?? modCollection.DirectlyInheritsFrom.Select(c => c.Name));
j.WriteEndObject(); j.WriteEndObject();
} }

2
Penumbra/Interop/ResourceLoading/CreateFileWHook.cs
View file

@ -100,7 +100,7 @@ public unsafe class CreateFileWHook : IDisposable
{ {
// Use static storage. // Use static storage.
var ptr = WriteFileName(name); var ptr = WriteFileName(name);
Penumbra.Log.Verbose($"[ResourceHooks] Calling CreateFileWDetour with {ByteString.FromSpanUnsafe(name, false)}."); Penumbra.Log.Excessive($"[ResourceHooks] Calling CreateFileWDetour with {ByteString.FromSpanUnsafe(name, false)}.");
return _createFileWHook.OriginalDisposeSafe(ptr, access, shareMode, security, creation, flags, template); return _createFileWHook.OriginalDisposeSafe(ptr, access, shareMode, security, creation, flags, template);
} }