ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-29 11:59:26 +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

10
Penumbra/Interop/Resolver/PathResolver.Data.cs
View file

@ -68,12 +68,12 @@ public unsafe partial class PathResolver
CharacterBaseCreateHook?.Enable();
EnableDrawHook?.Enable();
CharacterBaseDestructorHook?.Enable();
Penumbra.ModManager.Collections.CollectionChanged += CheckCollections;
Penumbra.CollectionManager.CollectionChanged += CheckCollections;
}
private void DisableDataHooks()
{
Penumbra.ModManager.Collections.CollectionChanged -= CheckCollections;
Penumbra.CollectionManager.CollectionChanged -= CheckCollections;
CharacterBaseCreateHook?.Disable();
EnableDrawHook?.Disable();
CharacterBaseDestructorHook?.Disable();
@ -161,7 +161,7 @@ public unsafe partial class PathResolver
{
if( gameObject == null )
{
return Penumbra.ModManager.Collections.DefaultCollection;
return Penumbra.CollectionManager.DefaultCollection;
}
var name = gameObject->ObjectIndex switch
@ -174,9 +174,9 @@ public unsafe partial class PathResolver
}
?? new Utf8String( gameObject->Name ).ToString();
return Penumbra.ModManager.Collections.CharacterCollection.TryGetValue( name, out var col )
return Penumbra.CollectionManager.CharacterCollection.TryGetValue( name, out var col )
? col
: Penumbra.ModManager.Collections.DefaultCollection;
: Penumbra.CollectionManager.DefaultCollection;
}
// Update collections linked to Game/DrawObjects due to a change in collection configuration.