ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-01-03 06:13:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A lot of interface stuff, some more cleanup and fixes. Main functionality should be mostly fine, importing works. Missing a lot of mod edit options.

Browse source
This commit is contained in:
Ottermandias 2022-04-26 21:35:09 +02:00
parent 8dd681bdda
commit dbb9931189
77 changed files with 3332 additions and 2066 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Mods/Subclasses/IModGroup.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using Dalamud.Logging;
using Newtonsoft.Json;
using OtterGui.Filesystem;
using Penumbra.Util;
namespace Penumbra.Mods;
@ -76,4 +77,7 @@ public interface IModGroup : IEnumerable< ISubMod >
j.WriteEndArray();
j.WriteEndObject();
}
public IModGroup Convert( SelectType type );
public bool MoveOption( int optionIdxFrom, int optionIdxTo );
}

24
Penumbra/Mods/Subclasses/Mod2.Files.MultiModGroup.cs → Penumbra/Mods/Subclasses/Mod.Files.MultiModGroup.cs
View file

@ -5,10 +5,11 @@ using System.IO;
using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui.Filesystem;
namespace Penumbra.Mods;
public partial class Mod2
public partial class Mod
{
private sealed class MultiModGroup : IModGroup
{
@ -63,5 +64,26 @@ public partial class Mod2
return ret;
}
public IModGroup Convert( SelectType type )
{
switch( type )
{
case SelectType.Multi: return this;
case SelectType.Single:
var multi = new SingleModGroup()
{
Name = Name,
Description = Description,
Priority = Priority,
};
multi.OptionData.AddRange( PrioritizedOptions.Select( p => p.Mod ) );
return multi;
default: throw new ArgumentOutOfRangeException( nameof( type ), type, null );
}
}
public bool MoveOption( int optionIdxFrom, int optionIdxTo )
=> PrioritizedOptions.Move( optionIdxFrom, optionIdxTo );
}
}

25
Penumbra/Mods/Subclasses/Mod2.Files.SingleModGroup.cs → Penumbra/Mods/Subclasses/Mod.Files.SingleModGroup.cs
View file

@ -2,12 +2,14 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui.Filesystem;
namespace Penumbra.Mods;
public partial class Mod2
public partial class Mod
{
private sealed class SingleModGroup : IModGroup
{
@ -62,5 +64,26 @@ public partial class Mod2
return ret;
}
public IModGroup Convert( SelectType type )
{
switch( type )
{
case SelectType.Single: return this;
case SelectType.Multi:
var multi = new MultiModGroup()
{
Name = Name,
Description = Description,
Priority = Priority,
};
multi.PrioritizedOptions.AddRange( OptionData.Select( ( o, i ) => ( o, i ) ) );
return multi;
default: throw new ArgumentOutOfRangeException( nameof( type ), type, null );
}
}
public bool MoveOption( int optionIdxFrom, int optionIdxTo )
=> OptionData.Move( optionIdxFrom, optionIdxTo );
}
}

36
Penumbra/Mods/Subclasses/Mod2.Files.SubMod.cs → Penumbra/Mods/Subclasses/Mod.Files.SubMod.cs
View file

