1.0 compatibility

Crzyrndm · Apr 27, 2015 · 94c008a · 94c008a
1 parent 01415d2
commit 94c008a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/FilterExtension/ConfigNodes/customCategory.cs b/FilterExtension/ConfigNodes/customCategory.cs
@@ -80,9 +80,9 @@ public void initialise()
             PartCategorizer.Category category;
             if (!stockCategory)
             {
-                PartCategorizer.Icon icon = Core.getIcon(iconName);
+                RUI.Icons.Selectable.Icon icon = Core.getIcon(iconName);
                 if (icon == null)
-                    icon = PartCategorizer.Instance.fallbackIcon;
+                    icon = PartCategorizer.Instance.iconLoader.iconDictionary["number1"];
                 PartCategorizer.AddCustomFilter(categoryName, icon, colour);
 
                 category = PartCategorizer.Instance.filters.Find(c => c.button.categoryName == categoryName);

diff --git a/FilterExtension/ConfigNodes/customSubCategory.cs b/FilterExtension/ConfigNodes/customSubCategory.cs
@@ -66,11 +66,11 @@ public bool checkFilters(AvailablePart part)
 
         public void initialise(PartCategorizer.Category cat)
         {
-            PartCategorizer.Icon icon = Core.getIcon(iconName);
+            RUI.Icons.Selectable.Icon icon = Core.getIcon(iconName);
             if (icon == null)
             {
                 Core.Log(this.subCategoryTitle + " no icon found");
-                icon = PartCategorizer.Instance.fallbackIcon;
+                icon = PartCategorizer.Instance.iconLoader.iconDictionary["number1"];
             }
 
             if (hasFilters)
@@ -83,7 +83,7 @@ public void initialise(PartCategorizer.Category cat)
                 Core.Log("Invalid subCategory definition");
         }
 
-        private void Edit(string title, PartCategorizer.Icon icon)
+        private void Edit(string title, RUI.Icons.Selectable.Icon icon)
         {
             PartCategorizer.Category category = PartCategorizer.Instance.filters.FirstOrDefault(f => f.button.categoryName == "");
             List<PartCategorizer.Category> subCategories = category.subcategories;
@@ -92,7 +92,7 @@ private void Edit(string title, PartCategorizer.Icon icon)
             if (but != null)
             {
                 but.categoryName = subCategoryTitle;
-                if (icon != PartCategorizer.Instance.fallbackIcon)
+                if (icon != PartCategorizer.Instance.iconLoader.iconDictionary["number1"])
                 {
                     but.SetIcon(icon);
                 }

diff --git a/FilterExtension/Core.cs b/FilterExtension/Core.cs
@@ -35,7 +35,7 @@ public class Core : MonoBehaviour
         public List<string> resources = new List<string>();
 
         // Dictionary of icons created on entering the main menu
-        public Dictionary<string, PartCategorizer.Icon> iconDict = new Dictionary<string, PartCategorizer.Icon>();
+        public Dictionary<string, RUI.Icons.Selectable.Icon> iconDict = new Dictionary<string, RUI.Icons.Selectable.Icon>();
 
         // Config has options to disable the FbM replacement, and the default Category/SC and sort method
         public bool replaceFbM = true;
@@ -441,21 +441,22 @@ private static void loadIcons()
 
                 if (!Instance.iconDict.ContainsKey(name))
                 {
-                    PartCategorizer.Icon icon = new PartCategorizer.Icon(name, t.texture, selectedTex, false);
+                    RUI.Icons.Selectable.Icon icon = new RUI.Icons.Selectable.Icon(name, t.texture, selectedTex, false);
                     Instance.iconDict.Add(icon.name, icon);
                 }
 
             }
         }
 
-        public static PartCategorizer.Icon getIcon(string name)
+        public static RUI.Icons.Selectable.Icon getIcon(string name)
         {
             if (string.IsNullOrEmpty(name))
                 return null;
             if (Instance.iconDict.ContainsKey(name))
                 return Instance.iconDict[name];
-            if (PartCategorizer.Instance.iconDictionary.ContainsKey(name))
-                return PartCategorizer.Instance.iconDictionary[name];
+            if (PartCategorizer.Instance.iconLoader.iconDictionary.ContainsKey(name))
+                return PartCategorizer.Instance.iconLoader.iconDictionary[name];
+
             return null;
         }
 

diff --git a/GameData/000_FilterExtensions/FilterExtensions.dll b/GameData/000_FilterExtensions/FilterExtensions.dll