first pass at part module based filtering. Needs testing

FilterExtension/ConfigNodes/customSubCategory.cs

@@ -91,6 +91,16 @@ public bool checkFilters(AvailablePart part, int depth = 0)
             }
             if (!unPurchasedOverride && Core.Instance.hideUnpurchased && !ResearchAndDevelopment.PartModelPurchased(part) && !ResearchAndDevelopment.IsExperimentalPart(part))
                 return false;
+
+            PartModuleFilter pmf;
+            if (Core.Instance.filterModules.TryGetValue(part.name, out pmf))
+            {
+                if (pmf.CheckForForceAdd(subCategoryTitle))
+                    return true;
+                if (pmf.CheckForForceBlock(subCategoryTitle))
+                    return false;
+            }
+
             return ((!template.Any() || template.Any(t => t.checkFilter(part, depth))) && filters.Any(f => f.checkFilter(part, depth))); // part passed a template if present, and a subcategory filter
         }
 

FilterExtension/Core.cs

@@ -33,9 +33,11 @@ public class Core : MonoBehaviour
         public List<List<string>> propellantCombos = new List<List<string>>();
         // entry for each unique resource
         public List<string> resources = new List<string>();
-
         // Dictionary of icons created on entering the main menu
         public Dictionary<string, RUI.Icons.Selectable.Icon> iconDict = new Dictionary<string, RUI.Icons.Selectable.Icon>();
+        // Dictionary of all filtering part modules by part name
+        public Dictionary<string, PartModuleFilter> filterModules = new Dictionary<string, PartModuleFilter>();
+
 
         // Config has options to disable the FbM replacement, and the default Category/SC and sort method
         public bool hideUnpurchased = true;
