From 21b657c086bec233d2f1939a4be835f90cff68ce Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Sat, 16 Jan 2021 11:09:42 -0500
Subject: [PATCH 1/9] new meta format; enchanced grouping; minor fixes

---
 Penumbra/Importer/Models/ExtendedModPack.cs |   2 +-
 Penumbra/Importer/TexToolsImport.cs         |  43 +++--
 Penumbra/Models/GroupInformation.cs         | 192 +-------------------
 Penumbra/Models/ModInfo.cs                  |   7 +-
 Penumbra/Models/ModMeta.cs                  |   2 +-
 Penumbra/Mods/ModManager.cs                 |  51 ++++--
 Penumbra/Mods/ResourceMod.cs                |   6 +-
 Penumbra/Plugin.cs                          |   2 +
 Penumbra/UI/SettingsInterface.cs            |  86 +++++----
 9 files changed, 136 insertions(+), 255 deletions(-)

diff --git a/Penumbra/Importer/Models/ExtendedModPack.cs b/Penumbra/Importer/Models/ExtendedModPack.cs
index 7070c7d6..5a69e191 100644
--- a/Penumbra/Importer/Models/ExtendedModPack.cs
+++ b/Penumbra/Importer/Models/ExtendedModPack.cs
@@ -5,7 +5,7 @@ namespace Penumbra.Importer.Models
     internal class OptionList
     {
         public string Name { get; set; }
-        public object Description { get; set; }
+        public string Description { get; set; }
         public string ImagePath { get; set; }
         public List< SimpleMod > ModsJsons { get; set; }
         public string GroupName { get; set; }
diff --git a/Penumbra/Importer/TexToolsImport.cs b/Penumbra/Importer/TexToolsImport.cs
index c33a5f43..8fda845c 100644
--- a/Penumbra/Importer/TexToolsImport.cs
+++ b/Penumbra/Importer/TexToolsImport.cs
@@ -211,14 +211,16 @@ namespace Penumbra.Importer
                 return;
 
             // Iterate through all pages
-            foreach( var option in from modPackPage in modList.ModPackPages
-                from modGroup in modPackPage.ModGroups
-                from option in modGroup.OptionList
-                select option )
+            foreach( var page in modList.ModPackPages)
             {
-                var optionFolder = new DirectoryInfo( Path.Combine( newModFolder.FullName, option.Name ) );
-                ExtractSimpleModList( optionFolder, option.ModsJsons, modData );
-                AddMeta( optionFolder, newModFolder, modMeta, option.Name );
+                foreach(var group in page.ModGroups) {
+                    var groupFolder = new DirectoryInfo(Path.Combine(newModFolder.FullName, group.GroupName));
+                    foreach(var option in group.OptionList) {
+                        var optionFolder = new DirectoryInfo( Path.Combine( groupFolder.FullName, option.Name ) );
+                        ExtractSimpleModList( optionFolder, option.ModsJsons, modData );
+                    }
+                    AddMeta(newModFolder, groupFolder, group, modMeta);
+                }
             }
 
             File.WriteAllText(
@@ -227,19 +229,26 @@ namespace Penumbra.Importer
             );
         }
 
