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

fix a bug where priorities weren't fixed after deleting mods

Browse source
This commit is contained in:
Adam 2020-12-26 14:47:36 +11:00
parent 055399a7e7
commit d7fda7cf1b
3 changed files with 70 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Penumbra/Mods/ModCollection.cs
View file

@ -84,6 +84,14 @@ namespace Penumbra.Mods
)
).ToList();
// if anything gets removed above, the priority ordering gets fucked, so we need to resort and reindex them otherwise BAD THINGS HAPPEN
ModSettings = ModSettings.OrderBy( x => x.Priority ).ToList();
var p = 0;
foreach( var modSetting in ModSettings )
{
modSetting.Priority = p++;
}
// reorder the resourcemods list so we can just directly iterate
EnabledMods = GetOrderedAndEnabledModList().ToArray();
@ -129,6 +137,8 @@ namespace Penumbra.Mods
// save new prios
Save();
}
public ModInfo FindModSettings( string name )
{

26
Penumbra/Plugin.cs
View file

@ -43,7 +43,7 @@ namespace Penumbra
PluginInterface.CommandManager.AddHandler( CommandName, new CommandInfo( OnCommand )
{
HelpMessage = "/penumbra 0 will disable penumbra, /penumbra 1 will enable it."
HelpMessage = "/penumbra - toggle ui\n/penumbra reload - reload mod file lists & discover any new mods"
} );
ResourceLoader.Init();
@ -65,15 +65,27 @@ namespace Penumbra
ResourceLoader.Dispose();
}
private void OnCommand( string command, string args )
private void OnCommand( string command, string rawArgs )
{
var args = rawArgs.Split( ' ' );
if( args.Length > 0 )
Configuration.IsEnabled = args[ 0 ] == '1';
{
switch( args[ 0 ] )
{
case "reload":
{
ModManager.DiscoverMods();
PluginInterface.Framework.Gui.Chat.Print(
$"Reloaded Penumbra mods. You have {ModManager.Mods.ModSettings.Count} mods, {ModManager.Mods.EnabledMods.Length} of which are enabled."
);
break;
}
}
if( Configuration.IsEnabled )
ResourceLoader.Enable();
else
ResourceLoader.Disable();
return;
}
SettingsInterface.Visible = !SettingsInterface.Visible;
}
}
}

45
Penumbra/UI/SettingsInterface.cs
View file

@ -18,6 +18,7 @@ namespace Penumbra.UI
private readonly Plugin _plugin;
public bool Visible = false;
public bool ShowDebugBar = false;
private static readonly Vector2 AutoFillSize = new Vector2( -1, -1 );
private static readonly Vector2 ModListSize = new Vector2( 200, -1 );
@ -36,10 +37,46 @@ namespace Penumbra.UI
public SettingsInterface( Plugin plugin )
{
_plugin = plugin;
#if DEBUG
Visible = true;
ShowDebugBar = true;
#endif
}
public void Draw()
{
if( ShowDebugBar && ImGui.BeginMainMenuBar() )
{
if( ImGui.BeginMenu( "Penumbra" ) )
{
if( ImGui.MenuItem( "Toggle UI", "/penumbra", Visible ) )
{
Visible = !Visible;
}
if( ImGui.MenuItem( "Rediscover Mods" ) )
{
ReloadMods();
}
// ImGui.Separator();
// #if DEBUG
// ImGui.Text( _plugin.PluginDebugTitleStr );
// #else
// ImGui.Text( _plugin.Name );
// #endif
ImGui.EndMenu();
}
ImGui.EndMainMenuBar();
}
if( !Visible )
{
return;
}
ImGui.SetNextWindowSizeConstraints( MinSettingsSize, MaxSettingsSize );
#if DEBUG
var ret = ImGui.Begin( _plugin.PluginDebugTitleStr, ref Visible );
@ -94,7 +131,7 @@ namespace Penumbra.UI
{
Process.Start( _plugin.Configuration.CurrentCollection );
}
ImGui.SetCursorPosY( ImGui.GetCursorPosY() + 15 );
#if DEBUG
@ -105,12 +142,12 @@ namespace Penumbra.UI
{
_plugin.ResourceLoader.ReloadPlayerResource();
}
if( _plugin.ResourceLoader != null )
{
ImGui.Checkbox( "DEBUG Log all loaded files", ref _plugin.ResourceLoader.LogAllFiles );
}
ImGui.SetCursorPosY( ImGui.GetCursorPosY() + 15 );
#endif
@ -164,7 +201,7 @@ namespace Penumbra.UI
{
ImGui.Button( "Import in progress..." );
}
ImGui.SetCursorPosY( ImGui.GetCursorPosY() + 15 );
if( ImGui.Button( "Save Settings" ) )