Skip to content

Commit b6f3ea2

Browse files
TomGrobbeTomGrobbe
committed
Update dependencies, add .editorconfig for basic code editor style guide, cleanup some usings.
1 parent 0b1fae1 commit b6f3ea2

17 files changed

+311
-99
lines changed

‎.editorconfig

Lines changed: 228 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,228 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
#### Core EditorConfig Options ####
8+
9+
# Indentation and spacing
10+
indent_size = 4
11+
indent_style = space
12+
tab_width = 4
13+
14+
# New line preferences
15+
end_of_line = crlf
16+
insert_final_newline = false
17+
18+
#### .NET Coding Conventions ####
19+
20+
# Organize usings
21+
dotnet_separate_import_directive_groups = true
22+
dotnet_sort_system_directives_first = true
23+
file_header_template = unset
24+
25+
# this. and Me. preferences
26+
dotnet_style_qualification_for_event = false
27+
dotnet_style_qualification_for_field = false
28+
dotnet_style_qualification_for_method = false
29+
dotnet_style_qualification_for_property = false
30+
31+
# Language keywords vs BCL types preferences
32+
dotnet_style_predefined_type_for_locals_parameters_members = true
33+
dotnet_style_predefined_type_for_member_access = true
34+
35+
# Parentheses preferences
36+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
37+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
38+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
39+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
40+
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members
43+
44+
# Expression-level preferences
45+
dotnet_style_coalesce_expression = true
46+
dotnet_style_collection_initializer = true
47+
dotnet_style_explicit_tuple_names = true
48+
dotnet_style_namespace_match_folder = true
49+
dotnet_style_null_propagation = true
50+
dotnet_style_object_initializer = true
51+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
52+
dotnet_style_prefer_auto_properties = true
53+
dotnet_style_prefer_compound_assignment = true
54+
dotnet_style_prefer_conditional_expression_over_assignment = true
55+
dotnet_style_prefer_conditional_expression_over_return = true
56+
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
57+
dotnet_style_prefer_inferred_anonymous_type_member_names = true
58+
dotnet_style_prefer_inferred_tuple_names = true
59+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
60+
dotnet_style_prefer_simplified_boolean_expressions = true
61+
dotnet_style_prefer_simplified_interpolation = true
62+
63+
# Field preferences
64+
dotnet_style_readonly_field = true
65+
66+
# Parameter preferences
67+
dotnet_code_quality_unused_parameters = all
68+
69+
# Suppression preferences
70+
dotnet_remove_unnecessary_suppression_exclusions = none
71+
72+
# New line preferences
73+
dotnet_style_allow_multiple_blank_lines_experimental = true
74+
dotnet_style_allow_statement_immediately_after_block_experimental = true
75+
76+
#### C# Coding Conventions ####
77+
78+
# var preferences
79+
csharp_style_var_elsewhere = true
80+
csharp_style_var_for_built_in_types = true
81+
csharp_style_var_when_type_is_apparent = true
82+
83+
# Expression-bodied members
84+
csharp_style_expression_bodied_accessors = true
85+
csharp_style_expression_bodied_constructors = false
86+
csharp_style_expression_bodied_indexers = true
87+
csharp_style_expression_bodied_lambdas = true
88+
csharp_style_expression_bodied_local_functions = false
89+
csharp_style_expression_bodied_methods = false
90+
csharp_style_expression_bodied_operators = false
91+
csharp_style_expression_bodied_properties = true
92+
93+
# Pattern matching preferences
94+
csharp_style_pattern_matching_over_as_with_null_check = true
95+
csharp_style_pattern_matching_over_is_with_cast_check = true
96+
csharp_style_prefer_extended_property_pattern = true
97+
csharp_style_prefer_not_pattern = true
98+
csharp_style_prefer_pattern_matching = true
99+
csharp_style_prefer_switch_expression = true
100+
101+
# Null-checking preferences
102+
csharp_style_conditional_delegate_call = true
103+
104+
# Modifier preferences
105+
csharp_prefer_static_local_function = true
106+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
107+
csharp_style_prefer_readonly_struct = true
108+
109+
# Code-block preferences
110+
csharp_prefer_braces = true:suggestion
111+
csharp_prefer_simple_using_statement = true
112+
csharp_style_namespace_declarations = block_scoped
113+
csharp_style_prefer_method_group_conversion = true
114+
csharp_style_prefer_top_level_statements = true
115+
116+
# Expression-level preferences
117+
csharp_prefer_simple_default_expression = true
118+
csharp_style_deconstructed_variable_declaration = true
119+
csharp_style_implicit_object_creation_when_type_is_apparent = true
120+
csharp_style_inlined_variable_declaration = true
121+
csharp_style_prefer_index_operator = true
122+
csharp_style_prefer_local_over_anonymous_function = true
123+
csharp_style_prefer_null_check_over_type_check = true
124+
csharp_style_prefer_range_operator = true
125+
csharp_style_prefer_tuple_swap = true
126+
csharp_style_prefer_utf8_string_literals = true
127+
csharp_style_throw_expression = true
128+
csharp_style_unused_value_assignment_preference = discard_variable
129+
csharp_style_unused_value_expression_statement_preference = discard_variable
130+
131+
# 'using' directive preferences
132+
csharp_using_directive_placement = outside_namespace
133+
134+
# New line preferences
135+
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
136+
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
137+
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
138+
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
139+
csharp_style_allow_embedded_statements_on_same_line_experimental = true
140+
141+
#### C# Formatting Rules ####
142+
143+
# New line preferences
144+
csharp_new_line_before_catch = true
145+
csharp_new_line_before_else = true
146+
csharp_new_line_before_finally = true
147+
csharp_new_line_before_members_in_anonymous_types = true
148+
csharp_new_line_before_members_in_object_initializers = true
149+
csharp_new_line_before_open_brace = all
150+
csharp_new_line_between_query_expression_clauses = true
151+
152+
# Indentation preferences
153+
csharp_indent_block_contents = true
154+
csharp_indent_braces = false
155+
csharp_indent_case_contents = true
156+
csharp_indent_case_contents_when_block = true
157+
csharp_indent_labels = one_less_than_current
158+
csharp_indent_switch_labels = true
159+
160+
# Space preferences
161+
csharp_space_after_cast = false
162+
csharp_space_after_colon_in_inheritance_clause = true
163+
csharp_space_after_comma = true
164+
csharp_space_after_dot = false
165+
csharp_space_after_keywords_in_control_flow_statements = true
166+
csharp_space_after_semicolon_in_for_statement = true
167+
csharp_space_around_binary_operators = before_and_after
168+
csharp_space_around_declaration_statements = false
169+
csharp_space_before_colon_in_inheritance_clause = true
170+
csharp_space_before_comma = false
171+
csharp_space_before_dot = false
172+
csharp_space_before_open_square_brackets = false
173+
csharp_space_before_semicolon_in_for_statement = false
174+
csharp_space_between_empty_square_brackets = false
175+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
176+
csharp_space_between_method_call_name_and_opening_parenthesis = false
177+
csharp_space_between_method_call_parameter_list_parentheses = false
178+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
179+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
180+
csharp_space_between_method_declaration_parameter_list_parentheses = false
181+
csharp_space_between_parentheses = false
182+
csharp_space_between_square_brackets = false
183+
184+
# Wrapping preferences
185+
csharp_preserve_single_line_blocks = true
186+
csharp_preserve_single_line_statements = true
187+
188+
#### Naming styles ####
189+
190+
# Naming rules
191+
192+
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
193+
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
194+
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
195+
196+
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
197+
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
198+
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
199+
200+
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
201+
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
202+
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
203+
204+
# Symbol specifications
205+
206+
dotnet_naming_symbols.interface.applicable_kinds = interface
207+
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
208+
dotnet_naming_symbols.interface.required_modifiers =
209+
210+
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
211+
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
212+
dotnet_naming_symbols.types.required_modifiers =
213+
214+
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
215+
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
216+
dotnet_naming_symbols.non_field_members.required_modifiers =
217+
218+
# Naming styles
219+
220+
dotnet_naming_style.pascal_case.required_prefix =
221+
dotnet_naming_style.pascal_case.required_suffix =
222+
dotnet_naming_style.pascal_case.word_separator =
223+
dotnet_naming_style.pascal_case.capitalization = pascal_case
224+
225+
dotnet_naming_style.begins_with_i.required_prefix = I
226+
dotnet_naming_style.begins_with_i.required_suffix =
227+
dotnet_naming_style.begins_with_i.word_separator =
228+
dotnet_naming_style.begins_with_i.capitalization = pascal_case