-        void AddMeta( DirectoryInfo optionFolder, DirectoryInfo baseFolder, ModMeta meta, string optionName )
+        private void AddMeta( DirectoryInfo baseFolder, DirectoryInfo groupFolder,ModGroup group, ModMeta meta)
         {
-            var optionFolderLength = optionFolder.FullName.Length;
-            var baseFolderLength = baseFolder.FullName.Length;
-            foreach( var dir in optionFolder.EnumerateDirectories() )
-            {
-                foreach( var file in dir.EnumerateFiles( "*.*", SearchOption.AllDirectories ) )
-                {
-                    meta.Groups.AddFileToOtherGroups( optionName
-                        , file.FullName.Substring( baseFolderLength ).TrimStart( '\\' )
-                        , file.FullName.Substring( optionFolderLength ).TrimStart( '\\' ).Replace( '\\', '/' ) );
+            var Inf = new InstallerInfo {
+                SelectionType = group.SelectionType,
+                GroupName = group.GroupName,
+                Options = new List<Option>(),
+            };
+            foreach(var opt in group.OptionList) {
+                    var optio = new Option{
+                        OptionName = opt.Name,
+                        OptionDesc = String.IsNullOrEmpty(opt.Description) ? "" : opt.Description,
+                        OptionFiles = new Dictionary<string, string>()
+                    };
+                    var optDir = new DirectoryInfo(Path.Combine( groupFolder.FullName, opt.Name));
+                    foreach(var file in optDir.EnumerateFiles("*.*", SearchOption.AllDirectories)) {
+                        optio.OptionFiles[file.FullName.Substring(baseFolder.FullName.Length).TrimStart('\\')] = file.FullName.Substring(optDir.FullName.Length).TrimStart('\\').Replace('\\','/');
                 }
+                Inf.Options.Add(optio);
             }
+            meta.Groups.Add(group.GroupName, Inf);
         }
 
         private void ImportMetaModPack( FileInfo file )
diff --git a/Penumbra/Models/GroupInformation.cs b/Penumbra/Models/GroupInformation.cs
index f3065573..e92c2667 100644
--- a/Penumbra/Models/GroupInformation.cs
+++ b/Penumbra/Models/GroupInformation.cs
@@ -1,189 +1,15 @@
-using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Linq;
 
 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]
-        private class GroupDescription : ISerializable
-        {
-            public GroupDescription( GroupInformation info, (string, uint, uint, ulong) vars )
-            {
-                GamePath = vars.Item1;
-
-                static List< string > AddGroupTypes( ulong flags, ulong bound, List< string > groupType )
-                {
-                    List< string > ret = null;
-                    if( flags != uint.MaxValue )
-                    {
-                        ret = new();
-                        for( var i = 0; i < groupType.Count; ++i )
-                        {
-                            var flag = 1u << i;
-                            if( ( flags & flag ) == flag )
-                                ret.Add( groupType[ i ] );
-                        }
-                    }
-
-                    return ret;
-                }
-
-                // Tops and Bottoms are uint.
-                TopTypes = AddGroupTypes( vars.Item2, uint.MaxValue, info.TopTypes );
-                BottomTypes = AddGroupTypes( vars.Item3, uint.MaxValue, info.BottomTypes );
-                // Exclusions are the other way around and ulong.
-                GroupExclusions = AddGroupTypes( ~vars.Item4, 0, info.OtherGroups );
-            }
-
-            public (string, uint, uint, ulong) ToTuple( GroupInformation info )
-            {
-                static ulong TypesToFlags( List< string > ownTypes, List< string > globalTypes )
-                {
-                    if( ownTypes == null )
-                        return ulong.MaxValue;
-
-                    ulong flags = 0;
-                    foreach( var x in ownTypes )
-                    {
-                        var index = globalTypes.IndexOf( x );
-                        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.
-                var groupEx = ( GroupExclusions == null ) ? ulong.MaxValue : ~TypesToFlags( GroupExclusions, info.OtherGroups );
-                return ( GamePath, tops, bottoms, groupEx );
-            }
-
-            public string GamePath { get; set; }
-            public List< string > TopTypes { get; set; }
-            public List< string > BottomTypes { get; set; }
-            public List< string > GroupExclusions { get; set; }
-
-            // Customize (De)-Serialization to ignore nulls.
-            public GroupDescription( SerializationInfo info, StreamingContext context )
-            {
-                List< string > readListOrNull( string name )
-                {
-                    try
-                    {
-                        var ret = ( List< string > )info.GetValue( name, typeof( List< string > ) );
-                        if( ret == null || ret.Count == 0 )
-                            return null;
-                        return ret;
-                    }
-                    catch( Exception )
-                    {
-                        return null;
-                    }
-                }
-
-                GamePath = info.GetString( "GamePath" );
-                TopTypes = readListOrNull( "TopTypes" );
-                BottomTypes = readListOrNull( "BottomTypes" );
-                GroupExclusions = readListOrNull( "GroupExclusions" );
-            }
-
-            public virtual void GetObjectData( SerializationInfo info, StreamingContext context )
-            {
-                info.AddValue( "GamePath", GamePath );
-                if( TopTypes != null ) info.AddValue( "TopTypes", TopTypes );
-                if( BottomTypes != null ) info.AddValue( "BottomTypes", BottomTypes );
-                if( GroupExclusions != null ) info.AddValue( "GroupExclusions", GroupExclusions );
-            }
-        }
-
-        public List< string > TopTypes { get; set; } = new();
-        public List< string > BottomTypes { get; set; } = new();
-        public List< string > OtherGroups { get; set; } = new();
-
-        public void AddFileToOtherGroups( string optionName, string fileName, string gamePath )
-        {
-            var idx = OtherGroups.IndexOf( optionName );
-            if( idx < 0 )
-            {
-                idx = OtherGroups.Count;
-                OtherGroups.Add( optionName );
-            }
-
-            (string, uint, uint, ulong) tuple = ( gamePath, uint.MaxValue, uint.MaxValue, ( 1ul << idx ) );
-
-            if( !FileToGameAndGroup.TryGetValue( fileName, out var tuple2 ) )
-            {
-                FileToGameAndGroup.Add( fileName, tuple );
-            }
-            else
-            {
-                tuple2.Item1 = tuple.Item1;
-                tuple2.Item4 |= tuple.Item4;
-            }
-        }
-
-        public Dictionary< string, (string, uint, uint, ulong) > FileToGameAndGroup { get; set; } = new();
-
-        public GroupInformation()
-        {
-        }
-
-        public GroupInformation( SerializationInfo info, StreamingContext context )
-        {
-            try
-            {
-                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 )
-            {
-            }
-        }
-
-        public virtual void GetObjectData( SerializationInfo info, StreamingContext context )
-        {
-            if( ( TopTypes?.Count ?? 0 ) > 0 ) info.AddValue( "TopTypes", TopTypes );
-            if( ( BottomTypes?.Count ?? 0 ) > 0 ) info.AddValue( "BottomTypes", BottomTypes );
-            if( ( OtherGroups?.Count ?? 0 ) > 0 ) info.AddValue( "Groups", OtherGroups );
-            if( ( FileToGameAndGroup?.Count ?? 0 ) > 0 )
-            {
-                var dict = FileToGameAndGroup.ToDictionary( pair => pair.Key, pair => new GroupDescription( this, pair.Value ) );
-                info.AddValue( "FileToGameAndGroups", dict );
-            }
-        }
+    public struct Option {
+        public string OptionName;
+        public string OptionDesc;
+        public Dictionary<string, string> OptionFiles;
+    }
+    public struct InstallerInfo {
+        public string GroupName;
+        public string SelectionType;
+        public List<Option> Options;
     }
 }
\ No newline at end of file
diff --git a/Penumbra/Models/ModInfo.cs b/Penumbra/Models/ModInfo.cs
index 8eb01437..6d45fb30 100644
--- a/Penumbra/Models/ModInfo.cs
+++ b/Penumbra/Models/ModInfo.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using System.Collections.Generic;
 using Penumbra.Mods;
 
 namespace Penumbra.Models
@@ -7,10 +8,8 @@ namespace Penumbra.Models
     {
         public string FolderName { get; set; }
         public bool Enabled      { get; set; }
-        public int Priority      { get; set; }
-        public int CurrentTop    { get; set; } = 0;
-        public int CurrentBottom { get; set; } = 0;
-        public int CurrentGroup  { get; set; } = 0;
+        public int Priority      { get; set; }
+        public Dictionary<string, int> Conf {get;set;}
 
         [JsonIgnore]
         public ResourceMod Mod { get; set; }
diff --git a/Penumbra/Models/ModMeta.cs b/Penumbra/Models/ModMeta.cs
index 4f8576d9..6128b241 100644
--- a/Penumbra/Models/ModMeta.cs
+++ b/Penumbra/Models/ModMeta.cs
@@ -17,6 +17,6 @@ namespace Penumbra.Models
 
         public Dictionary< string, string > FileSwaps { get; } = new();
 
-        public GroupInformation Groups { get; set; } = new();
+        public Dictionary<string, InstallerInfo> Groups { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/Penumbra/Mods/ModManager.cs b/Penumbra/Mods/ModManager.cs
index 95fa4905..a698f23c 100644
--- a/Penumbra/Mods/ModManager.cs
+++ b/Penumbra/Mods/ModManager.cs
@@ -100,9 +100,19 @@ namespace Penumbra.Mods
             CalculateEffectiveFileList();
 
             // Needed to reload body textures with mods
-            _plugin.GameUtils.ReloadPlayerResources();
+            //_plugin.GameUtils.ReloadPlayerResources();
+        }
+        private (InstallerInfo, Option, string) GlobalPosition(string rel, Dictionary<string, InstallerInfo> gps) {
+            string filePath = null;
+            foreach(var g in gps) {
+                foreach(var opt in g.Value.Options) {
+                    if(opt.OptionFiles.TryGetValue(rel, out filePath)) {
+                        return (g.Value, opt, filePath);
+                    }
+                }
+            }
+            return (default(InstallerInfo), default(Option), null);
         }
-
         public void CalculateEffectiveFileList()
         {
             ResolvedFiles.Clear();
@@ -123,23 +133,34 @@ namespace Penumbra.Mods
 
                     string gamePath;
                     bool addFile = true;
-                    (string, uint, uint, ulong) tuple;
-                    if( mod.Meta.Groups.FileToGameAndGroup.TryGetValue( relativeFilePath, out tuple ) )
-                    {
-                        gamePath = tuple.Item1;
-                        var (_, tops, bottoms, excludes) = tuple;
-                        var validTop = ( ( 1u << settings.CurrentTop ) & tops ) != 0;
-                        var validBottom = ( ( 1u << settings.CurrentBottom ) & bottoms ) != 0;
-                        var validGroup = ( ( 1ul << settings.CurrentGroup ) & excludes ) != 0;
-                        addFile = validTop && validBottom && validGroup;
+                    var gps = mod.Meta.Groups;
+                    if(gps.Count >=1) {
+                        var negivtron = GlobalPosition(relativeFilePath, gps);
+                        if(negivtron.Item3 != null) {
+                            if(settings.Conf == null) {
+                                settings.Conf = new();
+                            }
+                            if(!settings.Conf.ContainsKey(negivtron.Item1.GroupName)) {
+                                settings.Conf[negivtron.Item1.GroupName] = 0;
+                            }
+                            var current = settings.Conf[negivtron.Item1.GroupName];
+                            var flag = negivtron.Item1.Options.IndexOf(negivtron.Item2);
+                            if(negivtron.Item1.SelectionType=="Single") {
+                                addFile = current == flag;
+                            } else {
+                                flag = 1 << negivtron.Item1.Options.IndexOf(negivtron.Item2);
+                                addFile = (flag & current)!=0;
+                            }
+                            gamePath = negivtron.Item3;
+                        } else {
+                            gamePath = relativeFilePath.Replace( '\\', '/' );
+                        }
                     }
                     else
                         gamePath = relativeFilePath.Replace( '\\', '/' );
-
                     if( addFile )
                     {
-                        if( !ResolvedFiles.ContainsKey( gamePath ) )
-                        {
+                        if( !ResolvedFiles.ContainsKey( gamePath ) )                            {
                             ResolvedFiles[ gamePath.ToLowerInvariant() ] = file;
                             registeredFiles[ gamePath ] = mod.Meta.Name;
                         }
@@ -149,7 +170,6 @@ namespace Penumbra.Mods
                         }
                     }
                 }
-
                 foreach( var swap in mod.Meta.FileSwaps )
                 {
                     // just assume people put not fucked paths in here lol
@@ -164,6 +184,7 @@ namespace Penumbra.Mods
                     }
                 }
             }
+            _plugin.GameUtils.ReloadPlayerResources();
         }
 
         public void ChangeModPriority( ModInfo info, bool up = false )
diff --git a/Penumbra/Mods/ResourceMod.cs b/Penumbra/Mods/ResourceMod.cs
index f71ddfcd..a167ee51 100644
--- a/Penumbra/Mods/ResourceMod.cs
+++ b/Penumbra/Mods/ResourceMod.cs
@@ -33,9 +33,9 @@ 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[]{'/', '\\'}) < 0) 
-                    ModFiles.Add( new FileInfo(Path.Combine(ModBasePath.FullName, pair.Key)) );
+            //foreach( var pair in Meta.Groups.FileToGameAndGroup )
+            //    if (pair.Key.IndexOfAny(new[]{'/', '\\'}) < 0) 
+            //        ModFiles.Add( new FileInfo(Path.Combine(ModBasePath.FullName, pair.Key)) );
         }
 
         public void AddConflict( string modName, string path )
