fix: Add custom classes to Add Chunk dialog

They were not being included before making it impossible to add custom class chunks(since 7.2)
WolvenKit · Aug 4, 2023 · 4221435 · 4221435
1 parent 8b3ed4f
commit 4221435
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/WolvenKit/Forms/Dialog/frmAddChunk.cs b/WolvenKit/Forms/Dialog/frmAddChunk.cs
@@ -9,8 +9,12 @@ namespace WolvenKit
 {
     public partial class frmAddChunk : Form
     {
-        private string[] classTypes = null;
-        private string[] enumTypes = null;
+        //private string[] classTypes = null;
+        //private string[] enumTypes = null;
+        private List<string> vanillaClasses = null;
+        private List<string> customClasses = null;
+        private List<string> vanillaEnums = null;
+        private List<string> customEnums = null;
         public frmAddChunk(List<string> list = null, bool isVariant = false, bool allowEditName = false)
         {
             InitializeComponent();
@@ -24,16 +28,20 @@ public frmAddChunk(List<string> list = null, bool isVariant = false, bool allowE
             {
                 txName.Enabled = false;
             }
-            if (list == null)
+            if (vanillaClasses == null)
             {
-                list = AssemblyDictionary.TypeNames;
+                vanillaClasses = AssemblyDictionary.TypeNames;
             }
-            list.Sort();
-            classTypes = list.ToArray();
+            vanillaClasses.Sort();
 
-            list = AssemblyDictionary.EnumNames;
-            list.Sort();
-            enumTypes = list.ToArray();
+            customClasses = CR2WManager.TypeNames;
+            customClasses.Sort();
+
+
+            vanillaEnums = AssemblyDictionary.EnumNames;
+            vanillaEnums.Sort();
+            customEnums = CR2WManager.EnumNames;
+            customEnums.Sort();
             UpdateTypeChoices();
         }
 
@@ -42,11 +50,11 @@ private void UpdateTypeChoices()
             txType.Items.Clear();
             if (checkEnum.Checked)
             {
-                txType.Items.AddRange(enumTypes);
+                txType.Items.AddRange(vanillaEnums.Concat(customEnums).Distinct().ToArray());
             }
             else
             {
-                txType.Items.AddRange(classTypes);
+                txType.Items.AddRange(vanillaClasses.Concat(customClasses).Distinct().ToArray());
             }
             if (txType.SelectedIndex < 0 && txType.Items.Count > 0)
                 txType.SelectedIndex = 0;