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

formatting fixes

Browse source
This commit is contained in:
Adam 2021-02-15 21:23:18 +11:00
parent 41b02abc2f
commit 729ef7fea7
2 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Penumbra/Mods/ModCollection.cs
View file

@ -64,7 +64,7 @@ namespace Penumbra.Mods
continue;
}
var meta = ModMeta.LoadFromFile(metaFile.FullName);
var meta = ModMeta.LoadFromFile( metaFile.FullName );
var mod = new ResourceMod
{
@ -181,7 +181,7 @@ namespace Penumbra.Mods
return AddModSettings( mod );
}
public IEnumerable<ModInfo> GetOrderedAndEnabledModSettings( bool invertOrder = false )
public IEnumerable< ModInfo > GetOrderedAndEnabledModSettings( bool invertOrder = false )
{
var query = ModSettings
.Where( x => x.Enabled );
@ -194,16 +194,16 @@ namespace Penumbra.Mods
return query.OrderByDescending( x => x.Priority );
}
public IEnumerable<ResourceMod> GetOrderedAndEnabledModList( bool invertOrder = false )
public IEnumerable< ResourceMod > GetOrderedAndEnabledModList( bool invertOrder = false )
{
return GetOrderedAndEnabledModSettings( invertOrder )
.Select( x => x.Mod );
}
public IEnumerable<(ResourceMod, ModInfo)> GetOrderedAndEnabledModListWithSettings( bool invertOrder = false )
public IEnumerable< (ResourceMod, ModInfo) > GetOrderedAndEnabledModListWithSettings( bool invertOrder = false )
{
return GetOrderedAndEnabledModSettings( invertOrder )
.Select( x => (x.Mod, x) );
.Select( x => ( x.Mod, x ) );
}
}
}
}

77
Penumbra/Mods/ModManager.cs
View file

@ -118,7 +118,8 @@ namespace Penumbra.Mods
// fixup path
var baseDir = mod.ModBasePath.FullName;
if(settings.Conf == null) {
if( settings.Conf == null )
{
settings.Conf = new();
_plugin.ModManager.Mods.Save();
}
@ -126,14 +127,16 @@ namespace Penumbra.Mods
foreach( var file in mod.ModFiles )
{
var relativeFilePath = file.FullName.Substring( baseDir.Length ).TrimStart( '\\' );
bool doNotAdd = false;
void AddFiles(HashSet<string> gamePaths)
void AddFiles( HashSet< string > gamePaths )
{
doNotAdd = true;
foreach (var gamePath in gamePaths)
foreach( var gamePath in gamePaths )
{
if( !ResolvedFiles.ContainsKey( gamePath ) ) {
if( !ResolvedFiles.ContainsKey( gamePath ) )
{
ResolvedFiles[ gamePath.ToLowerInvariant() ] = file;
registeredFiles[ gamePath ] = mod.Meta.Name;
}
@ -144,58 +147,61 @@ namespace Penumbra.Mods
}
}
HashSet<string> paths;
foreach (var group in mod.Meta.Groups.Select( G => G.Value))
{
if (!settings.Conf.TryGetValue(group.GroupName, out var setting)
|| (group.SelectionType == SelectType.Single && settings.Conf[group.GroupName] >= group.Options.Count))
HashSet< string > paths;
foreach( var group in mod.Meta.Groups.Select( G => G.Value ) )
{
if( !settings.Conf.TryGetValue( group.GroupName, out var setting )
|| ( group.SelectionType == SelectType.Single && settings.Conf[ group.GroupName ] >= group.Options.Count ) )
{
settings.Conf[group.GroupName] = 0;
settings.Conf[ group.GroupName ] = 0;
_plugin.ModManager.Mods.Save();
setting = 0;
}
if (group.Options.Count == 0)
continue;
if (group.SelectionType == SelectType.Multi)
settings.Conf[group.GroupName] &= ((1 << group.Options.Count) - 1);
switch(group.SelectionType)
}
if( group.Options.Count == 0 )
continue;
if( group.SelectionType == SelectType.Multi )
settings.Conf[ group.GroupName ] &= ( ( 1 << group.Options.Count ) - 1 );
switch( group.SelectionType )
{
case SelectType.Single:
if (group.Options[setting].OptionFiles.TryGetValue(relativeFilePath, out paths))
AddFiles(paths);
if( group.Options[ setting ].OptionFiles.TryGetValue( relativeFilePath, out paths ) )
AddFiles( paths );
else
{
for(var i = 0; i < group.Options.Count; ++i)
for( var i = 0; i < group.Options.Count; ++i )
{
if (i == setting)
if( i == setting )
continue;
if(group.Options[i].OptionFiles.ContainsKey(relativeFilePath))
if( group.Options[ i ].OptionFiles.ContainsKey( relativeFilePath ) )
{
doNotAdd = true;
break;
}
}
}
break;
break;
case SelectType.Multi:
for(var i = 0; i < group.Options.Count; ++i)
for( var i = 0; i < group.Options.Count; ++i )
{
if ((setting & (1 << i)) != 0)
if( ( setting & ( 1 << i ) ) != 0 )
{
if (group.Options[i].OptionFiles.TryGetValue(relativeFilePath, out paths))
AddFiles(paths);
}
else if (group.Options[i].OptionFiles.ContainsKey(relativeFilePath))
if( group.Options[ i ].OptionFiles.TryGetValue( relativeFilePath, out paths ) )
AddFiles( paths );
}
else if( group.Options[ i ].OptionFiles.ContainsKey( relativeFilePath ) )
doNotAdd = true;
}
break;
}
}
if (!doNotAdd)
AddFiles(new() { relativeFilePath.Replace( '\\', '/' ) });
if( !doNotAdd )
AddFiles( new() { relativeFilePath.Replace( '\\', '/' ) } );
}
@ -213,6 +219,7 @@ namespace Penumbra.Mods
}
}
}
_plugin.GameUtils.ReloadPlayerResources();
}
@ -262,4 +269,4 @@ namespace Penumbra.Mods
// _fileSystemWatcher?.Dispose();
}
}
}
}