diff --git a/Penumbra/Plugin.cs b/Penumbra/Plugin.cs
index b158e458..38cf4a9e 100644
--- a/Penumbra/Plugin.cs
+++ b/Penumbra/Plugin.cs
@@ -53,6 +53,8 @@ namespace Penumbra
             ResourceLoader.Init();
             ResourceLoader.Enable();
 
+            GameUtils.ReloadPlayerResources();
+
             SettingsInterface = new SettingsInterface( this );
             PluginInterface.UiBuilder.OnBuildUi += SettingsInterface.Draw;
 
diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 7a7a0c28..57b41dfc 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -598,36 +598,56 @@ namespace Penumbra.UI
 
         private void DrawGroupSelectors()
         {
-            var hasTopTypes = ( _selectedMod.Mod.Meta.Groups.TopTypes?.Count ?? 0 ) > 1;
-            var hasBottomTypes = ( _selectedMod.Mod.Meta.Groups.BottomTypes?.Count ?? 0 ) > 1;
-            var hasGroups = ( _selectedMod.Mod.Meta.Groups.OtherGroups?.Count ?? 0 ) > 1;
-            var numSelectors = ( hasTopTypes ? 1 : 0 ) + ( hasBottomTypes ? 1 : 0 ) + ( hasGroups ? 1 : 0 );
-            var selectorWidth = ( ImGui.GetWindowWidth()
-                                  - ( hasTopTypes ? ImGui.CalcTextSize( "Top       " ).X : 0 )
-                                  - ( hasBottomTypes ? ImGui.CalcTextSize( "Bottom       " ).X : 0 )
-                                  - ( hasGroups ? ImGui.CalcTextSize( "Group       " ).X : 0 ) ) / numSelectors;
-
-            void DrawSelector( string label, string propertyName, System.Collections.Generic.List< string > list, bool sameLine )
-            {
-                var current = ( int )_selectedMod.GetType().GetProperty( propertyName ).GetValue( _selectedMod );
-                ImGui.SetNextItemWidth( selectorWidth );
-                if( sameLine ) ImGui.SameLine();
-                if( ImGui.Combo( label, ref current, list.ToArray(), list.Count() ) )
-                {
-                    _selectedMod.GetType().GetProperty( propertyName ).SetValue( _selectedMod, current );
-                    _plugin.ModManager.Mods.Save();
-                    _plugin.ModManager.CalculateEffectiveFileList();
+            //Spahetti code time
+            var mod = _plugin.SettingsInterface._selectedMod;
+            var conf = mod.Conf;
+            if(conf == null) {
+                mod.Conf = new();
+                conf = mod.Conf;
+                _plugin.ModManager.Mods.Save();
+                _plugin.ModManager.CalculateEffectiveFileList();
+            }
+            var settings = mod.Mod.Meta.Groups;
+            foreach(var g in settings) {
+                if(!conf.ContainsKey(g.Key)) {
+                    conf[g.Key] = 0;
+                }
+                switch(g.Value.SelectionType) {
+                    case "Multi":
+                    {
+                        var i = 0;
+                        var flag = conf[g.Key];
+                        foreach(var opt in g.Value.Options) {
+                            var enab = (flag & 1<<i)!=0;
+                            if(ImGui.Checkbox(opt.OptionName, ref enab)) {
+                                flag = flag ^= 1<<i;
+                                conf[g.Key] = flag;
+                                _plugin.ModManager.Mods.Save();
+                                _plugin.ModManager.CalculateEffectiveFileList();
+                            }
+                            i++;
+                        }
+                        break;
+                    }
+                    case "Single": 
+                    {
+                        var code = conf[g.Key];
+                        if(ImGui.Combo(g.Value.GroupName, ref code, g.Value.Options.Select(x=>x.OptionName).ToArray(), g.Value.Options.ToArray().Length)) {
+                            conf[g.Key] = code;
+                            _plugin.ModManager.Mods.Save();
+                            _plugin.ModManager.CalculateEffectiveFileList();
+                        }
+                        break;
+                    }
+                    default: {
+                        ImGui.Text("I dunno what this is, please report it!");
+                        ImGui.Text(g.Value.GroupName);
+                        ImGui.Text(g.Value.SelectionType);
+                        break;
+                    }
                 }
             }
-
-            if( hasTopTypes )
-                DrawSelector( "Top", "CurrentTop", _selectedMod.Mod.Meta.Groups.TopTypes, false );
-
-            if( hasBottomTypes )
-                DrawSelector( "Bottom", "CurrentBottom", _selectedMod.Mod.Meta.Groups.BottomTypes, hasTopTypes );
-
-            if( hasGroups )
-                DrawSelector( "Group", "CurrentGroup", _selectedMod.Mod.Meta.Groups.OtherGroups, numSelectors > 1 );
+            
         }
 
         void DrawInstalledMods()
@@ -692,8 +712,6 @@ namespace Penumbra.UI
 
                     DrawEditButtons();
 
-                    DrawGroupSelectors();
-
                     ImGui.BeginTabBar( "PenumbraPluginDetails" );
                     
                     if( _selectedMod.Mod.Meta.Description?.Length > 0 && ImGui.BeginTabItem( "About" ) )
@@ -714,7 +732,13 @@ namespace Penumbra.UI
                             ImGui.EndTabItem();
                         }
                     }
