ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-20 07:34:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix for reloading penumbra and default IMCs (forgot a clone)

Browse source
This commit is contained in:
Ottermandias 2021-03-05 16:53:09 +01:00
parent db5ce7a2e4
commit 9daffc9382
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Penumbra/MetaData/ImcExtensions.cs
View file

@ -1,5 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
using System.IO; using System.IO;
using System.Linq;
using Lumina.Data.Files; using Lumina.Data.Files;
using Penumbra.Game; using Penumbra.Game;
using Penumbra.Mods; using Penumbra.Mods;
@ -77,5 +78,22 @@ namespace Penumbra.MetaData
return ref parts[ idx ].Variants[ imc.Variant - 1 ]; return ref parts[ idx ].Variants[ imc.Variant - 1 ];
} }
public static ImcFile Clone( this ImcFile file )
{
var ret = new ImcFile
{
Count = file.Count,
PartMask = file.PartMask
};
var parts = file.GetParts().Select( P => new ImcFile.ImageChangeParts()
{
DefaultVariant = P.DefaultVariant,
Variants = ( ImcFile.ImageChangeData[] )P.Variants.Clone()
} ).ToArray();
var prop = ret.GetType().GetField( "Parts", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance );
prop!.SetValue( ret, parts );
return ret;
}
} }
} }

2
Penumbra/MetaData/MetaDefaults.cs
View file

@ -96,7 +96,7 @@ namespace Penumbra.MetaData
=> GetDefaultEstFile( type, equip, body )?.Clone(); => GetDefaultEstFile( type, equip, body )?.Clone();
public ImcFile? GetNewImcFile( ObjectType type, ushort primarySetId, ushort secondarySetId = 0 ) public ImcFile? GetNewImcFile( ObjectType type, ushort primarySetId, ushort secondarySetId = 0 )
=> GetDefaultImcFile( type, primarySetId, secondarySetId ); // todo ?.Clone(); => GetDefaultImcFile( type, primarySetId, secondarySetId )?.Clone();
public MetaDefaults( DalamudPluginInterface pi ) public MetaDefaults( DalamudPluginInterface pi )

2
Penumbra/Mods/MetaManager.cs
View file

@ -4,7 +4,6 @@ using System.IO;
using System.Linq; using System.Linq;
using Dalamud.Plugin; using Dalamud.Plugin;
using Lumina.Data.Files; using Lumina.Data.Files;
using Penumbra.Game;
using Penumbra.Hooks; using Penumbra.Hooks;
using Penumbra.Util; using Penumbra.Util;
using Penumbra.MetaData; using Penumbra.MetaData;
@ -77,6 +76,7 @@ namespace Penumbra.Mods
_currentManipulations.Clear(); _currentManipulations.Clear();
_currentFiles.Clear(); _currentFiles.Clear();
ClearDirectory(); ClearDirectory();
_resourceManagement.ReloadPlayerResources();
} }
private void ClearDirectory() private void ClearDirectory()