From c681f1533db813aa701eab98925ba0139a7eb55c Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Tue, 27 Sep 2022 10:13:36 +0200 Subject: [PATCH] Let meta incorporation look at both extensions. --- Penumbra/Mods/Subclasses/Mod.Files.SubMod.cs | 58 ++++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/Penumbra/Mods/Subclasses/Mod.Files.SubMod.cs b/Penumbra/Mods/Subclasses/Mod.Files.SubMod.cs index 07c752af..47c777cd 100644 --- a/Penumbra/Mods/Subclasses/Mod.Files.SubMod.cs +++ b/Penumbra/Mods/Subclasses/Mod.Files.SubMod.cs @@ -154,43 +154,41 @@ public partial class Mod { foreach( var (key, file) in Files.ToList() ) { + var ext1 = key.Extension().AsciiToLower().ToString(); + var ext2 = file.Extension.ToLowerInvariant(); try { - switch( file.Extension ) + if( ext1 == ".meta" || ext2 == ".meta" ) { - case ".meta": - FileData.Remove( key ); - if( !file.Exists ) - { - continue; - } + FileData.Remove( key ); + if( !file.Exists ) + { + continue; + } - var meta = new TexToolsMeta( File.ReadAllBytes( file.FullName ) ); - if( delete ) - { - File.Delete( file.FullName ); - } + var meta = new TexToolsMeta( File.ReadAllBytes( file.FullName ) ); + if( delete ) + { + File.Delete( file.FullName ); + } - ManipulationData.UnionWith( meta.MetaManipulations ); + ManipulationData.UnionWith( meta.MetaManipulations ); + } + else if( ext1 == ".rgsp" || ext2 == ".rgsp" ) + { + FileData.Remove( key ); + if( !file.Exists ) + { + continue; + } - break; - case ".rgsp": - FileData.Remove( key ); - if( !file.Exists ) - { - continue; - } + var rgsp = TexToolsMeta.FromRgspFile( file.FullName, File.ReadAllBytes( file.FullName ) ); + if( delete ) + { + File.Delete( file.FullName ); + } - var rgsp = TexToolsMeta.FromRgspFile( file.FullName, File.ReadAllBytes( file.FullName ) ); - if( delete ) - { - File.Delete( file.FullName ); - } - - ManipulationData.UnionWith( rgsp.MetaManipulations ); - - break; - default: continue; + ManipulationData.UnionWith( rgsp.MetaManipulations ); } } catch( Exception e )