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

Revert "formating fixes"

Browse source 
This reverts commit 1504af9f3d.
This commit is contained in:
Stanley Dimant 2022-06-18 13:11:25 +02:00
parent 1504af9f3d
commit 2103ae3053
3 changed files with 144 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Penumbra/Api/PenumbraApi.cs
View file

@ -138,8 +138,7 @@ public class PenumbraApi : IDisposable, IPenumbraApi
} }
var gamePath = Utf8GamePath.FromString( path, out var p, true ) ? p : Utf8GamePath.Empty; var gamePath = Utf8GamePath.FromString( path, out var p, true ) ? p : Utf8GamePath.Empty;
var ret = Penumbra.CollectionManager.Character( characterName ).ResolveReversePath( new FullPath( path ) ) ?? var ret = Penumbra.CollectionManager.Character( characterName ).ResolveReversePath( new FullPath( path ) ) ?? new List<Utf8GamePath>();
new List< Utf8GamePath >();
if( ret.Count == 0 ) ret.Add( gamePath ); if( ret.Count == 0 ) ret.Add( gamePath );
return ret.Select( r => r.ToString() ).ToArray(); return ret.Select( r => r.ToString() ).ToArray();
} }
@ -236,8 +235,7 @@ public class PenumbraApi : IDisposable, IPenumbraApi
public Dictionary<string, (string[], SelectType)>? GetAvailableModSettings( string modDirectory, string modName ) public Dictionary<string, (string[], SelectType)>? GetAvailableModSettings( string modDirectory, string modName )
=> throw new NotImplementedException(); => throw new NotImplementedException();
public (PenumbraApiEc, (bool, int, Dictionary< string, string[] >, bool)?) GetCurrentModSettings( string collectionName, public (PenumbraApiEc, (bool, int, Dictionary<string, string[]>, bool)?) GetCurrentModSettings( string collectionName, string modDirectory, string modName,
string modDirectory, string modName,
bool allowInheritance ) bool allowInheritance )
=> throw new NotImplementedException(); => throw new NotImplementedException();
@ -253,8 +251,7 @@ public class PenumbraApi : IDisposable, IPenumbraApi
public PenumbraApiEc TrySetModSetting( string collectionName, string modDirectory, string modName, string optionGroupName, string option ) public PenumbraApiEc TrySetModSetting( string collectionName, string modDirectory, string modName, string optionGroupName, string option )
=> throw new NotImplementedException(); => throw new NotImplementedException();
public PenumbraApiEc TrySetModSetting( string collectionName, string modDirectory, string modName, string optionGroupName, public PenumbraApiEc TrySetModSetting( string collectionName, string modDirectory, string modName, string optionGroupName, string[] options )
string[] options )
=> throw new NotImplementedException(); => throw new NotImplementedException();
public PenumbraApiEc CreateTemporaryCollection( string collectionName, string? character, bool forceOverwriteCharacter ) public PenumbraApiEc CreateTemporaryCollection( string collectionName, string? character, bool forceOverwriteCharacter )

4
Penumbra/Api/PenumbraIpc.cs
View file

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

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

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