move desc to own tab, invert load order setting, normalise line endings

Penumbra/API/ModsController.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Linq;
 using EmbedIO;
 using EmbedIO.Routing;
@@ -25,7 +24,7 @@ namespace Penumbra.API
                 x.FolderName,
                 x.Mod.Meta,
                 BasePath = x.Mod.ModBasePath.FullName,
-                Files = x.Mod.ModFiles.Select( x => x.FullName )
+                Files = x.Mod.ModFiles.Select( fi => fi.FullName )
             } );
         }
 

Penumbra/Configuration.cs

@@ -12,16 +12,18 @@ namespace Penumbra
 
         public bool IsEnabled { get; set; } = true;
 
-        public bool ShowAdvanced { get; set; } = false;
+        public bool ShowAdvanced { get; set; }
         
-        public bool DisableFileSystemNotifications { get; set; } = false;
+        public bool DisableFileSystemNotifications { get; set; }
 
-        public bool EnableHttpApi { get; set; } = false;
+        public bool EnableHttpApi { get; set; }
 
         public string CurrentCollection { get; set; } = @"D:/ffxiv/fs_mods/";
 
         public List< string > ModCollections { get; set; } = new();
 
+        public bool InvertModListOrder { get; set; }
+
         // the below exist just to make saving less cumbersome
 
         [NonSerialized]

Penumbra/DialogExtensions.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -49,15 +46,15 @@ namespace Penumbra
 
         public class HiddenForm : Form
         {
-            private readonly CommonDialog form;
+            private readonly CommonDialog _form;
-            private readonly IWin32Window owner;
+            private readonly IWin32Window _owner;
-            private readonly TaskCompletionSource< DialogResult > taskSource;
+            private readonly TaskCompletionSource< DialogResult > _taskSource;
 
             public HiddenForm( CommonDialog form, IWin32Window owner, TaskCompletionSource< DialogResult > taskSource )
             {
-                this.form = form;
+                this._form = form;
-                this.owner = owner;
+                this._owner = owner;
-                this.taskSource = taskSource;
+                this._taskSource = taskSource;
 
                 Opacity = 0;
                 FormBorderStyle = FormBorderStyle.None;
@@ -72,12 +69,12 @@ namespace Penumbra
                 Hide();
                 try
                 {
-                    var result = form.ShowDialog( owner );
+                    var result = _form.ShowDialog( _owner );
-                    taskSource.SetResult( result );
+                    _taskSource.SetResult( result );
                 }
                 catch( Exception e )
                 {
-                    taskSource.SetException( e );
+                    _taskSource.SetException( e );
                 }
 
                 Close();

Penumbra/Game/GameUtils.cs

@@ -7,8 +7,6 @@ namespace Penumbra.Game
 {
     public class GameUtils
     {
-        private readonly DalamudPluginInterface _pluginInterface;
-
         [Function( CallingConventions.Microsoft )]
         public unsafe delegate void* LoadPlayerResourcesPrototype( IntPtr pResourceManager );
 
@@ -25,9 +23,7 @@ namespace Penumbra.Game
 
         public GameUtils( DalamudPluginInterface pluginInterface )
         {
-            _pluginInterface = pluginInterface;
+            var scanner = pluginInterface.TargetModuleScanner;
-
-            var scanner = _pluginInterface.TargetModuleScanner;
 
             var loadPlayerResourcesAddress =
                 scanner.ScanText(

Penumbra/Importer/TexToolsImport.cs

@@ -17,7 +17,7 @@ namespace Penumbra.Importer
         private readonly DirectoryInfo _outDirectory;
 
         private const string TempFileName = "textools-import";
-        private readonly string _resolvedTempFilePath = null;
+        private readonly string _resolvedTempFilePath;
 
         public ImporterState State { get; private set; }
 
@@ -216,9 +216,9 @@ namespace Penumbra.Importer
                 from option in modGroup.OptionList
                 select option )
             {
-                var OptionFolder = new DirectoryInfo(Path.Combine(newModFolder.FullName, option.Name));
+                var optionFolder = new DirectoryInfo( Path.Combine( newModFolder.FullName, option.Name ) );
-                ExtractSimpleModList(OptionFolder, option.ModsJsons, modData );
+                ExtractSimpleModList( optionFolder, option.ModsJsons, modData );
-                AddMeta(OptionFolder, newModFolder, modMeta, option.Name);
+                AddMeta( optionFolder, newModFolder, modMeta, option.Name );
             }
 
             File.WriteAllText(

Penumbra/Models/GroupInformation.cs

@@ -8,7 +8,6 @@ namespace Penumbra.Models
     [Serializable]
     public class GroupInformation : ISerializable
     {
-
         // This class is just used as a temp class while (de)-serializing.
         // It converts the flags into lists and back.
         [Serializable]
@@ -31,6 +30,7 @@ namespace Penumbra.Models
                                 ret.Add( groupType[ i ] );
                         }
                     }
+
                     return ret;
                 }
 
@@ -55,8 +55,10 @@ namespace Penumbra.Models
                         if( index >= 0 )
                             flags |= ( 1u << index );
                     }
+
                     return flags;
                 }
+
                 var tops = ( uint )TypesToFlags( TopTypes, info.TopTypes );
                 var bottoms = ( uint )TypesToFlags( BottomTypes, info.BottomTypes );
                 // Exclusions are the other way around.
@@ -65,9 +67,9 @@ namespace Penumbra.Models
             }
 
             public string GamePath { get; set; }
-            public List<string> TopTypes  { get; set; } = null;
+            public List< string > TopTypes { get; set; }
-            public List<string> BottomTypes { get; set; } = null;
+            public List< string > BottomTypes { get; set; }
-            public List<string> GroupExclusions { get; set; } = null;
+            public List< string > GroupExclusions { get; set; }
 
             // Customize (De)-Serialization to ignore nulls.
             public GroupDescription( SerializationInfo info, StreamingContext context )
@@ -81,8 +83,12 @@ namespace Penumbra.Models
                             return null;
                         return ret;
                     }
