diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..663af56 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,690 @@ +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = false +max_line_length = 120 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = true +ij_smart_tabs = false +ij_visual_guides = +ij_wrap_on_typing = false + +[*.java] +ij_java_align_consecutive_assignments = false +ij_java_align_consecutive_variable_declarations = false +ij_java_align_group_field_declarations = false +ij_java_align_multiline_annotation_parameters = false +ij_java_align_multiline_array_initializer_expression = false +ij_java_align_multiline_assignment = false +ij_java_align_multiline_binary_operation = false +ij_java_align_multiline_chained_methods = false +ij_java_align_multiline_deconstruction_list_components = true +ij_java_align_multiline_extends_list = false +ij_java_align_multiline_for = true +ij_java_align_multiline_method_parentheses = false +ij_java_align_multiline_parameters = true +ij_java_align_multiline_parameters_in_calls = false +ij_java_align_multiline_parenthesized_expression = false +ij_java_align_multiline_records = true +ij_java_align_multiline_resources = true +ij_java_align_multiline_ternary_operation = false +ij_java_align_multiline_text_blocks = false +ij_java_align_multiline_throws_list = false +ij_java_align_subsequent_simple_methods = false +ij_java_align_throws_keyword = false +ij_java_align_types_in_multi_catch = true +ij_java_annotation_parameter_wrap = off +ij_java_array_initializer_new_line_after_left_brace = false +ij_java_array_initializer_right_brace_on_new_line = false +ij_java_array_initializer_wrap = off +ij_java_assert_statement_colon_on_next_line = false +ij_java_assert_statement_wrap = off +ij_java_assignment_wrap = off +ij_java_binary_operation_sign_on_next_line = false +ij_java_binary_operation_wrap = off +ij_java_blank_lines_after_anonymous_class_header = 0 +ij_java_blank_lines_after_class_header = 0 +ij_java_blank_lines_after_imports = 1 +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_initializer = 1 +ij_java_blank_lines_around_method = 1 +ij_java_blank_lines_around_method_in_interface = 1 +ij_java_blank_lines_before_class_end = 0 +ij_java_blank_lines_before_imports = 1 +ij_java_blank_lines_before_method_body = 0 +ij_java_blank_lines_before_package = 0 +ij_java_block_brace_style = end_of_line +ij_java_block_comment_add_space = false +ij_java_block_comment_at_first_column = true +ij_java_builder_methods = +ij_java_call_parameters_new_line_after_left_paren = false +ij_java_call_parameters_right_paren_on_new_line = false +ij_java_call_parameters_wrap = off +ij_java_case_statement_on_separate_line = true +ij_java_catch_on_new_line = false +ij_java_class_annotation_wrap = split_into_lines +ij_java_class_brace_style = end_of_line +ij_java_class_count_to_use_import_on_demand = 999 +ij_java_class_names_in_javadoc = 1 +ij_java_deconstruction_list_wrap = normal +ij_java_do_not_indent_top_level_class_members = false +ij_java_do_not_wrap_after_single_annotation = false +ij_java_do_not_wrap_after_single_annotation_in_parameter = false +ij_java_do_while_brace_force = always +ij_java_doc_add_blank_line_after_description = true +ij_java_doc_add_blank_line_after_param_comments = false +ij_java_doc_add_blank_line_after_return = false +ij_java_doc_add_p_tag_on_empty_lines = true +ij_java_doc_align_exception_comments = true +ij_java_doc_align_param_comments = true +ij_java_doc_do_not_wrap_if_one_line = false +ij_java_doc_enable_formatting = true +ij_java_doc_enable_leading_asterisks = true +ij_java_doc_indent_on_continuation = false +ij_java_doc_keep_empty_lines = true +ij_java_doc_keep_empty_parameter_tag = true +ij_java_doc_keep_empty_return_tag = true +ij_java_doc_keep_empty_throws_tag = true +ij_java_doc_keep_invalid_tags = true +ij_java_doc_param_description_on_new_line = false +ij_java_doc_preserve_line_breaks = false +ij_java_doc_use_throws_not_exception_tag = true +ij_java_else_on_new_line = false +ij_java_entity_dd_prefix = +ij_java_entity_dd_suffix = EJB +ij_java_entity_eb_prefix = +ij_java_entity_eb_suffix = Bean +ij_java_entity_hi_prefix = +ij_java_entity_hi_suffix = Home +ij_java_entity_lhi_prefix = Local +ij_java_entity_lhi_suffix = Home +ij_java_entity_li_prefix = Local +ij_java_entity_li_suffix = +ij_java_entity_pk_class = java.lang.String +ij_java_entity_ri_prefix = +ij_java_entity_ri_suffix = +ij_java_entity_vo_prefix = +ij_java_entity_vo_suffix = VO +ij_java_enum_constants_wrap = off +ij_java_enum_field_annotation_wrap = off +ij_java_extends_keyword_wrap = off +ij_java_extends_list_wrap = off +ij_java_field_annotation_wrap = split_into_lines +ij_java_field_name_prefix = +ij_java_field_name_suffix = +ij_java_filter_class_prefix = +ij_java_filter_class_suffix = +ij_java_filter_dd_prefix = +ij_java_filter_dd_suffix = +ij_java_finally_on_new_line = false +ij_java_for_brace_force = never +ij_java_for_statement_new_line_after_left_paren = false +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_if_brace_force = always +ij_java_imports_layout = *,|,javax.**,java.**,|,$* +ij_java_indent_case_from_switch = true +ij_java_insert_inner_class_imports = false +ij_java_insert_override_annotation = true +ij_java_keep_blank_lines_before_right_brace = 2 +ij_java_keep_blank_lines_between_package_declaration_and_header = 2 +ij_java_keep_blank_lines_in_code = 2 +ij_java_keep_blank_lines_in_declarations = 2 +ij_java_keep_builder_methods_indents = false +ij_java_keep_control_statement_in_one_line = true +ij_java_keep_first_column_comment = true +ij_java_keep_indents_on_empty_lines = false +ij_java_keep_line_breaks = true +ij_java_keep_multiple_expressions_in_one_line = false +ij_java_keep_simple_blocks_in_one_line = false +ij_java_keep_simple_classes_in_one_line = false +ij_java_keep_simple_lambdas_in_one_line = false +ij_java_keep_simple_methods_in_one_line = false +ij_java_label_indent_absolute = false +ij_java_label_indent_size = 0 +ij_java_lambda_brace_style = end_of_line +ij_java_layout_static_imports_separately = true +ij_java_line_comment_add_space = false +ij_java_line_comment_add_space_on_reformat = false +ij_java_line_comment_at_first_column = true +ij_java_listener_class_prefix = +ij_java_listener_class_suffix = +ij_java_local_variable_name_prefix = +ij_java_local_variable_name_suffix = +ij_java_message_dd_prefix = +ij_java_message_dd_suffix = EJB +ij_java_message_eb_prefix = +ij_java_message_eb_suffix = Bean +ij_java_method_annotation_wrap = split_into_lines +ij_java_method_brace_style = end_of_line +ij_java_method_call_chain_wrap = off +ij_java_method_parameters_new_line_after_left_paren = false +ij_java_method_parameters_right_paren_on_new_line = false +ij_java_method_parameters_wrap = off +ij_java_modifier_list_wrap = false +ij_java_multi_catch_types_wrap = normal +ij_java_names_count_to_use_import_on_demand = 999 +ij_java_new_line_after_lparen_in_annotation = false +ij_java_new_line_after_lparen_in_deconstruction_pattern = true +ij_java_new_line_after_lparen_in_record_header = false +ij_java_new_line_when_body_is_presented = false +ij_java_packages_to_use_import_on_demand = 999 +ij_java_parameter_annotation_wrap = off +ij_java_parameter_name_prefix = +ij_java_parameter_name_suffix = +ij_java_parentheses_expression_new_line_after_left_paren = false +ij_java_parentheses_expression_right_paren_on_new_line = false +ij_java_place_assignment_sign_on_next_line = false +ij_java_prefer_longer_names = true +ij_java_prefer_parameters_wrap = false +ij_java_record_components_wrap = normal +ij_java_repeat_annotations = +ij_java_repeat_synchronized = true +ij_java_replace_instanceof_and_cast = false +ij_java_replace_null_check = true +ij_java_replace_sum_lambda_with_method_ref = true +ij_java_resource_list_new_line_after_left_paren = false +ij_java_resource_list_right_paren_on_new_line = false +ij_java_resource_list_wrap = off +ij_java_rparen_on_new_line_in_annotation = false +ij_java_rparen_on_new_line_in_deconstruction_pattern = true +ij_java_rparen_on_new_line_in_record_header = false +ij_java_servlet_class_prefix = +ij_java_servlet_class_suffix = +ij_java_servlet_dd_prefix = +ij_java_servlet_dd_suffix = +ij_java_session_dd_prefix = +ij_java_session_dd_suffix = EJB +ij_java_session_eb_prefix = +ij_java_session_eb_suffix = Bean +ij_java_session_hi_prefix = +ij_java_session_hi_suffix = Home +ij_java_session_lhi_prefix = Local +ij_java_session_lhi_suffix = Home +ij_java_session_li_prefix = Local +ij_java_session_li_suffix = +ij_java_session_ri_prefix = +ij_java_session_ri_suffix = +ij_java_session_si_prefix = +ij_java_session_si_suffix = Service +ij_java_space_after_closing_angle_bracket_in_type_argument = false +ij_java_space_after_colon = true +ij_java_space_after_comma = true +ij_java_space_after_comma_in_type_arguments = true +ij_java_space_after_for_semicolon = true +ij_java_space_after_quest = true +ij_java_space_after_type_cast = false +ij_java_space_before_annotation_array_initializer_left_brace = false +ij_java_space_before_annotation_parameter_list = false +ij_java_space_before_array_initializer_left_brace = false +ij_java_space_before_catch_keyword = true +ij_java_space_before_catch_left_brace = true +ij_java_space_before_catch_parentheses = true +ij_java_space_before_class_left_brace = true +ij_java_space_before_colon = true +ij_java_space_before_colon_in_foreach = true +ij_java_space_before_comma = false +ij_java_space_before_deconstruction_list = false +ij_java_space_before_do_left_brace = true +ij_java_space_before_else_keyword = true +ij_java_space_before_else_left_brace = true +ij_java_space_before_finally_keyword = true +ij_java_space_before_finally_left_brace = true +ij_java_space_before_for_left_brace = true +ij_java_space_before_for_parentheses = true +ij_java_space_before_for_semicolon = false +ij_java_space_before_if_left_brace = true +ij_java_space_before_if_parentheses = true +ij_java_space_before_method_call_parentheses = false +ij_java_space_before_method_left_brace = true +ij_java_space_before_method_parentheses = false +ij_java_space_before_opening_angle_bracket_in_type_parameter = false +ij_java_space_before_quest = true +ij_java_space_before_switch_left_brace = true +ij_java_space_before_switch_parentheses = true +ij_java_space_before_synchronized_left_brace = true +ij_java_space_before_synchronized_parentheses = true +ij_java_space_before_try_left_brace = true +ij_java_space_before_try_parentheses = true +ij_java_space_before_type_parameter_list = false +ij_java_space_before_while_keyword = true +ij_java_space_before_while_left_brace = true +ij_java_space_before_while_parentheses = true +ij_java_space_inside_one_line_enum_braces = false +ij_java_space_within_empty_array_initializer_braces = false +ij_java_space_within_empty_method_call_parentheses = false +ij_java_space_within_empty_method_parentheses = false +ij_java_spaces_around_additive_operators = true +ij_java_spaces_around_annotation_eq = true +ij_java_spaces_around_assignment_operators = true +ij_java_spaces_around_bitwise_operators = true +ij_java_spaces_around_equality_operators = true +ij_java_spaces_around_lambda_arrow = true +ij_java_spaces_around_logical_operators = true +ij_java_spaces_around_method_ref_dbl_colon = false +ij_java_spaces_around_multiplicative_operators = true +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_within_angle_brackets = false +ij_java_spaces_within_annotation_parentheses = false +ij_java_spaces_within_array_initializer_braces = false +ij_java_spaces_within_braces = false +ij_java_spaces_within_brackets = false +ij_java_spaces_within_cast_parentheses = false +ij_java_spaces_within_catch_parentheses = false +ij_java_spaces_within_deconstruction_list = false +ij_java_spaces_within_for_parentheses = false +ij_java_spaces_within_if_parentheses = false +ij_java_spaces_within_method_call_parentheses = false +ij_java_spaces_within_method_parentheses = false +ij_java_spaces_within_parentheses = false +ij_java_spaces_within_record_header = false +ij_java_spaces_within_switch_parentheses = false +ij_java_spaces_within_synchronized_parentheses = false +ij_java_spaces_within_try_parentheses = false +ij_java_spaces_within_while_parentheses = false +ij_java_special_else_if_treatment = true +ij_java_static_field_name_prefix = +ij_java_static_field_name_suffix = +ij_java_subclass_name_prefix = +ij_java_subclass_name_suffix = Impl +ij_java_switch_expressions_wrap = normal +ij_java_ternary_operation_signs_on_next_line = false +ij_java_ternary_operation_wrap = off +ij_java_test_name_prefix = +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_relative_indents = false +ij_java_use_single_class_imports = true +ij_java_variable_annotation_wrap = off +ij_java_visibility = public +ij_java_while_brace_force = always +ij_java_while_on_new_line = false +ij_java_wrap_comments = false +ij_java_wrap_first_method_in_call_chain = false +ij_java_wrap_long_lines = false +ij_java_wrap_semicolon_after_call_chain = false + +[.editorconfig] +ij_editorconfig_align_group_field_declarations = false +ij_editorconfig_space_after_colon = false +ij_editorconfig_space_after_comma = true +ij_editorconfig_space_before_colon = false +ij_editorconfig_space_before_comma = false +ij_editorconfig_spaces_around_assignment_operators = true + +[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.rng,*.tld,*.wadl,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}] +ij_xml_align_attributes = true +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +ij_xml_block_comment_add_space = false +ij_xml_block_comment_at_first_column = true +ij_xml_keep_blank_lines = 2 +ij_xml_keep_indents_on_empty_lines = false +ij_xml_keep_line_breaks = true +ij_xml_keep_line_breaks_in_text = true +ij_xml_keep_whitespaces = false +ij_xml_keep_whitespaces_around_cdata = preserve +ij_xml_keep_whitespaces_inside_cdata = false +ij_xml_line_comment_at_first_column = true +ij_xml_space_after_tag_name = false +ij_xml_space_around_equals_in_attribute = false +ij_xml_space_inside_empty_tag = false +ij_xml_text_wrap = normal + +[{*.bash,*.sh,*.zsh}] +indent_size = 2 +tab_width = 2 +ij_shell_binary_ops_start_line = false +ij_shell_keep_column_alignment_padding = false +ij_shell_minify_program = false +ij_shell_redirect_followed_by_space = false +ij_shell_switch_cases_indented = false +ij_shell_use_unix_line_separator = true + +[{*.gant,*.groovy,*.gy}] +ij_groovy_align_group_field_declarations = false +ij_groovy_align_multiline_array_initializer_expression = false +ij_groovy_align_multiline_assignment = false +ij_groovy_align_multiline_binary_operation = false +ij_groovy_align_multiline_chained_methods = false +ij_groovy_align_multiline_extends_list = false +ij_groovy_align_multiline_for = true +ij_groovy_align_multiline_list_or_map = true +ij_groovy_align_multiline_method_parentheses = false +ij_groovy_align_multiline_parameters = true +ij_groovy_align_multiline_parameters_in_calls = false +ij_groovy_align_multiline_resources = true +ij_groovy_align_multiline_ternary_operation = false +ij_groovy_align_multiline_throws_list = false +ij_groovy_align_named_args_in_map = true +ij_groovy_align_throws_keyword = false +ij_groovy_array_initializer_new_line_after_left_brace = false +ij_groovy_array_initializer_right_brace_on_new_line = false +ij_groovy_array_initializer_wrap = off +ij_groovy_assert_statement_wrap = off +ij_groovy_assignment_wrap = off +ij_groovy_binary_operation_wrap = off +ij_groovy_blank_lines_after_class_header = 0 +ij_groovy_blank_lines_after_imports = 1 +ij_groovy_blank_lines_after_package = 1 +ij_groovy_blank_lines_around_class = 1 +ij_groovy_blank_lines_around_field = 0 +ij_groovy_blank_lines_around_field_in_interface = 0 +ij_groovy_blank_lines_around_method = 1 +ij_groovy_blank_lines_around_method_in_interface = 1 +ij_groovy_blank_lines_before_imports = 1 +ij_groovy_blank_lines_before_method_body = 0 +ij_groovy_blank_lines_before_package = 0 +ij_groovy_block_brace_style = end_of_line +ij_groovy_block_comment_add_space = false +ij_groovy_block_comment_at_first_column = true +ij_groovy_call_parameters_new_line_after_left_paren = false +ij_groovy_call_parameters_right_paren_on_new_line = false +ij_groovy_call_parameters_wrap = off +ij_groovy_catch_on_new_line = false +ij_groovy_class_annotation_wrap = split_into_lines +ij_groovy_class_brace_style = end_of_line +ij_groovy_class_count_to_use_import_on_demand = 999 +ij_groovy_do_while_brace_force = never +ij_groovy_else_on_new_line = false +ij_groovy_enable_groovydoc_formatting = true +ij_groovy_enum_constants_wrap = off +ij_groovy_extends_keyword_wrap = off +ij_groovy_extends_list_wrap = off +ij_groovy_field_annotation_wrap = split_into_lines +ij_groovy_finally_on_new_line = false +ij_groovy_for_brace_force = never +ij_groovy_for_statement_new_line_after_left_paren = false +ij_groovy_for_statement_right_paren_on_new_line = false +ij_groovy_for_statement_wrap = off +ij_groovy_ginq_general_clause_wrap_policy = 2 +ij_groovy_ginq_having_wrap_policy = 1 +ij_groovy_ginq_indent_having_clause = true +ij_groovy_ginq_indent_on_clause = true +ij_groovy_ginq_on_wrap_policy = 1 +ij_groovy_ginq_space_after_keyword = true +ij_groovy_if_brace_force = never +ij_groovy_import_annotation_wrap = 2 +ij_groovy_imports_layout = *,|,javax.**,java.**,|,$* +ij_groovy_indent_case_from_switch = true +ij_groovy_indent_label_blocks = true +ij_groovy_insert_inner_class_imports = false +ij_groovy_keep_blank_lines_before_right_brace = 2 +ij_groovy_keep_blank_lines_in_code = 2 +ij_groovy_keep_blank_lines_in_declarations = 2 +ij_groovy_keep_control_statement_in_one_line = true +ij_groovy_keep_first_column_comment = true +ij_groovy_keep_indents_on_empty_lines = false +ij_groovy_keep_line_breaks = true +ij_groovy_keep_multiple_expressions_in_one_line = false +ij_groovy_keep_simple_blocks_in_one_line = false +ij_groovy_keep_simple_classes_in_one_line = true +ij_groovy_keep_simple_lambdas_in_one_line = true +ij_groovy_keep_simple_methods_in_one_line = true +ij_groovy_label_indent_absolute = false +ij_groovy_label_indent_size = 0 +ij_groovy_lambda_brace_style = end_of_line +ij_groovy_layout_static_imports_separately = true +ij_groovy_line_comment_add_space = false +ij_groovy_line_comment_add_space_on_reformat = false +ij_groovy_line_comment_at_first_column = true +ij_groovy_method_annotation_wrap = split_into_lines +ij_groovy_method_brace_style = end_of_line +ij_groovy_method_call_chain_wrap = off +ij_groovy_method_parameters_new_line_after_left_paren = false +ij_groovy_method_parameters_right_paren_on_new_line = false +ij_groovy_method_parameters_wrap = off +ij_groovy_modifier_list_wrap = false +ij_groovy_names_count_to_use_import_on_demand = 999 +ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.* +ij_groovy_parameter_annotation_wrap = off +ij_groovy_parentheses_expression_new_line_after_left_paren = false +ij_groovy_parentheses_expression_right_paren_on_new_line = false +ij_groovy_prefer_parameters_wrap = false +ij_groovy_resource_list_new_line_after_left_paren = false +ij_groovy_resource_list_right_paren_on_new_line = false +ij_groovy_resource_list_wrap = off +ij_groovy_space_after_assert_separator = true +ij_groovy_space_after_colon = true +ij_groovy_space_after_comma = true +ij_groovy_space_after_comma_in_type_arguments = true +ij_groovy_space_after_for_semicolon = true +ij_groovy_space_after_quest = true +ij_groovy_space_after_type_cast = true +ij_groovy_space_before_annotation_parameter_list = false +ij_groovy_space_before_array_initializer_left_brace = false +ij_groovy_space_before_assert_separator = false +ij_groovy_space_before_catch_keyword = true +ij_groovy_space_before_catch_left_brace = true +ij_groovy_space_before_catch_parentheses = true +ij_groovy_space_before_class_left_brace = true +ij_groovy_space_before_closure_left_brace = true +ij_groovy_space_before_colon = true +ij_groovy_space_before_comma = false +ij_groovy_space_before_do_left_brace = true +ij_groovy_space_before_else_keyword = true +ij_groovy_space_before_else_left_brace = true +ij_groovy_space_before_finally_keyword = true +ij_groovy_space_before_finally_left_brace = true +ij_groovy_space_before_for_left_brace = true +ij_groovy_space_before_for_parentheses = true +ij_groovy_space_before_for_semicolon = false +ij_groovy_space_before_if_left_brace = true +ij_groovy_space_before_if_parentheses = true +ij_groovy_space_before_method_call_parentheses = false +ij_groovy_space_before_method_left_brace = true +ij_groovy_space_before_method_parentheses = false +ij_groovy_space_before_quest = true +ij_groovy_space_before_record_parentheses = false +ij_groovy_space_before_switch_left_brace = true +ij_groovy_space_before_switch_parentheses = true +ij_groovy_space_before_synchronized_left_brace = true +ij_groovy_space_before_synchronized_parentheses = true +ij_groovy_space_before_try_left_brace = true +ij_groovy_space_before_try_parentheses = true +ij_groovy_space_before_while_keyword = true +ij_groovy_space_before_while_left_brace = true +ij_groovy_space_before_while_parentheses = true +ij_groovy_space_in_named_argument = true +ij_groovy_space_in_named_argument_before_colon = false +ij_groovy_space_within_empty_array_initializer_braces = false +ij_groovy_space_within_empty_method_call_parentheses = false +ij_groovy_spaces_around_additive_operators = true +ij_groovy_spaces_around_assignment_operators = true +ij_groovy_spaces_around_bitwise_operators = true +ij_groovy_spaces_around_equality_operators = true +ij_groovy_spaces_around_lambda_arrow = true +ij_groovy_spaces_around_logical_operators = true +ij_groovy_spaces_around_multiplicative_operators = true +ij_groovy_spaces_around_regex_operators = true +ij_groovy_spaces_around_relational_operators = true +ij_groovy_spaces_around_shift_operators = true +ij_groovy_spaces_within_annotation_parentheses = false +ij_groovy_spaces_within_array_initializer_braces = false +ij_groovy_spaces_within_braces = true +ij_groovy_spaces_within_brackets = false +ij_groovy_spaces_within_cast_parentheses = false +ij_groovy_spaces_within_catch_parentheses = false +ij_groovy_spaces_within_for_parentheses = false +ij_groovy_spaces_within_gstring_injection_braces = false +ij_groovy_spaces_within_if_parentheses = false +ij_groovy_spaces_within_list_or_map = false +ij_groovy_spaces_within_method_call_parentheses = false +ij_groovy_spaces_within_method_parentheses = false +ij_groovy_spaces_within_parentheses = false +ij_groovy_spaces_within_switch_parentheses = false +ij_groovy_spaces_within_synchronized_parentheses = false +ij_groovy_spaces_within_try_parentheses = false +ij_groovy_spaces_within_tuple_expression = false +ij_groovy_spaces_within_while_parentheses = false +ij_groovy_special_else_if_treatment = true +ij_groovy_ternary_operation_wrap = off +ij_groovy_throws_keyword_wrap = off +ij_groovy_throws_list_wrap = off +ij_groovy_use_flying_geese_braces = false +ij_groovy_use_fq_class_names = false +ij_groovy_use_fq_class_names_in_javadoc = true +ij_groovy_use_relative_indents = false +ij_groovy_use_single_class_imports = true +ij_groovy_variable_annotation_wrap = off +ij_groovy_while_brace_force = never +ij_groovy_while_on_new_line = false +ij_groovy_wrap_chain_calls_after_dot = false +ij_groovy_wrap_long_lines = false + +[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.png.mcmeta,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,.ws-context,bowerrc,jest.config,mcmod.info,pack.mcmeta}] +indent_size = 2 +ij_json_array_wrapping = split_into_lines +ij_json_keep_blank_lines_in_code = 0 +ij_json_keep_indents_on_empty_lines = false +ij_json_keep_line_breaks = true +ij_json_keep_trailing_comma = false +ij_json_object_wrapping = split_into_lines +ij_json_property_alignment = do_not_align +ij_json_space_after_colon = true +ij_json_space_after_comma = true +ij_json_space_before_colon = false +ij_json_space_before_comma = false +ij_json_spaces_within_braces = false +ij_json_spaces_within_brackets = false +ij_json_wrap_long_lines = false + +[{*.kt,*.kts}] +ij_kotlin_align_in_columns_case_branch = false +ij_kotlin_align_multiline_binary_operation = false +ij_kotlin_align_multiline_extends_list = false +ij_kotlin_align_multiline_method_parentheses = false +ij_kotlin_align_multiline_parameters = true +ij_kotlin_align_multiline_parameters_in_calls = false +ij_kotlin_allow_trailing_comma = false +ij_kotlin_allow_trailing_comma_on_call_site = false +ij_kotlin_assignment_wrap = normal +ij_kotlin_blank_lines_after_class_header = 0 +ij_kotlin_blank_lines_around_block_when_branches = 0 +ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1 +ij_kotlin_block_comment_add_space = false +ij_kotlin_block_comment_at_first_column = true +ij_kotlin_call_parameters_new_line_after_left_paren = true +ij_kotlin_call_parameters_right_paren_on_new_line = true +ij_kotlin_call_parameters_wrap = on_every_item +ij_kotlin_catch_on_new_line = false +ij_kotlin_class_annotation_wrap = split_into_lines +ij_kotlin_continuation_indent_for_chained_calls = false +ij_kotlin_continuation_indent_for_expression_bodies = false +ij_kotlin_continuation_indent_in_argument_lists = false +ij_kotlin_continuation_indent_in_elvis = false +ij_kotlin_continuation_indent_in_if_conditions = false +ij_kotlin_continuation_indent_in_parameter_lists = false +ij_kotlin_continuation_indent_in_supertype_lists = false +ij_kotlin_else_on_new_line = false +ij_kotlin_enum_constants_wrap = off +ij_kotlin_extends_list_wrap = normal +ij_kotlin_field_annotation_wrap = split_into_lines +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_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 +ij_kotlin_keep_blank_lines_in_declarations = 2 +ij_kotlin_keep_first_column_comment = true +ij_kotlin_keep_indents_on_empty_lines = false +ij_kotlin_keep_line_breaks = true +ij_kotlin_lbrace_on_next_line = false +ij_kotlin_line_break_after_multiline_when_entry = true +ij_kotlin_line_comment_add_space = false +ij_kotlin_line_comment_add_space_on_reformat = false +ij_kotlin_line_comment_at_first_column = true +ij_kotlin_method_annotation_wrap = split_into_lines +ij_kotlin_method_call_chain_wrap = normal +ij_kotlin_method_parameters_new_line_after_left_paren = true +ij_kotlin_method_parameters_right_paren_on_new_line = true +ij_kotlin_method_parameters_wrap = on_every_item +ij_kotlin_name_count_to_use_star_import = 5 +ij_kotlin_name_count_to_use_star_import_for_members = 3 +ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.** +ij_kotlin_parameter_annotation_wrap = off +ij_kotlin_space_after_comma = true +ij_kotlin_space_after_extend_colon = true +ij_kotlin_space_after_type_colon = true +ij_kotlin_space_before_catch_parentheses = true +ij_kotlin_space_before_comma = false +ij_kotlin_space_before_extend_colon = true +ij_kotlin_space_before_for_parentheses = true +ij_kotlin_space_before_if_parentheses = true +ij_kotlin_space_before_lambda_arrow = true +ij_kotlin_space_before_type_colon = false +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_equality_operators = true +ij_kotlin_spaces_around_function_type_arrow = true +ij_kotlin_spaces_around_logical_operators = true +ij_kotlin_spaces_around_multiplicative_operators = true +ij_kotlin_spaces_around_range = false +ij_kotlin_spaces_around_relational_operators = true +ij_kotlin_spaces_around_unary_operator = false +ij_kotlin_spaces_around_when_arrow = true +ij_kotlin_variable_annotation_wrap = off +ij_kotlin_while_on_new_line = false +ij_kotlin_wrap_elvis_expressions = 1 +ij_kotlin_wrap_expression_body_functions = 1 +ij_kotlin_wrap_first_method_in_call_chain = false + +[{*.markdown,*.md}] +ij_markdown_force_one_space_after_blockquote_symbol = true +ij_markdown_force_one_space_after_header_symbol = true +ij_markdown_force_one_space_after_list_bullet = true +ij_markdown_force_one_space_between_words = true +ij_markdown_format_tables = true +ij_markdown_insert_quote_arrows_on_wrap = true +ij_markdown_keep_indents_on_empty_lines = false +ij_markdown_keep_line_breaks_inside_text_blocks = true +ij_markdown_max_lines_around_block_elements = 1 +ij_markdown_max_lines_around_header = 1 +ij_markdown_max_lines_between_paragraphs = 1 +ij_markdown_min_lines_around_block_elements = 1 +ij_markdown_min_lines_around_header = 1 +ij_markdown_min_lines_between_paragraphs = 1 +ij_markdown_wrap_text_if_long = true +ij_markdown_wrap_text_inside_blockquotes = true + +[{*.properties,spring.handlers,spring.schemas}] +ij_properties_align_group_field_declarations = false +ij_properties_keep_blank_lines = false +ij_properties_key_value_delimiter = equals +ij_properties_spaces_around_key_value_delimiter = false + +[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}] +ij_toml_keep_indents_on_empty_lines = false + +[{*.yaml,*.yml}] +indent_size = 2 +ij_yaml_align_values_properties = do_not_align +ij_yaml_autoinsert_sequence_marker = true +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_sequence_on_new_line = false +ij_yaml_space_before_colon = false +ij_yaml_spaces_within_braces = true +ij_yaml_spaces_within_brackets = true diff --git a/src/main/java/com/enderio/regilite/Regilite.java b/src/main/java/com/enderio/regilite/Regilite.java index fd64ea4..3131fc6 100644 --- a/src/main/java/com/enderio/regilite/Regilite.java +++ b/src/main/java/com/enderio/regilite/Regilite.java @@ -158,7 +158,7 @@ public void addMenus(Collection, ? extends MenuType item : getItems()) { if (item instanceof RegiliteItem) { - Consumer outputConsumer = ((RegiliteItem) item).getTab().get(event.getTabKey()); + Consumer outputConsumer = ((RegiliteItem)item).getTab().get(event.getTabKey()); if (outputConsumer != null) { outputConsumer.accept(event); } diff --git a/src/main/java/com/enderio/regilite/data/RegiliteBlockLootProvider.java b/src/main/java/com/enderio/regilite/data/RegiliteBlockLootProvider.java index a66a507..7346fc3 100644 --- a/src/main/java/com/enderio/regilite/data/RegiliteBlockLootProvider.java +++ b/src/main/java/com/enderio/regilite/data/RegiliteBlockLootProvider.java @@ -41,7 +41,7 @@ protected void generate() { continue; } - BiConsumer lootTable = ((RegiliteBlock) block).getLootTable(); + BiConsumer lootTable = ((RegiliteBlock)block).getLootTable(); if (lootTable != null) { lootTable.accept(this, block.get()); } @@ -55,7 +55,7 @@ public void generate(BiConsumer, LootTable.Builder> pGene this.generate(); Set> set = new HashSet<>(); - for(DeferredHolder block : registered) { + for (DeferredHolder block : registered) { if (block.get().isEnabled(this.enabledFeatures)) { var lootTableResourceKey = block.get().getLootTable(); if (lootTableResourceKey != BuiltInLootTables.EMPTY && set.add(lootTableResourceKey)) { diff --git a/src/main/java/com/enderio/regilite/data/RegiliteBlockStateProvider.java b/src/main/java/com/enderio/regilite/data/RegiliteBlockStateProvider.java index fdb177c..9d3963a 100644 --- a/src/main/java/com/enderio/regilite/data/RegiliteBlockStateProvider.java +++ b/src/main/java/com/enderio/regilite/data/RegiliteBlockStateProvider.java @@ -6,7 +6,6 @@ package com.enderio.regilite.data; import com.enderio.regilite.holder.RegiliteBlock; -import com.enderio.regilite.registry.BlockRegistry; import net.minecraft.data.PackOutput; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.client.model.generators.BlockStateProvider; @@ -28,7 +27,7 @@ public RegiliteBlockStateProvider(PackOutput output, String modid, ExistingFileH protected void registerStatesAndModels() { for (DeferredHolder block : registered) { if (block instanceof RegiliteBlock) { - BiConsumer> blockstate = ((RegiliteBlock) block).getBlockStateProvider(); + BiConsumer> blockstate = ((RegiliteBlock)block).getBlockStateProvider(); if (blockstate != null) { blockstate.accept(this, new DataGenContext<>(block.getKey().location(), block::get)); } diff --git a/src/main/java/com/enderio/regilite/data/RegiliteDataProvider.java b/src/main/java/com/enderio/regilite/data/RegiliteDataProvider.java index 54c7ff7..99b080d 100644 --- a/src/main/java/com/enderio/regilite/data/RegiliteDataProvider.java +++ b/src/main/java/com/enderio/regilite/data/RegiliteDataProvider.java @@ -19,12 +19,7 @@ import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; diff --git a/src/main/java/com/enderio/regilite/data/RegiliteItemModelProvider.java b/src/main/java/com/enderio/regilite/data/RegiliteItemModelProvider.java index 4f9cb34..83ef042 100644 --- a/src/main/java/com/enderio/regilite/data/RegiliteItemModelProvider.java +++ b/src/main/java/com/enderio/regilite/data/RegiliteItemModelProvider.java @@ -35,7 +35,7 @@ public RegiliteItemModelProvider(PackOutput output, String modid, ExistingFileHe protected void registerModels() { for (DeferredHolder item : registered) { if (item instanceof RegiliteItem) { - var modelProvider = ((RegiliteItem) item).getModelProvider(); + var modelProvider = ((RegiliteItem)item).getModelProvider(); if (modelProvider != null) { modelProvider.accept(this, new DataGenContext<>(item.getKey().location(), item::get)); } @@ -53,14 +53,14 @@ public ItemModelBuilder basicBlock(Item item) { public ItemModelBuilder basicBlock(ResourceLocation item) { return getBuilder(item.toString()) - .parent(new ModelFile.UncheckedModelFile(ResourceLocation.fromNamespaceAndPath( - item.getNamespace(), "block/" + item.getPath()))); + .parent(new ModelFile.UncheckedModelFile(ResourceLocation.fromNamespaceAndPath( + item.getNamespace(), "block/" + item.getPath()))); } public ItemModelBuilder basicItem(Item item, ResourceLocation texture) { return getBuilder(BuiltInRegistries.ITEM.getKey(item).toString()) - .parent(new ModelFile.UncheckedModelFile("item/generated")) - .texture("layer0", texture); + .parent(new ModelFile.UncheckedModelFile("item/generated")) + .texture("layer0", texture); } public ItemModelBuilder handheld(Item item) { diff --git a/src/main/java/com/enderio/regilite/data/RegiliteLangProvider.java b/src/main/java/com/enderio/regilite/data/RegiliteLangProvider.java index 70f1de3..dece5bc 100644 --- a/src/main/java/com/enderio/regilite/data/RegiliteLangProvider.java +++ b/src/main/java/com/enderio/regilite/data/RegiliteLangProvider.java @@ -26,8 +26,9 @@ public void add(Map, String> entries) { @Override protected void addTranslations() { for (Map.Entry, String> entry : langEntries.entrySet()) { - if (!entry.getValue().isEmpty()) + if (!entry.getValue().isEmpty()) { this.add(entry.getKey().get(), entry.getValue()); + } } } } diff --git a/src/main/java/com/enderio/regilite/data/RegiliteTagProvider.java b/src/main/java/com/enderio/regilite/data/RegiliteTagProvider.java index fde987d..98dd1d1 100644 --- a/src/main/java/com/enderio/regilite/data/RegiliteTagProvider.java +++ b/src/main/java/com/enderio/regilite/data/RegiliteTagProvider.java @@ -36,7 +36,7 @@ public RegiliteTagProvider(PackOutput output, ResourceKey> protected void addTags(HolderLookup.Provider lookupProvider) { for (DeferredHolder entry : registered) { if (entry instanceof ITagagble) { - Set> tag = ((ITagagble) entry).getTags(); + Set> tag = ((ITagagble)entry).getTags(); if (tag != null) { tag.forEach(t -> tag(t).add(entry.get())); @@ -58,7 +58,7 @@ public FluidTagProvider(PackOutput output, ResourceKey> key, Fun protected void addTags(HolderLookup.Provider lookupProvider) { for (DeferredHolder entry : registered) { if (entry instanceof RegiliteFluid fluidtype) { - Set> tag = ((ITagagble) entry).getTags(); + Set> tag = ((ITagagble)entry).getTags(); if (tag != null) { tag.forEach(t -> tag(t).add(fluidtype.getSource())); diff --git a/src/main/java/com/enderio/regilite/events/BlockEntityCapabilityEvents.java b/src/main/java/com/enderio/regilite/events/BlockEntityCapabilityEvents.java index 66f1679..4e72c8f 100644 --- a/src/main/java/com/enderio/regilite/events/BlockEntityCapabilityEvents.java +++ b/src/main/java/com/enderio/regilite/events/BlockEntityCapabilityEvents.java @@ -7,7 +7,6 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.holder.RegiliteBlockEntity; -import com.enderio.regilite.registry.BlockEntityRegistry; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; public class BlockEntityCapabilityEvents { diff --git a/src/main/java/com/enderio/regilite/events/ColorEvents.java b/src/main/java/com/enderio/regilite/events/ColorEvents.java index e8aed60..60b7884 100644 --- a/src/main/java/com/enderio/regilite/events/ColorEvents.java +++ b/src/main/java/com/enderio/regilite/events/ColorEvents.java @@ -8,7 +8,6 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.holder.RegiliteBlock; import com.enderio.regilite.holder.RegiliteItem; -import com.enderio.regilite.registry.ItemRegistry; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; @@ -27,9 +26,10 @@ public Items(Regilite regilite) { public void registerItemColor(RegisterColorHandlersEvent.Item event) { for (DeferredHolder item : regilite.getItems()) { if (item instanceof RegiliteItem) { - var colorSupplier = ((RegiliteItem) item).getColorSupplier(); - if (colorSupplier != null) + var colorSupplier = ((RegiliteItem)item).getColorSupplier(); + if (colorSupplier != null) { event.register(colorSupplier.get().get(), item.get()); + } } } } @@ -46,9 +46,10 @@ public Blocks(Regilite regilite) { public void registerBlockColor(RegisterColorHandlersEvent.Block event) { for (DeferredHolder block : regilite.getBlock()) { if (block instanceof RegiliteBlock) { - var colorSupplier = ((RegiliteBlock) block).getColorSupplier(); - if (colorSupplier != null) + var colorSupplier = ((RegiliteBlock)block).getColorSupplier(); + if (colorSupplier != null) { event.register(colorSupplier.get().get(), block.get()); + } } } } diff --git a/src/main/java/com/enderio/regilite/events/ItemCapabilityEvents.java b/src/main/java/com/enderio/regilite/events/ItemCapabilityEvents.java index f6ddcd9..52410a9 100644 --- a/src/main/java/com/enderio/regilite/events/ItemCapabilityEvents.java +++ b/src/main/java/com/enderio/regilite/events/ItemCapabilityEvents.java @@ -7,7 +7,6 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.holder.RegiliteItem; -import com.enderio.regilite.registry.ItemRegistry; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; public class ItemCapabilityEvents { diff --git a/src/main/java/com/enderio/regilite/events/ScreenEvents.java b/src/main/java/com/enderio/regilite/events/ScreenEvents.java index 144980b..a78e881 100644 --- a/src/main/java/com/enderio/regilite/events/ScreenEvents.java +++ b/src/main/java/com/enderio/regilite/events/ScreenEvents.java @@ -7,12 +7,9 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.holder.RegiliteMenu; -import com.enderio.regilite.registry.MenuRegistry; -import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; import net.neoforged.neoforge.registries.DeferredHolder; diff --git a/src/main/java/com/enderio/regilite/holder/RegiliteBlock.java b/src/main/java/com/enderio/regilite/holder/RegiliteBlock.java index a8c2d06..91ba50b 100644 --- a/src/main/java/com/enderio/regilite/holder/RegiliteBlock.java +++ b/src/main/java/com/enderio/regilite/holder/RegiliteBlock.java @@ -7,9 +7,9 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.data.DataGenContext; +import com.enderio.regilite.data.RegiliteBlockLootProvider; import com.enderio.regilite.registry.ITagagble; import com.enderio.regilite.registry.ItemRegistry; -import com.enderio.regilite.data.RegiliteBlockLootProvider; import com.enderio.regilite.utils.DefaultTranslationUtility; import net.minecraft.client.color.block.BlockColor; import net.minecraft.resources.ResourceKey; @@ -38,6 +38,7 @@ public class RegiliteBlock extends DeferredBlock implements private BiConsumer> blockStateProvider = (prov, ctx) -> prov.simpleBlock(ctx.get()); @Nullable private Supplier> colorSupplier; + protected RegiliteBlock(ResourceKey key, Regilite regilite) { super(key); this.regilite = regilite; diff --git a/src/main/java/com/enderio/regilite/holder/RegiliteBlockEntity.java b/src/main/java/com/enderio/regilite/holder/RegiliteBlockEntity.java index dd01355..864e3cb 100644 --- a/src/main/java/com/enderio/regilite/holder/RegiliteBlockEntity.java +++ b/src/main/java/com/enderio/regilite/holder/RegiliteBlockEntity.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; diff --git a/src/main/java/com/enderio/regilite/holder/RegiliteFluid.java b/src/main/java/com/enderio/regilite/holder/RegiliteFluid.java index 921fef0..990fc4b 100644 --- a/src/main/java/com/enderio/regilite/holder/RegiliteFluid.java +++ b/src/main/java/com/enderio/regilite/holder/RegiliteFluid.java @@ -57,7 +57,8 @@ public RegiliteFluid createFluid(DeferredRegister register, Consumer createFluid(DeferredRegister register) { - return this.createFluid(register, properties1 -> {}); + return this.createFluid(register, properties1 -> { + }); } public BaseFlowingFluid.Source getSource() { @@ -79,7 +80,8 @@ public LiquidBlock getBlock() { // region Block public RegiliteFluid withBlock(BlockRegistry registry, BlockBehaviour.Properties properties) { - return withBlock(registry, f -> new LiquidBlock(f.get(), properties), b -> {}); + return withBlock(registry, f -> new LiquidBlock(f.get(), properties), b -> { + }); } public RegiliteFluid withBlock(BlockRegistry registry, BlockBehaviour.Properties properties, Consumer> blockConfigure) { @@ -87,7 +89,8 @@ public RegiliteFluid withBlock(BlockRegistry registry, BlockBehaviour.Propert } public RegiliteFluid withBlock(BlockRegistry registry, Function, ? extends LiquidBlock> supplier) { - return withBlock(registry, supplier, b -> {}); + return withBlock(registry, supplier, b -> { + }); } public RegiliteFluid withBlock(BlockRegistry registry, Function, ? extends LiquidBlock> supplier, Consumer> blockConfigure) { @@ -101,7 +104,8 @@ public RegiliteFluid withBlock(BlockRegistry registry, Function withBucket(ItemRegistry registry) { - return withCustomBucket(registry, f -> new BucketItem(f.get(), new Item.Properties().stacksTo(1)), i -> {}); + return withCustomBucket(registry, f -> new BucketItem(f.get(), new Item.Properties().stacksTo(1)), i -> { + }); } public RegiliteFluid withBucket(ItemRegistry registry, Consumer> itemConfigure) { @@ -109,11 +113,13 @@ public RegiliteFluid withBucket(ItemRegistry registry, Consumer withBucket(ItemRegistry registry, Item.Properties properties) { - return withCustomBucket(registry, f -> new BucketItem(f.get(), properties), i -> {}); + return withCustomBucket(registry, f -> new BucketItem(f.get(), properties), i -> { + }); } public RegiliteFluid withCustomBucket(ItemRegistry registry, Function, I> supplier) { - return withCustomBucket(registry, supplier, i -> {}); + return withCustomBucket(registry, supplier, i -> { + }); } public RegiliteFluid withCustomBucket(ItemRegistry registry, Function, I> supplier, Consumer> itemConfigure) { diff --git a/src/main/java/com/enderio/regilite/holder/RegiliteHolder.java b/src/main/java/com/enderio/regilite/holder/RegiliteHolder.java index 17a8ca3..b33b811 100644 --- a/src/main/java/com/enderio/regilite/holder/RegiliteHolder.java +++ b/src/main/java/com/enderio/regilite/holder/RegiliteHolder.java @@ -7,6 +7,7 @@ public interface RegiliteHolder> { /** * Mutate this object using the provided applicator. * This can be used to collect common combinations of modifications together to reduce repetition. + * * @param applicator An applicator that will modify the object. * @return The object. */ diff --git a/src/main/java/com/enderio/regilite/holder/RegiliteItem.java b/src/main/java/com/enderio/regilite/holder/RegiliteItem.java index 2d9f0b8..80d7937 100644 --- a/src/main/java/com/enderio/regilite/holder/RegiliteItem.java +++ b/src/main/java/com/enderio/regilite/holder/RegiliteItem.java @@ -7,13 +7,15 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.data.DataGenContext; -import com.enderio.regilite.registry.ITagagble; import com.enderio.regilite.data.RegiliteItemModelProvider; +import com.enderio.regilite.registry.ITagagble; import com.enderio.regilite.utils.DefaultTranslationUtility; import net.minecraft.client.color.item.ItemColor; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.*; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.capabilities.ICapabilityProvider; import net.neoforged.neoforge.capabilities.ItemCapability; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; diff --git a/src/main/java/com/enderio/regilite/registry/BlockEntityRegistry.java b/src/main/java/com/enderio/regilite/registry/BlockEntityRegistry.java index a5054d5..c14c043 100644 --- a/src/main/java/com/enderio/regilite/registry/BlockEntityRegistry.java +++ b/src/main/java/com/enderio/regilite/registry/BlockEntityRegistry.java @@ -53,7 +53,7 @@ private RegiliteBlockEntity registerBlockEntity(Strin //TODO steam mess, can this be cleaner? @SafeVarargs public final RegiliteBlockEntity registerBlockEntity(String name, BlockEntityType.BlockEntitySupplier sup, Supplier... blocks) { - return this.registerBlockEntity(name, () -> BlockEntityType.Builder.of(sup, Arrays.stream(blocks).map(Supplier::get).toList().toArray(new Block[] {})).build(null)); + return this.registerBlockEntity(name, () -> BlockEntityType.Builder.of(sup, Arrays.stream(blocks).map(Supplier::get).toList().toArray(new Block[]{})).build(null)); } public RegiliteBlockEntity registerBlockEntity(String name, Supplier> supplier) { diff --git a/src/main/java/com/enderio/regilite/registry/BlockRegistry.java b/src/main/java/com/enderio/regilite/registry/BlockRegistry.java index d0eed23..60d6a1d 100644 --- a/src/main/java/com/enderio/regilite/registry/BlockRegistry.java +++ b/src/main/java/com/enderio/regilite/registry/BlockRegistry.java @@ -7,21 +7,16 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.holder.RegiliteBlock; -import com.enderio.regilite.holder.RegiliteFluid; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.FlowingFluid; import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; -import java.util.Objects; import java.util.function.Function; import java.util.function.Supplier; @@ -44,7 +39,7 @@ protected BlockRegistry(Regilite regilite) { @SuppressWarnings("unchecked") @Override public RegiliteBlock register(String name, Function func) { - return ((RegiliteBlock) super.register(name, func)); + return ((RegiliteBlock)super.register(name, func)); } /** diff --git a/src/main/java/com/enderio/regilite/registry/FluidRegistry.java b/src/main/java/com/enderio/regilite/registry/FluidRegistry.java index 3cc5779..e8acbf5 100644 --- a/src/main/java/com/enderio/regilite/registry/FluidRegistry.java +++ b/src/main/java/com/enderio/regilite/registry/FluidRegistry.java @@ -20,7 +20,7 @@ import java.util.function.Function; import java.util.function.Supplier; -public class FluidRegistry extends DeferredRegister{ +public class FluidRegistry extends DeferredRegister { private final Regilite regilite; @@ -35,7 +35,7 @@ public static FluidRegistry create(Regilite regilite) { @Override public RegiliteFluid register(String name, Function func) { - return (RegiliteFluid) super.register(name, func); + return (RegiliteFluid)super.register(name, func); } @Override diff --git a/src/main/java/com/enderio/regilite/registry/ITagagble.java b/src/main/java/com/enderio/regilite/registry/ITagagble.java index 8597720..72f7157 100644 --- a/src/main/java/com/enderio/regilite/registry/ITagagble.java +++ b/src/main/java/com/enderio/regilite/registry/ITagagble.java @@ -5,9 +5,7 @@ package com.enderio.regilite.registry; -import com.enderio.regilite.holder.RegiliteEntity; import net.minecraft.tags.TagKey; -import net.minecraft.world.entity.EntityType; import java.util.Set; diff --git a/src/main/java/com/enderio/regilite/registry/ItemRegistry.java b/src/main/java/com/enderio/regilite/registry/ItemRegistry.java index 72a4ee6..90ddee3 100644 --- a/src/main/java/com/enderio/regilite/registry/ItemRegistry.java +++ b/src/main/java/com/enderio/regilite/registry/ItemRegistry.java @@ -7,17 +7,14 @@ import com.enderio.regilite.Regilite; import com.enderio.regilite.holder.RegiliteBlock; -import com.enderio.regilite.holder.RegiliteFluid; import com.enderio.regilite.holder.RegiliteItem; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; @@ -45,7 +42,7 @@ protected ItemRegistry(Regilite regilite) { @SuppressWarnings("unchecked") @Override public RegiliteItem register(String name, Function func) { - return (RegiliteItem) super.register(name, func); + return (RegiliteItem)super.register(name, func); } /** diff --git a/src/test/java/com/enderio/regilite/examplemod/BlockEntities.java b/src/test/java/com/enderio/regilite/examplemod/BlockEntities.java index dfcda95..6761852 100644 --- a/src/test/java/com/enderio/regilite/examplemod/BlockEntities.java +++ b/src/test/java/com/enderio/regilite/examplemod/BlockEntities.java @@ -6,8 +6,8 @@ package com.enderio.regilite.examplemod; import com.enderio.regilite.examplemod.exampleclasses.ExampleBlockentity; -import com.enderio.regilite.registry.BlockEntityRegistry; import com.enderio.regilite.holder.RegiliteBlockEntity; +import com.enderio.regilite.registry.BlockEntityRegistry; import net.neoforged.bus.api.IEventBus; public class BlockEntities { diff --git a/src/test/java/com/enderio/regilite/examplemod/Blocks.java b/src/test/java/com/enderio/regilite/examplemod/Blocks.java index fd06b83..d16a532 100644 --- a/src/test/java/com/enderio/regilite/examplemod/Blocks.java +++ b/src/test/java/com/enderio/regilite/examplemod/Blocks.java @@ -5,11 +5,11 @@ package com.enderio.regilite.examplemod; +import com.enderio.regilite.data.RegiliteBlockLootProvider; import com.enderio.regilite.examplemod.exampleclasses.ExampleBlock; import com.enderio.regilite.examplemod.exampleclasses.ExampleColors; -import com.enderio.regilite.data.RegiliteBlockLootProvider; -import com.enderio.regilite.registry.BlockRegistry; import com.enderio.regilite.holder.RegiliteBlock; +import com.enderio.regilite.registry.BlockRegistry; import com.enderio.regilite.registry.ItemRegistry; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; @@ -19,8 +19,8 @@ import net.neoforged.bus.api.IEventBus; public class Blocks { - public static final BlockRegistry BLOCKS = ExampleMod.getRegilite().blockRegistry(); - public static final ItemRegistry ITEMS = ExampleMod.getRegilite().itemRegistry(); + public static final BlockRegistry BLOCKS = ExampleMod.getRegilite().blockRegistry(); + public static final ItemRegistry ITEMS = ExampleMod.getRegilite().itemRegistry(); public static final RegiliteBlock EXAMPLE_BLOCK = BLOCKS .registerBlock("example_block", ExampleBlock::new, BlockBehaviour.Properties.of().mapColor(MapColor.STONE)) diff --git a/src/test/java/com/enderio/regilite/examplemod/CreativeTabs.java b/src/test/java/com/enderio/regilite/examplemod/CreativeTabs.java index cb8e83c..e6689a1 100644 --- a/src/test/java/com/enderio/regilite/examplemod/CreativeTabs.java +++ b/src/test/java/com/enderio/regilite/examplemod/CreativeTabs.java @@ -5,7 +5,6 @@ package com.enderio.regilite.examplemod; -import com.enderio.regilite.data.RegiliteDataProvider; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/test/java/com/enderio/regilite/examplemod/ExampleMod.java b/src/test/java/com/enderio/regilite/examplemod/ExampleMod.java index 93af35a..bf36f04 100644 --- a/src/test/java/com/enderio/regilite/examplemod/ExampleMod.java +++ b/src/test/java/com/enderio/regilite/examplemod/ExampleMod.java @@ -6,7 +6,6 @@ package com.enderio.regilite.examplemod; import com.enderio.regilite.Regilite; -import com.enderio.regilite.data.RegiliteDataProvider; import com.mojang.logging.LogUtils; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; @@ -14,8 +13,7 @@ // The value here should match an entry in the META-INF/neoforge.mods.toml file @Mod(ExampleMod.MODID) -public class ExampleMod -{ +public class ExampleMod { public static final String MODID = "examplemod"; private static final Logger LOGGER = LogUtils.getLogger(); public static final Regilite regilite = new Regilite(MODID); diff --git a/src/test/java/com/enderio/regilite/examplemod/Fluids.java b/src/test/java/com/enderio/regilite/examplemod/Fluids.java index f4bc6c0..eec8202 100644 --- a/src/test/java/com/enderio/regilite/examplemod/Fluids.java +++ b/src/test/java/com/enderio/regilite/examplemod/Fluids.java @@ -5,16 +5,13 @@ package com.enderio.regilite.examplemod; -import com.enderio.regilite.registry.BlockRegistry; import com.enderio.regilite.holder.RegiliteFluid; +import com.enderio.regilite.registry.BlockRegistry; import com.enderio.regilite.registry.FluidRegistry; import com.enderio.regilite.registry.ItemRegistry; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.item.BucketItem; -import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Fluid; import net.neoforged.bus.api.IEventBus; @@ -22,7 +19,7 @@ import net.neoforged.neoforge.registries.DeferredRegister; public class Fluids { - private static final FluidRegistry FLUIDTYPES = ExampleMod.getRegilite().fluidRegistry(); + private static final FluidRegistry FLUIDTYPES = ExampleMod.getRegilite().fluidRegistry(); private static final DeferredRegister FLUIDS = DeferredRegister.create(BuiltInRegistries.FLUID.key(), ExampleMod.MODID); public static final BlockRegistry BLOCKS = ExampleMod.getRegilite().blockRegistry(); public static final ItemRegistry ITEMS = ExampleMod.getRegilite().itemRegistry(); diff --git a/src/test/java/com/enderio/regilite/examplemod/exampleclasses/ExampleBlock.java b/src/test/java/com/enderio/regilite/examplemod/exampleclasses/ExampleBlock.java index 607cbe5..ec348db 100644 --- a/src/test/java/com/enderio/regilite/examplemod/exampleclasses/ExampleBlock.java +++ b/src/test/java/com/enderio/regilite/examplemod/exampleclasses/ExampleBlock.java @@ -8,7 +8,6 @@ import com.enderio.regilite.examplemod.BlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.player.Player; diff --git a/src/test/resources/META-INF/neoforge.mods.toml b/src/test/resources/META-INF/neoforge.mods.toml index 248bd39..d0f8fdd 100644 --- a/src/test/resources/META-INF/neoforge.mods.toml +++ b/src/test/resources/META-INF/neoforge.mods.toml @@ -1,15 +1,15 @@ -modLoader="javafml" -loaderVersion="${loader_version_range}" -license="N/A" +modLoader = "javafml" +loaderVersion = "${loader_version_range}" +license = "N/A" [[mods]] -modId="examplemod" -version="1.0" -displayName="Example Mod" -description='''Test mod for Regilite''' +modId = "examplemod" +version = "1.0" +displayName = "Example Mod" +description = '''Test mod for Regilite''' [[dependencies.examplemod]] - modId="minecraft" - type="required" #mandatory - versionRange="${minecraft_version_range}" - ordering="NONE" - side="BOTH" +modId = "minecraft" +type = "required" #mandatory +versionRange = "${minecraft_version_range}" +ordering = "NONE" +side = "BOTH"