@ -6,12 +6,12 @@ using Dalamud.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Penumbra.GameData.ByteString;
using Penumbra.Importer;
using Penumbra.Import;
using Penumbra.Meta.Manipulations;
namespace Penumbra.Mods;
public partial class Mod2
public partial class Mod
{
private string DefaultFile
=> Path.Combine( BasePath.FullName, "default_mod.json" );
@ -135,31 +135,7 @@ public partial class Mod2
{
File.Delete( file.FullName );
}
foreach( var manip in meta.EqpManipulations )
{
ManipulationData.Add( manip );
}
foreach( var manip in meta.EqdpManipulations )
{
ManipulationData.Add( manip );
}
foreach( var manip in meta.EstManipulations )
{
ManipulationData.Add( manip );
}
foreach( var manip in meta.GmpManipulations )
{
ManipulationData.Add( manip );
}
foreach( var manip in meta.ImcManipulations )
{
ManipulationData.Add( manip );
}
ManipulationData.UnionWith( meta.MetaManipulations );
break;
case ".rgsp":
@ -174,11 +150,7 @@ public partial class Mod2
{
File.Delete( file.FullName );
}
foreach( var manip in rgsp.RspManipulations )
{
ManipulationData.Add( manip );
}
ManipulationData.UnionWith( rgsp.MetaManipulations );
break;
default: continue;

90
Penumbra/Mods/Subclasses/ModSettings.cs
View file

@ -1,19 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using OtterGui.Filesystem;
namespace Penumbra.Mods;
// Contains the settings for a given mod.
public class ModSettings2
public class ModSettings
{
public static readonly ModSettings2 Empty = new();
public static readonly ModSettings Empty = new();
public List< uint > Settings { get; init; } = new();
public int Priority { get; set; }
public bool Enabled { get; set; }
public ModSettings2 DeepCopy()
public ModSettings DeepCopy()
=> new()
{
Enabled = Enabled,
@ -21,7 +22,7 @@ public class ModSettings2
Settings = Settings.ToList(),
};
public static ModSettings2 DefaultSettings( Mod2 mod )
public static ModSettings DefaultSettings( Mod mod )
=> new()
{
Enabled = false,
@ -29,19 +30,31 @@ public class ModSettings2
Settings = Enumerable.Repeat( 0u, mod.Groups.Count ).ToList(),
};
public void HandleChanges( ModOptionChangeType type, Mod2 mod, int groupIdx, int optionIdx )
public bool HandleChanges( ModOptionChangeType type, Mod mod, int groupIdx, int optionIdx, int movedToIdx )
{
switch( type )
{
case ModOptionChangeType.GroupRenamed: return true;
case ModOptionChangeType.GroupAdded:
Settings.Insert( groupIdx, 0 );
break;
return true;
case ModOptionChangeType.GroupDeleted:
Settings.RemoveAt( groupIdx );
break;
return true;
case ModOptionChangeType.GroupTypeChanged:
{
var group = mod.Groups[ groupIdx ];
var config = Settings[ groupIdx ];
Settings[ groupIdx ] = group.Type switch
{
SelectType.Single => ( uint )Math.Min( group.Count - 1, BitOperations.TrailingZeroCount( config ) ),
SelectType.Multi => 1u << ( int )config,
_ => config,
};
return config != Settings[ groupIdx ];
}
case ModOptionChangeType.OptionDeleted:
{
var group = mod.Groups[ groupIdx ];
var config = Settings[ groupIdx ];
Settings[ groupIdx ] = group.Type switch
@ -50,20 +63,38 @@ public class ModSettings2
SelectType.Multi => RemoveBit( config, optionIdx ),
_ => config,
};
break;
return config != Settings[ groupIdx ];
}
case ModOptionChangeType.GroupMoved: return Settings.Move( groupIdx, movedToIdx );
case ModOptionChangeType.OptionMoved:
{
var group = mod.Groups[ groupIdx ];
var config = Settings[ groupIdx ];
Settings[ groupIdx ] = group.Type switch
{
SelectType.Single => config == optionIdx ? ( uint )movedToIdx : config,
SelectType.Multi => MoveBit( config, optionIdx, movedToIdx ),
_ => config,
};
return config != Settings[ groupIdx ];
}
default: return false;
}
}
public void SetValue( Mod2 mod, int groupIdx, uint newValue )
private static uint FixSetting( IModGroup group, uint value )
=> group.Type switch
{
SelectType.Single => ( uint )Math.Min( value, group.Count - 1 ),
SelectType.Multi => ( uint )( value & ( ( 1 << group.Count ) - 1 ) ),
_ => value,
};
public void SetValue( Mod mod, int groupIdx, uint newValue )
{
AddMissingSettings( groupIdx + 1 );
var group = mod.Groups[ groupIdx ];
Settings[ groupIdx ] = group.Type switch
{
SelectType.Single => ( uint )Math.Max( newValue, group.Count ),
SelectType.Multi => ( ( 1u << group.Count ) - 1 ) & newValue,
_ => newValue,
};
Settings[ groupIdx ] = FixSetting( group, newValue );
}
private static uint RemoveBit( uint config, int bit )
@ -75,6 +106,16 @@ public class ModSettings2
return low | high;
}
private static uint MoveBit( uint config, int bit1, int bit2 )
{
var enabled = ( config & ( 1 << bit1 ) ) != 0 ? 1u << bit2 : 0u;
config = RemoveBit( config, bit1 );
var lowMask = ( 1u << bit2 ) - 1u;
var low = config & lowMask;
var high = ( config & ~lowMask ) << 1;
return low | enabled | high;
}
internal bool AddMissingSettings( int totalCount )
{
if( totalCount <= Settings.Count )
@ -100,7 +141,7 @@ public class ModSettings2
Settings = Settings.ToDictionary( kvp => kvp.Key, kvp => kvp.Value ),
};
public SavedSettings( ModSettings2 settings, Mod2 mod )
public SavedSettings( ModSettings settings, Mod mod )
{
Priority = settings.Priority;
Enabled = settings.Enabled;
@ -113,7 +154,7 @@ public class ModSettings2
}
}
public bool ToSettings( Mod2 mod, out ModSettings2 settings )
public bool ToSettings( Mod mod, out ModSettings settings )
{
var list = new List< uint >( mod.Groups.Count );
var changes = Settings.Count != mod.Groups.Count;
@ -121,7 +162,12 @@ public class ModSettings2
{
if( Settings.TryGetValue( group.Name, out var config ) )
{
list.Add( config );
var actualConfig = FixSetting( group, config );
list.Add( actualConfig );
if( actualConfig != config )
{
changes = true;
}
}
else
{
@ -130,7 +176,7 @@ public class ModSettings2
}
}
settings = new ModSettings2
settings = new ModSettings
{
Enabled = Enabled,
Priority = Priority,