Add Custom Categories to Saved MP Characters & Vehicles

vMenu/CommonFunctions.cs

@@ -1488,6 +1488,7 @@ public struct VehicleInfo
             public bool bulletProofTires;
             public int headlightColor;
             public float enveffScale;
+            public string Category;
         };
         #endregion
 
@@ -1582,7 +1583,8 @@ public static async void SaveVehicle(string updateExistingSavedVehicleName = nul
                         xenonHeadlights = IsToggleModOn(veh.Handle, 22),
                         bulletProofTires = !veh.CanTiresBurst,
                         headlightColor = VehicleOptions.GetHeadlightsColorForVehicle(veh),
-                        enveffScale = GetVehicleEnveffScale(veh.Handle)
+                        enveffScale = GetVehicleEnveffScale(veh.Handle),
+                        Category = "Uncategorized"
                     };
 
                     #endregion

vMenu/MainMenu.cs

@@ -659,19 +659,12 @@ private static void CreateSubmenus()
             if (IsAllowed(Permission.SVMenu))
             {
                 SavedVehiclesMenu = new SavedVehicles();
-                var menu = SavedVehiclesMenu.GetMenu();
+                var menu = SavedVehiclesMenu.GetTypeMenu();
                 var button = new MenuItem("Saved Vehicles", "Save new vehicles, or spawn or delete already saved vehicles.")
                 {
                     Label = "→→→"
                 };
                 AddMenu(VehicleSubmenu, menu, button);
-                VehicleSubmenu.OnItemSelect += (sender, item, index) =>
-                {
-                    if (item == button)
-                    {
-                        SavedVehiclesMenu.UpdateMenuAvailableCategories();
-                    }
-                };
             }
 
             // Add the Personal Vehicle menu.

vMenu/MpPedDataManager.cs

@@ -115,6 +115,7 @@ public struct MultiplayerPedData
             public int Version;
             public string WalkingStyle;
             public string FacialExpression;
+            public string Category;
         }
     }
 }

vMenu/StorageManager.cs

@@ -349,5 +349,63 @@ public static MpPedDataManager.MultiplayerPedData GetSavedMpCharacterData(string
             Log(jsonString);
             return output;
         }
+
+        /// <summary>
+        /// Returns a <see cref="MpCharacterCategory"/> struct containing the data of the saved MP Character Category.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public static menus.MpPedCustomization.MpCharacterCategory GetSavedMpCharacterCategoryData(string name)
+        {
+            var output = new menus.MpPedCustomization.MpCharacterCategory();
+            if (string.IsNullOrEmpty(name))
+            {
+                return output;
+            }
+            var jsonString = GetResourceKvpString(name.StartsWith("mp_character_category_") ? name : "mp_character_category_" + name);
+            if (string.IsNullOrEmpty(jsonString))
+            {
+                return output;
+            }
+            try
+            {
+                output = JsonConvert.DeserializeObject<menus.MpPedCustomization.MpCharacterCategory>(jsonString);
+            }
+            catch (JsonException e)
+            {
+                Debug.WriteLine(e.Message);
+            }
+            Log(jsonString);
+            return output;
+        }
+
+        /// <summary>
+        /// Returns a <see cref="SavedVehicleCategory"/> struct containing the data of the saved Vehicle Category.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public static menus.SavedVehicles.SavedVehicleCategory GetSavedVehicleCategoryData(string name)
+        {
+            var output = new menus.SavedVehicles.SavedVehicleCategory();
+            if (string.IsNullOrEmpty(name))
+            {
+                return output;
+            }
+            var jsonString = GetResourceKvpString(name.StartsWith("saved_veh_category_") ? name : "saved_veh_category_" + name);
+            if (string.IsNullOrEmpty(jsonString))
+            {
+                return output;
+            }
+            try
+            {
+                output = JsonConvert.DeserializeObject<menus.SavedVehicles.SavedVehicleCategory>(jsonString);
+            }
+            catch (JsonException e)
+            {
+                Debug.WriteLine(e.Message);
+            }
+            Log(jsonString);
+            return output;
+        }
     }
 }