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

tmp

Browse source
This commit is contained in:
Ottermandias 2022-03-22 22:58:00 +01:00
parent 4a4d93baf3
commit 0eff4e2e67
3 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Penumbra/Mods/CollectionManager.cs
View file

@ -21,7 +21,7 @@ public delegate void CollectionChangeDelegate( ModCollection? oldCollection, Mod
string? characterName = null ); string? characterName = null );
// Contains all collections and respective functions, as well as the collection settings. // Contains all collections and respective functions, as well as the collection settings.
public class CollectionManager public class CollectionManager : IDisposable
{ {
private readonly ModManager _manager; private readonly ModManager _manager;
@ -42,10 +42,43 @@ public class CollectionManager
{ {
_manager = manager; _manager = manager;
_manager.ModsRediscovered += OnModsRediscovered;
ReadCollections(); ReadCollections();
LoadConfigCollections( Penumbra.Config ); LoadConfigCollections( Penumbra.Config );
} }
public void Dispose()
{
_manager.ModsRediscovered -= OnModsRediscovered;
}
private void OnModsRediscovered()
{
RecreateCaches();
DefaultCollection.SetFiles();
}
private void OnModChanged( ModChangeType type, int idx, ModData mod )
{
switch( type )
{
case ModChangeType.Added:
foreach( var collection in Collections.Values )
{
collection.AddMod( mod );
}
break;
case ModChangeType.Removed:
RemoveModFromCaches( mod.BasePath );
break;
case ModChangeType.Changed:
// TODO
break;
default: throw new ArgumentOutOfRangeException( nameof( type ), type, null );
}
}
public void CreateNecessaryCaches() public void CreateNecessaryCaches()
{ {
AddCache( DefaultCollection ); AddCache( DefaultCollection );

21
Penumbra/Mods/ModManager.cs
View file

@ -32,9 +32,8 @@ public class ModManager
public ModFolder StructuredMods { get; } = ModFileSystem.Root; public ModFolder StructuredMods { get; } = ModFileSystem.Root;
public CollectionManager Collections { get; }
public event ModChangeDelegate? ModChange; public event ModChangeDelegate? ModChange;
public event Action? ModsRediscovered;
public bool Valid { get; private set; } public bool Valid { get; private set; }
@ -82,18 +81,14 @@ public class ModManager
Config.ModDirectory = BasePath.FullName; Config.ModDirectory = BasePath.FullName;
Config.Save(); Config.Save();
} }
if( !firstTime )
{
Collections.RecreateCaches();
}
} }
ModsRediscovered?.Invoke();
} }
public ModManager() public ModManager()
{ {
SetBaseDirectory( Config.ModDirectory, true ); SetBaseDirectory( Config.ModDirectory, true );
Collections = new CollectionManager( this );
} }
private bool SetSortOrderPath( ModData mod, string path ) private bool SetSortOrderPath( ModData mod, string path )
@ -161,8 +156,7 @@ public class ModManager
SetModStructure(); SetModStructure();
} }
Collections.RecreateCaches(); ModsRediscovered?.Invoke();
Collections.DefaultCollection.SetFiles();
} }
public void DeleteMod( DirectoryInfo modFolder ) public void DeleteMod( DirectoryInfo modFolder )
@ -185,7 +179,6 @@ public class ModManager
var mod = ModsInternal[ idx ]; var mod = ModsInternal[ idx ];
mod.SortOrder.ParentFolder.RemoveMod( mod ); mod.SortOrder.ParentFolder.RemoveMod( mod );
ModsInternal.RemoveAt( idx ); ModsInternal.RemoveAt( idx );
Collections.RemoveModFromCaches( modFolder );
ModChange?.Invoke( ModChangeType.Removed, idx, mod ); ModChange?.Invoke( ModChangeType.Removed, idx, mod );
} }
} }
@ -213,10 +206,6 @@ public class ModManager
ModsInternal.Add( mod ); ModsInternal.Add( mod );
ModChange?.Invoke( ModChangeType.Added, ModsInternal.Count - 1, mod ); ModChange?.Invoke( ModChangeType.Added, ModsInternal.Count - 1, mod );
foreach( var collection in Collections.Collections.Values )
{
collection.AddMod( mod );
}
return ModsInternal.Count - 1; return ModsInternal.Count - 1;
} }
@ -261,7 +250,7 @@ public class ModManager
mod.Resources.MetaManipulations.SaveToFile( MetaCollection.FileName( mod.BasePath ) ); mod.Resources.MetaManipulations.SaveToFile( MetaCollection.FileName( mod.BasePath ) );
} }
Collections.UpdateCollections( mod, metaChanges, fileChanges, nameChange, reloadMeta ); Penumbra.CollectionManager.UpdateCollections( mod, metaChanges, fileChanges, nameChange, reloadMeta ); // TODO
ModChange?.Invoke( ModChangeType.Changed, idx, mod ); ModChange?.Invoke( ModChangeType.Changed, idx, mod );
return true; return true;
} }

7
Penumbra/Penumbra.cs
View file

@ -34,6 +34,7 @@ public class Penumbra : IDalamudPlugin
public static CharacterUtility CharacterUtility { get; private set; } = null!; public static CharacterUtility CharacterUtility { get; private set; } = null!;
public static ModManager ModManager { get; private set; } = null!; public static ModManager ModManager { get; private set; } = null!;
public static CollectionManager CollectionManager { get; private set; } = null!;
public static ResourceLoader ResourceLoader { get; set; } = null!; public static ResourceLoader ResourceLoader { get; set; } = null!;
public ResourceLogger ResourceLogger { get; } public ResourceLogger ResourceLogger { get; }
@ -66,8 +67,9 @@ public class Penumbra : IDalamudPlugin
ResourceLogger = new ResourceLogger( ResourceLoader ); ResourceLogger = new ResourceLogger( ResourceLoader );
ModManager = new ModManager(); ModManager = new ModManager();
ModManager.DiscoverMods(); ModManager.DiscoverMods();
ObjectReloader = new ObjectReloader(); CollectionManager = new CollectionManager( ModManager );
PathResolver = new PathResolver( ResourceLoader ); ObjectReloader = new ObjectReloader();
PathResolver = new PathResolver( ResourceLoader );
Dalamud.Commands.AddHandler( CommandName, new CommandInfo( OnCommand ) Dalamud.Commands.AddHandler( CommandName, new CommandInfo( OnCommand )
{ {
@ -193,6 +195,7 @@ public class Penumbra : IDalamudPlugin
Api.Dispose(); Api.Dispose();
SettingsInterface.Dispose(); SettingsInterface.Dispose();
ObjectReloader.Dispose(); ObjectReloader.Dispose();
CollectionManager.Dispose();
Dalamud.Commands.RemoveHandler( CommandName ); Dalamud.Commands.RemoveHandler( CommandName );