-
+                    if(_selectedMod.Mod.Meta.Groups.Count >=1) {
+                        if(ImGui.BeginTabItem( "Configuration" )) {
+                            ImGui.SetNextItemWidth(-1);
+                            DrawGroupSelectors();
+                            ImGui.EndTabItem();
+                        }
+                    }
                     if( ImGui.BeginTabItem( "Files" ) )
                     {
                         ImGui.SetNextItemWidth( -1 );

From 4b48805233b309d0f7ddde05f6d8cdc8c38bb38a Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Sat, 16 Jan 2021 12:04:40 -0500
Subject: [PATCH 2/9] fix imgui screwiness

---
 Penumbra/UI/SettingsInterface.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 57b41dfc..2c9d0f34 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -619,7 +619,7 @@ namespace Penumbra.UI
                         var flag = conf[g.Key];
                         foreach(var opt in g.Value.Options) {
                             var enab = (flag & 1<<i)!=0;
-                            if(ImGui.Checkbox(opt.OptionName, ref enab)) {
+                            if(ImGui.Checkbox(g.Value.GroupName + " - " +opt.OptionName, ref enab)) {
                                 flag = flag ^= 1<<i;
                                 conf[g.Key] = flag;
                                 _plugin.ModManager.Mods.Save();

From c7d4cc7171bfb05821c2fe455a1632e8aaafdfb3 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Sat, 16 Jan 2021 13:03:51 -0500
Subject: [PATCH 3/9] Groups with < 2 dropdown options hide

---
 Penumbra/UI/SettingsInterface.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 2c9d0f34..67218ce7 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -632,10 +632,12 @@ namespace Penumbra.UI
                     case "Single": 
                     {
                         var code = conf[g.Key];
-                        if(ImGui.Combo(g.Value.GroupName, ref code, g.Value.Options.Select(x=>x.OptionName).ToArray(), g.Value.Options.ToArray().Length)) {
-                            conf[g.Key] = code;
-                            _plugin.ModManager.Mods.Save();
-                            _plugin.ModManager.CalculateEffectiveFileList();
+                        if(g.Value.Options.Count >1) {
+                            if(ImGui.Combo(g.Value.GroupName, ref code, g.Value.Options.Select(x=>x.OptionName).ToArray(), g.Value.Options.ToArray().Length)) {
+                                conf[g.Key] = code;
+                                _plugin.ModManager.Mods.Save();
+                                _plugin.ModManager.CalculateEffectiveFileList();
+                            }
                         }
                         break;
                     }

From 53c17bef48b5211716cf1ce682e63b826112d549 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Sat, 16 Jan 2021 13:16:19 -0500
Subject: [PATCH 4/9] Remove uneeded line

---
 Penumbra/UI/SettingsInterface.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 67218ce7..70349f75 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -736,7 +736,6 @@ namespace Penumbra.UI
                     }
                     if(_selectedMod.Mod.Meta.Groups.Count >=1) {
                         if(ImGui.BeginTabItem( "Configuration" )) {
-                            ImGui.SetNextItemWidth(-1);
                             DrawGroupSelectors();
                             ImGui.EndTabItem();
                         }

From a84f2cda6f242a6f4656aca8ce15c5bdda283736 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Sun, 17 Jan 2021 12:37:17 -0500
Subject: [PATCH 5/9] Change selectiontype to an Enum

---
 Penumbra/Importer/Models/ExtendedModPack.cs | 5 +++--
 Penumbra/Models/GroupInformation.cs         | 5 ++++-
 Penumbra/Mods/ModManager.cs                 | 2 +-
 Penumbra/UI/SettingsInterface.cs            | 6 +++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Penumbra/Importer/Models/ExtendedModPack.cs b/Penumbra/Importer/Models/ExtendedModPack.cs
index 5a69e191..105cdee0 100644
--- a/Penumbra/Importer/Models/ExtendedModPack.cs
+++ b/Penumbra/Importer/Models/ExtendedModPack.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Penumbra.Models;
 
 namespace Penumbra.Importer.Models
 {
@@ -9,14 +10,14 @@ namespace Penumbra.Importer.Models
         public string ImagePath { get; set; }
         public List< SimpleMod > ModsJsons { get; set; }
         public string GroupName { get; set; }
-        public string SelectionType { get; set; }
+        public SelectType SelectionType { get; set; }
         public bool IsChecked { get; set; }
     }
 
     internal class ModGroup
     {
         public string GroupName { get; set; }
-        public string SelectionType { get; set; }
+        public SelectType SelectionType { get; set; }
         public List< OptionList > OptionList { get; set; }
     }
 
diff --git a/Penumbra/Models/GroupInformation.cs b/Penumbra/Models/GroupInformation.cs
index e92c2667..9beadcae 100644
--- a/Penumbra/Models/GroupInformation.cs
+++ b/Penumbra/Models/GroupInformation.cs
@@ -2,6 +2,9 @@ using System.Collections.Generic;
 
 namespace Penumbra.Models
 {
+    public enum SelectType {
+        Single, Multi
+    }
     public struct Option {
         public string OptionName;
         public string OptionDesc;
@@ -9,7 +12,7 @@ namespace Penumbra.Models
     }
     public struct InstallerInfo {
         public string GroupName;
-        public string SelectionType;
+        public SelectType SelectionType;
         public List<Option> Options;
     }
 }
\ No newline at end of file
diff --git a/Penumbra/Mods/ModManager.cs b/Penumbra/Mods/ModManager.cs
index a698f23c..c9d81a40 100644
--- a/Penumbra/Mods/ModManager.cs
+++ b/Penumbra/Mods/ModManager.cs
@@ -145,7 +145,7 @@ namespace Penumbra.Mods
                             }
                             var current = settings.Conf[negivtron.Item1.GroupName];
                             var flag = negivtron.Item1.Options.IndexOf(negivtron.Item2);
-                            if(negivtron.Item1.SelectionType=="Single") {
+                            if(negivtron.Item1.SelectionType==SelectType.Single) {
                                 addFile = current == flag;
                             } else {
                                 flag = 1 << negivtron.Item1.Options.IndexOf(negivtron.Item2);
diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 70349f75..54610022 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -613,7 +613,7 @@ namespace Penumbra.UI
                     conf[g.Key] = 0;
                 }
                 switch(g.Value.SelectionType) {
-                    case "Multi":
+                    case SelectType.Multi:
                     {
                         var i = 0;
                         var flag = conf[g.Key];
@@ -629,7 +629,7 @@ namespace Penumbra.UI
                         }
                         break;
                     }
-                    case "Single": 
+                    case SelectType.Single: 
                     {
                         var code = conf[g.Key];
                         if(g.Value.Options.Count >1) {
@@ -644,7 +644,7 @@ namespace Penumbra.UI
                     default: {
                         ImGui.Text("I dunno what this is, please report it!");
                         ImGui.Text(g.Value.GroupName);
-                        ImGui.Text(g.Value.SelectionType);
+                        ImGui.Text(g.Value.SelectionType.ToString());
                         break;
                     }
                 }

From 1ebdf891c00ff9ca9052da9d5e8b2592f25db205 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Mon, 18 Jan 2021 10:59:48 -0500
Subject: [PATCH 6/9] Clean now impossible code path

---
 Penumbra/UI/SettingsInterface.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 54610022..75dd7042 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -641,12 +641,6 @@ namespace Penumbra.UI
                         }
                         break;
                     }
-                    default: {
-                        ImGui.Text("I dunno what this is, please report it!");
-                        ImGui.Text(g.Value.GroupName);
-                        ImGui.Text(g.Value.SelectionType.ToString());
-                        break;
-                    }
                 }
             }
             

From 46d6f7e0d01af89b9ad9bda9ac2b2c3593f88cb2 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Mon, 18 Jan 2021 11:11:32 -0500
Subject: [PATCH 7/9] fully move default code to CalcEffectiveFileList

---
 Penumbra/Mods/ModManager.cs      | 2 ++
 Penumbra/UI/SettingsInterface.cs | 9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Penumbra/Mods/ModManager.cs b/Penumbra/Mods/ModManager.cs
index c9d81a40..88b85ea7 100644
--- a/Penumbra/Mods/ModManager.cs
+++ b/Penumbra/Mods/ModManager.cs
@@ -139,9 +139,11 @@ namespace Penumbra.Mods
                         if(negivtron.Item3 != null) {
                             if(settings.Conf == null) {
                                 settings.Conf = new();
+                                _plugin.ModManager.Mods.Save();
                             }
                             if(!settings.Conf.ContainsKey(negivtron.Item1.GroupName)) {
                                 settings.Conf[negivtron.Item1.GroupName] = 0;
+                                _plugin.ModManager.Mods.Save();
                             }
                             var current = settings.Conf[negivtron.Item1.GroupName];
                             var flag = negivtron.Item1.Options.IndexOf(negivtron.Item2);
diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 75dd7042..3d04c166 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -601,17 +601,8 @@ namespace Penumbra.UI
             //Spahetti code time
             var mod = _plugin.SettingsInterface._selectedMod;
             var conf = mod.Conf;
-            if(conf == null) {
-                mod.Conf = new();
-                conf = mod.Conf;
-                _plugin.ModManager.Mods.Save();
-                _plugin.ModManager.CalculateEffectiveFileList();
-            }
             var settings = mod.Mod.Meta.Groups;
             foreach(var g in settings) {
-                if(!conf.ContainsKey(g.Key)) {
-                    conf[g.Key] = 0;
-                }
                 switch(g.Value.SelectionType) {
                     case SelectType.Multi:
                     {

From b3c9fe89020e95beb0914ae19615f23aebc7c0f1 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Mon, 18 Jan 2021 11:15:55 -0500
Subject: [PATCH 8/9] switch statement instead of if

---
 Penumbra/Mods/ModManager.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Penumbra/Mods/ModManager.cs b/Penumbra/Mods/ModManager.cs
index 88b85ea7..a9117b33 100644
--- a/Penumbra/Mods/ModManager.cs
+++ b/Penumbra/Mods/ModManager.cs
@@ -147,11 +147,16 @@ namespace Penumbra.Mods
                             }
                             var current = settings.Conf[negivtron.Item1.GroupName];
                             var flag = negivtron.Item1.Options.IndexOf(negivtron.Item2);
-                            if(negivtron.Item1.SelectionType==SelectType.Single) {
-                                addFile = current == flag;
-                            } else {
-                                flag = 1 << negivtron.Item1.Options.IndexOf(negivtron.Item2);
-                                addFile = (flag & current)!=0;
+                            switch(negivtron.Item1.SelectionType) {
+                                case SelectType.Single: {
+                                    addFile = current == flag;
+                                    break;
+                                } 
+                                case SelectType.Multi: {
+                                    flag = 1 << negivtron.Item1.Options.IndexOf(negivtron.Item2);
+                                    addFile = (flag & current)!=0;
+                                    break;
+                                }
                             }
                             gamePath = negivtron.Item3;
                         } else {

From 66a849e38ae714233c53d0c6e78376247b5c94ca Mon Sep 17 00:00:00 2001
From: Minizbot2012 <mini@zbots.org>
Date: Thu, 21 Jan 2021 22:17:12 -0500
Subject: [PATCH 9/9] Clean up formatting

---
 Penumbra/Importer/TexToolsImport.cs | 28 ++++++++------
 Penumbra/Models/GroupInformation.cs |  9 +++--
 Penumbra/Mods/ModManager.cs         | 57 ++++++++++++++++++-----------
 Penumbra/UI/SettingsInterface.cs    | 57 ++++++++++++++++-------------
 4 files changed, 88 insertions(+), 63 deletions(-)

diff --git a/Penumbra/Importer/TexToolsImport.cs b/Penumbra/Importer/TexToolsImport.cs
index 8fda845c..9ec04a57 100644
--- a/Penumbra/Importer/TexToolsImport.cs
+++ b/Penumbra/Importer/TexToolsImport.cs
@@ -231,24 +231,28 @@ namespace Penumbra.Importer
 
         private void AddMeta( DirectoryInfo baseFolder, DirectoryInfo groupFolder,ModGroup group, ModMeta meta)
         {
-            var Inf = new InstallerInfo {
+            var Inf = new InstallerInfo
+            {
                 SelectionType = group.SelectionType,
                 GroupName = group.GroupName,
                 Options = new List<Option>(),
             };
-            foreach(var opt in group.OptionList) {
-                    var optio = new Option{
-                        OptionName = opt.Name,
-                        OptionDesc = String.IsNullOrEmpty(opt.Description) ? "" : opt.Description,
-                        OptionFiles = new Dictionary<string, string>()
-                    };
-                    var optDir = new DirectoryInfo(Path.Combine( groupFolder.FullName, opt.Name));
-                    foreach(var file in optDir.EnumerateFiles("*.*", SearchOption.AllDirectories)) {
-                        optio.OptionFiles[file.FullName.Substring(baseFolder.FullName.Length).TrimStart('\\')] = file.FullName.Substring(optDir.FullName.Length).TrimStart('\\').Replace('\\','/');
+            foreach( var opt in group.OptionList )
+            {
+                var optio = new Option
+                {
+                    OptionName = opt.Name,
+                    OptionDesc = String.IsNullOrEmpty( opt.Description ) ? "" : opt.Description,
+                    OptionFiles = new Dictionary<string, string>()
+                };
+                var optDir = new DirectoryInfo( Path.Combine( groupFolder.FullName, opt.Name ) );
+                foreach( var file in optDir.EnumerateFiles( "*.*", SearchOption.AllDirectories ) )
+                {
+                    optio.OptionFiles[file.FullName.Substring( baseFolder.FullName.Length ).TrimStart( '\\' )] = file.FullName.Substring( optDir.FullName.Length ).TrimStart( '\\' ).Replace( '\\', '/' );
                 }
-                Inf.Options.Add(optio);
+                Inf.Options.Add( optio );
             }
-            meta.Groups.Add(group.GroupName, Inf);
+            meta.Groups.Add( group.GroupName, Inf );
         }
 
         private void ImportMetaModPack( FileInfo file )
diff --git a/Penumbra/Models/GroupInformation.cs b/Penumbra/Models/GroupInformation.cs
index 9beadcae..f7eb19e3 100644
--- a/Penumbra/Models/GroupInformation.cs
+++ b/Penumbra/Models/GroupInformation.cs
@@ -2,15 +2,18 @@ using System.Collections.Generic;
 
 namespace Penumbra.Models
 {
-    public enum SelectType {
+    public enum SelectType
+    {
         Single, Multi
     }
-    public struct Option {
+    public struct Option
+    {
         public string OptionName;
         public string OptionDesc;
         public Dictionary<string, string> OptionFiles;
     }
-    public struct InstallerInfo {
+    public struct InstallerInfo
+    {
         public string GroupName;
         public SelectType SelectionType;
         public List<Option> Options;
diff --git a/Penumbra/Mods/ModManager.cs b/Penumbra/Mods/ModManager.cs
index a9117b33..c63d338f 100644
--- a/Penumbra/Mods/ModManager.cs
+++ b/Penumbra/Mods/ModManager.cs
@@ -102,16 +102,20 @@ namespace Penumbra.Mods
             // Needed to reload body textures with mods
             //_plugin.GameUtils.ReloadPlayerResources();
         }
-        private (InstallerInfo, Option, string) GlobalPosition(string rel, Dictionary<string, InstallerInfo> gps) {
+        private (InstallerInfo, Option, string) GlobalPosition( string rel, Dictionary<string, InstallerInfo> gps )
+        {
             string filePath = null;
-            foreach(var g in gps) {
-                foreach(var opt in g.Value.Options) {
-                    if(opt.OptionFiles.TryGetValue(rel, out filePath)) {
+            foreach( var g in gps )
+            {
+                foreach( var opt in g.Value.Options )
+                {
+                    if( opt.OptionFiles.TryGetValue( rel, out filePath ) )
+                    {
                         return (g.Value, opt, filePath);
                     }
                 }
             }
-            return (default(InstallerInfo), default(Option), null);
+            return (default( InstallerInfo ), default( Option ), null);
         }
         public void CalculateEffectiveFileList()
         {
@@ -134,32 +138,41 @@ namespace Penumbra.Mods
                     string gamePath;
                     bool addFile = true;
                     var gps = mod.Meta.Groups;
-                    if(gps.Count >=1) {
-                        var negivtron = GlobalPosition(relativeFilePath, gps);
-                        if(negivtron.Item3 != null) {
-                            if(settings.Conf == null) {
+                    if( gps.Count >= 1 )
+                    {
+                        var negivtron = GlobalPosition( relativeFilePath, gps );
+                        if( negivtron.Item3 != null )
+                        {
+                            if( settings.Conf == null )
+                            {
                                 settings.Conf = new();
                                 _plugin.ModManager.Mods.Save();
                             }
-                            if(!settings.Conf.ContainsKey(negivtron.Item1.GroupName)) {
+                            if( !settings.Conf.ContainsKey( negivtron.Item1.GroupName ) )
+                            {
                                 settings.Conf[negivtron.Item1.GroupName] = 0;
                                 _plugin.ModManager.Mods.Save();
                             }
                             var current = settings.Conf[negivtron.Item1.GroupName];
-                            var flag = negivtron.Item1.Options.IndexOf(negivtron.Item2);
-                            switch(negivtron.Item1.SelectionType) {
-                                case SelectType.Single: {
-                                    addFile = current == flag;
-                                    break;
-                                } 
-                                case SelectType.Multi: {
-                                    flag = 1 << negivtron.Item1.Options.IndexOf(negivtron.Item2);
-                                    addFile = (flag & current)!=0;
-                                    break;
-                                }
+                            var flag = negivtron.Item1.Options.IndexOf( negivtron.Item2 );
+                            switch( negivtron.Item1.SelectionType )
+                            {
+                                case SelectType.Single:
+                                    {
+                                        addFile = current == flag;
+                                        break;
+                                    }
+                                case SelectType.Multi:
+                                    {
+                                        flag = 1 << negivtron.Item1.Options.IndexOf( negivtron.Item2 );
+                                        addFile = ( flag & current ) != 0;
+                                        break;
+                                    }
                             }
                             gamePath = negivtron.Item3;
-                        } else {
+                        }
+                        else
+                        {
                             gamePath = relativeFilePath.Replace( '\\', '/' );
                         }
                     }
diff --git a/Penumbra/UI/SettingsInterface.cs b/Penumbra/UI/SettingsInterface.cs
index 3d04c166..484865b4 100644
--- a/Penumbra/UI/SettingsInterface.cs
+++ b/Penumbra/UI/SettingsInterface.cs
@@ -602,39 +602,44 @@ namespace Penumbra.UI
             var mod = _plugin.SettingsInterface._selectedMod;
             var conf = mod.Conf;
             var settings = mod.Mod.Meta.Groups;
-            foreach(var g in settings) {
-                switch(g.Value.SelectionType) {
+            foreach( var g in settings )
+            {
+                switch( g.Value.SelectionType )
+                {
                     case SelectType.Multi:
-                    {
-                        var i = 0;
-                        var flag = conf[g.Key];
-                        foreach(var opt in g.Value.Options) {
-                            var enab = (flag & 1<<i)!=0;
-                            if(ImGui.Checkbox(g.Value.GroupName + " - " +opt.OptionName, ref enab)) {
-                                flag = flag ^= 1<<i;
-                                conf[g.Key] = flag;
-                                _plugin.ModManager.Mods.Save();
-                                _plugin.ModManager.CalculateEffectiveFileList();
+                        {
+                            var i = 0;
+                            var flag = conf[g.Key];
+                            foreach( var opt in g.Value.Options )
+                            {
+                                var enab = ( flag & 1 << i ) != 0;
+                                if( ImGui.Checkbox( g.Value.GroupName + " - " + opt.OptionName, ref enab ) )
+                                {
+                                    flag = flag ^= 1 << i;
+                                    conf[g.Key] = flag;
+                                    _plugin.ModManager.Mods.Save();
+                                    _plugin.ModManager.CalculateEffectiveFileList();
+                                }
+                                i++;
                             }
-                            i++;
+                            break;
                         }
-                        break;
-                    }
-                    case SelectType.Single: 
-                    {
-                        var code = conf[g.Key];
-                        if(g.Value.Options.Count >1) {
-                            if(ImGui.Combo(g.Value.GroupName, ref code, g.Value.Options.Select(x=>x.OptionName).ToArray(), g.Value.Options.ToArray().Length)) {
-                                conf[g.Key] = code;
-                                _plugin.ModManager.Mods.Save();
-                                _plugin.ModManager.CalculateEffectiveFileList();
+                    case SelectType.Single:
+                        {
+                            var code = conf[g.Key];
+                            if( g.Value.Options.Count > 1 )
+                            {
+                                if( ImGui.Combo( g.Value.GroupName, ref code, g.Value.Options.Select( x => x.OptionName ).ToArray(), g.Value.Options.ToArray().Length ) )
+                                {
+                                    conf[g.Key] = code;
+                                    _plugin.ModManager.Mods.Save();
+                                    _plugin.ModManager.CalculateEffectiveFileList();
+                                }
                             }
+                            break;
                         }
-                        break;
-                    }
                 }
             }
-            
         }
 
         void DrawInstalledMods()