diff --git a/Penumbra/Importer/TexToolsMeta.cs b/Penumbra/Importer/TexToolsMeta.cs index e39b06ac..1afd8f0f 100644 --- a/Penumbra/Importer/TexToolsMeta.cs +++ b/Penumbra/Importer/TexToolsMeta.cs @@ -275,17 +275,21 @@ public class TexToolsMeta { var def = new ImcFile( new ImcManipulation( info.PrimaryType, info.SecondaryType, info.PrimaryId, info.SecondaryId, i, new ImcEntry() ).GamePath() ); - foreach( var value in values.Where( v => true || !v.Equals( def.GetEntry( 0, i ) ) ) ) + foreach( var value in values ) { - ImcManipulations.Add( new ImcManipulation( info.PrimaryType, info.SecondaryType, info.PrimaryId, info.SecondaryId, i, - value ) ); + if( !value.Equals( def.GetEntry( 0, i ) ) ) + { + ImcManipulations.Add( new ImcManipulation( info.PrimaryType, info.SecondaryType, info.PrimaryId, info.SecondaryId, i, + value ) ); + } + ++i; } } } catch( Exception e ) { - PluginLog.Error( "Could not compute IMC manipulation. This is in all likelihood due to TexTools corrupting your index files.\n" + PluginLog.Warning( $"Could not compute IMC manipulation for {info.PrimaryType} {info.PrimaryId}. This is in all likelihood due to TexTools corrupting your index files.\n" + $"If the following error looks like Lumina is having trouble to read an IMC file, please do a do-over in TexTools:\n{e}" ); } } diff --git a/Penumbra/Mods/Mod2.Meta.Migration.cs b/Penumbra/Mods/Mod2.Meta.Migration.cs index 9623487e..a675c660 100644 --- a/Penumbra/Mods/Mod2.Meta.Migration.cs +++ b/Penumbra/Mods/Mod2.Meta.Migration.cs @@ -38,7 +38,10 @@ public sealed partial class Mod2 { if( unusedFile.ToGamePath( mod.BasePath, out var gamePath ) ) { - mod._default.FileData.Add( gamePath, unusedFile ); + if( !mod._default.FileData.TryAdd( gamePath, unusedFile ) ) + { + PluginLog.Error( $"Could not add {gamePath} because it already points to {mod._default.FileData[ gamePath ]}." ); + } } } diff --git a/Penumbra/Penumbra.csproj b/Penumbra/Penumbra.csproj index 707b9f9e..0ce77a6e 100644 --- a/Penumbra/Penumbra.csproj +++ b/Penumbra/Penumbra.csproj @@ -1,89 +1,89 @@ - - - net5.0-windows - preview - x64 - Penumbra - absolute gangstas - Penumbra - Copyright © 2020 - 1.0.0.0 - 1.0.0.0 - bin\$(Configuration)\ - true - enable - true - true - - - - full - DEBUG;TRACE;USE_EQP;USE_EQDP;USE_GMP;USE_EST;USE_CMP;USE_IMC - - - - pdbonly - $(DefineConstants)TRACE;USE_EQP;USE_EQDP;USE_GMP;USE_EST;USE_CMP;USE_IMC - - - - $(MSBuildWarningsAsMessages);MSB3277 - - + + + net5.0-windows + preview + x64 + Penumbra + absolute gangstas + Penumbra + Copyright © 2020 + 1.0.0.0 + 1.0.0.0 + bin\$(Configuration)\ + true + enable + true + true + + + + full + DEBUG;TRACE;USE_EQP;USE_EQDP;USE_GMP;USE_EST;USE_CMP;USE_IMC + + + + pdbonly + $(DefineConstants)TRACE;USE_EQP;USE_EQDP;USE_GMP;USE_EST;USE_CMP;USE_IMC + + + + $(MSBuildWarningsAsMessages);MSB3277 + + - - - - - PreserveNewest - - - - - - $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll - False - - - $(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll - False - - - $(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll - False - - - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll - False - - - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll - False - - - $(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll - False - - - - - - - - - - - - - - - - - - Always - - + + + + + PreserveNewest + + + + + + $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll + False + + + $(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll + False + + + $(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll + False + + + $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll + False + + + $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll + False + + + $(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll + False + + + + + + + + + + + + + + + + + + Always + + \ No newline at end of file