-                    catch (Exception) { return null; }
+                    catch( Exception )
+                    {
+                        return null;
                     }
+                }
+
                 GamePath = info.GetString( "GamePath" );
                 TopTypes = readListOrNull( "TopTypes" );
                 BottomTypes = readListOrNull( "BottomTypes" );
@@ -126,20 +132,46 @@ namespace Penumbra.Models
 
         public Dictionary< string, (string, uint, uint, ulong) > FileToGameAndGroup { get; set; } = new();
 
-        public GroupInformation(){ }
+        public GroupInformation()
+        {
+        }
 
         public GroupInformation( SerializationInfo info, StreamingContext context )
         {
-            try { TopTypes    = (List<string>) info.GetValue( "TopTypes",       TopTypes.GetType() ); } catch(Exception){ }
+            try
-            try { BottomTypes = (List<string>) info.GetValue( "BottomTypes", BottomTypes.GetType() ); } catch(Exception){ }
+            {
-            try { OtherGroups = (List<string>) info.GetValue( "Groups",      OtherGroups.GetType() ); } catch(Exception){ }
+                TopTypes = ( List< string > )info.GetValue( "TopTypes", TopTypes.GetType() );
+            }
+            catch( Exception )
+            {
+            }
+
+            try
+            {
+                BottomTypes = ( List< string > )info.GetValue( "BottomTypes", BottomTypes.GetType() );
+            }
+            catch( Exception )
+            {
+            }
+
+            try
+            {
+                OtherGroups = ( List< string > )info.GetValue( "Groups", OtherGroups.GetType() );
+            }
+            catch( Exception )
+            {
+            }
+
             try
             {
                 Dictionary< string, GroupDescription > dict = new();
                 dict = ( Dictionary< string, GroupDescription > )info.GetValue( "FileToGameAndGroups", dict.GetType() );
                 foreach( var pair in dict )
                     FileToGameAndGroup.Add( pair.Key, pair.Value.ToTuple( this ) );
-            } catch (Exception){  }
+            }
+            catch( Exception )
+            {
+            }
         }
 
         public virtual void GetObjectData( SerializationInfo info, StreamingContext context )

Penumbra/Models/ModMeta.cs

@@ -4,6 +4,7 @@ namespace Penumbra.Models
 {
     public class ModMeta
     {
+        public uint FileVersion { get; set; }
         public string Name { get; set; }
         public string Author { get; set; }
         public string Description { get; set; }

Penumbra/Mods/ModCollection.cs

@@ -21,7 +21,7 @@ namespace Penumbra.Mods
             _basePath = basePath;
         }
 
-        public void Load()
+        public void Load( bool invertOrder = false )
         {
             // find the collection json
             var collectionPath = Path.Combine( _basePath.FullName, "collection.json" );
@@ -94,7 +94,7 @@ namespace Penumbra.Mods
             }
 
             // reorder the resourcemods list so we can just directly iterate
-            EnabledMods = GetOrderedAndEnabledModList().ToArray();
+            EnabledMods = GetOrderedAndEnabledModList( invertOrder ).ToArray();
 
             // write the collection metadata back to disk
             Save();
@@ -181,22 +181,28 @@ namespace Penumbra.Mods
             return AddModSettings( mod );
         }
 
