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

Move CollectionManager out of ModManager

Browse source
This commit is contained in:
Ottermandias 2022-03-23 11:45:38 +01:00
parent 0eff4e2e67
commit 9c0fc8a8c7
19 changed files with 94 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Penumbra/Interop/Resolver/PathResolver.cs
View file

@ -36,7 +36,7 @@ public partial class PathResolver : IDisposable
var nonDefault = HandleMaterialSubFiles( gamePath, out var collection ) || PathCollections.TryGetValue( gamePath.Path, out collection );
if( !nonDefault )
{
collection = Penumbra.ModManager.Collections.DefaultCollection;
collection = Penumbra.CollectionManager.DefaultCollection;
}
else
{
@ -49,7 +49,7 @@ public partial class PathResolver : IDisposable
var resolved = collection!.ResolveSwappedOrReplacementPath( gamePath );
if( resolved == null )
{
resolved = Penumbra.ModManager.Collections.ForcedCollection.ResolveSwappedOrReplacementPath( gamePath );
resolved = Penumbra.CollectionManager.ForcedCollection.ResolveSwappedOrReplacementPath( gamePath );
if( resolved == null )
{
// We also need to handle defaulted materials against a non-default collection.
@ -61,7 +61,7 @@ public partial class PathResolver : IDisposable
return ( null, collection );
}
collection = Penumbra.ModManager.Collections.ForcedCollection;
collection = Penumbra.CollectionManager.ForcedCollection;
}
// Since mtrl files load their files separately, we need to add the new, resolved path