From 6604294e806718f2812a4320b86ad34ef94b5644 Mon Sep 17 00:00:00 2001 From: Jared Date: Sat, 6 May 2023 03:13:06 +0200 Subject: [PATCH] Initial code --- .editorconfig | 992 ++++++++++++++++++ .gitattributes | 15 + .gitignore | 28 + Jenkinsfile | 47 + build.gradle.kts | 65 ++ buildSrc/build.gradle.kts | 31 + .../searchables/gradle/DefaultPlugin.kt | 196 ++++ .../searchables/gradle/LoaderPlugin.kt | 101 ++ .../searchables/gradle/Properties.kt | 13 + .../blamejared/searchables/gradle/Versions.kt | 10 + common/build.gradle.kts | 33 + .../searchables/api/SearchableComponent.java | 96 ++ .../searchables/api/SearchableType.java | 164 +++ .../searchables/api/SearchablesConstants.java | 14 + .../searchables/api/TokenRange.java | 218 ++++ .../api/autcomplete/AutoComplete.java | 199 ++++ .../autcomplete/AutoCompletingEditBox.java | 163 +++ .../api/autcomplete/CompletionSuggestion.java | 19 + .../api/autcomplete/CompletionVisitor.java | 124 +++ .../api/autcomplete/package-info.java | 8 + .../api/context/ContextVisitor.java | 47 + .../api/context/SearchComponent.java | 20 + .../api/context/SearchContext.java | 38 + .../api/context/SearchLiteral.java | 19 + .../api/context/SearchPredicate.java | 11 + .../searchables/api/context/package-info.java | 8 + .../api/formatter/FormattingConstants.java | 11 + .../api/formatter/FormattingContext.java | 27 + .../api/formatter/FormattingVisitor.java | 134 +++ .../api/formatter/package-info.java | 8 + .../searchables/api/package-info.java | 8 + .../blamejared/searchables/lang/SLParser.java | 120 +++ .../searchables/lang/SLScanner.java | 100 ++ .../searchables/lang/StringSearcher.java | 31 + .../blamejared/searchables/lang/Token.java | 59 ++ .../searchables/lang/TokenType.java | 5 + .../lang/expression/Expression.java | 11 + .../lang/expression/package-info.java | 10 + .../expression/type/ComponentExpression.java | 54 + .../expression/type/GroupingExpression.java | 55 + .../expression/type/LiteralExpression.java | 46 + .../expression/type/PairedExpression.java | 40 + .../lang/expression/type/package-info.java | 10 + .../visitor/ContextAwareVisitor.java | 23 + .../lang/expression/visitor/Visitor.java | 22 + .../lang/expression/visitor/package-info.java | 10 + .../searchables/lang/package-info.java | 8 + .../searchables/mixin/AccessEditBox.java | 22 + common/src/main/resources/pack.mcmeta | 6 + .../main/resources/searchables.mixins.json | 17 + .../blamejared/searchables/TestConstants.java | 54 + .../searchables/tests/AutoCompleteTest.java | 336 ++++++ .../searchables/tests/SearchTest.java | 121 +++ fabric/build.gradle.kts | 49 + .../searchables/SearchablesFabric.java | 5 + .../resources/assets/searchables/icon.png | Bin 0 -> 14098 bytes fabric/src/main/resources/fabric.mod.json | 37 + .../resources/searchables.fabric.mixins.json | 15 + forge/build.gradle.kts | 57 + .../searchables/SearchablesForge.java | 12 + forge/src/main/resources/META-INF/mods.toml | 27 + forge/src/main/resources/icon.png | Bin 0 -> 14098 bytes .../resources/searchables.forge.mixins.json | 16 + gradle.properties | 3 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 ++++ gradlew.bat | 89 ++ settings.gradle.kts | 23 + 69 files changed, 4548 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 Jenkinsfile create mode 100644 build.gradle.kts create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/DefaultPlugin.kt create mode 100644 buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/LoaderPlugin.kt create mode 100644 buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Properties.kt create mode 100644 buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/Versions.kt create mode 100644 common/build.gradle.kts create mode 100644 common/src/main/java/com/blamejared/searchables/api/SearchableComponent.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/SearchableType.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/SearchablesConstants.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/TokenRange.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoComplete.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/autcomplete/AutoCompletingEditBox.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionSuggestion.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/autcomplete/CompletionVisitor.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/autcomplete/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/context/ContextVisitor.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/context/SearchComponent.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/context/SearchContext.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/context/SearchLiteral.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/context/SearchPredicate.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/context/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/formatter/FormattingConstants.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/formatter/FormattingContext.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/formatter/FormattingVisitor.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/formatter/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/api/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/SLParser.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/SLScanner.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/StringSearcher.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/Token.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/TokenType.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/Expression.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/type/ComponentExpression.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/type/GroupingExpression.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/type/LiteralExpression.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/type/PairedExpression.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/type/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/visitor/ContextAwareVisitor.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/visitor/Visitor.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/expression/visitor/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/lang/package-info.java create mode 100644 common/src/main/java/com/blamejared/searchables/mixin/AccessEditBox.java create mode 100644 common/src/main/resources/pack.mcmeta create mode 100644 common/src/main/resources/searchables.mixins.json create mode 100644 common/src/test/java/com/blamejared/searchables/TestConstants.java create mode 100644 common/src/test/java/com/blamejared/searchables/tests/AutoCompleteTest.java create mode 100644 common/src/test/java/com/blamejared/searchables/tests/SearchTest.java create mode 100644 fabric/build.gradle.kts create mode 100644 fabric/src/main/java/com/blamejared/searchables/SearchablesFabric.java create mode 100644 fabric/src/main/resources/assets/searchables/icon.png create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 fabric/src/main/resources/searchables.fabric.mixins.json create mode 100644 forge/build.gradle.kts create mode 100644 forge/src/main/java/com/blamejared/searchables/SearchablesForge.java create mode 100644 forge/src/main/resources/META-INF/mods.toml create mode 100644 forge/src/main/resources/icon.png create mode 100644 forge/src/main/resources/searchables.forge.mixins.json create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts 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 0000000000000000000000000000000000000000..12ea5a9caa0de4f55a95bf4dd58e14b37a4b73ad GIT binary patch literal 14098 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