‎SharedClasses/ConfigManager.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
3+
64
using CitizenFX.Core;
7-
using static CitizenFX.Core.Native.API;
5+
86
using Newtonsoft.Json;
97

8+
using static CitizenFX.Core.Native.API;
9+
1010
namespace vMenuShared
1111
{
1212
public static class ConfigManager
@@ -39,7 +39,7 @@ public enum Setting
3939
vmenu_auto_ban_cheaters_ban_message,
4040
vmenu_log_ban_actions,
4141
vmenu_log_kick_actions,
42-
42+
4343
// Weather settings
4444
vmenu_enable_weather_sync,
4545
vmenu_enable_dynamic_weather,

‎SharedClasses/PermissionsManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
4+
65
using CitizenFX.Core;
6+
77
using static CitizenFX.Core.Native.API;
88

99
namespace vMenuShared

‎vMenu/CommonFunctions.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text;
54
using System.Threading.Tasks;
5+
6+
using CitizenFX.Core;
7+
68
using MenuAPI;
9+
710
using Newtonsoft.Json;
8-
using CitizenFX.Core;
9-
using static CitizenFX.Core.UI.Screen;
11+
1012
using static CitizenFX.Core.Native.API;
13+
using static CitizenFX.Core.UI.Screen;
1114
using static vMenuShared.PermissionsManager;
1215

1316
namespace vMenuClient

‎vMenu/EntitySpawner.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Collections.Specialized;
4-
using System.Drawing;
5-
using System.Drawing.Drawing2D;
62
using System.Threading.Tasks;
3+
74
using CitizenFX.Core;
5+
86
using static CitizenFX.Core.Native.API;
97

108
namespace vMenuClient

‎vMenu/EventManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Text;
54
using System.Threading.Tasks;
6-
using MenuAPI;
7-
using Newtonsoft.Json;
5+
86
using CitizenFX.Core;
9-
using static CitizenFX.Core.UI.Screen;
7+
8+
using Newtonsoft.Json;
9+
1010
using static CitizenFX.Core.Native.API;
1111
using static vMenuClient.CommonFunctions;
1212
using static vMenuShared.ConfigManager;

‎vMenu/FunctionsController.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5-
using MenuAPI;
6-
using Newtonsoft.Json;
5+
76
using CitizenFX.Core;
87
using CitizenFX.Core.UI;
9-
using static CitizenFX.Core.UI.Screen;
8+
9+
using MenuAPI;
10+
11+
using Newtonsoft.Json;
12+
1013
using static CitizenFX.Core.Native.API;
14+
using static CitizenFX.Core.UI.Screen;
1115
using static vMenuClient.CommonFunctions;
16+
using static vMenuClient.data.PedModels;
1217
using static vMenuShared.ConfigManager;
1318
using static vMenuShared.PermissionsManager;
14-
using static vMenuClient.data.PedModels;
1519

1620
namespace vMenuClient
1721
{

‎vMenu/MainMenu.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
53
using System.Threading.Tasks;
4+
5+
using CitizenFX.Core;
6+
67
using MenuAPI;
8+
79
using Newtonsoft.Json;
8-
using CitizenFX.Core;
9-
using static CitizenFX.Core.UI.Screen;
10+
1011
using static CitizenFX.Core.Native.API;
1112
using static vMenuClient.CommonFunctions;
1213
using static vMenuShared.ConfigManager;

‎vMenu/MpPedDataManager.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using MenuAPI;
7-
using Newtonsoft.Json;
1+
using System.Collections.Generic;
2+
83
using CitizenFX.Core;
9-
using static CitizenFX.Core.UI.Screen;
10-
using static CitizenFX.Core.Native.API;
11-
using static vMenuClient.CommonFunctions;
124

135
namespace vMenuClient
146
{

‎vMenu/Noclip.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System.Collections.Generic;
22
using System.Threading.Tasks;
3+
34
using CitizenFX.Core;
5+
46
using static CitizenFX.Core.Native.API;
57

68
namespace vMenuClient

0 commit comments

Comments
 (0)