diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..5b552493 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,228 @@ +# Remove the line below if you want to inherit .editorconfig settings from higher directories +root = true + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = space +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = false + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = true +dotnet_sort_system_directives_first = true +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Expression-level preferences +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true +dotnet_style_prefer_conditional_expression_over_return = true +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Field preferences +dotnet_style_readonly_field = true + +# Parameter preferences +dotnet_code_quality_unused_parameters = all + +# Suppression preferences +dotnet_remove_unnecessary_suppression_exclusions = none + +# New line preferences +dotnet_style_allow_multiple_blank_lines_experimental = true +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = true +csharp_style_var_for_built_in_types = true +csharp_style_var_when_type_is_apparent = true + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = false +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Null-checking preferences +csharp_style_conditional_delegate_call = true + +# Modifier preferences +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async +csharp_style_prefer_readonly_struct = true + +# Code-block preferences +csharp_prefer_braces = true:suggestion +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = block_scoped +csharp_style_prefer_method_group_conversion = true +csharp_style_prefer_top_level_statements = true + +# Expression-level preferences +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace + +# New line preferences +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true +csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/SharedClasses/ConfigManager.cs b/SharedClasses/ConfigManager.cs index 77a8b3a8..d1e68058 100644 --- a/SharedClasses/ConfigManager.cs +++ b/SharedClasses/ConfigManager.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + using CitizenFX.Core; -using static CitizenFX.Core.Native.API; + using Newtonsoft.Json; +using static CitizenFX.Core.Native.API; + namespace vMenuShared { public static class ConfigManager @@ -39,7 +39,7 @@ public enum Setting vmenu_auto_ban_cheaters_ban_message, vmenu_log_ban_actions, vmenu_log_kick_actions, - + // Weather settings vmenu_enable_weather_sync, vmenu_enable_dynamic_weather, diff --git a/SharedClasses/PermissionsManager.cs b/SharedClasses/PermissionsManager.cs index 4f00c165..d155be34 100644 --- a/SharedClasses/PermissionsManager.cs +++ b/SharedClasses/PermissionsManager.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; + using CitizenFX.Core; + using static CitizenFX.Core.Native.API; namespace vMenuShared diff --git a/vMenu/CommonFunctions.cs b/vMenu/CommonFunctions.cs index 7c8a627c..27dbf79b 100644 --- a/vMenu/CommonFunctions.cs +++ b/vMenu/CommonFunctions.cs @@ -1,13 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; + +using CitizenFX.Core; + using MenuAPI; + using Newtonsoft.Json; -using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + using static CitizenFX.Core.Native.API; +using static CitizenFX.Core.UI.Screen; using static vMenuShared.PermissionsManager; namespace vMenuClient diff --git a/vMenu/EntitySpawner.cs b/vMenu/EntitySpawner.cs index ab6e28f9..47d8cd31 100644 --- a/vMenu/EntitySpawner.cs +++ b/vMenu/EntitySpawner.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Drawing; -using System.Drawing.Drawing2D; using System.Threading.Tasks; + using CitizenFX.Core; + using static CitizenFX.Core.Native.API; namespace vMenuClient diff --git a/vMenu/EventManager.cs b/vMenu/EventManager.cs index d0a61823..54f96993 100644 --- a/vMenu/EventManager.cs +++ b/vMenu/EventManager.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; -using MenuAPI; -using Newtonsoft.Json; + using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + +using Newtonsoft.Json; + using static CitizenFX.Core.Native.API; using static vMenuClient.CommonFunctions; using static vMenuShared.ConfigManager; diff --git a/vMenu/FunctionsController.cs b/vMenu/FunctionsController.cs index 425f160c..af26a299 100644 --- a/vMenu/FunctionsController.cs +++ b/vMenu/FunctionsController.cs @@ -2,16 +2,20 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using MenuAPI; -using Newtonsoft.Json; + using CitizenFX.Core; using CitizenFX.Core.UI; -using static CitizenFX.Core.UI.Screen; + +using MenuAPI; + +using Newtonsoft.Json; + using static CitizenFX.Core.Native.API; +using static CitizenFX.Core.UI.Screen; using static vMenuClient.CommonFunctions; +using static vMenuClient.data.PedModels; using static vMenuShared.ConfigManager; using static vMenuShared.PermissionsManager; -using static vMenuClient.data.PedModels; namespace vMenuClient { diff --git a/vMenu/MainMenu.cs b/vMenu/MainMenu.cs index 363d16bb..6b7c7e94 100644 --- a/vMenu/MainMenu.cs +++ b/vMenu/MainMenu.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; + +using CitizenFX.Core; + using MenuAPI; + using Newtonsoft.Json; -using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + using static CitizenFX.Core.Native.API; using static vMenuClient.CommonFunctions; using static vMenuShared.ConfigManager; diff --git a/vMenu/MpPedDataManager.cs b/vMenu/MpPedDataManager.cs index 9ae90690..d7b858b8 100644 --- a/vMenu/MpPedDataManager.cs +++ b/vMenu/MpPedDataManager.cs @@ -1,14 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using MenuAPI; -using Newtonsoft.Json; +using System.Collections.Generic; + using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; -using static CitizenFX.Core.Native.API; -using static vMenuClient.CommonFunctions; namespace vMenuClient { diff --git a/vMenu/Noclip.cs b/vMenu/Noclip.cs index 146c8f9f..be71eac6 100644 --- a/vMenu/Noclip.cs +++ b/vMenu/Noclip.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; + using CitizenFX.Core; + using static CitizenFX.Core.Native.API; namespace vMenuClient diff --git a/vMenu/Notification.cs b/vMenu/Notification.cs index 0552489d..5e68edf4 100644 --- a/vMenu/Notification.cs +++ b/vMenu/Notification.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using MenuAPI; -using Newtonsoft.Json; +using System.Collections.Generic; + using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + using static CitizenFX.Core.Native.API; -using static vMenuClient.CommonFunctions; +using static CitizenFX.Core.UI.Screen; namespace vMenuClient { diff --git a/vMenu/PlayerLists.cs b/vMenu/PlayerLists.cs index a2f1c11f..53ca5dcd 100644 --- a/vMenu/PlayerLists.cs +++ b/vMenu/PlayerLists.cs @@ -1,9 +1,10 @@ -using CitizenFX.Core; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; +using CitizenFX.Core; + using static CitizenFX.Core.Native.API; namespace vMenuClient diff --git a/vMenu/StorageManager.cs b/vMenu/StorageManager.cs index 9c1b7582..6fb5fa8b 100644 --- a/vMenu/StorageManager.cs +++ b/vMenu/StorageManager.cs @@ -1,16 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Dynamic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using MenuAPI; -using Newtonsoft.Json; +using System.Collections.Generic; + using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + +using Newtonsoft.Json; + using static CitizenFX.Core.Native.API; using static vMenuClient.CommonFunctions; -using static vMenuShared.PermissionsManager; namespace vMenuClient { diff --git a/vMenu/UserDefaults.cs b/vMenu/UserDefaults.cs index f27bdc0c..c60232c5 100644 --- a/vMenu/UserDefaults.cs +++ b/vMenu/UserDefaults.cs @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using MenuAPI; +using System.Collections.Generic; + using Newtonsoft.Json; -using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + using static CitizenFX.Core.Native.API; using static vMenuClient.CommonFunctions; -using static vMenuShared.PermissionsManager; namespace vMenuClient { @@ -159,7 +153,7 @@ public static bool VehicleBikeSeatbelt get { return GetSettingsBool("vehicleBikeSeatbelt"); } set { SetSavedSettingsBool("vehicleBikeSeatbelt", value); } } - + public static int VehicleDefaultRadio { get { return GetSettingsInt("vehicleDefaultRadio"); } diff --git a/vMenu/menus/SavedVehicles.cs b/vMenu/menus/SavedVehicles.cs index 86c46124..73d87b51 100644 --- a/vMenu/menus/SavedVehicles.cs +++ b/vMenu/menus/SavedVehicles.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; + +using CitizenFX.Core; + using MenuAPI; + using Newtonsoft.Json; -using CitizenFX.Core; -using static CitizenFX.Core.UI.Screen; + using static CitizenFX.Core.Native.API; using static vMenuClient.CommonFunctions; -using static vMenuShared.PermissionsManager; namespace vMenuClient { @@ -26,18 +26,17 @@ public class SavedVehicles private int deleteButtonPressedCount = 0; private int replaceButtonPressedCount = 0; - /// /// Creates the menu. /// private void CreateMenu() { - string menuTitle = "Saved Vehicles"; + var menuTitle = "Saved Vehicles"; #region Create menus and submenus // Create the menu. menu = new Menu(menuTitle, "Manage Saved Vehicles"); - MenuItem saveVehicle = new MenuItem("Save Current Vehicle", "Save the vehicle you are currently sitting in."); + var saveVehicle = new MenuItem("Save Current Vehicle", "Save the vehicle you are currently sitting in."); menu.AddMenuItem(saveVehicle); saveVehicle.LeftIcon = MenuItem.Icon.CAR; @@ -56,11 +55,11 @@ private void CreateMenu() } }; - for (int i = 0; i < 23; i++) + for (var i = 0; i < 23; i++) { - Menu categoryMenu = new Menu("Saved Vehicles", GetLabelText($"VEH_CLASS_{i}")); + var categoryMenu = new Menu("Saved Vehicles", GetLabelText($"VEH_CLASS_{i}")); - MenuItem categoryButton = new MenuItem(GetLabelText($"VEH_CLASS_{i}"), $"All saved vehicles from the {(GetLabelText($"VEH_CLASS_{i}"))} category."); + var categoryButton = new MenuItem(GetLabelText($"VEH_CLASS_{i}"), $"All saved vehicles from the {GetLabelText($"VEH_CLASS_{i}")} category."); subMenus.Add(categoryMenu); MenuController.AddSubmenu(menu, categoryMenu); menu.AddMenuItem(categoryButton); @@ -78,7 +77,7 @@ private void CreateMenu() }; } - MenuItem unavailableModels = new MenuItem("Unavailable Saved Vehicles", "These vehicles are currently unavailable because the models are not present in the game. These vehicles are most likely not being streamed from the server.") + var unavailableModels = new MenuItem("Unavailable Saved Vehicles", "These vehicles are currently unavailable because the models are not present in the game. These vehicles are most likely not being streamed from the server.") { Label = "→→→" }; @@ -89,10 +88,10 @@ private void CreateMenu() MenuController.AddMenu(selectedVehicleMenu); - MenuItem spawnVehicle = new MenuItem("Spawn Vehicle", "Spawn this saved vehicle."); - MenuItem renameVehicle = new MenuItem("Rename Vehicle", "Rename your saved vehicle."); - MenuItem replaceVehicle = new MenuItem("~r~Replace Vehicle", "Your saved vehicle will be replaced with the vehicle you are currently sitting in. ~r~Warning: this can NOT be undone!"); - MenuItem deleteVehicle = new MenuItem("~r~Delete Vehicle", "~r~This will delete your saved vehicle. Warning: this can NOT be undone!"); + var spawnVehicle = new MenuItem("Spawn Vehicle", "Spawn this saved vehicle."); + var renameVehicle = new MenuItem("Rename Vehicle", "Rename your saved vehicle."); + var replaceVehicle = new MenuItem("~r~Replace Vehicle", "Your saved vehicle will be replaced with the vehicle you are currently sitting in. ~r~Warning: this can NOT be undone!"); + var deleteVehicle = new MenuItem("~r~Delete Vehicle", "~r~This will delete your saved vehicle. Warning: this can NOT be undone!"); selectedVehicleMenu.AddMenuItem(spawnVehicle); selectedVehicleMenu.AddMenuItem(renameVehicle); selectedVehicleMenu.AddMenuItem(replaceVehicle); @@ -127,7 +126,7 @@ private void CreateMenu() } else if (item == renameVehicle) { - string newName = await GetUserInput(windowTitle: "Enter a new name for this vehicle.", maxInputLength: 30); + var newName = await GetUserInput(windowTitle: "Enter a new name for this vehicle.", maxInputLength: 30); if (string.IsNullOrEmpty(newName)) { Notify.Error(CommonErrors.InvalidInput); @@ -211,10 +210,10 @@ private void CreateMenu() { if (m.Size > 0) { - int index = m.CurrentIndex; + var index = m.CurrentIndex; if (index < m.Size) { - MenuItem item = m.GetMenuItems().Find(i => i.Index == index); + var item = m.GetMenuItems().Find(i => i.Index == index); if (item != null && (item.ItemData is KeyValuePair sd)) { if (item.Label == "~r~Are you sure?") @@ -295,7 +294,7 @@ public void UpdateMenuAvailableCategories() savedVehicles = GetSavedVehicles(); svMenuItems = new Dictionary>(); - for (int i = 1; i < GetMenu().Size - 1; i++) + for (var i = 1; i < GetMenu().Size - 1; i++) { if (savedVehicles.Any(a => GetVehicleClassFromName(a.Value.model) == i - 1 && IsModelInCdimage(a.Value.model))) { @@ -316,19 +315,19 @@ public void UpdateMenuAvailableCategories() // Check if the items count will be changed. If there are less cars than there were before, one probably got deleted // so in that case we need to refresh the index of that menu just to be safe. If not, keep the index where it is for improved // usability of the menu. - foreach (Menu m in subMenus) + foreach (var m in subMenus) { - int size = m.Size; - int vclass = subMenus.IndexOf(m); + var size = m.Size; + var vclass = subMenus.IndexOf(m); - int count = savedVehicles.Count(a => GetVehicleClassFromName(a.Value.model) == vclass); + var count = savedVehicles.Count(a => GetVehicleClassFromName(a.Value.model) == vclass); if (count < size) { m.RefreshIndex(); } } - foreach (Menu m in subMenus) + foreach (var m in subMenus) { // Clear items but don't reset the index because we can guarantee that the index won't be out of bounds. // this is the case because of the loop above where we reset the index if the items count changes. @@ -342,10 +341,10 @@ public void UpdateMenuAvailableCategories() { if (IsModelInCdimage(sv.Value.model)) { - int vclass = GetVehicleClassFromName(sv.Value.model); - Menu menu = subMenus[vclass]; + var vclass = GetVehicleClassFromName(sv.Value.model); + var menu = subMenus[vclass]; - MenuItem savedVehicleBtn = new MenuItem(sv.Key.Substring(4), $"Manage this saved vehicle.") + var savedVehicleBtn = new MenuItem(sv.Key.Substring(4), $"Manage this saved vehicle.") { Label = $"({sv.Value.name}) →→→" }; @@ -355,7 +354,7 @@ public void UpdateMenuAvailableCategories() } else { - MenuItem missingVehItem = new MenuItem(sv.Key.Substring(4), "This model could not be found in the game files. Most likely because this is an addon vehicle and it's currently not streamed by the server.") + var missingVehItem = new MenuItem(sv.Key.Substring(4), "This model could not be found in the game files. Most likely because this is an addon vehicle and it's currently not streamed by the server.") { Label = "(" + sv.Value.name + ")", Enabled = false, @@ -366,7 +365,7 @@ public void UpdateMenuAvailableCategories() unavailableVehiclesMenu.AddMenuItem(missingVehItem); } } - foreach (Menu m in subMenus) + foreach (var m in subMenus) { m.SortMenuItems((MenuItem A, MenuItem B) => { diff --git a/vMenu/vMenuClient.csproj b/vMenu/vMenuClient.csproj index c3725302..22eee59b 100644 --- a/vMenu/vMenuClient.csproj +++ b/vMenu/vMenuClient.csproj @@ -19,7 +19,7 @@ - + runtime diff --git a/vMenuServer/vMenuServer.csproj b/vMenuServer/vMenuServer.csproj index 14d78205..eeb8959a 100644 --- a/vMenuServer/vMenuServer.csproj +++ b/vMenuServer/vMenuServer.csproj @@ -19,7 +19,7 @@ - + runtime