Skip to content

Commit

Permalink
Refactor config (2)
Browse files Browse the repository at this point in the history
  • Loading branch information
s-yh-china committed Nov 27, 2024
1 parent 40a4f2d commit ae6d5d6
Show file tree
Hide file tree
Showing 3 changed files with 238 additions and 207 deletions.
12 changes: 11 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
root = true

[*]
charset = utf-8
end_of_line = lf
Expand Down Expand Up @@ -54,6 +56,7 @@ ij_java_blank_lines_after_package = 1
ij_java_blank_lines_around_class = 1
ij_java_blank_lines_around_field = 0
ij_java_blank_lines_around_field_in_interface = 0
ij_java_blank_lines_around_field_with_annotations = 0
ij_java_blank_lines_around_initializer = 1
ij_java_blank_lines_around_method = 1
ij_java_blank_lines_around_method_in_interface = 1
Expand Down Expand Up @@ -131,6 +134,7 @@ ij_java_for_statement_right_paren_on_new_line = false
ij_java_for_statement_wrap = off
ij_java_generate_final_locals = false
ij_java_generate_final_parameters = false
ij_java_generate_use_type_annotation_before_type = true
ij_java_if_brace_force = never
ij_java_imports_layout = *, |, javax.**, java.**, |, $*
ij_java_indent_case_from_switch = true
Expand Down Expand Up @@ -276,6 +280,7 @@ ij_java_spaces_around_relational_operators = true
ij_java_spaces_around_shift_operators = true
ij_java_spaces_around_type_bounds_in_type_parameters = true
ij_java_spaces_around_unary_operator = false
ij_java_spaces_inside_block_braces_when_body_is_present = false
ij_java_spaces_within_angle_brackets = false
ij_java_spaces_within_annotation_parentheses = false
ij_java_spaces_within_array_initializer_braces = false
Expand Down Expand Up @@ -307,7 +312,7 @@ ij_java_test_name_suffix = Test
ij_java_throws_keyword_wrap = off
ij_java_throws_list_wrap = off
ij_java_use_external_annotations = false
ij_java_use_fq_class_names = false
ij_java_use_fq_class_names = true
ij_java_use_relative_indents = false
ij_java_use_single_class_imports = true
ij_java_variable_annotation_wrap = off
Expand Down Expand Up @@ -393,6 +398,7 @@ ij_kotlin_finally_on_new_line = false
ij_kotlin_if_rparen_on_new_line = true
ij_kotlin_import_nested_classes = false
ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
ij_kotlin_indent_before_arrow_on_new_line = true
ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
ij_kotlin_keep_blank_lines_before_right_brace = 2
ij_kotlin_keep_blank_lines_in_code = 2
Expand Down Expand Up @@ -428,6 +434,7 @@ ij_kotlin_space_before_when_parentheses = true
ij_kotlin_space_before_while_parentheses = true
ij_kotlin_spaces_around_additive_operators = true
ij_kotlin_spaces_around_assignment_operators = true
ij_kotlin_spaces_around_elvis = true
ij_kotlin_spaces_around_equality_operators = true
ij_kotlin_spaces_around_function_type_arrow = true
ij_kotlin_spaces_around_logical_operators = true
Expand Down Expand Up @@ -521,6 +528,9 @@ ij_yaml_block_mapping_on_new_line = false
ij_yaml_indent_sequence_value = true
ij_yaml_keep_indents_on_empty_lines = false
ij_yaml_keep_line_breaks = true
ij_yaml_line_comment_add_space = false
ij_yaml_line_comment_add_space_on_reformat = false
ij_yaml_line_comment_at_first_column = true
ij_yaml_sequence_on_new_line = false
ij_yaml_space_before_colon = false
ij_yaml_spaces_within_braces = true
Expand Down
9 changes: 9 additions & 0 deletions patches/server/0001-Build-changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,15 @@ index 774556a62eb240da42e84db4502e2ed43495be17..fdef98a7796d84c7b0ee61241859e10c
Properties properties = new Properties();

if (stream != null) {
diff --git a/src/main/java/org/leavesmc/leaves/.editorconfig b/src/main/java/org/leavesmc/leaves/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..6f086600baf9c98d681c4f5be5bb29c0e2086e6a
--- /dev/null
+++ b/src/main/java/org/leavesmc/leaves/.editorconfig
@@ -0,0 +1,2 @@
+[*.java]
+ij_java_use_fq_class_names = false
\ No newline at end of file
diff --git a/src/main/java/org/leavesmc/leaves/region/LeavesHooks.java b/src/main/java/org/leavesmc/leaves/region/LeavesHooks.java
new file mode 100644
index 0000000000000000000000000000000000000000..47b6241ba0a23a0579b8b046f1e45832117b6581
Expand Down
Loading

0 comments on commit ae6d5d6

Please sign in to comment.