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

Let Material Path Resolver search through temporary collections.

Browse source
This commit is contained in:
Ottermandias 2022-06-22 18:43:36 +02:00
parent 311882948a
commit 95e7febd38
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Penumbra.GameData/Structs/CharacterArmor.cs
View file

@ -1,15 +1,14 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Penumbra.GameData.Structs namespace Penumbra.GameData.Structs;
{
[StructLayout( LayoutKind.Sequential, Pack = 1 )]
public readonly struct CharacterArmor
{
public readonly SetId Set;
public readonly byte Variant;
public readonly StainId Stain;
public override string ToString() [StructLayout( LayoutKind.Sequential, Pack = 1 )]
=> $"{Set},{Variant},{Stain}"; public readonly struct CharacterArmor
} {
public readonly SetId Set;
public readonly byte Variant;
public readonly StainId Stain;
public override string ToString()
=> $"{Set},{Variant},{Stain}";
} }

4
Penumbra/Collections/ModCollection.cs
View file

@ -75,9 +75,9 @@ public partial class ModCollection
=> new(name, CurrentVersion, new Dictionary< string, ModSettings.SavedSettings >()); => new(name, CurrentVersion, new Dictionary< string, ModSettings.SavedSettings >());
// Create a new temporary collection that does not save and has a negative index. // Create a new temporary collection that does not save and has a negative index.
public static ModCollection CreateNewTemporary(string tag, string characterName) public static ModCollection CreateNewTemporary( string tag, string characterName )
{ {
var collection = new ModCollection($"{tag}_{characterName}_temporary", Empty); var collection = new ModCollection( $"{tag}_{characterName}", Empty );
collection.ModSettingChanged -= collection.SaveOnChange; collection.ModSettingChanged -= collection.SaveOnChange;
collection.InheritanceChanged -= collection.SaveOnChange; collection.InheritanceChanged -= collection.SaveOnChange;
collection.Index = ~Penumbra.TempMods.Collections.Count; collection.Index = ~Penumbra.TempMods.Collections.Count;

7
Penumbra/Interop/Resolver/PathResolver.Material.cs
View file

@ -8,6 +8,7 @@ using Penumbra.Collections;
using Penumbra.GameData.ByteString; using Penumbra.GameData.ByteString;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
using Penumbra.Interop.Structs; using Penumbra.Interop.Structs;
using Penumbra.Util;
namespace Penumbra.Interop.Resolver; namespace Penumbra.Interop.Resolver;
@ -56,7 +57,7 @@ public unsafe partial class PathResolver
} }
// Check specifically for shpk and tex files whether we are currently in a material load. // Check specifically for shpk and tex files whether we are currently in a material load.
private bool HandleMaterialSubFiles( ResourceType type, [NotNullWhen(true)] out ModCollection? collection ) private bool HandleMaterialSubFiles( ResourceType type, [NotNullWhen( true )] out ModCollection? collection )
{ {
if( _mtrlCollection != null && type is ResourceType.Tex or ResourceType.Shpk ) if( _mtrlCollection != null && type is ResourceType.Tex or ResourceType.Shpk )
{ {
@ -81,7 +82,9 @@ public unsafe partial class PathResolver
var lastUnderscore = split.LastIndexOf( ( byte )'_' ); var lastUnderscore = split.LastIndexOf( ( byte )'_' );
var name = lastUnderscore == -1 ? split.ToString() : split.Substring( 0, lastUnderscore ).ToString(); var name = lastUnderscore == -1 ? split.ToString() : split.Substring( 0, lastUnderscore ).ToString();
if( Penumbra.CollectionManager.ByName( name, out var collection ) ) if( Penumbra.TempMods.Collections.Values.FindFirst( c => string.Equals( c.Name, name, StringComparison.OrdinalIgnoreCase ),
out var collection )
|| Penumbra.CollectionManager.ByName( name, out collection ) )
{ {
#if DEBUG #if DEBUG
PluginLog.Verbose( "Using MtrlLoadHandler with collection {$Split:l} for path {$Path:l}.", name, path ); PluginLog.Verbose( "Using MtrlLoadHandler with collection {$Split:l} for path {$Path:l}.", name, path );