d`71f(z-c~EWa;5*#cvUGNDc1dnK zn;e?JV6b|9VbGNdtY9IQg{IYLVxa>hPFkhQl}S)w+hXAqB;cq!y4GduS9wsCu47uA zHKhILS}pwi-VwO8%#GzO#|(xtD}A92{=*z}IY4sT6(UF`pJu4mT*&b9H|s@5hPE(E zFk?1rAEhN`xI1utcCn_y57y-6T_2Po%!~u26jLdX|XJ|#1ETl6+EeQwvjnhI+`s?8`Y)X!Z3_($pQg~3S zbqbijLbDHkNL2qhheT+?L&l*l_01mTX7h5)Ul*O+!na%CU#CV~j?dK;+sPe^LmmOO zqb{Brk3W4tB$`rwV2SOal+0)yCqAjhC&(YTD2H&p$?{9v!`zx^j)Ig9ypOGs5q2e< za@+>UdHnHxcY()G84F6zh2}FblsoP!=ipFD#-_~o!PuB%=WObBuOyj@m!>0=-@hdw z%q6H}Z=JeJx%_Is)z?f@?zrNPODXN~k#Dxn3f@VWly3O-=*16eRM$euN*mH_%DhfQ zn&bde)+Maja_Da?DBw#mONU`*qBX4QvPA808sX!2yJR$5B9Y;~og#b$cex-eGK+3##4!X(1Z zv}`!ruu-YaEmJ*xn{tZb%9r1XQs8eAeCc$&66N91Oyf zia)IFWbP@t4Ts^)j@^u1oF~T3;2y(DXk>P6`#7zjJ$YpyT3{Ny0mnx*2+~x%Pk*wLYM$Fg#JOywN=O zhOb}VDS{3Ig+2Gw?V6>NVK+KZ*%-Ep<0A8CAXvye%3a}2vo(v3OTWqKP)Vg%iHx2<>IRul<1 zMQG?9B)=8MeZI6z@)F8F5S5iP*?_1DhJanao=e#dgB!vrnOX^5c9h|$lZ@9PaQC3G z?NKxD(|73Uc}qTjB4P$(jCICrxg#*Ki9suo*Nhq(8VHBI>*cf(%_fy;&;#QAA(gw* zj$yO3d;tQ9`VqnbuLg0GkqPE=dL1*u!kk||I^1c+sA1qAZ z$`^*36Wzv4|j_KKcky3pB^y^0B;rfpzy01%)s)`k`#0_v7V( z;Gy?Om;duUng(A=YcQThcyeFR7Eb#Nyo|V?4UzbPlZt*}FRViT?@U_x|MM1<4FCIf|BcgaAj!?U zjefQ@h$sG}D3m*H=o#qRvivl8-y;=z=tX`qf@chm;Y=9X7QGf)T{C(sT|#}QL_0)v zFoL&2LyB}Mw?i;&0VIEMY`W^jGn7P5=!Y0{eW;if3BT{b5TJUoQ!~2{BOpys^j>*C z@RB@fgY*l8+K-p4L>t8k;z8buN@C!l#67Mn8N^dG=OHaU^`T$|ZQOQaMAIO*EzyLH z+Y$*P&inM~F9R(oS`;~TgprdtZtnPo9&rI}q4^~W9{N_u{dzheIHClv(^`5IaC@c#wZTeTtp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..12ea5a9caa0de4f55a95bf4dd58e14b37a4b73ad GIT binary patch literal 14098 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

d`71f(z-c~EWa;5*#cvUGNDc1dnK zn;e?JV6b|9VbGNdtY9IQg{IYLVxa>hPFkhQl}S)w+hXAqB;cq!y4GduS9wsCu47uA zHKhILS}pwi-VwO8%#GzO#|(xtD}A92{=*z}IY4sT6(UF`pJu4mT*&b9H|s@5hPE(E zFk?1rAEhN`xI1utcCn_y57y-6T_2Po%!~u26jLdX|XJ|#1ETl6+EeQwvjnhI+`s?8`Y)X!Z3_($pQg~3S zbqbijLbDHkNL2qhheT+?L&l*l_01mTX7h5)Ul*O+!na%CU#CV~j?dK;+sPe^LmmOO zqb{Brk3W4tB$`rwV2SOal+0)yCqAjhC&(YTD2H&p$?{9v!`zx^j)Ig9ypOGs5q2e< za@+>UdHnHxcY()G84F6zh2}FblsoP!=ipFD#-_~o!PuB%=WObBuOyj@m!>0=-@hdw z%q6H}Z=JeJx%_Is)z?f@?zrNPODXN~k#Dxn3f@VWly3O-=*16eRM$euN*mH_%DhfQ zn&bde)+Maja_Da?DBw#mONU`*qBX4QvPA808sX!2yJR$5B9Y;~og#b$cex-eGK+3##4!X(1Z zv}`!ruu-YaEmJ*xn{tZb%9r1XQs8eAeCc$&66N91Oyf zia)IFWbP@t4Ts^)j@^u1oF~T3;2y(DXk>P6`#7zjJ$YpyT3{Ny0mnx*2+~x%Pk*wLYM$Fg#JOywN=O zhOb}VDS{3Ig+2Gw?V6>NVK+KZ*%-Ep<0A8CAXvye%3a}2vo(v3OTWqKP)Vg%iHx2<>IRul<1 zMQG?9B)=8MeZI6z@)F8F5S5iP*?_1DhJanao=e#dgB!vrnOX^5c9h|$lZ@9PaQC3G z?NKxD(|73Uc}qTjB4P$(jCICrxg#*Ki9suo*Nhq(8VHBI>*cf(%_fy;&;#QAA(gw* zj$yO3d;tQ9`VqnbuLg0GkqPE=dL1*u!kk||I^1c+sA1qAZ z$`^*36Wzv4|j_KKcky3pB^y^0B;rfpzy01%)s)`k`#0_v7V( z;Gy?Om;duUng(A=YcQThcyeFR7Eb#Nyo|V?4UzbPlZt*}FRViT?@U_x|MM1<4FCIf|BcgaAj!?U zjefQ@h$sG}D3m*H=o#qRvivl8-y;=z=tX`qf@chm;Y=9X7QGf)T{C(sT|#}QL_0)v zFoL&2LyB}Mw?i;&0VIEMY`W^jGn7P5=!Y0{eW;if3BT{b5TJUoQ!~2{BOpys^j>*C z@RB@fgY*l8+K-p4L>t8k;z8buN@C!l#67Mn8N^dG=OHaU^`T$|ZQOQaMAIO*EzyLH z+Y$*P&inM~F9R(oS`;~TgprdtZtnPo9&rI}q4^~W9{N_u{dzheIHClv(^`5IaC@c#wZTeTtp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 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")