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

formating fixes

Browse source
This commit is contained in:
Stanley Dimant 2022-06-16 23:51:16 +02:00 • committed by Ottermandias
parent 1c7037416c
commit bcd62cbe69
3 changed files with 144 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Penumbra/Api/PenumbraApi.cs
View file

@ -138,7 +138,8 @@ public class PenumbraApi : IDisposable, IPenumbraApi
}
var gamePath = Utf8GamePath.FromString( path, out var p, true ) ? p : Utf8GamePath.Empty;
var ret = Penumbra.CollectionManager.Character( characterName ).ResolveReversePath( new FullPath( path ) ) ?? new List<Utf8GamePath>();
var ret = Penumbra.CollectionManager.Character( characterName ).ResolveReversePath( new FullPath( path ) ) ??
new List< Utf8GamePath >();
if( ret.Count == 0 ) ret.Add( gamePath );
return ret.Select( r => r.ToString() ).ToArray();
}

4
Penumbra/Api/PenumbraIpc.cs
View file

@ -121,7 +121,7 @@ public partial class PenumbraIpc
internal ICallGateProvider< int, int, object >? ProviderRedrawIndex;
internal ICallGateProvider< GameObject, int, object >? ProviderRedrawObject;
internal ICallGateProvider< int, object >? ProviderRedrawAll;
internal ICallGateProvider<string, string> ProviderObjectIsRedrawn;
internal ICallGateProvider< string, string >? ProviderObjectIsRedrawn;
private static RedrawType CheckRedrawType( int value )
{
@ -189,7 +189,7 @@ public partial class PenumbraIpc
private void Api_ObjectIsRedrawn( object? sender, EventArgs e )
{
ProviderObjectIsRedrawn.SendMessage( ( ( GameObject? )sender )?.Name.ToString() ?? "" );
ProviderObjectIsRedrawn?.SendMessage( ( ( GameObject? )sender )?.Name.ToString() ?? "" );
}
private void DisposeRedrawProviders()

4
Penumbra/Collections/ModCollection.Cache.cs
View file

@ -12,6 +12,7 @@ using Penumbra.Util;
namespace Penumbra.Collections;
public record struct ModPath( Mod Mod, FullPath Path );
public record ModConflicts( Mod Mod2, List< object > Conflicts, bool HasPriority, bool Solved );
public partial class ModCollection
@ -368,7 +369,8 @@ public partial class ModCollection
foreach( var conflict in tmpConflicts )
{
if( data is Utf8GamePath path && conflict.Conflicts.RemoveAll( p => p is Utf8GamePath x && x.Equals( path ) ) > 0
|| data is MetaManipulation meta && conflict.Conflicts.RemoveAll( m => m is MetaManipulation x && x.Equals( meta ) ) > 0 )
|| data is MetaManipulation meta &&
conflict.Conflicts.RemoveAll( m => m is MetaManipulation x && x.Equals( meta ) ) > 0 )
{
AddConflict( data, addedMod, conflict.Mod2 );
}