-        public IEnumerable<ModInfo> GetOrderedAndEnabledModSettings()
+        public IEnumerable<ModInfo> GetOrderedAndEnabledModSettings( bool invertOrder = false )
         {
-            return ModSettings
+            var query = ModSettings
-                .Where( x => x.Enabled )
+                .Where( x => x.Enabled );
-                .OrderBy( x => x.Priority );
+
+            if( !invertOrder )
+            {
+                return query.OrderBy( x => x.Priority );
             }
 
-        public IEnumerable<ResourceMod> GetOrderedAndEnabledModList()
+            return query.OrderByDescending( x => x.Priority );
+        }
+
+        public IEnumerable<ResourceMod> GetOrderedAndEnabledModList( bool invertOrder = false )
         {
-            return GetOrderedAndEnabledModSettings()
+            return GetOrderedAndEnabledModSettings( invertOrder )
                 .Select( x => x.Mod );
         }
 
-        public IEnumerable<(ResourceMod, ModInfo)> GetOrderedAndEnabledModListWithSettings()
+        public IEnumerable<(ResourceMod, ModInfo)> GetOrderedAndEnabledModListWithSettings( bool invertOrder = false )
         {
-            return GetOrderedAndEnabledModSettings()
+            return GetOrderedAndEnabledModSettings( invertOrder )
                 .Select( x => (x.Mod, x) );
         }
     }

Penumbra/Mods/ModManager.cs

@@ -110,7 +110,7 @@ namespace Penumbra.Mods
 
             var registeredFiles = new Dictionary< string, string >();
 
-            foreach( var (mod, settings) in Mods.GetOrderedAndEnabledModListWithSettings() )
+            foreach( var (mod, settings) in Mods.GetOrderedAndEnabledModListWithSettings( _plugin.Configuration.InvertModListOrder ) )
             {
                 mod.FileConflicts?.Clear();
 

Penumbra/Mods/ResourceMod.cs

@@ -34,7 +34,7 @@ namespace Penumbra.Mods
 
             // Only add if not in a sub-folder, otherwise it was already added.
             foreach( var pair in Meta.Groups.FileToGameAndGroup )
-                if (pair.Key.IndexOfAny(new char[]{'/', '\\'}) < 0) 
+                if (pair.Key.IndexOfAny(new[]{'/', '\\'}) < 0) 
                     ModFiles.Add( new FileInfo(Path.Combine(ModBasePath.FullName, pair.Key)) );
         }
 

Penumbra/Penumbra.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net472</TargetFramework>
-        <LangVersion>latest</LangVersion>
+        <LangVersion>preview</LangVersion>
         <AssemblyTitle>Penumbra</AssemblyTitle>
         <Company>absolute gangstas</Company>
         <Product>Penumbra</Product>

Penumbra/Plugin.cs

@@ -1,7 +1,6 @@
 using Dalamud.Game.Command;
 using Dalamud.Plugin;
 using EmbedIO;
-using EmbedIO.Actions;
 using EmbedIO.WebApi;
 using Penumbra.API;
 using Penumbra.Game;

Penumbra/UI/SettingsInterface.cs

@@ -18,8 +18,8 @@ namespace Penumbra.UI
     {
         private readonly Plugin _plugin;
 
-        public bool Visible = false;
+        public bool Visible;
-        public bool ShowDebugBar = false;
+        public bool ShowDebugBar;
 
         private static readonly Vector2 AutoFillSize = new Vector2( -1, -1 );
         private static readonly Vector2 ModListSize = new Vector2( 200, -1 );
@@ -33,7 +33,7 @@ namespace Penumbra.UI
         private int? _selectedModDeleteIndex;
         private ModInfo _selectedMod;
 
-        public bool IsImportRunning = false;
+        private bool _isImportRunning;
         private TexToolsImport _texToolsImport = null!;
 
         public SettingsInterface( Plugin plugin )
@@ -129,7 +129,7 @@ namespace Penumbra.UI
             DrawImportTab();
 
 
-            if( !IsImportRunning )
+            if( !_isImportRunning )
             {
                 DrawModBrowser();
 
@@ -156,11 +156,11 @@ namespace Penumbra.UI
                 return;
             }
 
-            if( !IsImportRunning )
+            if( !_isImportRunning )
             {
                 if( ImGui.Button( "Import TexTools Modpacks" ) )
                 {
-                    IsImportRunning = true;
+                    _isImportRunning = true;
 
                     Task.Run( async () =>
                     {
@@ -197,7 +197,7 @@ namespace Penumbra.UI
                             ReloadMods();
                         }
 
-                        IsImportRunning = false;
+                        _isImportRunning = false;
                     } );
                 }
             }
@@ -279,7 +279,18 @@ namespace Penumbra.UI
                 Process.Start( _plugin.Configuration.CurrentCollection );
             }
 
