diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..320035c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,992 @@ +[*] +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 = false +ij_smart_tabs = false +ij_visual_guides = none +ij_wrap_on_typing = false + +[*.java] +ij_visual_guides = 120 +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_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_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 = 1 +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 = 0 +ij_java_blank_lines_around_method = 1 +ij_java_blank_lines_around_method_in_interface = 1 +ij_java_blank_lines_before_class_end = 1 +ij_java_blank_lines_before_imports = 1 +ij_java_blank_lines_before_method_body = 1 +ij_java_blank_lines_before_package = 0 +ij_java_block_brace_style = end_of_line +ij_java_block_comment_at_first_column = true +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_do_not_indent_top_level_class_members = false +ij_java_do_not_wrap_after_single_annotation = false +ij_java_do_while_brace_force = if_multiline +ij_java_doc_add_blank_line_after_description = true +ij_java_doc_add_blank_line_after_param_comments = true +ij_java_doc_add_blank_line_after_return = true +ij_java_doc_add_p_tag_on_empty_lines = false +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_suffix = EJB +ij_java_entity_eb_suffix = Bean +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_pk_class = java.lang.String +ij_java_entity_vo_suffix = VO +ij_java_enum_constants_wrap = on_every_item +ij_java_extends_keyword_wrap = off +ij_java_extends_list_wrap = off +ij_java_field_annotation_wrap = split_into_lines +ij_java_finally_on_new_line = false +ij_java_for_brace_force = if_multiline +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 = if_multiline +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_control_statement_in_one_line = false +ij_java_keep_first_column_comment = false +ij_java_keep_indents_on_empty_lines = true +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 = true +ij_java_keep_simple_lambdas_in_one_line = true +ij_java_keep_simple_methods_in_one_line = true +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_at_first_column = true +ij_java_message_dd_suffix = EJB +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 = on_every_item +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_names_count_to_use_import_on_demand = 999 +ij_java_new_line_after_lparen_in_record_header = false +ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.* +ij_java_parameter_annotation_wrap = off +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_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_record_header = false +ij_java_session_dd_suffix = EJB +ij_java_session_eb_suffix = Bean +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_si_suffix = Service +ij_java_space_after_closing_angle_bracket_in_type_argument = true +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 = true +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 = true +ij_java_space_before_catch_keyword = true +ij_java_space_before_catch_left_brace = true +ij_java_space_before_catch_parentheses = false +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_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 = false +ij_java_space_before_for_semicolon = false +ij_java_space_before_if_left_brace = true +ij_java_space_before_if_parentheses = false +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 = false +ij_java_space_before_synchronized_left_brace = true +ij_java_space_before_synchronized_parentheses = false +ij_java_space_before_try_left_brace = true +ij_java_space_before_try_parentheses = false +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 = false +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_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_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_subclass_name_suffix = Impl +ij_java_ternary_operation_signs_on_next_line = false +ij_java_ternary_operation_wrap = off +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 = if_multiline +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 + +[*.nbtt] +ij_continuation_indent_size = 4 +ij_visual_guides = 120 +ij_nbtt_keep_indents_on_empty_lines = false +ij_nbtt_space_after_colon = true +ij_nbtt_space_after_comma = true +ij_nbtt_space_before_colon = true +ij_nbtt_space_before_comma = false +ij_nbtt_spaces_within_brackets = false +ij_nbtt_spaces_within_parentheses = 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,*.wsdd,*.wsdl,*.xjb,*.xml,*.xsd,*.xsl,*.xslt,*.xul}] +ij_xml_align_attributes = true +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +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 + +[{*.ats,*.ts}] +ij_continuation_indent_size = 4 +ij_typescript_align_imports = false +ij_typescript_align_multiline_array_initializer_expression = false +ij_typescript_align_multiline_binary_operation = false +ij_typescript_align_multiline_chained_methods = false +ij_typescript_align_multiline_extends_list = false +ij_typescript_align_multiline_for = true +ij_typescript_align_multiline_parameters = true +ij_typescript_align_multiline_parameters_in_calls = false +ij_typescript_align_multiline_ternary_operation = false +ij_typescript_align_object_properties = 0 +ij_typescript_align_union_types = false +ij_typescript_align_var_statements = 0 +ij_typescript_array_initializer_new_line_after_left_brace = false +ij_typescript_array_initializer_right_brace_on_new_line = false +ij_typescript_array_initializer_wrap = off +ij_typescript_assignment_wrap = off +ij_typescript_binary_operation_sign_on_next_line = false +ij_typescript_binary_operation_wrap = off +ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_typescript_blank_lines_after_imports = 1 +ij_typescript_blank_lines_around_class = 1 +ij_typescript_blank_lines_around_field = 0 +ij_typescript_blank_lines_around_field_in_interface = 0 +ij_typescript_blank_lines_around_function = 1 +ij_typescript_blank_lines_around_method = 1 +ij_typescript_blank_lines_around_method_in_interface = 1 +ij_typescript_block_brace_style = end_of_line +ij_typescript_call_parameters_new_line_after_left_paren = false +ij_typescript_call_parameters_right_paren_on_new_line = false +ij_typescript_call_parameters_wrap = off +ij_typescript_catch_on_new_line = false +ij_typescript_chained_call_dot_on_new_line = true +ij_typescript_class_brace_style = end_of_line +ij_typescript_comma_on_new_line = false +ij_typescript_do_while_brace_force = never +ij_typescript_else_on_new_line = false +ij_typescript_enforce_trailing_comma = keep +ij_typescript_extends_keyword_wrap = off +ij_typescript_extends_list_wrap = off +ij_typescript_field_prefix = _ +ij_typescript_file_name_style = relaxed +ij_typescript_finally_on_new_line = false +ij_typescript_for_brace_force = never +ij_typescript_for_statement_new_line_after_left_paren = false +ij_typescript_for_statement_right_paren_on_new_line = false +ij_typescript_for_statement_wrap = off +ij_typescript_force_quote_style = false +ij_typescript_force_semicolon_style = false +ij_typescript_function_expression_brace_style = end_of_line +ij_typescript_if_brace_force = never +ij_typescript_import_merge_members = global +ij_typescript_import_prefer_absolute_path = global +ij_typescript_import_sort_members = true +ij_typescript_import_sort_module_name = false +ij_typescript_import_use_node_resolution = true +ij_typescript_imports_wrap = on_every_item +ij_typescript_indent_case_from_switch = true +ij_typescript_indent_chained_calls = true +ij_typescript_indent_package_children = 0 +ij_typescript_jsdoc_include_types = false +ij_typescript_jsx_attribute_value = braces +ij_typescript_keep_blank_lines_in_code = 2 +ij_typescript_keep_first_column_comment = true +ij_typescript_keep_indents_on_empty_lines = false +ij_typescript_keep_line_breaks = true +ij_typescript_keep_simple_blocks_in_one_line = false +ij_typescript_keep_simple_methods_in_one_line = false +ij_typescript_line_comment_add_space = true +ij_typescript_line_comment_at_first_column = false +ij_typescript_method_brace_style = end_of_line +ij_typescript_method_call_chain_wrap = off +ij_typescript_method_parameters_new_line_after_left_paren = false +ij_typescript_method_parameters_right_paren_on_new_line = false +ij_typescript_method_parameters_wrap = off +ij_typescript_object_literal_wrap = on_every_item +ij_typescript_parentheses_expression_new_line_after_left_paren = false +ij_typescript_parentheses_expression_right_paren_on_new_line = false +ij_typescript_place_assignment_sign_on_next_line = false +ij_typescript_prefer_as_type_cast = false +ij_typescript_prefer_explicit_types_function_expression_returns = false +ij_typescript_prefer_explicit_types_function_returns = false +ij_typescript_prefer_explicit_types_vars_fields = false +ij_typescript_prefer_parameters_wrap = false +ij_typescript_reformat_c_style_comments = false +ij_typescript_space_after_colon = true +ij_typescript_space_after_comma = true +ij_typescript_space_after_dots_in_rest_parameter = false +ij_typescript_space_after_generator_mult = true +ij_typescript_space_after_property_colon = true +ij_typescript_space_after_quest = true +ij_typescript_space_after_type_colon = true +ij_typescript_space_after_unary_not = false +ij_typescript_space_before_async_arrow_lparen = true +ij_typescript_space_before_catch_keyword = true +ij_typescript_space_before_catch_left_brace = true +ij_typescript_space_before_catch_parentheses = true +ij_typescript_space_before_class_lbrace = true +ij_typescript_space_before_class_left_brace = true +ij_typescript_space_before_colon = true +ij_typescript_space_before_comma = false +ij_typescript_space_before_do_left_brace = true +ij_typescript_space_before_else_keyword = true +ij_typescript_space_before_else_left_brace = true +ij_typescript_space_before_finally_keyword = true +ij_typescript_space_before_finally_left_brace = true +ij_typescript_space_before_for_left_brace = true +ij_typescript_space_before_for_parentheses = true +ij_typescript_space_before_for_semicolon = false +ij_typescript_space_before_function_left_parenth = true +ij_typescript_space_before_generator_mult = false +ij_typescript_space_before_if_left_brace = true +ij_typescript_space_before_if_parentheses = true +ij_typescript_space_before_method_call_parentheses = false +ij_typescript_space_before_method_left_brace = true +ij_typescript_space_before_method_parentheses = false +ij_typescript_space_before_property_colon = false +ij_typescript_space_before_quest = true +ij_typescript_space_before_switch_left_brace = true +ij_typescript_space_before_switch_parentheses = true +ij_typescript_space_before_try_left_brace = true +ij_typescript_space_before_type_colon = false +ij_typescript_space_before_unary_not = false +ij_typescript_space_before_while_keyword = true +ij_typescript_space_before_while_left_brace = true +ij_typescript_space_before_while_parentheses = true +ij_typescript_spaces_around_additive_operators = true +ij_typescript_spaces_around_arrow_function_operator = true +ij_typescript_spaces_around_assignment_operators = true +ij_typescript_spaces_around_bitwise_operators = true +ij_typescript_spaces_around_equality_operators = true +ij_typescript_spaces_around_logical_operators = true +ij_typescript_spaces_around_multiplicative_operators = true +ij_typescript_spaces_around_relational_operators = true +ij_typescript_spaces_around_shift_operators = true +ij_typescript_spaces_around_unary_operator = false +ij_typescript_spaces_within_array_initializer_brackets = false +ij_typescript_spaces_within_brackets = false +ij_typescript_spaces_within_catch_parentheses = false +ij_typescript_spaces_within_for_parentheses = false +ij_typescript_spaces_within_if_parentheses = false +ij_typescript_spaces_within_imports = false +ij_typescript_spaces_within_interpolation_expressions = false +ij_typescript_spaces_within_method_call_parentheses = false +ij_typescript_spaces_within_method_parentheses = false +ij_typescript_spaces_within_object_literal_braces = false +ij_typescript_spaces_within_object_type_braces = true +ij_typescript_spaces_within_parentheses = false +ij_typescript_spaces_within_switch_parentheses = false +ij_typescript_spaces_within_type_assertion = false +ij_typescript_spaces_within_union_types = true +ij_typescript_spaces_within_while_parentheses = false +ij_typescript_special_else_if_treatment = true +ij_typescript_ternary_operation_signs_on_next_line = false +ij_typescript_ternary_operation_wrap = off +ij_typescript_union_types_wrap = on_every_item +ij_typescript_use_chained_calls_group_indents = false +ij_typescript_use_double_quotes = true +ij_typescript_use_explicit_js_extension = global +ij_typescript_use_path_mapping = always +ij_typescript_use_public_modifier = false +ij_typescript_use_semicolon_after_statement = true +ij_typescript_var_declaration_wrap = normal +ij_typescript_while_brace_force = never +ij_typescript_while_on_new_line = false +ij_typescript_wrap_comments = false + +[{*.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 + +[{*.cjs,*.js}] +ij_continuation_indent_size = 4 +ij_javascript_align_imports = false +ij_javascript_align_multiline_array_initializer_expression = false +ij_javascript_align_multiline_binary_operation = false +ij_javascript_align_multiline_chained_methods = false +ij_javascript_align_multiline_extends_list = false +ij_javascript_align_multiline_for = true +ij_javascript_align_multiline_parameters = true +ij_javascript_align_multiline_parameters_in_calls = false +ij_javascript_align_multiline_ternary_operation = false +ij_javascript_align_object_properties = 0 +ij_javascript_align_union_types = false +ij_javascript_align_var_statements = 0 +ij_javascript_array_initializer_new_line_after_left_brace = false +ij_javascript_array_initializer_right_brace_on_new_line = false +ij_javascript_array_initializer_wrap = off +ij_javascript_assignment_wrap = off +ij_javascript_binary_operation_sign_on_next_line = false +ij_javascript_binary_operation_wrap = off +ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_javascript_blank_lines_after_imports = 1 +ij_javascript_blank_lines_around_class = 1 +ij_javascript_blank_lines_around_field = 0 +ij_javascript_blank_lines_around_function = 1 +ij_javascript_blank_lines_around_method = 1 +ij_javascript_block_brace_style = end_of_line +ij_javascript_call_parameters_new_line_after_left_paren = false +ij_javascript_call_parameters_right_paren_on_new_line = false +ij_javascript_call_parameters_wrap = off +ij_javascript_catch_on_new_line = false +ij_javascript_chained_call_dot_on_new_line = true +ij_javascript_class_brace_style = end_of_line +ij_javascript_comma_on_new_line = false +ij_javascript_do_while_brace_force = never +ij_javascript_else_on_new_line = false +ij_javascript_enforce_trailing_comma = keep +ij_javascript_extends_keyword_wrap = off +ij_javascript_extends_list_wrap = off +ij_javascript_field_prefix = _ +ij_javascript_file_name_style = relaxed +ij_javascript_finally_on_new_line = false +ij_javascript_for_brace_force = never +ij_javascript_for_statement_new_line_after_left_paren = false +ij_javascript_for_statement_right_paren_on_new_line = false +ij_javascript_for_statement_wrap = off +ij_javascript_force_quote_style = false +ij_javascript_force_semicolon_style = false +ij_javascript_function_expression_brace_style = end_of_line +ij_javascript_if_brace_force = never +ij_javascript_import_merge_members = global +ij_javascript_import_prefer_absolute_path = global +ij_javascript_import_sort_members = true +ij_javascript_import_sort_module_name = false +ij_javascript_import_use_node_resolution = true +ij_javascript_imports_wrap = on_every_item +ij_javascript_indent_case_from_switch = true +ij_javascript_indent_chained_calls = true +ij_javascript_indent_package_children = 0 +ij_javascript_jsx_attribute_value = braces +ij_javascript_keep_blank_lines_in_code = 2 +ij_javascript_keep_first_column_comment = true +ij_javascript_keep_indents_on_empty_lines = false +ij_javascript_keep_line_breaks = true +ij_javascript_keep_simple_blocks_in_one_line = false +ij_javascript_keep_simple_methods_in_one_line = false +ij_javascript_line_comment_add_space = true +ij_javascript_line_comment_at_first_column = false +ij_javascript_method_brace_style = end_of_line +ij_javascript_method_call_chain_wrap = off +ij_javascript_method_parameters_new_line_after_left_paren = false +ij_javascript_method_parameters_right_paren_on_new_line = false +ij_javascript_method_parameters_wrap = off +ij_javascript_object_literal_wrap = on_every_item +ij_javascript_parentheses_expression_new_line_after_left_paren = false +ij_javascript_parentheses_expression_right_paren_on_new_line = false +ij_javascript_place_assignment_sign_on_next_line = false +ij_javascript_prefer_as_type_cast = false +ij_javascript_prefer_explicit_types_function_expression_returns = false +ij_javascript_prefer_explicit_types_function_returns = false +ij_javascript_prefer_explicit_types_vars_fields = false +ij_javascript_prefer_parameters_wrap = false +ij_javascript_reformat_c_style_comments = false +ij_javascript_space_after_colon = true +ij_javascript_space_after_comma = true +ij_javascript_space_after_dots_in_rest_parameter = false +ij_javascript_space_after_generator_mult = true +ij_javascript_space_after_property_colon = true +ij_javascript_space_after_quest = true +ij_javascript_space_after_type_colon = true +ij_javascript_space_after_unary_not = false +ij_javascript_space_before_async_arrow_lparen = true +ij_javascript_space_before_catch_keyword = true +ij_javascript_space_before_catch_left_brace = true +ij_javascript_space_before_catch_parentheses = true +ij_javascript_space_before_class_lbrace = true +ij_javascript_space_before_class_left_brace = true +ij_javascript_space_before_colon = true +ij_javascript_space_before_comma = false +ij_javascript_space_before_do_left_brace = true +ij_javascript_space_before_else_keyword = true +ij_javascript_space_before_else_left_brace = true +ij_javascript_space_before_finally_keyword = true +ij_javascript_space_before_finally_left_brace = true +ij_javascript_space_before_for_left_brace = true +ij_javascript_space_before_for_parentheses = true +ij_javascript_space_before_for_semicolon = false +ij_javascript_space_before_function_left_parenth = true +ij_javascript_space_before_generator_mult = false +ij_javascript_space_before_if_left_brace = true +ij_javascript_space_before_if_parentheses = true +ij_javascript_space_before_method_call_parentheses = false +ij_javascript_space_before_method_left_brace = true +ij_javascript_space_before_method_parentheses = false +ij_javascript_space_before_property_colon = false +ij_javascript_space_before_quest = true +ij_javascript_space_before_switch_left_brace = true +ij_javascript_space_before_switch_parentheses = true +ij_javascript_space_before_try_left_brace = true +ij_javascript_space_before_type_colon = false +ij_javascript_space_before_unary_not = false +ij_javascript_space_before_while_keyword = true +ij_javascript_space_before_while_left_brace = true +ij_javascript_space_before_while_parentheses = true +ij_javascript_spaces_around_additive_operators = true +ij_javascript_spaces_around_arrow_function_operator = true +ij_javascript_spaces_around_assignment_operators = true +ij_javascript_spaces_around_bitwise_operators = true +ij_javascript_spaces_around_equality_operators = true +ij_javascript_spaces_around_logical_operators = true +ij_javascript_spaces_around_multiplicative_operators = true +ij_javascript_spaces_around_relational_operators = true +ij_javascript_spaces_around_shift_operators = true +ij_javascript_spaces_around_unary_operator = false +ij_javascript_spaces_within_array_initializer_brackets = false +ij_javascript_spaces_within_brackets = false +ij_javascript_spaces_within_catch_parentheses = false +ij_javascript_spaces_within_for_parentheses = false +ij_javascript_spaces_within_if_parentheses = false +ij_javascript_spaces_within_imports = false +ij_javascript_spaces_within_interpolation_expressions = false +ij_javascript_spaces_within_method_call_parentheses = false +ij_javascript_spaces_within_method_parentheses = false +ij_javascript_spaces_within_object_literal_braces = false +ij_javascript_spaces_within_object_type_braces = true +ij_javascript_spaces_within_parentheses = false +ij_javascript_spaces_within_switch_parentheses = false +ij_javascript_spaces_within_type_assertion = false +ij_javascript_spaces_within_union_types = true +ij_javascript_spaces_within_while_parentheses = false +ij_javascript_special_else_if_treatment = true +ij_javascript_ternary_operation_signs_on_next_line = false +ij_javascript_ternary_operation_wrap = off +ij_javascript_union_types_wrap = on_every_item +ij_javascript_use_chained_calls_group_indents = false +ij_javascript_use_double_quotes = true +ij_javascript_use_explicit_js_extension = global +ij_javascript_use_path_mapping = always +ij_javascript_use_public_modifier = false +ij_javascript_use_semicolon_after_statement = true +ij_javascript_var_declaration_wrap = normal +ij_javascript_while_brace_force = never +ij_javascript_while_on_new_line = false +ij_javascript_wrap_comments = false + +[{*.comp,*.frag,*.fsh,*.geom,*.glsl,*.shader,*.tesc,*.tese,*.vert,*.vsh}] +ij_glsl_keep_indents_on_empty_lines = false + +[{*.ft,*.vm,*.vsl}] +ij_vtl_keep_indents_on_empty_lines = false + +[{*.gant,*.gradle,*.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_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 = 5 +ij_groovy_do_while_brace_force = never +ij_groovy_else_on_new_line = false +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_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_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 = 3 +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 = true +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_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_long_lines = false + +[{*.gradle.kts,*.kt,*.kts,*.main.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 = off +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_at_first_column = true +ij_kotlin_call_parameters_new_line_after_left_paren = false +ij_kotlin_call_parameters_right_paren_on_new_line = false +ij_kotlin_call_parameters_wrap = off +ij_kotlin_catch_on_new_line = false +ij_kotlin_class_annotation_wrap = split_into_lines +ij_kotlin_continuation_indent_for_chained_calls = true +ij_kotlin_continuation_indent_for_expression_bodies = true +ij_kotlin_continuation_indent_in_argument_lists = true +ij_kotlin_continuation_indent_in_elvis = true +ij_kotlin_continuation_indent_in_if_conditions = true +ij_kotlin_continuation_indent_in_parameter_lists = true +ij_kotlin_continuation_indent_in_supertype_lists = true +ij_kotlin_else_on_new_line = false +ij_kotlin_enum_constants_wrap = off +ij_kotlin_extends_list_wrap = off +ij_kotlin_field_annotation_wrap = split_into_lines +ij_kotlin_finally_on_new_line = false +ij_kotlin_if_rparen_on_new_line = false +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_comment_add_space = false +ij_kotlin_line_comment_at_first_column = true +ij_kotlin_method_annotation_wrap = split_into_lines +ij_kotlin_method_call_chain_wrap = off +ij_kotlin_method_parameters_new_line_after_left_paren = false +ij_kotlin_method_parameters_right_paren_on_new_line = false +ij_kotlin_method_parameters_wrap = off +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 = 0 +ij_kotlin_wrap_first_method_in_call_chain = false + +[{*.graphqlconfig,*.har,*.jsb2,*.jsb3,*.json,*.mcmeta,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config,mcmod.info,pack.mcmeta}] +indent_size = 2 +ij_visual_guides = 120 +ij_json_keep_blank_lines_in_code = 0 +ij_json_keep_indents_on_empty_lines = false +ij_json_keep_line_breaks = true +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 + +[{*.htm,*.html,*.sht,*.shtm,*.shtml}] +ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3 +ij_html_align_attributes = true +ij_html_align_text = false +ij_html_attribute_wrap = normal +ij_html_block_comment_at_first_column = true +ij_html_do_not_align_children_of_min_lines = 0 +ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p +ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot +ij_html_enforce_quotes = false +ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var +ij_html_keep_blank_lines = 2 +ij_html_keep_indents_on_empty_lines = false +ij_html_keep_line_breaks = true +ij_html_keep_line_breaks_in_text = true +ij_html_keep_whitespaces = false +ij_html_keep_whitespaces_inside = span,pre,textarea +ij_html_line_comment_at_first_column = true +ij_html_new_line_after_last_attribute = never +ij_html_new_line_before_first_attribute = never +ij_html_quote_style = double +ij_html_remove_new_line_before_tags = br +ij_html_space_after_tag_name = false +ij_html_space_around_equality_in_attribute = false +ij_html_space_inside_empty_tag = false +ij_html_text_wrap = normal +ij_html_uniform_ident = false + +[{*.jsf,*.jsp,*.jspf,*.tag,*.tagf,*.xjsp}] +ij_jsp_jsp_prefer_comma_separated_import_list = false +ij_jsp_keep_indents_on_empty_lines = false + +[{*.jspx,*.tagx}] +ij_jspx_keep_indents_on_empty_lines = false + +[{*.markdown,*.md}] +ij_visual_guides = 120 +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_keep_indents_on_empty_lines = false +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 + +[{*.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 + +[{*.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/.gitattributes b/.gitattributes new file mode 100644 index 0000000..20fc528 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +* text eol=lf +*.bat text eol=crlf +*.patch text eol=lf +*.java text eol=lf +*.gradle text eol=crlf +*.png binary +*.gif binary +*.exe binary +*.dll binary +*.jar binary +*.lzma binary +*.zip binary +*.pyd binary +*.cfg text eol=lf +*.jks binary \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2b6ec1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +*.class + +# Package Files # +*.war +*.ear +build +eclipse +bin +out + +*.classpath +*.project +.gradle +.settings +.idea +*.iml +*.ipr +*.iws +.metadata/* +*.eml +run/ +usernamecache.json +*.stackdump +secrets.json +changelog.md +*.launch + +logs/ diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..10bf18a --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,47 @@ +#!/usr/bin/env groovy + +pipeline { + agent any + tools { + jdk "jdk-17.0.1" + } + environment { + curseforgeApiToken = credentials('curseforge_token') + discordCFWebhook = credentials('discord_cf_webhook') + versionTrackerKey = credentials('version_tracker_key') + versionTrackerAPI = credentials('version_tracker_api') + } + stages { + stage('Clean') { + steps { + echo 'Cleaning Project' + sh 'chmod +x gradlew' + sh './gradlew clean' + } + } + stage('Build') { + steps { + echo 'Building' + sh './gradlew build' + } + } + stage('Git Changelog') { + steps { + sh './gradlew genGitChangelog' + } + } + + stage('Publish') { + steps { + echo 'Updating version' + sh './gradlew updateVersionTracker' + + echo 'Deploying to Maven' + sh './gradlew publish' + + echo 'Deploying to CurseForge' + sh './gradlew publishCurseForge postDiscord' + } + } + } +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..b51adcb --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,65 @@ +import com.blamejared.searchables.gradle.Properties +import com.blamejared.searchables.gradle.Versions +import com.blamejared.modtemplate.Utils +import com.diluv.schoomp.Webhook +import com.diluv.schoomp.message.Message +import com.diluv.schoomp.message.embed.Embed +import java.io.IOException +import java.util.* + +plugins { + `java-library` +} + +version = Utils.updatingVersion(Versions.MOD) + +tasks.create("postDiscord") { + + doLast { + try { + + // Create a new webhook instance for Discord + val webhook = Webhook(Utils.locateProperty(project, "discordCFWebhook"), "${Properties.NAME} CurseForge Gradle Upload") + + // Craft a message to send to Discord using the webhook. + val message = Message() + message.username = Properties.NAME + message.avatarUrl = Properties.AVATAR + message.content = "${Properties.NAME} $version for Minecraft ${Versions.MINECRAFT} has been published!" + + val embed = Embed() + val downloadSources = StringJoiner("\n") + + mapOf(Pair("fabric", "<:fabric:932163720568782878>"), Pair("forge", "<:forge:932163698003443804>")) + .filter { + project(":${it.key}").ext.has("curse_file_url") + }.map { "${it.value} [${it.key.capitalize(Locale.ENGLISH)}](${project(":${it.key}").ext.get("curse_file_url")})" } + .forEach { downloadSources.add(it) } + + listOf("common", "fabric", "forge") + .map { project(":${it}") } + .map { "<:maven:932165250738970634> `\"${it.group}:${it.base.archivesName.get()}:${it.version}\"`" } + .forEach { downloadSources.add(it) } + + // Add Curseforge DL link if available. + val downloadString = downloadSources.toString() + + if (downloadString.isNotEmpty()) { + + embed.addField("Download", downloadString, false) + } + + embed.addField("Changelog", Utils.getCIChangelog(project, Properties.GIT_REPO).take(1000), false) + + embed.color = 0xF16436 + message.addEmbed(embed) + + webhook.sendMessage(message) + } catch (e: IOException) { + + project.logger.error("Failed to push CF Discord webhook.") + project.file("post_discord_error.log").writeText(e.stackTraceToString()) + } + } + +} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..8e4f536 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,31 @@ +import org.gradle.kotlin.dsl.`kotlin-dsl` + +plugins { + `kotlin-dsl` +} + +repositories { + gradlePluginPortal() + maven("https://maven.blamejared.com") { + name = "BlameJared" + } +} + +dependencies { + gradleApi() + implementation(group = "com.blamejared", name = "ModTemplate", version = "3.0.0.38") + implementation(group = "net.darkhax.curseforgegradle", name = "CurseForgeGradle", version = "1.0.10") +} + +gradlePlugin { + plugins { + create("default") { + id = "com.blamejared.searchables.default" + implementationClass = "com.blamejared.searchables.gradle.DefaultPlugin" + } + create("loader") { + id = "com.blamejared.searchables.loader" + implementationClass = "com.blamejared.searchables.gradle.LoaderPlugin" + } + } +} diff --git a/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/DefaultPlugin.kt b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/DefaultPlugin.kt new file mode 100644 index 0000000..c7806d1 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/DefaultPlugin.kt @@ -0,0 +1,196 @@ +package com.blamejared.searchables.gradle + +import com.blamejared.modtemplate.Utils +import groovy.namespace.QName +import groovy.util.Node +import groovy.util.NodeList +import org.gradle.api.JavaVersion +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.BasePlugin +import org.gradle.api.plugins.BasePluginExtension +import org.gradle.api.plugins.JavaLibraryPlugin +import org.gradle.api.plugins.JavaPluginExtension +import org.gradle.api.publish.PublishingExtension +import org.gradle.api.publish.maven.MavenPublication +import org.gradle.api.publish.maven.plugins.MavenPublishPlugin +import org.gradle.api.publish.tasks.GenerateModuleMetadata +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.api.tasks.javadoc.Javadoc +import org.gradle.external.javadoc.StandardJavadocDocletOptions +import org.gradle.jvm.tasks.Jar +import org.gradle.jvm.toolchain.JavaLanguageVersion +import org.gradle.kotlin.dsl.* +import org.gradle.language.jvm.tasks.ProcessResources +import org.gradle.plugins.ide.idea.IdeaPlugin +import org.gradle.plugins.ide.idea.model.IdeaModel +import java.nio.charset.StandardCharsets +import java.text.SimpleDateFormat +import java.util.* + +class DefaultPlugin : Plugin { + + override fun apply(project: Project): Unit = project.run { + setupDefaults(project) + applyJavaPlugin(project) + applyIdeaPlugin(project) + applyDependencies(project) + applyMavenPlugin(project) + } + + private fun setupDefaults(project: Project) { + project.plugins.apply(BasePlugin::class.java) + val base = project.extensions.getByType(BasePluginExtension::class.java) + + base.archivesName.set("${Properties.NAME}-${project.name.toLowerCase()}-${Versions.MINECRAFT}") + project.version = Utils.updatingVersion(Versions.MOD) + project.group = Properties.GROUP + + project.tasks.withType().all { + enabled = false + } + + project.repositories { + this.add(mavenCentral()) + this.add(this.maven("https://repo.spongepowered.org/repository/maven-public/") { + name = "Sponge" + }) + this.add(this.maven("https://maven.blamejared.com/") { + name = "BlameJared" + }) + this.add(this.maven("https://maven.parchmentmc.org/") { + name = "ParchmentMC" + }) + } + + } + + private fun applyJavaPlugin(project: Project) { + project.plugins.apply(JavaLibraryPlugin::class.java) + + with(project.extensions.getByType(JavaPluginExtension::class.java)) { + toolchain.languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_17.majorVersion)) + withSourcesJar() + withJavadocJar() + sourceSets { + named("main") { + resources { + srcDirs.add(project.file("src/generated/resources")) + } + } + } + } + + project.tasks { + named("compileTestJava") { + this.options.isFork = true + this.options.compilerArgs.add("-XDenableSunApiLintControl") + } + + withType { + this.options.encoding = StandardCharsets.UTF_8.toString() + this.options.release.set(Versions.JAVA.toInt()) + } + + withType { + this.options.encoding = StandardCharsets.UTF_8.toString() + options { + // Javadoc defines this specifically as StandardJavadocDocletOptions + // but only has a getter for MinimalJavadocOptions, but let's just make sure to be safe + if (this is StandardJavadocDocletOptions) { + this.addStringOption("Xdoclint:none", "-quiet") + } + } + } + + withType { + outputs.upToDateWhen { false } + inputs.property("version", project.version) + filesMatching("*.mixins.json") { + if (project.name == "fabric") { + expand("refmap_target" to "${project.extensions.getByType(BasePluginExtension::class.java).archivesName.get()}-") + } else { + expand("refmap_target" to "${Properties.MODID}.") + } + } + filesMatching("fabric.mod.json") { + expand("version" to project.version) + } + } + + withType().configureEach { + manifest { + attributes["Specification-Title"] = Properties.NAME + attributes["Specification-Vendor"] = Properties.AUTHOR + attributes["Specification-Version"] = archiveVersion + attributes["Implementation-Title"] = project.name + attributes["Implementation-Version"] = archiveVersion + attributes["Implementation-Vendor"] = Properties.AUTHOR + attributes["Implementation-Timestamp"] = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(Date()) + attributes["Timestamp"] = System.currentTimeMillis() + attributes["Built-On-Java"] = "${System.getProperty("java.vm.version")} (${System.getProperty("java.vm.vendor")})" + attributes["Built-On-Minecraft"] = Versions.MINECRAFT + } + } + } + + } + + private fun applyDependencies(project: Project) { + val implementation = project.configurations.getByName("implementation") + val compileOnly = project.configurations.getByName("compileOnly") + val annotationProcessor = project.configurations.getByName("annotationProcessor") + + implementation.dependencies.add(project.dependencies.create("com.google.code.findbugs:jsr305:3.0.2")) + implementation.dependencies.add(project.dependencies.create("org.jetbrains:annotations:24.0.1")) + implementation.dependencies.add(project.dependencies.create("com.google.auto.service:auto-service-annotations:1.0.1")) + annotationProcessor.dependencies.add(project.dependencies.create("com.google.auto.service:auto-service:1.0.1")) + } + + private fun applyIdeaPlugin(project: Project) { + project.plugins.apply(IdeaPlugin::class.java) + + val idea = project.extensions.getByType() + idea.module.excludeDirs.addAll(setOf(project.file("run"), project.file("run_server"), project.file("run_client"), project.file("run_game_test"))) + } + + private fun applyMavenPlugin(project: Project) { + project.plugins.apply(MavenPublishPlugin::class.java) + + val publishing = project.extensions.getByType() + project.afterEvaluate { + val base = project.extensions.getByType() + publishing.publications.register("mavenJava", MavenPublication::class.java) { + artifactId = base.archivesName.get() + from(project.components.getByName("java")) + + if (project.name.equals("forge")) { + pom.withXml { + val depNodeList = asNode()["dependencies"] as NodeList + depNodeList.map { it as Node }.forEach { depList -> + val deps = depList.getAt(QName("http://maven.apache.org/POM/4.0.0", "dependency")) + deps.map { it as Node }.forEach { dep -> + dep.parent().remove(dep) + } + } + } + } + } + } + publishing.repositories { + maven("file:///${System.getenv("local_maven")}") + } + } + + private fun common(project: Project): Project { + return project.project(":common") + } + + private fun commonJava(project: Project): JavaPluginExtension { + return common(project).extensions.getByType(JavaPluginExtension::class.java) + } + + private fun depJava(project: Project, other: String): JavaPluginExtension { + return project.project(other).extensions.getByType(JavaPluginExtension::class.java) + } +} diff --git a/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/LoaderPlugin.kt b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/LoaderPlugin.kt new file mode 100644 index 0000000..5d8c244 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/LoaderPlugin.kt @@ -0,0 +1,101 @@ +package com.blamejared.searchables.gradle + +import com.blamejared.modtemplate.ModTemplatePlugin +import com.blamejared.modtemplate.Utils +import com.blamejared.modtemplate.extensions.ModTemplateExtension +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPluginExtension +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.api.tasks.javadoc.Javadoc +import org.gradle.jvm.tasks.Jar +import org.gradle.kotlin.dsl.invoke +import org.gradle.kotlin.dsl.named +import org.gradle.kotlin.dsl.withType +import org.gradle.language.jvm.tasks.ProcessResources + +class LoaderPlugin : Plugin { + + override fun apply(project: Project): Unit = project.run { + + applyJavaPlugin(project) + applyDependencies(project) + applyModTemplate(project) + } + + private fun applyJavaPlugin(project: Project) { + val commonJava = commonJava(project) + + project.tasks { + withType { + from(commonJava.sourceSets.getByName("main").resources) + } + + withType { + source(commonJava(project).sourceSets.getByName("main").allSource) + } + + withType { + source(commonJava(project).sourceSets.getByName("main").allJava) + } + + named("sourcesJar") { + from(commonJava(project).sourceSets.getByName("main").allSource) + } + + if (project.name.equals("forge")) { + withType(Jar::class.java) { + finalizedBy("reobfJar") + } + } + + } + } + + private fun applyDependencies(project: Project) { + } + + private fun applyModTemplate(project: Project) { + + project.plugins.apply(ModTemplatePlugin::class.java) + + with(project.extensions.getByType(ModTemplateExtension::class.java)) { + mcVersion(Versions.MINECRAFT) + curseHomepage(Properties.CURSE_HOMEPAGE) + displayName(Properties.NAME) + modLoader(project.name) + changelog { + // Don't register the task since we will never use it, but the properties are used + enabled(false) + firstCommit(Properties.FIRST_COMMIT) + repo(Properties.GIT_REPO) + } + + versionTracker { + enabled(true) + endpoint(Utils.locateProperty(project, "versionTrackerAPI")) + author(Properties.AUTHOR) + projectName("${Properties.NAME}-${project.name}") + homepage(Properties.CURSE_HOMEPAGE) + uid(Utils.locateProperty(project, "versionTrackerKey")) + } + + } + } + + private fun notCommon(project: Project): Boolean { + return !project.name.equals("common") + } + + private fun common(project: Project): Project { + return project.project(":common") + } + + private fun commonJava(project: Project): JavaPluginExtension { + return common(project).extensions.getByType(JavaPluginExtension::class.java) + } + + private fun depJava(project: Project, other: String): JavaPluginExtension { + return project.project(other).extensions.getByType(JavaPluginExtension::class.java) + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Properties.kt b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Properties.kt new file mode 100644 index 0000000..477e91e --- /dev/null +++ b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Properties.kt @@ -0,0 +1,13 @@ +package com.blamejared.searchables.gradle + +object Properties { + const val GROUP = "com.blamejared.searchables" + const val NAME = "Searchables" + const val AUTHOR = "Jared" + const val MODID = "searchables" + const val AVATAR = "https://media.forgecdn.net/avatars/814/175/638189233295197018.png" + const val CURSE_PROJECT_ID = "858542" + const val CURSE_HOMEPAGE = "https://www.curseforge.com/minecraft/mc-mods/searchables" + const val FIRST_COMMIT = "344baf3f05508fb79a5270eb6f24d727ab5ffe7e" + const val GIT_REPO = "https://github.com/jaredlll08/searchables" +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Versions.kt b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Versions.kt new file mode 100644 index 0000000..95c6435 --- /dev/null +++ b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Versions.kt @@ -0,0 +1,10 @@ +package com.blamejared.searchables.gradle + +object Versions { + const val MOD = "1.0.0" + const val JAVA = "17" + const val MINECRAFT = "1.19.4" + const val FORGE = "45.0.4" + const val FABRIC = "0.76.0+1.19.4" + const val FABRIC_LOADER = "0.14.17" +} \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 0000000..c3a465e --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,33 @@ +import com.blamejared.searchables.gradle.Versions + +plugins { + id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT" + id("com.blamejared.searchables.default") +} + + +minecraft { + version(Versions.MINECRAFT) + runs { + client("Common Client") { + workingDirectory(project.file("run")) + } + } +} + +dependencies { + compileOnly("org.spongepowered:mixin:0.8.5") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") + testImplementation("org.hamcrest:hamcrest:2.2") +} + +tasks.named("test") { + useJUnitPlatform() + + maxHeapSize = "1G" + + testLogging { + events("passed") + } +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/SearchableComponent.java b/common/src/main/java/com/blamejared/searchables/api/SearchableComponent.java new file mode 100644 index 0000000..1efa82f --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/SearchableComponent.java @@ -0,0 +1,96 @@ +package com.blamejared.searchables.api; + +import net.minecraft.Util; +import org.apache.commons.lang3.StringUtils; + +import java.util.Optional; +import java.util.StringJoiner; +import java.util.function.BiPredicate; +import java.util.function.Function; +import java.util.function.Predicate; + +public class SearchableComponent { + + private static final String STRING_CHARACTERS = "'\"`"; + // A user can't search for a term that contains at-least one of each string character, + // as it will be impossible to tokenize as the engine doesn't have escaped quotes (yet), so lets filter them out. + public static final Predicate VALID_SUGGESTION = s -> { + int quoteCount = 0; + for(int i = 0; i < STRING_CHARACTERS.length(); i++) { + if(StringUtils.contains(s, STRING_CHARACTERS.charAt(i))) { + quoteCount++; + } + } + return quoteCount < 3; + }; + + // If a term contains a quote string or a space, we should quote it for accuracy. + public static final Function QUOTE = Util.memoize(s -> { + if(StringUtils.containsNone(s, STRING_CHARACTERS + " ")) { + return s; + } + char quoteChar = '"'; + while(StringUtils.contains(s, quoteChar)) { + quoteChar = switch(quoteChar) { + case '"' -> '\''; + case '\'' -> '`'; + default -> + throw new IllegalStateException("Unable to nicely wrap {" + s + "}! Make sure to filter Strings through 'SearchableComponent#VALID_SUGGESTION'!"); + }; + } + return StringUtils.wrap(s, quoteChar); + }); + + private final String key; + + private final Function> toString; + + private final BiPredicate filter; + + private SearchableComponent(String key, Function> toString, BiPredicate filter) { + + this.key = key; + this.toString = toString.andThen(s -> s.filter(VALID_SUGGESTION)); + this.filter = filter; + } + + public static SearchableComponent create(String key, BiPredicate filter) { + + return create(key, t -> Optional.empty(), filter); + } + + public static SearchableComponent create(String key, Function> toString, BiPredicate filter) { + + return new SearchableComponent<>(key, toString, filter); + } + + public static SearchableComponent create(String key, Function> toString) { + + return new SearchableComponent<>(key, toString, (t, search) -> toString.apply(t) + .map(tStr -> StringUtils.containsIgnoreCase(tStr, search)) + .orElse(false)); + } + + public String key() { + + return key; + } + + public BiPredicate filter() { + + return filter; + } + + public Function> getToString() { + + return toString; + } + + @Override + public String toString() { + + return new StringJoiner(", ", SearchableComponent.class.getSimpleName() + "[", "]").add("key='" + key + "'") + .toString(); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/SearchableType.java b/common/src/main/java/com/blamejared/searchables/api/SearchableType.java new file mode 100644 index 0000000..c419fe4 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/SearchableType.java @@ -0,0 +1,164 @@ +package com.blamejared.searchables.api; + +import com.blamejared.searchables.api.autcomplete.CompletionSuggestion; +import com.blamejared.searchables.api.context.ContextVisitor; +import com.blamejared.searchables.api.context.SearchContext; +import com.blamejared.searchables.lang.StringSearcher; +import com.google.common.base.CharMatcher; +import com.google.common.collect.ImmutableMap; +import net.minecraft.network.chat.Component; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; + +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +public final class SearchableType { + + private final Map> components; + @Nullable + private final SearchableComponent defaultComponent; + + private SearchableType(final Map> components, @Nullable final SearchableComponent defaultComponent) { + + this.components = components; + this.defaultComponent = defaultComponent; + } + + public Map> components() { + + return components; + } + + public Optional> component(final String key) { + + return Optional.ofNullable(components.get(key)); + } + + public Optional> defaultComponent() { + + return Optional.ofNullable(defaultComponent); + } + + public List getSuggestionsFor(final List entries, final String currentToken, final int position, final TokenRange replacementRange) { + + final TokenRange suggestionRange = replacementRange.rangeAtPosition(position); + final String suggestionFrom = suggestionRange.substring(currentToken, position); + final int suggestionIndex = replacementRange.rangeIndexAtPosition(position); + return switch(suggestionIndex) { + case 0 -> getSuggestionsForComponent( + suggestionFrom, + replacementRange.simplify()); + case 1 -> getSuggestionsForTerm( + entries, + replacementRange.range(0).substring(currentToken), + "", + replacementRange.simplify()); + case 2 -> getSuggestionsForTerm( + entries, + replacementRange.range(0).substring(currentToken), + suggestionFrom, + replacementRange.simplify()); + default -> List.of(); + }; + } + + public List getSuggestionsForComponent(final String componentName, final TokenRange replacementRange) { + + return this.components() + .keySet() + .stream() + .filter(s -> StringUtils.startsWithIgnoreCase(s, componentName)) + .sorted(Comparator.naturalOrder()) + .map(s -> new CompletionSuggestion(s, Component.literal(s), ":", replacementRange)) + .distinct() + .collect(Collectors.toList()); + } + + public List getSuggestionsForTerm(final List entries, final String componentName, final String current, final TokenRange replacementRange) { + + final Function> mapper = this.component(componentName) + .map(SearchableComponent::getToString) + .orElseGet(() -> t -> Optional.empty()); + final boolean startsWithQuote = !current.isEmpty() && CharMatcher.anyOf("`'\"").matches(current.charAt(0)); + String termString = startsWithQuote ? current.substring(1) : current; + return entries.stream() + .map(mapper) + .filter(Optional::isPresent) + .map(Optional::get) + .filter(s -> StringUtils.startsWithIgnoreCase(s, termString)) + .sorted(Comparator.naturalOrder()) + .map(SearchableComponent.QUOTE) + .map(s -> new CompletionSuggestion(componentName + ":" + s, Component.literal(s), " ", replacementRange)) + .distinct() + .collect(Collectors.toList()); + + } + + public List filterEntries(final List entries, final String search) { + + return filterEntries(entries, search, t -> true); + } + + public List filterEntries(final List entries, final String search, final Predicate extraPredicate) { + + Optional> context = StringSearcher.search(search, new ContextVisitor<>()); + return entries.stream() + .filter(context.map(tSearchContext -> tSearchContext.createPredicate(this)) + .orElse(t -> true) + .and(extraPredicate)) + .toList(); + } + + public static class Builder { + + private final ImmutableMap.Builder> components; + + @Nullable + private SearchableComponent defaultComponent; + + public Builder() { + + this.components = ImmutableMap.builder(); + this.defaultComponent = null; + } + + public Builder component(final SearchableComponent component) { + + return component(component.key(), component); + } + + public Builder component(final String key, final SearchableComponent component) { + + components.put(key, component); + return this; + } + + public Builder defaultComponent(final SearchableComponent component) { + + return defaultComponent(component.key(), component); + } + + public Builder defaultComponent(final String key, final SearchableComponent component) { + + if(defaultComponent != null) { + throw new IllegalStateException("Cannot mark multiple components as a default component!"); + } + components.put(key, component); + defaultComponent = component; + return this; + } + + public SearchableType build() { + //TODO An event could be fired here to allow 3rd parties to add new components + return new SearchableType<>(components.buildOrThrow(), defaultComponent); + } + + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/SearchablesConstants.java b/common/src/main/java/com/blamejared/searchables/api/SearchablesConstants.java new file mode 100644 index 0000000..5a388b6 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/SearchablesConstants.java @@ -0,0 +1,14 @@ +package com.blamejared.searchables.api; + +import net.minecraft.resources.ResourceLocation; + +public class SearchablesConstants { + + public static final String MOD_ID = "searchables"; + + public static ResourceLocation rl(final String path) { + + return new ResourceLocation(MOD_ID, path); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/TokenRange.java b/common/src/main/java/com/blamejared/searchables/api/TokenRange.java new file mode 100644 index 0000000..8792cee --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/TokenRange.java @@ -0,0 +1,218 @@ +package com.blamejared.searchables.api; + +import org.jetbrains.annotations.NotNull; + +import java.util.*; + +public final class TokenRange implements Comparable { + + public static final TokenRange EMPTY = at(0); + + public static TokenRange at(final int position) { + + return new TokenRange(position, position); + } + + public static TokenRange between(final int start, final int end) { + + return new TokenRange(start, end); + } + + public static TokenRange encompassing(final TokenRange first, final TokenRange second) { + + return new TokenRange(Math.min(first.start(), second.start()), Math.max(first.end(), second.end())); + } + + private final int start; + private final int end; + + private final SortedSet subRanges; + + public TokenRange(final int start, final int end) { + + this.start = start; + this.end = end; + this.subRanges = new TreeSet<>(); + } + + public void addRange(final TokenRange range) { + + this.subRanges.add(range); + // flattenRanges(); + } + + public void addRanges(final Collection ranges) { + + this.subRanges.addAll(ranges); + } + + public Set subRanges() { + + return subRanges; + } + + public TokenRange range(final int index) { + + return subRanges().stream().skip(index).findFirst().orElseThrow(); + } + + public int rangeIndexAtPosition(final int position) { + + int i = 0; + for(TokenRange subRange : subRanges()) { + if(!subRange.contains(position)) { + i++; + continue; + } + break; + } + return i; + } + + public TokenRange rangeAtPosition(final int position) { + + //TODO if a range is empty, there are issues, need to find a repro case + return subRanges.stream() + .filter(tokenRange -> tokenRange.contains(position)) + .findFirst() + .orElse(this); + } + + public TokenRange simplify() { + + return TokenRange.between(this.start(), this.end()); + } + + public boolean contains(final TokenRange other) { + + return this.start() <= other.start() && other.end() <= this.end(); + } + + // Fully covers + public boolean covers(final TokenRange other) { + + return this.start() <= other.start() && other.end() <= this.end(); + } + + public boolean contains(final int position) { + + return (this.start() <= position && position <= this.end()); + } + + public String substring(final String of) { + + return of.substring(this.start(), this.end()); + } + + public String substring(final String of, final int end) { + + return of.substring(this.start(), end); + } + + public String delete(final String from) { + + return new StringBuilder(from).delete(this.start(), this.end()).toString(); + } + + public String insert(final String to, final String toInsert) { + + return new StringBuilder(to).insert(this.start(), toInsert).toString(); + } + + public String replace(final String into, final String toInsert) { + + return insert(delete(into), toInsert); + } + + public boolean isEmpty() { + + return this.start() == this.end(); + } + + public int length() { + + return this.end() - this.start(); + } + + public int start() { + + return start; + } + + public int end() { + + return end; + } + + public TokenRange recalculate() { + + if(this.subRanges().isEmpty()) { + return this; + } + int start = this.subRanges() + .stream() + .min(Comparator.comparing(TokenRange::end)) + .map(TokenRange::start) + .orElse(this.start()); + int end = this.subRanges() + .stream() + .max(Comparator.comparing(TokenRange::end)) + .map(TokenRange::end) + .orElse(this.end()); + + if(start == this.start() && end == this.end()) { + return this; + } + + TokenRange newRange = TokenRange.between(start, end); + newRange.subRanges().addAll(this.subRanges()); + return newRange; + } + + @Override + public boolean equals(final Object o) { + + if(this == o) { + return true; + } + if(o == null || getClass() != o.getClass()) { + return false; + } + + TokenRange that = (TokenRange) o; + + if(start != that.start) { + return false; + } + if(end != that.end) { + return false; + } + return Objects.equals(subRanges, that.subRanges); + } + + @Override + public int hashCode() { + + int result = start; + result = 31 * result + end; + result = 31 * result + subRanges.hashCode(); + return result; + } + + @Override + public String toString() { + + return "TokenRange{" + + "start=" + start + + ", end=" + end + + ", subRanges=" + subRanges + + '}'; + } + + @Override + public int compareTo(@NotNull final TokenRange o) { + + return Integer.compare(this.start(), o.start()); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoComplete.java b/common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoComplete.java new file mode 100644 index 0000000..38b397f --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoComplete.java @@ -0,0 +1,199 @@ +package com.blamejared.searchables.api.autcomplete; + +import com.blamejared.searchables.api.*; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.narration.NarrationElementOutput; +import net.minecraft.network.chat.Component; +import net.minecraft.util.Mth; +import org.joml.Vector2d; + +import java.util.*; +import java.util.function.*; + +public class AutoComplete extends AbstractWidget implements Consumer { + + private final SearchableType type; + private final AutoCompletingEditBox editBox; + private final Supplier> entries; + private final int suggestionHeight; + private final int maxSuggestions; + private List suggestions; + // The index of the element at the top of the displayed list + private int displayOffset; + // The actual selectedIndex, -1 means none selected, range is 0 -> maxSuggestions + private int selectedIndex; + private final Vector2d lastMousePosition; + private int lastCursorPosition; + + public AutoComplete(SearchableType type, AutoCompletingEditBox editBox, Supplier> entries, int x, int y, int width, int suggestionHeight) { + + this(type, editBox, entries, x, y, width, suggestionHeight, 7); + } + + public AutoComplete(SearchableType type, AutoCompletingEditBox editBox, Supplier> entries, int x, int y, int width, int suggestionHeight, int maxSuggestions) { + + super(x, y, width, suggestionHeight * maxSuggestions, Component.empty()); + this.type = type; + this.editBox = editBox; + this.entries = entries; + this.suggestionHeight = suggestionHeight; + this.maxSuggestions = maxSuggestions; + this.suggestions = List.of(); + this.displayOffset = 0; + this.selectedIndex = -1; + this.lastMousePosition = new Vector2d(0, 0); + this.lastCursorPosition = -1; + } + + @Override + public void accept(String value) { + + int position = this.editBox().getCursorPosition(); + if(lastCursorPosition != position) { + displayOffset = 0; + selectedIndex = 0; + TokenRange replacementRange = this.editBox().completionVisitor().rangeAt(position); + suggestions = type.getSuggestionsFor(entries.get(), value, position, replacementRange); + } + lastCursorPosition = position; + } + + // For some reason mojang has these as 2 methods... + @Override + protected boolean clicked(double xpos, double ypos) { + + return super.clicked(xpos, ypos) && ypos < this.getY() + (suggestionHeight * shownSuggestions()); + } + + @Override + public boolean isMouseOver(double xpos, double ypos) { + + return super.isMouseOver(xpos, ypos) && ypos < this.getY() + (suggestionHeight * shownSuggestions()); + } + + @Override + public boolean mouseScrolled(double xpos, double ypos, double delta) { + + if(isMouseOver(xpos, ypos) || this.editBox().isMouseOver(xpos, ypos)) { + displayOffset = (int) Mth.clamp(displayOffset - delta, 0, Math.max(this.suggestions.size() - maxSuggestions, 0)); + lastMousePosition.set(0); + return true; + } + + return false; + } + + @Override + public boolean mouseClicked(double mx, double my, int mb) { + + if(super.mouseClicked(mx, my, mb)) { + updateHoveringState(mx, my); + if(selectedIndex != -1) { + insertSuggestion(); + } + return true; + } + return false; + } + + public void insertSuggestion() { + + CompletionSuggestion suggestion = this.suggestions.get(displayOffset + selectedIndex); + this.editBox.deleteChars(suggestion.replacementRange()); + this.editBox.insertText(suggestion.toInsert()); + } + + @Override + public void renderWidget(PoseStack pose, int mx, int my, float partial) { + + if(!editBox.isFocused()) { + return; + } + updateHoveringState(mx, my); + + for(int i = displayOffset; i < Math.min(displayOffset + maxSuggestions, suggestions.size()); i++) { + CompletionSuggestion suggestion = suggestions.get(i); + int minX = this.getX() + 2; + int minY = this.getY() + (suggestionHeight * (i - displayOffset)); + int maxY = minY + suggestionHeight; + boolean hovered = selectedIndex != -1 && displayOffset + selectedIndex == i; + fill(pose, this.getX(), minY, this.getX() + this.getWidth(), maxY, hovered ? 0xe0111111 : 0xe0000000); + Minecraft.getInstance().font.drawShadow(pose, suggestion.display(), minX, minY + 1, hovered ? Objects.requireNonNull(ChatFormatting.YELLOW.getColor()) : 0xFFFFFFFF); + } + this.lastMousePosition.set(mx, my); + } + + public void updateHoveringState(double xpos, double ypos) { + + if(!lastMousePosition.equals(xpos, ypos)) { + selectedIndex = -1; + if(isMouseOver(xpos, ypos)) { + int minY = this.getY(); + for(int i = 0; i < shownSuggestions(); i++) { + int maxY = minY + suggestionHeight; + if(xpos >= getX() && xpos <= this.getX() + this.getWidth() && ypos >= minY && ypos < maxY) { + selectedIndex = i; + } + minY = maxY; + } + } + } + } + + public void scrollUp() { + + this.scrollUp(1); + } + + public void scrollUp(int amount) { + + this.offsetDisplay(this.selectedIndex - amount); + } + + public void scrollDown() { + + this.scrollDown(1); + } + + public void scrollDown(int amount) { + + this.offsetDisplay(this.selectedIndex + amount); + } + + public void offsetDisplay(int offset) { + + offset = Mth.clamp(offset, 0, shownSuggestions() - 1); + final int halfSuggestions = Math.floorDiv(maxSuggestions, 2); + int currentItem = this.displayOffset + offset; + if(currentItem < this.displayOffset + halfSuggestions) { + this.displayOffset = Math.max(currentItem - halfSuggestions, 0); + } else if(currentItem > this.displayOffset + halfSuggestions) { + this.displayOffset = Math.min(currentItem - halfSuggestions, Math.max(this.suggestions.size() - maxSuggestions, 0)); + } + this.selectedIndex = currentItem - this.displayOffset; + } + + public int shownSuggestions() { + + return Math.min(maxSuggestions, suggestions.size()); + } + + public int maxSuggestions() { + + return maxSuggestions; + } + + public AutoCompletingEditBox editBox() { + + return editBox; + } + + @Override + protected void updateWidgetNarration(NarrationElementOutput output) { + + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoCompletingEditBox.java b/common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoCompletingEditBox.java new file mode 100644 index 0000000..4015dbe --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoCompletingEditBox.java @@ -0,0 +1,163 @@ +package com.blamejared.searchables.api.autcomplete; + +import com.blamejared.searchables.api.SearchableType; +import com.blamejared.searchables.api.TokenRange; +import com.blamejared.searchables.api.formatter.FormattingVisitor; +import com.blamejared.searchables.mixin.AccessEditBox; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; +import org.lwjgl.glfw.GLFW; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; + +public class AutoCompletingEditBox extends EditBox { + + private final FormattingVisitor formattingVisitor; + private final CompletionVisitor completionVisitor; + private final DelegatingConsumers responders = new DelegatingConsumers<>(); + private final AutoComplete autoComplete; + + public AutoCompletingEditBox(Font font, int x, int y, int width, int height, Component message, SearchableType type, Supplier> entries) { + + this(font, x, y, width, height, null, message, type, entries); + } + + public AutoCompletingEditBox(Font font, int x, int y, int width, int height, @Nullable EditBox thisBox, Component message, SearchableType type, Supplier> entries) { + + super(font, x, y, width, height, thisBox, message); + this.formattingVisitor = new FormattingVisitor(type); + this.completionVisitor = new CompletionVisitor(); + this.autoComplete = new AutoComplete<>(type, this, entries, x, y + 2 + height, width, (font.lineHeight + 2)); + setHint(Component.translatable("options.search")); + this.setFormatter(formattingVisitor); + this.setResponder(responders); + addResponder(this.formattingVisitor); + addResponder(this.completionVisitor); + addResponder(this.autoComplete); + } + + @Override + public boolean mouseScrolled(double xpos, double ypos, double delta) { + + return super.mouseScrolled(xpos, ypos, delta); + } + + @Override + public boolean mouseClicked(double xpos, double ypos, int button) { + + if(this.isFocused() && autoComplete.mouseClicked(xpos, ypos, button)) { + return true; + } + if((isMouseOver(xpos, ypos) || autoComplete().isMouseOver(xpos, ypos)) && button == GLFW.GLFW_MOUSE_BUTTON_2) { + this.setValue(""); + return true; + } + return super.mouseClicked(xpos, ypos, button); + } + + @Override + public boolean keyPressed(int key, int scancode, int mods) { + + switch(key) { + case (GLFW.GLFW_KEY_PAGE_DOWN) -> { + this.autoComplete.scrollDown(this.autoComplete().maxSuggestions()); + return true; + } + case (GLFW.GLFW_KEY_DOWN) -> { + this.autoComplete().scrollDown(); + return true; + } + case (GLFW.GLFW_KEY_PAGE_UP) -> { + this.autoComplete.scrollUp(this.autoComplete().maxSuggestions()); + return true; + } + case (GLFW.GLFW_KEY_UP) -> { + this.autoComplete().scrollUp(); + return true; + } + case (GLFW.GLFW_KEY_ENTER) -> { + this.autoComplete().insertSuggestion(); + return true; + } + } + return super.keyPressed(key, scancode, mods); + } + + public void deleteChars(TokenRange range) { + + if(!this.getValue().isEmpty()) { + if(!range.isEmpty()) { + String newValue = range.delete(this.getValue()); + if(this.getFilter().test(newValue)) { + this.setValue(newValue); + this.moveCursorTo(range.start()); + } + } + } + } + + public Predicate getFilter() { + + return ((AccessEditBox) this).searchables$getFilter(); + } + + @Nullable + public Consumer getResponder() { + + return ((AccessEditBox) this).searchables$getResponder(); + } + + @Override + public void setResponder(Consumer responder) { + + if(this.getResponder() == null) { + super.setResponder(responders); + } else { + this.addResponder(responder); + } + } + + public void addResponder(Consumer responder) { + + this.responders.addConsumer(responder); + } + + public FormattingVisitor formattingVisitor() { + + return formattingVisitor; + } + + public CompletionVisitor completionVisitor() { + + return completionVisitor; + } + + public AutoComplete autoComplete() { + + return autoComplete; + } + + private static class DelegatingConsumers implements Consumer { + + private final List> consumers = new ArrayList<>(); + + @Override + public void accept(T t) { + + consumers.forEach(tConsumer -> tConsumer.accept(t)); + } + + public void addConsumer(Consumer consumer) { + + this.consumers.add(consumer); + } + + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionSuggestion.java b/common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionSuggestion.java new file mode 100644 index 0000000..07088da --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionSuggestion.java @@ -0,0 +1,19 @@ +package com.blamejared.searchables.api.autcomplete; + +import com.blamejared.searchables.api.TokenRange; +import net.minecraft.network.chat.Component; + +public record CompletionSuggestion(String suggestion, Component display, String suffix, TokenRange replacementRange) { + + public String replaceIn(final String into) { + + return replacementRange.replace(into, toInsert()); + } + + public String toInsert() { + + return suggestion + suffix; + } + + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionVisitor.java b/common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionVisitor.java new file mode 100644 index 0000000..23c61ca --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionVisitor.java @@ -0,0 +1,124 @@ +package com.blamejared.searchables.api.autcomplete; + +import com.blamejared.searchables.api.TokenRange; +import com.blamejared.searchables.lang.StringSearcher; +import com.blamejared.searchables.lang.expression.type.*; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +import java.util.*; +import java.util.function.Consumer; + +public class CompletionVisitor implements Visitor, Consumer { + + private final List tokens = new ArrayList<>(); + private TokenRange lastRange = TokenRange.EMPTY; + + public void reset() { + + tokens.clear(); + lastRange = TokenRange.EMPTY; + } + + public List tokens() { + + return tokens; + } + + public void reduceTokens() { + + //TODO look into if this is even needed or if it can be done while visiting + + ListIterator iterator = tokens.listIterator(tokens.size()); + TokenRange lastRange = null; + while(iterator.hasPrevious()) { + TokenRange previous = iterator.previous(); + if(lastRange == null) { + lastRange = previous; + } else { + if(lastRange.covers(previous)) { + lastRange.addRange(previous); + iterator.remove(); + } else { + lastRange = previous; + } + } + } + } + + public Optional tokenAt(final int position) { + + return tokens.stream() + .filter(range -> range.contains(position)) + .findFirst(); + } + + public TokenRange rangeAt(final int position) { + + return tokenAt(position).orElse(TokenRange.EMPTY); + } + + @Override + public TokenRange visitGrouping(final GroupingExpression expr) { + + TokenRange leftRange = expr.left().accept(this); + getAndPushRange(); + TokenRange rightRange = expr.right().accept(this); + return TokenRange.encompassing(leftRange, rightRange); + } + + @Override + public TokenRange visitComponent(final ComponentExpression expr) { + + TokenRange leftRange = expr.left().accept(this); + addToken(getAndPushRange()); + TokenRange rightRange = expr.right().accept(this); + return addToken(TokenRange.encompassing(leftRange, rightRange)); + } + + @Override + public TokenRange visitLiteral(final LiteralExpression expr) { + + return addToken(getAndPushRange(expr.displayValue().length())); + } + + @Override + public TokenRange visitPaired(final PairedExpression expr) { + + TokenRange leftRange = addToken(expr.first().accept(this)); + TokenRange rightRange = addToken(expr.second().accept(this)); + return addToken(TokenRange.encompassing(leftRange, rightRange)); + } + + private TokenRange addToken(final TokenRange range) { + + this.tokens.add(range.recalculate()); + return range; + } + + private TokenRange getAndPushRange() { + + return getAndPushRange(1); + } + + private TokenRange getAndPushRange(final int end) { + + TokenRange oldRange = lastRange; + lastRange = TokenRange.between(lastRange.end(), lastRange.end() + end); + return TokenRange.between(oldRange.end(), oldRange.end() + end); + } + + @Override + public void accept(final String search) { + + reset(); + StringSearcher.search(search, this); + } + + @Override + public TokenRange postVisit(TokenRange obj) { + + this.reduceTokens(); + return Visitor.super.postVisit(obj); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/autcomplete/package-info.java b/common/src/main/java/com/blamejared/searchables/api/autcomplete/package-info.java new file mode 100644 index 0000000..c07df40 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/autcomplete/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.api.autcomplete; + +import net.minecraft.*; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/context/ContextVisitor.java b/common/src/main/java/com/blamejared/searchables/api/context/ContextVisitor.java new file mode 100644 index 0000000..9b6f8e1 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/context/ContextVisitor.java @@ -0,0 +1,47 @@ +package com.blamejared.searchables.api.context; + +import com.blamejared.searchables.lang.expression.type.ComponentExpression; +import com.blamejared.searchables.lang.expression.type.GroupingExpression; +import com.blamejared.searchables.lang.expression.type.LiteralExpression; +import com.blamejared.searchables.lang.expression.type.PairedExpression; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +public class ContextVisitor implements Visitor> { + + private final SearchContext context = new SearchContext<>(); + + @Override + public SearchContext visitGrouping(final GroupingExpression expr) { + + expr.left().accept(this); + expr.right().accept(this); + return context; + } + + @Override + public SearchContext visitComponent(final ComponentExpression expr) { + + if(expr.left() instanceof LiteralExpression leftLit && expr.right() instanceof LiteralExpression rightLit) { + context.add(new SearchComponent<>(leftLit.value(), rightLit.value())); + } else { + //TODO Do we want to handle a case of 'first:second:third'? + } + return context; + } + + @Override + public SearchContext visitLiteral(final LiteralExpression expr) { + + context.add(new SearchLiteral<>(expr.value())); + return context; + } + + @Override + public SearchContext visitPaired(final PairedExpression expr) { + + expr.first().accept(this); + expr.second().accept(this); + return context; + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/context/SearchComponent.java b/common/src/main/java/com/blamejared/searchables/api/context/SearchComponent.java new file mode 100644 index 0000000..16c9a7a --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/context/SearchComponent.java @@ -0,0 +1,20 @@ + +package com.blamejared.searchables.api.context; + +import com.blamejared.searchables.api.SearchableComponent; +import com.blamejared.searchables.api.SearchableType; + +import java.util.function.Predicate; + +record SearchComponent(String key, String value) implements SearchPredicate { + + @Override + public Predicate predicateFrom(final SearchableType type) { + + return type.component(key()) + .map(SearchableComponent::filter) + .> map(filter -> t -> filter.test(t, value())) + .orElse(t -> true); + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/context/SearchContext.java b/common/src/main/java/com/blamejared/searchables/api/context/SearchContext.java new file mode 100644 index 0000000..15f6242 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/context/SearchContext.java @@ -0,0 +1,38 @@ +package com.blamejared.searchables.api.context; + +import com.blamejared.searchables.api.SearchableType; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Stream; + +public class SearchContext { + + private final List> literals; + private final List> components; + + public SearchContext() { + + this.literals = new ArrayList<>(); + this.components = new ArrayList<>(); + } + + public Predicate createPredicate(final SearchableType type) { + + return Stream.> concat(literals.stream(), components.stream()) + .map(tSearchPredicate -> tSearchPredicate.predicateFrom(type)) + .reduce(t -> true, Predicate::and); + } + + public void add(final SearchLiteral literal) { + + this.literals.add(literal); + } + + public void add(final SearchComponent component) { + + this.components.add(component); + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/context/SearchLiteral.java b/common/src/main/java/com/blamejared/searchables/api/context/SearchLiteral.java new file mode 100644 index 0000000..66af504 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/context/SearchLiteral.java @@ -0,0 +1,19 @@ +package com.blamejared.searchables.api.context; + +import com.blamejared.searchables.api.SearchableComponent; +import com.blamejared.searchables.api.SearchableType; + +import java.util.function.Predicate; + +record SearchLiteral(String value) implements SearchPredicate { + + @Override + public Predicate predicateFrom(final SearchableType type) { + + return type.defaultComponent() + .map(SearchableComponent::filter) + .> map(filter -> t -> filter.test(t, value())) + .orElse(t -> true); + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/context/SearchPredicate.java b/common/src/main/java/com/blamejared/searchables/api/context/SearchPredicate.java new file mode 100644 index 0000000..90abe0f --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/context/SearchPredicate.java @@ -0,0 +1,11 @@ +package com.blamejared.searchables.api.context; + +import com.blamejared.searchables.api.SearchableType; + +import java.util.function.Predicate; + +interface SearchPredicate { + + Predicate predicateFrom(final SearchableType type); + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/context/package-info.java b/common/src/main/java/com/blamejared/searchables/api/context/package-info.java new file mode 100644 index 0000000..0200999 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/context/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.api.context; + +import net.minecraft.*; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingConstants.java b/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingConstants.java new file mode 100644 index 0000000..2ff8bcd --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingConstants.java @@ -0,0 +1,11 @@ +package com.blamejared.searchables.api.formatter; + +import net.minecraft.network.chat.Style; + +class FormattingConstants { + + static final Style INVALID = Style.EMPTY.withColor(0xFF0000).withUnderlined(true); + static final Style KEY = Style.EMPTY.withColor(0x669BBC); + static final Style TERM = Style.EMPTY.withColor(0xEECC77); + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingContext.java b/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingContext.java new file mode 100644 index 0000000..ab44f19 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingContext.java @@ -0,0 +1,27 @@ +package com.blamejared.searchables.api.formatter; + +import net.minecraft.network.chat.Style; + +public record FormattingContext(boolean isKey, Style style, boolean valid) { + + public static FormattingContext empty() { + + return new FormattingContext(false, Style.EMPTY, true); + } + + public static FormattingContext key(Style validStyle, boolean valid) { + + return new FormattingContext(true, valid ? validStyle : FormattingConstants.INVALID, valid); + } + + public static FormattingContext literal(Style validStyle, boolean valid) { + + return new FormattingContext(false, valid ? validStyle : FormattingConstants.INVALID, valid); + } + + public Style style(boolean valid) { + + return valid ? style() : FormattingConstants.INVALID; + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingVisitor.java b/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingVisitor.java new file mode 100644 index 0000000..10fb9da --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/formatter/FormattingVisitor.java @@ -0,0 +1,134 @@ +package com.blamejared.searchables.api.formatter; + +import com.blamejared.searchables.api.SearchableType; +import com.blamejared.searchables.api.TokenRange; +import com.blamejared.searchables.lang.StringSearcher; +import com.blamejared.searchables.lang.expression.type.ComponentExpression; +import com.blamejared.searchables.lang.expression.type.GroupingExpression; +import com.blamejared.searchables.lang.expression.type.LiteralExpression; +import com.blamejared.searchables.lang.expression.type.PairedExpression; +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.mojang.datafixers.util.Pair; +import net.minecraft.network.chat.Style; +import net.minecraft.util.FormattedCharSequence; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.BiFunction; +import java.util.function.Consumer; + +public class FormattingVisitor implements ContextAwareVisitor, Consumer, BiFunction { + + private final SearchableType type; + + private final List> tokens = new ArrayList<>(); + private TokenRange lastRange = TokenRange.at(0); + + public FormattingVisitor(final SearchableType type) { + + this.type = type; + } + + public void reset() { + + tokens.clear(); + lastRange = TokenRange.at(0); + } + + public List> tokens() { + + return tokens; + } + + public Optional> tokenAt(final int position) { + + return tokens.stream() + .filter(range -> range.getFirst().contains(position)) + .findFirst(); + } + + @Override + public TokenRange visitGrouping(final GroupingExpression expr, final FormattingContext context) { + + TokenRange leftRange = expr.left().accept(this, context); + tokens.add(Pair.of(getAndPushRange(), context.style())); + TokenRange rightRange = expr.right().accept(this, context); + return TokenRange.encompassing(leftRange, rightRange); + } + + @Override + public TokenRange visitComponent(final ComponentExpression expr, final FormattingContext context) { + + boolean valid = context.valid() && expr.left() instanceof LiteralExpression && expr.right() instanceof LiteralExpression; + TokenRange leftRange = expr.left().accept(this, FormattingContext.key(FormattingConstants.KEY, valid)); + tokens.add(Pair.of(getAndPushRange(), context.style(valid))); + TokenRange rightRange = expr.right().accept(this, FormattingContext.literal(FormattingConstants.TERM, valid)); + return TokenRange.encompassing(leftRange, rightRange); + } + + @Override + public TokenRange visitLiteral(final LiteralExpression expr, final FormattingContext context) { + + Style style = context.style(); + if(!context.valid() || context.isKey() && !type.components().containsKey(expr.value())) { + style = FormattingConstants.INVALID; + } + TokenRange range = getAndPushRange(expr.displayValue().length()); + tokens.add(Pair.of(range, style)); + return range; + } + + @Override + public TokenRange visitPaired(final PairedExpression expr, final FormattingContext context) { + + TokenRange leftRange = expr.first().accept(this, context); + TokenRange rightRange = expr.second().accept(this, context); + return TokenRange.encompassing(leftRange, rightRange); + } + + private TokenRange getAndPushRange() { + + return getAndPushRange(1); + } + + private TokenRange getAndPushRange(final int end) { + + TokenRange oldRange = lastRange; + lastRange = TokenRange.between(lastRange.end(), lastRange.end() + end); + return TokenRange.between(oldRange.end(), oldRange.end() + end); + } + + @Override + public void accept(final String search) { + + reset(); + StringSearcher.search(search, this, FormattingContext.empty()); + } + + @Override + public FormattedCharSequence apply(final String currentString, final Integer offset) { + + List sequences = new ArrayList<>(); + int index = 0; + for(Pair token : tokens) { + TokenRange range = token.getFirst(); + int subEnd = Math.max(range.start() - offset, 0); + if(subEnd >= currentString.length()) { + break; + } + + int subStart = Math.min(range.end() - offset, currentString.length()); + if(subStart > 0) { + sequences.add(FormattedCharSequence.forward(currentString.substring(index, subEnd), token.getSecond())); + sequences.add(FormattedCharSequence.forward(currentString.substring(subEnd, subStart), token.getSecond())); + index = subStart; + } + } + sequences.add(FormattedCharSequence.forward(currentString.substring(index), Style.EMPTY)); + + return FormattedCharSequence.composite(sequences); + } + + +} diff --git a/common/src/main/java/com/blamejared/searchables/api/formatter/package-info.java b/common/src/main/java/com/blamejared/searchables/api/formatter/package-info.java new file mode 100644 index 0000000..09aea13 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/formatter/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.api.formatter; + +import net.minecraft.*; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/api/package-info.java b/common/src/main/java/com/blamejared/searchables/api/package-info.java new file mode 100644 index 0000000..5576fef --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/api/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.api; + +import net.minecraft.*; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/lang/SLParser.java b/common/src/main/java/com/blamejared/searchables/lang/SLParser.java new file mode 100644 index 0000000..d284257 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/SLParser.java @@ -0,0 +1,120 @@ +package com.blamejared.searchables.lang; + +import com.blamejared.searchables.lang.expression.Expression; +import com.blamejared.searchables.lang.expression.type.ComponentExpression; +import com.blamejared.searchables.lang.expression.type.GroupingExpression; +import com.blamejared.searchables.lang.expression.type.LiteralExpression; +import com.blamejared.searchables.lang.expression.type.PairedExpression; + +import java.util.List; +import java.util.Optional; + +public class SLParser { + + private final List tokens; + private int current = 0; + + public SLParser(final List tokens) { + + this.tokens = tokens; + } + + public Optional parse() { + + if(tokens.size() == 1 && check(TokenType.EOL)) { + return Optional.empty(); + } + + return Optional.of(expression()); + } + + private Expression expression() { + + return grouping(); + } + + + private Expression grouping() { + + Expression expr = literal(); + + while(match(TokenType.SPACE)) { + Token operator = previous(); + Expression right = literal(); + + expr = operator.type() == TokenType.COLON ? new ComponentExpression(expr, operator, right) : new GroupingExpression(expr, operator, right); + } + return expr; + } + + private Expression literal() { + + if(match(TokenType.COLON)) { + Token prevColon = previous(); + if(match(TokenType.IDENTIFIER)) { + Token prevIdent = previous(); + LiteralExpression first = new LiteralExpression(prevColon.literal(), prevColon.lexeme()); + LiteralExpression second = new LiteralExpression(prevIdent.literal(), prevIdent.lexeme()); + return new PairedExpression(first, second); + } + } + if(match(TokenType.IDENTIFIER)) { + Token previous = previous(); + if(check(TokenType.COLON)) { + return new ComponentExpression(new LiteralExpression(previous.literal(), previous.lexeme()), advance(), literal()); + } + return new LiteralExpression(previous.literal(), previous.lexeme()); + } + + if(match(TokenType.STRING)) { + Token previous = previous(); + return new LiteralExpression(previous.literal(), previous.lexeme()); + } + + return new LiteralExpression("", ""); + } + + private boolean match(final TokenType... types) { + + for(TokenType type : types) { + if(check(type)) { + advance(); + return true; + } + } + + return false; + } + + private boolean check(final TokenType type) { + + if(isAtEnd()) { + return false; + } + return peek().type() == type; + } + + private Token advance() { + + if(!isAtEnd()) { + current++; + } + return previous(); + } + + private boolean isAtEnd() { + + return peek().type() == TokenType.EOL; + } + + private Token peek() { + + return tokens.get(current); + } + + private Token previous() { + + return tokens.get(current - 1); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/SLScanner.java b/common/src/main/java/com/blamejared/searchables/lang/SLScanner.java new file mode 100644 index 0000000..3d06b97 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/SLScanner.java @@ -0,0 +1,100 @@ +package com.blamejared.searchables.lang; + +import java.util.ArrayList; +import java.util.List; + +public class SLScanner { + + private final String source; + private final List tokens = new ArrayList<>(); + private int start = 0; + private int current = 0; + + public SLScanner(final String source) { + + this.source = source; + } + + public List scanTokens() { + + while(!isAtEnd()) { + // We are at the beginning of the next lexeme. + start = current; + scanToken(); + } + + tokens.add(new Token(TokenType.EOL, "", "", start, current)); + return tokens; + } + + private void scanToken() { + + char c = advance(); + switch(c) { + case ' ' -> space(); + case ':' -> addToken(TokenType.COLON, ":"); + case '"' -> string('"'); + case '\'' -> string('\''); + case '`' -> string('`'); + default -> identifier(); + } + } + + private void space() { + + addToken(TokenType.SPACE, " "); + } + + private void string(final char quote) { + + while(peek() != quote && !isAtEnd()) { + advance(); + } + + if(isAtEnd()) { + String value = source.substring(start + 1, current); + // Trim the surrounding quotes. + addToken(TokenType.STRING, value); + } else { + // The closing ". + advance(); + String value = source.substring(start + 1, current - 1); + // Trim the surrounding quotes. + addToken(TokenType.STRING, value); + } + } + + private void identifier() { + + while(!isAtEnd() && peek() != ' ' && peek() != ':') { + advance(); + } + String value = source.substring(start, current); + addToken(TokenType.IDENTIFIER, value); + } + + private char peek() { + + if(isAtEnd()) { + return '\0'; + } + return source.charAt(current); + } + + private char advance() { + + return source.charAt(current++); + } + + private void addToken(final TokenType type, final String literal) { + + String text = source.substring(start, current); + tokens.add(new Token(type, text, literal, start, current)); + } + + private boolean isAtEnd() { + + return current >= source.length(); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/StringSearcher.java b/common/src/main/java/com/blamejared/searchables/lang/StringSearcher.java new file mode 100644 index 0000000..79c4392 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/StringSearcher.java @@ -0,0 +1,31 @@ +package com.blamejared.searchables.lang; + +import com.blamejared.searchables.lang.expression.Expression; +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +import java.util.Optional; + +public class StringSearcher { + + public static Optional search(final String search, final Visitor visitor) { + + SLParser slParser = new SLParser(new SLScanner(search).scanTokens()); + return slParser.parse().map(expression -> expression.accept(visitor)).map(visitor::postVisit); + } + + public static Optional search(final String search, final ContextAwareVisitor visitor, final C context) { + + SLParser slParser = new SLParser(new SLScanner(search).scanTokens()); + return slParser.parse() + .map(expression -> expression.accept(visitor, context)) + .map(t -> visitor.postVisit(t, context)); + } + + public static Optional expression(final String search) { + + SLParser slParser = new SLParser(new SLScanner(search).scanTokens()); + return slParser.parse(); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/Token.java b/common/src/main/java/com/blamejared/searchables/lang/Token.java new file mode 100644 index 0000000..9f3db7c --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/Token.java @@ -0,0 +1,59 @@ +package com.blamejared.searchables.lang; + +@SuppressWarnings("ClassCanBeRecord") +public class Token { + + private final TokenType type; + private final String lexeme; + private final String literal; + + private final int start; + private final int end; + + public Token(final TokenType type, final String lexeme, final String literal, final int start, final int end) { + + this.type = type; + this.lexeme = lexeme; + this.literal = literal; + this.start = start; + this.end = end; + } + + @Override + public String toString() { + + return "Token{" + + "type=" + type + + ", lexeme='" + lexeme + '\'' + + ", literal='" + literal + '\'' + + ", start=" + start + + ", end=" + end + + '}'; + } + + public TokenType type() { + + return type; + } + + public String lexeme() { + + return lexeme; + } + + public int start() { + + return start; + } + + public int end() { + + return end; + } + + public String literal() { + + return literal; + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/TokenType.java b/common/src/main/java/com/blamejared/searchables/lang/TokenType.java new file mode 100644 index 0000000..a48e9d0 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/TokenType.java @@ -0,0 +1,5 @@ +package com.blamejared.searchables.lang; + +public enum TokenType { + COLON, IDENTIFIER, STRING, SPACE, EOL +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/Expression.java b/common/src/main/java/com/blamejared/searchables/lang/expression/Expression.java new file mode 100644 index 0000000..a715283 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/Expression.java @@ -0,0 +1,11 @@ +package com.blamejared.searchables.lang.expression; + +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +public abstract class Expression { + + public abstract R accept(final Visitor visitor); + + public abstract R accept(final ContextAwareVisitor visitor, final C context); +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/package-info.java b/common/src/main/java/com/blamejared/searchables/lang/expression/package-info.java new file mode 100644 index 0000000..ff09971 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.lang.expression; + + +import net.minecraft.FieldsAreNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/type/ComponentExpression.java b/common/src/main/java/com/blamejared/searchables/lang/expression/type/ComponentExpression.java new file mode 100644 index 0000000..8ab2713 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/type/ComponentExpression.java @@ -0,0 +1,54 @@ +package com.blamejared.searchables.lang.expression.type; + +import com.blamejared.searchables.lang.Token; +import com.blamejared.searchables.lang.expression.Expression; +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +public class ComponentExpression extends Expression { + + private final Expression left; + private final Token operator; + private final Expression right; + + public ComponentExpression(final Expression left, final Token operator, final Expression right) { + + this.left = left; + this.operator = operator; + this.right = right; + } + + @Override + public R accept(final Visitor visitor) { + + return visitor.visitComponent(this); + } + + @Override + public R accept(final ContextAwareVisitor visitor, final C context) { + + return visitor.visitComponent(this, context); + } + + public Expression left() { + + return left; + } + + public Token operator() { + + return operator; + } + + public Expression right() { + + return right; + } + + @Override + public String toString() { + + return "[%s%s%s]".formatted(left, operator.literal(), right); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/type/GroupingExpression.java b/common/src/main/java/com/blamejared/searchables/lang/expression/type/GroupingExpression.java new file mode 100644 index 0000000..b6d63cb --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/type/GroupingExpression.java @@ -0,0 +1,55 @@ +package com.blamejared.searchables.lang.expression.type; + +import com.blamejared.searchables.lang.Token; +import com.blamejared.searchables.lang.expression.Expression; +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +public class GroupingExpression extends Expression { + + private final Expression left; + private final Token operator; + private final Expression right; + + public GroupingExpression(final Expression left, final Token operator, final Expression right) { + + this.left = left; + this.operator = operator; + this.right = right; + } + + @Override + public R accept(final Visitor visitor) { + + return visitor.visitGrouping(this); + } + + @Override + public R accept(final ContextAwareVisitor visitor, final C context) { + + return visitor.visitGrouping(this, context); + } + + public Expression left() { + + return left; + } + + public Token operator() { + + return operator; + } + + public Expression right() { + + return right; + } + + + @Override + public String toString() { + + return "(%s%s%s)".formatted(left, operator.literal(), right); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/type/LiteralExpression.java b/common/src/main/java/com/blamejared/searchables/lang/expression/type/LiteralExpression.java new file mode 100644 index 0000000..4670822 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/type/LiteralExpression.java @@ -0,0 +1,46 @@ +package com.blamejared.searchables.lang.expression.type; + +import com.blamejared.searchables.lang.expression.Expression; +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +public class LiteralExpression extends Expression { + + private final String value; + private final String displayValue; + + public LiteralExpression(final String value, final String displayValue) { + + this.value = value; + this.displayValue = displayValue; + } + + @Override + public R accept(final Visitor visitor) { + + return visitor.visitLiteral(this); + } + + @Override + public R accept(final ContextAwareVisitor visitor, final C context) { + + return visitor.visitLiteral(this, context); + } + + public String value() { + + return value; + } + + public String displayValue() { + + return displayValue; + } + + @Override + public String toString() { + + return value; + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/type/PairedExpression.java b/common/src/main/java/com/blamejared/searchables/lang/expression/type/PairedExpression.java new file mode 100644 index 0000000..11c871a --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/type/PairedExpression.java @@ -0,0 +1,40 @@ +package com.blamejared.searchables.lang.expression.type; + +import com.blamejared.searchables.lang.expression.Expression; +import com.blamejared.searchables.lang.expression.visitor.ContextAwareVisitor; +import com.blamejared.searchables.lang.expression.visitor.Visitor; + +public class PairedExpression extends Expression { + + private final Expression first; + private final Expression second; + + public PairedExpression(final Expression first, final Expression second) { + + this.first = first; + this.second = second; + } + + public Expression first() { + + return first; + } + + public Expression second() { + + return second; + } + + @Override + public R accept(final Visitor visitor) { + + return visitor.visitPaired(this); + } + + @Override + public R accept(final ContextAwareVisitor visitor, final C context) { + + return visitor.visitPaired(this, context); + } + +} diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/type/package-info.java b/common/src/main/java/com/blamejared/searchables/lang/expression/type/package-info.java new file mode 100644 index 0000000..c210911 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/type/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.lang.expression.type; + + +import net.minecraft.FieldsAreNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/ContextAwareVisitor.java b/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/ContextAwareVisitor.java new file mode 100644 index 0000000..bdf878a --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/ContextAwareVisitor.java @@ -0,0 +1,23 @@ +package com.blamejared.searchables.lang.expression.visitor; + +import com.blamejared.searchables.lang.expression.type.ComponentExpression; +import com.blamejared.searchables.lang.expression.type.GroupingExpression; +import com.blamejared.searchables.lang.expression.type.LiteralExpression; +import com.blamejared.searchables.lang.expression.type.PairedExpression; + +public interface ContextAwareVisitor { + + R visitGrouping(GroupingExpression expr, C context); + + R visitComponent(ComponentExpression expr, C context); + + R visitLiteral(LiteralExpression expr, C context); + + R visitPaired(PairedExpression expr, C context); + + default R postVisit(R obj, C context) { + + return obj; + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/Visitor.java b/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/Visitor.java new file mode 100644 index 0000000..b1d237e --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/Visitor.java @@ -0,0 +1,22 @@ +package com.blamejared.searchables.lang.expression.visitor; + +import com.blamejared.searchables.lang.expression.type.ComponentExpression; +import com.blamejared.searchables.lang.expression.type.GroupingExpression; +import com.blamejared.searchables.lang.expression.type.LiteralExpression; +import com.blamejared.searchables.lang.expression.type.PairedExpression; + +public interface Visitor { + + R visitGrouping(GroupingExpression expr); + + R visitComponent(ComponentExpression expr); + + R visitLiteral(LiteralExpression expr); + + R visitPaired(PairedExpression expr); + + default R postVisit(R obj) { + return obj; + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/package-info.java b/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/package-info.java new file mode 100644 index 0000000..b468f32 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/expression/visitor/package-info.java @@ -0,0 +1,10 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.lang.expression.visitor; + + +import net.minecraft.FieldsAreNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/lang/package-info.java b/common/src/main/java/com/blamejared/searchables/lang/package-info.java new file mode 100644 index 0000000..0db99c0 --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/lang/package-info.java @@ -0,0 +1,8 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package com.blamejared.searchables.lang; + +import net.minecraft.*; + +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/common/src/main/java/com/blamejared/searchables/mixin/AccessEditBox.java b/common/src/main/java/com/blamejared/searchables/mixin/AccessEditBox.java new file mode 100644 index 0000000..9e4493e --- /dev/null +++ b/common/src/main/java/com/blamejared/searchables/mixin/AccessEditBox.java @@ -0,0 +1,22 @@ +package com.blamejared.searchables.mixin; + +import net.minecraft.client.gui.components.EditBox; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +import java.util.function.Consumer; +import java.util.function.Predicate; + +@Mixin(EditBox.class) +public interface AccessEditBox { + + @Accessor("filter") + Predicate searchables$getFilter(); + + @Nullable + @Accessor("responder") + Consumer searchables$getResponder(); + +} diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..c9f4fa0 --- /dev/null +++ b/common/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "${mod_name}", + "pack_format": 6 + } +} \ No newline at end of file diff --git a/common/src/main/resources/searchables.mixins.json b/common/src/main/resources/searchables.mixins.json new file mode 100644 index 0000000..1863f28 --- /dev/null +++ b/common/src/main/resources/searchables.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.blamejared.searchables.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + "AccessEditBox" + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "${refmap_target}refmap.json" +} \ No newline at end of file diff --git a/common/src/test/java/com/blamejared/searchables/TestConstants.java b/common/src/test/java/com/blamejared/searchables/TestConstants.java new file mode 100644 index 0000000..fc13763 --- /dev/null +++ b/common/src/test/java/com/blamejared/searchables/TestConstants.java @@ -0,0 +1,54 @@ +package com.blamejared.searchables; + +import com.blamejared.searchables.api.SearchableComponent; +import com.blamejared.searchables.api.SearchableType; + +import java.util.List; +import java.util.Optional; + +public class TestConstants { + + public static class Shapes { + + public static final Shape ZERO = new Shape("zero", "sq uare", "purple"); + public static final Shape ONE = new Shape("one", "sq'uare", "red"); + public static final Shape TWO = new Shape("two", "sq\"uare", "blue"); + public static final Shape THREE = new Shape("three", "sq`uare", "green"); + public static final Shape FOUR = new Shape("four", "square", "yellow"); + public static final Shape FIVE = new Shape("five", "circle", "red"); + public static final Shape SIX = new Shape("six", "circle", "blue"); + public static final Shape SEVEN = new Shape("seven", "circle", "green"); + public static final Shape EIGHT = new Shape("eight", "circle", "yellow"); + public static final Shape NINE = new Shape("nine", "triangle", "red"); + public static final Shape TEN = new Shape("ten", "triangle", "blue"); + public static final Shape ELEVEN = new Shape("eleven", "triangle", "green"); + public static final Shape TWELVE = new Shape("twelve", "triangle", "yellow"); + + } + + public static final List SHAPES = List.of( + Shapes.ZERO, + Shapes.ONE, + Shapes.TWO, + Shapes.THREE, + Shapes.FOUR, + Shapes.FIVE, + Shapes.SIX, + Shapes.SEVEN, + Shapes.EIGHT, + Shapes.NINE, + Shapes.TEN, + Shapes.ELEVEN, + Shapes.TWELVE + ); + + public static final SearchableType SHAPE = new SearchableType.Builder() + .defaultComponent(SearchableComponent.create("name", shape -> Optional.of(shape.name()))) + .component(SearchableComponent.create("type", shape -> Optional.of(shape.type()))) + .component(SearchableComponent.create("colour", shape -> Optional.of(shape.colour()))) + .build(); + + + public record Shape(String name, String type, String colour) {} + +} diff --git a/common/src/test/java/com/blamejared/searchables/tests/AutoCompleteTest.java b/common/src/test/java/com/blamejared/searchables/tests/AutoCompleteTest.java new file mode 100644 index 0000000..2a26244 --- /dev/null +++ b/common/src/test/java/com/blamejared/searchables/tests/AutoCompleteTest.java @@ -0,0 +1,336 @@ +package com.blamejared.searchables.tests; + +import com.blamejared.searchables.TestConstants; +import com.blamejared.searchables.api.TokenRange; +import com.blamejared.searchables.api.autcomplete.CompletionSuggestion; +import com.blamejared.searchables.api.autcomplete.CompletionVisitor; +import com.blamejared.searchables.lang.StringSearcher; +import net.minecraft.network.chat.Component; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + +public class AutoCompleteTest { + + @Test + public void testNoResults() { + + String search = "invalid"; + int position = 2; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, empty()); + } + + @Test + public void testType() { + + String search = "typ"; + int position = 2; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains(suggestion("type", "type", ":", 0, 3))); + assertThat(suggestions.get(0).replaceIn(search), is("type:")); + } + + @Test + public void testTerm() { + + String search = "type:sq"; + int position = 6; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(5)); + assertThat(suggestions, hasItems( + suggestion("type:square", "square", " ", 0, 7), + suggestion("type:'sq\"uare'", "'sq\"uare'", " ", 0, 7), + suggestion("type:\"sq`uare\"", "\"sq`uare\"", " ", 0, 7), + suggestion("type:\"sq'uare\"", "\"sq'uare\"", " ", 0, 7), + suggestion("type:\"sq uare\"", "\"sq uare\"", " ", 0, 7) + )); + assertThat(suggestions.get(0).replaceIn(search), is("type:\"sq uare\" ")); + assertThat(suggestions.get(1).replaceIn(search), is("type:'sq\"uare' ")); + assertThat(suggestions.get(2).replaceIn(search), is("type:\"sq'uare\" ")); + assertThat(suggestions.get(3).replaceIn(search), is("type:\"sq`uare\" ")); + assertThat(suggestions.get(4).replaceIn(search), is("type:square ")); + + } + + @Test + public void testTypeAtStart() { + + String search = "typ name:one"; + int position = 2; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("type", "type", ":", 0, 3)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("type: name:one")); + } + + @Test + public void testTermAtStart() { + + String search = "type:sq name:one"; + int position = 6; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(5)); + assertThat(suggestions, hasItems( + suggestion("type:square", "square", " ", 0, 7), + suggestion("type:'sq\"uare'", "'sq\"uare'", " ", 0, 7), + suggestion("type:\"sq`uare\"", "\"sq`uare\"", " ", 0, 7), + suggestion("type:\"sq'uare\"", "\"sq'uare\"", " ", 0, 7), + suggestion("type:\"sq uare\"", "\"sq uare\"", " ", 0, 7) + )); + // Is the extra space actually correct? + assertThat(suggestions.get(0).replaceIn(search), is("type:\"sq uare\" name:one")); + assertThat(suggestions.get(1).replaceIn(search), is("type:'sq\"uare' name:one")); + assertThat(suggestions.get(2).replaceIn(search), is("type:\"sq'uare\" name:one")); + assertThat(suggestions.get(3).replaceIn(search), is("type:\"sq`uare\" name:one")); + assertThat(suggestions.get(4).replaceIn(search), is("type:square name:one")); + } + + @Test + public void testTypeAtEnd() { + + String search = "name:one typ"; + int position = 10; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("type", "type", ":", 9, 12)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("name:one type:")); + } + + @Test + public void testTermAtEnd() { + + String search = "name:one type:s"; + int position = 15; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(5)); + assertThat(suggestions, hasItems( + suggestion("type:square", "square", " ", 9, 15), + suggestion("type:'sq\"uare'", "'sq\"uare'", " ", 9, 15), + suggestion("type:\"sq`uare\"", "\"sq`uare\"", " ", 9, 15), + suggestion("type:\"sq'uare\"", "\"sq'uare\"", " ", 9, 15), + suggestion("type:\"sq uare\"", "\"sq uare\"", " ", 9, 15) + )); + assertThat(suggestions.get(0).replaceIn(search), is("name:one type:\"sq uare\" ")); + assertThat(suggestions.get(1).replaceIn(search), is("name:one type:'sq\"uare' ")); + assertThat(suggestions.get(2).replaceIn(search), is("name:one type:\"sq'uare\" ")); + assertThat(suggestions.get(3).replaceIn(search), is("name:one type:\"sq`uare\" ")); + assertThat(suggestions.get(4).replaceIn(search), is("name:one type:square ")); + } + + @Test + public void testTermAtColon() { + + String search = "name:"; + int position = 5; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(13)); + assertThat(suggestions, hasItems( + suggestion("name:zero", "zero", " ", 0, 5), + suggestion("name:one", "one", " ", 0, 5), + suggestion("name:two", "two", " ", 0, 5), + suggestion("name:three", "three", " ", 0, 5), + suggestion("name:four", "four", " ", 0, 5), + suggestion("name:five", "five", " ", 0, 5), + suggestion("name:six", "six", " ", 0, 5), + suggestion("name:seven", "seven", " ", 0, 5), + suggestion("name:eight", "eight", " ", 0, 5), + suggestion("name:nine", "nine", " ", 0, 5), + suggestion("name:ten", "ten", " ", 0, 5), + suggestion("name:eleven", "eleven", " ", 0, 5), + suggestion("name:twelve", "twelve", " ", 0, 5) + )); + } + + + @Test + public void testTypeAtStartReplacingTerm() { + + String search = "name:one type:square"; + int position = 2; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("name", "name", ":", 0, 8)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("name: type:square")); + } + + @Test + public void testTypeAtEndReplacingTerm() { + + String search = "name:one type:square"; + int position = 10; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("type", "type", ":", 9, 20)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("name:one type:")); + } + + @Test + public void testTypeInMiddle() { + + String search = "colour:red name: type:square"; + int position = 12; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("name", "name", ":", 11, 16)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("colour:red name: type:square")); + } + + @Test + public void testTermInMiddle() { + + String search = "colour:red name:o type:square"; + int position = 17; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("name:one", "one", " ", 11, 17)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("colour:red name:one type:square")); + } + + @Test + public void testTypeInMiddleReplacingTerm() { + + String search = "colour:red name:one type:square"; + int position = 12; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(1)); + assertThat(suggestions, contains( + suggestion("name", "name", ":", 11, 19)) + ); + assertThat(suggestions.get(0).replaceIn(search), is("colour:red name: type:square")); + } + + @Test + public void testStringTerm() { + + String search = "type:`sq"; + int position = 7; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(5)); + assertThat(suggestions, hasItems( + suggestion("type:square", "square", " ", 0, 8), + suggestion("type:'sq\"uare'", "'sq\"uare'", " ", 0, 8), + suggestion("type:\"sq`uare\"", "\"sq`uare\"", " ", 0, 8), + suggestion("type:\"sq'uare\"", "\"sq'uare\"", " ", 0, 8), + suggestion("type:\"sq uare\"", "\"sq uare\"", " ", 0, 8) + )); + // Is the extra space actually correct? + assertThat(suggestions.get(0).replaceIn(search), is("type:\"sq uare\" ")); + assertThat(suggestions.get(1).replaceIn(search), is("type:'sq\"uare' ")); + assertThat(suggestions.get(2).replaceIn(search), is("type:\"sq'uare\" ")); + assertThat(suggestions.get(3).replaceIn(search), is("type:\"sq`uare\" ")); + assertThat(suggestions.get(4).replaceIn(search), is("type:square ")); + } + + @Test + public void testStringsTerm() { + + String search = "type:`"; + int position = 6; + + CompletionVisitor visitor = new CompletionVisitor(); + StringSearcher.search(search, visitor); + TokenRange replacementRange = visitor.rangeAt(position); + List suggestions = TestConstants.SHAPE.getSuggestionsFor(TestConstants.SHAPES, search, position, replacementRange); + assertThat(suggestions, hasSize(7)); + assertThat(suggestions, hasItems( + suggestion("type:triangle", "triangle", " ", 0, 6), + suggestion("type:square", "square", " ", 0, 6), + suggestion("type:circle", "circle", " ", 0, 6), + suggestion("type:'sq\"uare'", "'sq\"uare'", " ", 0, 6), + suggestion("type:\"sq`uare\"", "\"sq`uare\"", " ", 0, 6), + suggestion("type:\"sq'uare\"", "\"sq'uare\"", " ", 0, 6), + suggestion("type:\"sq uare\"", "\"sq uare\"", " ", 0, 6) + )); + assertThat(suggestions.get(0).replaceIn(search), is("type:circle ")); + assertThat(suggestions.get(1).replaceIn(search), is("type:\"sq uare\" ")); + assertThat(suggestions.get(2).replaceIn(search), is("type:'sq\"uare' ")); + assertThat(suggestions.get(3).replaceIn(search), is("type:\"sq'uare\" ")); + assertThat(suggestions.get(4).replaceIn(search), is("type:\"sq`uare\" ")); + assertThat(suggestions.get(5).replaceIn(search), is("type:square ")); + assertThat(suggestions.get(6).replaceIn(search), is("type:triangle ")); + } + + + private CompletionSuggestion suggestion(String suggestion, String display, String suffix, int rangeStart, int rangeEnd) { + + return new CompletionSuggestion(suggestion, Component.literal(display), suffix, TokenRange.between(rangeStart, rangeEnd)); + } + +} diff --git a/common/src/test/java/com/blamejared/searchables/tests/SearchTest.java b/common/src/test/java/com/blamejared/searchables/tests/SearchTest.java new file mode 100644 index 0000000..aeba25a --- /dev/null +++ b/common/src/test/java/com/blamejared/searchables/tests/SearchTest.java @@ -0,0 +1,121 @@ +package com.blamejared.searchables.tests; + +import com.blamejared.searchables.TestConstants; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; + +public class SearchTest { + + @Test + public void testNoResultsDefaultSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "negative"); + assertThat(shapes, empty()); + } + + @Test + public void testNoResultsComponentSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "name:invalid"); + assertThat(shapes, empty()); + } + + @Test + public void testNoResultsFullSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "name:invalid type:square colour:blue"); + assertThat(shapes, empty()); + } + + @Test + public void testDefaultSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "five"); + assertThat(shapes, hasSize(1)); + assertThat(shapes, contains(TestConstants.Shapes.FIVE)); + } + + @Test + public void testComponentSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "type:triangle"); + assertThat(shapes, hasSize(4)); + assertThat(shapes, contains(TestConstants.Shapes.NINE, TestConstants.Shapes.TEN, TestConstants.Shapes.ELEVEN, TestConstants.Shapes.TWELVE)); + } + + @Test + public void testComponentStringSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "type:`sq'uare`"); + assertThat(shapes, hasSize(1)); + assertThat(shapes, contains(TestConstants.Shapes.ONE)); + } + + @Test + public void testComponentStringWithSpaceSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "type:`sq "); + assertThat(shapes, hasSize(1)); + assertThat(shapes, contains(TestConstants.Shapes.ZERO)); + } + + @Test + public void testDefaultAndComponentSearchOrderOne() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "four type:square"); + assertThat(shapes, hasSize(1)); + assertThat(shapes, contains(TestConstants.Shapes.FOUR)); + } + + @Test + public void testDefaultAndComponentSearchOrderTwo() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "type:square four"); + assertThat(shapes, hasSize(1)); + assertThat(shapes, contains(TestConstants.Shapes.FOUR)); + } + + + @Test + public void testFullSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "name:eight type:circle colour:yellow"); + assertThat(shapes, hasSize(1)); + assertThat(shapes, contains(TestConstants.Shapes.EIGHT)); + } + + @Test + public void testEmptySearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, ""); + assertThat(shapes, contains(TestConstants.SHAPES.toArray(TestConstants.Shape[]::new))); + } + + @Test + public void testEmptyComponentSearch() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "name:"); + assertThat(shapes, contains(TestConstants.SHAPES.toArray(TestConstants.Shape[]::new))); + } + + @Test + public void testOneEmptyComponentSearchOrderOne() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "colour:red name:"); + assertThat(shapes, contains(TestConstants.Shapes.ONE, TestConstants.Shapes.FIVE, TestConstants.Shapes.NINE)); + } + + @Test + public void testOneEmptyComponentSearchOrderTwo() { + + List shapes = TestConstants.SHAPE.filterEntries(TestConstants.SHAPES, "name: colour:red"); + assertThat(shapes, contains(TestConstants.Shapes.ONE, TestConstants.Shapes.FIVE, TestConstants.Shapes.NINE)); + } + +} diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts new file mode 100644 index 0000000..4e7025f --- /dev/null +++ b/fabric/build.gradle.kts @@ -0,0 +1,49 @@ +import com.blamejared.searchables.gradle.Properties +import com.blamejared.searchables.gradle.Versions +import com.blamejared.modtemplate.Utils +import net.darkhax.curseforgegradle.TaskPublishCurseForge +import net.darkhax.curseforgegradle.Constants as CFG_Constants + +plugins { + id("fabric-loom") version "1.1-SNAPSHOT" + id("com.blamejared.searchables.default") + id("com.blamejared.searchables.loader") +} + +dependencies { + minecraft("com.mojang:minecraft:${Versions.MINECRAFT}") + mappings(loom.layered { + officialMojangMappings() + parchment("org.parchmentmc.data:parchment-1.18.1:2021.12.19@zip") + }) + modImplementation("net.fabricmc:fabric-loader:${Versions.FABRIC_LOADER}") + modImplementation("net.fabricmc.fabric-api:fabric-api:${Versions.FABRIC}") + implementation(project(":common")) +} + +loom { + runs { + named("client") { + client() + setConfigName("Fabric Client") + ideConfigGenerated(true) + runDir("run") + } + } +} + +tasks.create("publishCurseForge") { + apiToken = Utils.locateProperty(project, "curseforgeApiToken") + + val mainFile = upload(Properties.CURSE_PROJECT_ID, file("${project.buildDir}/libs/${base.archivesName.get()}-$version.jar")) + mainFile.changelogType = "markdown" + mainFile.changelog = Utils.getFullChangelog(project) + mainFile.releaseType = CFG_Constants.RELEASE_TYPE_RELEASE + mainFile.addJavaVersion("Java ${Versions.JAVA}") + mainFile.addGameVersion(Versions.MINECRAFT) + mainFile.addRequirement("fabric-api") + + doLast { + project.ext.set("curse_file_url", "${Properties.CURSE_HOMEPAGE}/files/${mainFile.curseFileId}") + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/blamejared/searchables/SearchablesFabric.java b/fabric/src/main/java/com/blamejared/searchables/SearchablesFabric.java new file mode 100644 index 0000000..e40d456 --- /dev/null +++ b/fabric/src/main/java/com/blamejared/searchables/SearchablesFabric.java @@ -0,0 +1,5 @@ +package com.blamejared.searchables; + +public class SearchablesFabric { + +} diff --git a/fabric/src/main/resources/assets/searchables/icon.png b/fabric/src/main/resources/assets/searchables/icon.png new file mode 100644 index 0000000..12ea5a9 Binary files /dev/null and b/fabric/src/main/resources/assets/searchables/icon.png differ diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..f6ec35f --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "searchables", + "name": "Searchables", + "version": "${version}", + "environment": "client", + "icon": "assets/searchables/icon.png", + "authors": [ + "Jaredlll08" + ], + "license": "MIT", + "contact": { + "homepage": "https://minecraft.curseforge.com/projects/searchables", + "sources": "https://github.com/jaredlll08/searchables" + }, + "description": "A library mod to facilitate adding search bars with auto complete and search types.", + "entrypoints": { + }, + "depends": { + "fabricloader": ">=0.14", + "java": ">=17", + "minecraft": "1.19.x" + }, + "recommends": { + "fabric": "*" + }, + "mixins": [ + { + "config": "searchables.mixins.json", + "environment": "client" + }, + { + "config": "searchables.fabric.mixins.json", + "environment": "client" + } + ] +} diff --git a/fabric/src/main/resources/searchables.fabric.mixins.json b/fabric/src/main/resources/searchables.fabric.mixins.json new file mode 100644 index 0000000..bee9846 --- /dev/null +++ b/fabric/src/main/resources/searchables.fabric.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.blamejared.searchables.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts new file mode 100644 index 0000000..6dcfb2a --- /dev/null +++ b/forge/build.gradle.kts @@ -0,0 +1,57 @@ +import com.blamejared.searchables.gradle.Properties +import com.blamejared.searchables.gradle.Versions +import com.blamejared.modtemplate.Utils +import net.darkhax.curseforgegradle.TaskPublishCurseForge +import net.darkhax.curseforgegradle.Constants as CFG_Constants + +plugins { + id("com.blamejared.searchables.default") + id("com.blamejared.searchables.loader") + id("net.minecraftforge.gradle") version ("5.1.+") + id("org.spongepowered.mixin") version ("0.7-SNAPSHOT") +} + +mixin { + add(sourceSets.main.get(), "${Properties.MODID}.refmap.json") + config("${Properties.MODID}.mixins.json") + config("${Properties.MODID}.forge.mixins.json") +} + +minecraft { + mappings("official", Versions.MINECRAFT) + accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg")) + runs { + create("client") { + taskName("Client") + workingDirectory(project.file("run")) + ideaModule("${rootProject.name}.${project.name}.main") + args("-mixin.config=${Properties.MODID}.mixins.json") + mods { + create(Properties.MODID) { + source(sourceSets.main.get()) + source(project(":common").sourceSets.main.get()) + } + } + } + } +} + +dependencies { + "minecraft"("net.minecraftforge:forge:${Versions.MINECRAFT}-${Versions.FORGE}") + implementation(project(":common")) + annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor") +} + +tasks.create("publishCurseForge") { + apiToken = Utils.locateProperty(project, "curseforgeApiToken") ?: 0 + + val mainFile = upload(Properties.CURSE_PROJECT_ID, file("${project.buildDir}/libs/${base.archivesName.get()}-$version.jar")) + mainFile.changelogType = "markdown" + mainFile.changelog = Utils.getFullChangelog(project) + mainFile.releaseType = CFG_Constants.RELEASE_TYPE_RELEASE + mainFile.addJavaVersion("Java ${Versions.JAVA}") + + doLast { + project.ext.set("curse_file_url", "${Properties.CURSE_HOMEPAGE}/files/${mainFile.curseFileId}") + } +} \ No newline at end of file diff --git a/forge/src/main/java/com/blamejared/searchables/SearchablesForge.java b/forge/src/main/java/com/blamejared/searchables/SearchablesForge.java new file mode 100644 index 0000000..7d2b5db --- /dev/null +++ b/forge/src/main/java/com/blamejared/searchables/SearchablesForge.java @@ -0,0 +1,12 @@ +package com.blamejared.searchables; + +import net.minecraftforge.fml.common.Mod; + +@Mod("searchables") +public class SearchablesForge { + + public SearchablesForge() { + + } + +} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..c6a40ba --- /dev/null +++ b/forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,27 @@ +modLoader = "javafml" +loaderVersion = "[41,)" +issueTrackerURL = "https://github.com/jaredlll08/searchables/issues" +license = "MIT" + +[[mods]] +modId = "searchables" +updateJSONURL = "https://updates.blamejared.com/get?n=searchables&gv=1.19.4" +version = "${file.jarVersion}" +displayName = "Searchables" +displayURL = "https://minecraft.curseforge.com/projects/searchables" +authors = "Jaredlll08" +logoFile = "icon.png" +description = ''' +A library mod to facilitate adding search bars with auto complete and search types. +''' +itemIcon = "minecraft:compass" +[[dependencies.searchables]] +modId = "forge" +mandatory = true +versionRange = "[41,)" +ordering = "NONE" +[[dependencies.searchables]] +modId = "minecraft" +mandatory = true +versionRange = "[1.19,)" +ordering = "NONE" \ No newline at end of file diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png new file mode 100644 index 0000000..12ea5a9 Binary files /dev/null and b/forge/src/main/resources/icon.png differ diff --git a/forge/src/main/resources/searchables.forge.mixins.json b/forge/src/main/resources/searchables.forge.mixins.json new file mode 100644 index 0000000..b0e8521 --- /dev/null +++ b/forge/src/main/resources/searchables.forge.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.blamejared.searchables.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "${refmap_target}refmap.json" +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1866634 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +# Gradle +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ffed3a2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b4f908a --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env bash + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +ARGV=("$@") +eval set -- $DEFAULT_JVM_OPTS + +IFS=$' +' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)" +IFS=$' +' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)" + +exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..24da762 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,23 @@ +pluginManagement { + repositories { + maven("https://maven.blamejared.com") + gradlePluginPortal() + maven("https://maven.fabricmc.net/") { + name = "Fabric" + } + maven("https://repo.spongepowered.org/repository/maven-public/") { + name = "Sponge Snapshots" + } + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "org.spongepowered.mixin") { + useModule("org.spongepowered:mixingradle:${requested.version}") + } + } + } +} +rootProject.name = "Searchables" +include("common") +include("fabric") +include("forge")