@@ -59,7 +61,7 @@ void Awake()
         {
             instance = this;
             DontDestroyOnLoad(this);
-            Log("Version 2.4.1");
+            Log("Version 2.5.0");
 
             getConfigs();
             getPartData();
@@ -154,26 +156,28 @@ private void getPartData()
                     RepairAvailablePartUrl(p);
 
                 // if the url is still borked, can't associate a mod to the part
-                if (string.IsNullOrEmpty(p.partUrl))
-                    continue;
-
-                // list of GameData folders
-                modNames.AddUnique(p.partUrl.Split(new char[] { '/', '\\' })[0]);
+                if (!string.IsNullOrEmpty(p.partUrl))
+                {
+                    // list of GameData folders
+                    modNames.AddUnique(p.partUrl.Split(new char[] { '/', '\\' })[0]);
 
-                // associate the path to the part
-                if (!partPathDict.ContainsKey(p.name))
-                    partPathDict.Add(p.name, p.partUrl);
-                else
-                    Log(p.name + " duplicated part key in part path dictionary");
+                    // associate the path to the part
+                    if (!partPathDict.ContainsKey(p.name))
+                        partPathDict.Add(p.name, p.partUrl);
+                    else
+                        Log(p.name + " duplicated part key in part path dictionary");
 
-                if (PartType.isEngine(p))
-                    processEnginePropellants(p);
+                    if (PartType.isEngine(p))
+                        processEnginePropellants(p);
 
-                if (p.partPrefab.Resources != null)
-                {
-                    foreach (PartResource r in p.partPrefab.Resources)
-                        resources.AddUnique(r.resourceName);
+                    if (p.partPrefab.Resources != null)
+                    {
+                        foreach (PartResource r in p.partPrefab.Resources)
+                            resources.AddUnique(r.resourceName);
+                    }
                 }
+                if (p.partPrefab.Modules.Contains("PartModuleFilter"))
+                    filterModules.Add(p.name, (PartModuleFilter)p.partPrefab.Modules["PartModuleFilter"]);
             }
 
             if (replaceFbM)

FilterExtension/Editor.cs

@@ -119,8 +119,10 @@ IEnumerator editorInit()
         /// </summary>
         void findPartsToBlock()
         {
+            PartModuleFilter pmf;
             // all parts that may not be visible
-            List<AvailablePart> partsToCheck = PartLoader.Instance.parts.FindAll(ap => ap.category == PartCategories.none);
+            List<AvailablePart> partsToCheck = PartLoader.Instance.parts.FindAll(ap => ap.category == PartCategories.none
+                                                                                    && !(Core.Instance.filterModules.TryGetValue(ap.name, out pmf) && pmf.hasForceAdd()));
             // Only checking the category which should be Filter by Function (should I find FbF explcitly?)
             PartCategorizer.Category mainCat = PartCategorizer.Instance.filters[0];
             // has a reference to all the subcats that FE added to the category
@@ -131,7 +133,7 @@ void findPartsToBlock()
             {
                 PartCategorizer.Category subCat = mainCat.subcategories[i];
                 // if the name is an FE subcat and the category should have that FE subcat and it's not the duplicate of one already seen created by another mod, mark it seen and move on
-                if (Core.Instance.subCategoriesDict.ContainsKey(subCat.button.categoryName) && customMainCat.subCategories.Any(subItem => string.Equals(subItem.subcategoryName, subCat.button.categoryName, StringComparison.CurrentCulture)) && !subCatsSeen.Contains(subCat.button.categoryName))
+                if (Core.Instance.subCategoriesDict.ContainsKey(subCat.button.categoryName) && customMainCat.subCategories.Any(subItem => string.Equals(subItem.subcategoryName, subCat.button.categoryName, StringComparison.CurrentCulture)))
                     subCatsSeen.Add(subCat.button.categoryName);
                 else // subcat created by another mod
                 {

FilterExtension/FilterExtensions.csproj

@@ -52,6 +52,7 @@
     <Compile Include="ConfigNodes\customCategory.cs" />
     <Compile Include="ConfigNodes\Check.cs" />
     <Compile Include="Core.cs" />
+    <Compile Include="PartModuleFilter.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="Utility\Extensions.cs" />
     <Compile Include="Utility\PartType.cs" />

FilterExtension/PartModuleFilter.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace FilterExtensions
+{
+    public class PartModuleFilter : PartModule
+    {
+        /// <summary>
+        /// list names of FE categories to push this part into even if it doesn't otherwise match the filters
+        /// </summary>
+        [KSPField]
+        public string filterAdd;
+        public HashSet<string> subcategoriesToAdd;
+
+        /// <summary>
+        /// list names of FE categories to never let this part be added to
+        /// </summary>
+        [KSPField]
+        public string filterBlock;
+        public HashSet<string> subcategoriesToBlock;
+
+        public bool CheckForForceAdd(string subcategory)
+        {
+            addStringToSet();
+            return subcategoriesToAdd.Contains(subcategory);
+        }
+
+        public bool CheckForForceBlock(string subcategory)
+        {
+            blockStringToSet();
+            return subcategoriesToBlock.Contains(subcategory);
+        }
+
+        void addStringToSet()
+        {
+            if (subcategoriesToAdd == null)
+            {
+                subcategoriesToAdd = new HashSet<string>();
+                string[] temp = filterAdd.Split(',');
+                for (int i = 0; i < temp.Length; ++i)
+                    subcategoriesToAdd.Add(temp[i].Trim());
+            }
+        }
+
+        void blockStringToSet()
+        {
+            if (subcategoriesToBlock == null)
+            {
+                subcategoriesToBlock = new HashSet<string>();
+                string[] temp = filterBlock.Split(',');
+                for (int i = 0; i < temp.Length; ++i)
+                    subcategoriesToBlock.Add(temp[i].Trim());
+            }
+        }
+
+        public bool hasForceAdd()
+        {
+            addStringToSet();
+            return subcategoriesToAdd.Any();
+        }
+
+        public bool hasForceBlock()
+        {
+            blockStringToSet();
+            return subcategoriesToBlock.Any();
+        }
+    }
+}

FilterExtension/Utility/PartType.cs

@@ -123,14 +123,14 @@ public static bool checkModuleName(AvailablePart part, string[] value, bool cont
             if (part.partPrefab == null || part.partPrefab.Modules == null)
                 return false;
             if (contains)
-                return value.Any(s => part.partPrefab.Modules.Contains(s) || checkModuleNameType(part, s));
+                return value.Any(s => checkModuleNameType(part, s) || part.partPrefab.Modules.Contains(s));
             else
             {
                 foreach (PartModule module in part.partPrefab.Modules)
                 {
                     foreach (string s in value)
                     {
-                        if (s != module.ClassName)
+                        if (s != module.ClassName.Replace('.', '_'))
                             return true;
                     }
                 }