-            ImGui.SetCursorPosY( ImGui.GetCursorPosY() + 15 );
+            ImGui.SetCursorPosY( ImGui.GetCursorPosY() + 20 );
+
+            var invertOrder = _plugin.Configuration.InvertModListOrder;
+            if( ImGui.Checkbox( "Invert mod load order (mods are loaded bottom up)", ref invertOrder ) )
+            {
+                _plugin.Configuration.InvertModListOrder = invertOrder;
+                dirty = true;
+
+                ReloadMods();
+            }
+
+            ImGui.SetCursorPosY( ImGui.GetCursorPosY() + 20 );
 
             var showAdvanced = _plugin.Configuration.ShowAdvanced;
             if( ImGui.Checkbox( "Show Advanced Settings", ref showAdvanced ) )
@@ -405,7 +416,13 @@ namespace Penumbra.UI
             ImGui.PopFont();
 
             if( ImGui.IsItemHovered() )
-                ImGui.SetTooltip( "Move the selected mod up in priority" );
+            {
+                ImGui.SetTooltip(
+                    _plugin.Configuration.InvertModListOrder
+                        ? "Move the selected mod down in priority"
+                        : "Move the selected mod up in priority"
+                );
+            }
 
             ImGui.PushFont( UiBuilder.IconFont );
 
@@ -430,7 +447,13 @@ namespace Penumbra.UI
             ImGui.PopFont();
 
             if( ImGui.IsItemHovered() )
-                ImGui.SetTooltip( "Move the selected mod down in priority" );
+            {
+                ImGui.SetTooltip(
+                    _plugin.Configuration.InvertModListOrder
+                        ? "Move the selected mod up in priority"
+                        : "Move the selected mod down in priority"
+                );
+            }
 
             ImGui.PushFont( UiBuilder.IconFont );
 
@@ -508,8 +531,11 @@ namespace Penumbra.UI
         // Website button with On-Hover address if valid http(s), otherwise text.
         private void DrawWebsiteText()
         {
-            if ((_selectedMod.Mod.Meta.Website?.Length ?? 0) > 0)
+            if( ( _selectedMod.Mod.Meta.Website?.Length ?? 0 ) <= 0 )
             {
+                return;
+            }
+            
             var validUrl = Uri.TryCreate( _selectedMod.Mod.Meta.Website, UriKind.Absolute, out Uri uriResult )
                            && ( uriResult.Scheme == Uri.UriSchemeHttps || uriResult.Scheme == Uri.UriSchemeHttp );
             ImGui.SameLine();
@@ -519,6 +545,7 @@ namespace Penumbra.UI
                 {
                     Process.Start( _selectedMod.Mod.Meta.Website );
                 }
+
                 if( ImGui.IsItemHovered() )
                 {
                     ImGui.BeginTooltip();
@@ -533,7 +560,6 @@ namespace Penumbra.UI
                 ImGui.Text( _selectedMod.Mod.Meta.Website );
             }
         }
-        }
 
         // Create Mod-Handling buttons.
         private void DrawEditButtons()
@@ -668,9 +694,14 @@ namespace Penumbra.UI
 
                     DrawGroupSelectors();
 
-                    ImGui.TextWrapped( _selectedMod.Mod.Meta.Description ?? "" );
-
                     ImGui.BeginTabBar( "PenumbraPluginDetails" );
+                    
+                    if( _selectedMod.Mod.Meta.Description?.Length > 0 && ImGui.BeginTabItem( "About" ) )
+                    {
+                        ImGui.TextWrapped( _selectedMod.Mod.Meta.Description );
+                        ImGui.EndTabItem();
+                    }
+                    
                     if( ( _selectedMod.Mod.Meta.ChangedItems?.Count ?? 0 ) > 0 )
                     {
                         if( ImGui.BeginTabItem( "Changed Items" ) )
@@ -713,6 +744,7 @@ namespace Penumbra.UI
                             ImGui.EndTabItem();
                         }
                     }
+
                     if( _selectedMod.Mod.FileConflicts.Any() )
                     {
                         if( ImGui.BeginTabItem( "File Conflicts" ) )

Penumbra/Util/Crc32.cs

@@ -1,7 +1,5 @@
-using System;
+using System.Linq;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using Penumbra.Extensions;
 
 namespace Penumbra.Util
 {
@@ -10,14 +8,14 @@ namespace Penumbra.Util
     /// </summary>
     public class Crc32
     {
-        private const uint POLY = 0xedb88320;
+        private const uint Poly = 0xedb88320;
 
         private static readonly uint[] CrcArray =
             Enumerable.Range( 0, 256 ).Select( i =>
             {
                 var k = ( uint )i;
                 for( var j = 0; j < 8; j++ )
-                    k = ( k & 1 ) != 0 ? ( k >> 1 ) ^ POLY : k >> 1;
+                    k = ( k & 1 ) != 0 ? ( k >> 1 ) ^ Poly : k >> 1;
 
                 return k;
             } ).ToArray();