Bump io.papermc.paperweight.userdev from 2.0.0-beta.21 to 2.0.0-beta.24 (#441)

* Some overall code health improvement
* Spigot BlockState handling optimization

.editorconfig

@@ -0,0 +1,491 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 2
+ij_continuation_indent_size = 4
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = true
+ij_smart_tabs = false
+ij_visual_guides = 
+ij_wrap_on_typing = false
+
+[*.java]
+ij_smart_tabs = true
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_deconstruction_list_components = true
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = false
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_align_types_in_multi_catch = true
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = true
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_field_with_annotations = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 1
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_add_space = false
+ij_java_block_comment_at_first_column = true
+ij_java_builder_methods = 
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = true
+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 = 1000
+ij_java_class_names_in_javadoc = 1
+ij_java_deconstruction_list_wrap = normal
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false
+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_enum_constants_wrap = off
+ij_java_enum_field_annotation_wrap = off
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = off
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_field_name_prefix = 
+ij_java_field_name_suffix = 
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = true
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_generate_use_type_annotation_before_type = true
+ij_java_if_brace_force = never
+ij_java_imports_layout = @*,*,|,java.**,|,$*
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_builder_methods_indents = false
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = true
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_on_demand_import_from_same_package_first = true
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_add_space_on_reformat = false
+ij_java_line_comment_at_first_column = true
+ij_java_local_variable_name_prefix = 
+ij_java_local_variable_name_suffix = 
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = off
+ij_java_method_parameters_new_line_after_left_paren = true
+ij_java_method_parameters_right_paren_on_new_line = true
+ij_java_method_parameters_wrap = on_every_item
+ij_java_modifier_list_wrap = false
+ij_java_multi_catch_types_wrap = normal
+ij_java_names_count_to_use_import_on_demand = 10
+ij_java_new_line_after_lparen_in_annotation = false
+ij_java_new_line_after_lparen_in_deconstruction_pattern = true
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_new_line_when_body_is_presented = false
+ij_java_packages_to_use_import_on_demand = 
+ij_java_parameter_annotation_wrap = off
+ij_java_parameter_name_prefix = 
+ij_java_parameter_name_suffix = 
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = true
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_preserve_module_imports = true
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = true
+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 = true
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_annotation = true
+ij_java_rparen_on_new_line_in_deconstruction_pattern = true
+ij_java_rparen_on_new_line_in_record_header = true
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = 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 = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_deconstruction_list = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_inside_block_braces_when_body_is_present = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_deconstruction_list = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_static_field_name_prefix = 
+ij_java_static_field_name_suffix = 
+ij_java_subclass_name_prefix = 
+ij_java_subclass_name_suffix = Impl
+ij_java_switch_expressions_wrap = normal
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = off
+ij_java_test_name_prefix = 
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = off
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+ij_java_wrap_semicolon_after_call_chain = false
+
+[*.properties]
+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
+
+[.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,*.jspx,*.pom,*.rng,*.tagx,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_xml_align_attributes = true
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_add_space = false
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = true
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = false
+ij_xml_text_wrap = normal
+
+[{*.bash,*.sh,*.zsh}]
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
+
+[{*.kt,*.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_add_space = false
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = true
+ij_kotlin_call_parameters_wrap = on_every_item
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_for_chained_calls = false
+ij_kotlin_continuation_indent_for_expression_bodies = false
+ij_kotlin_continuation_indent_in_argument_lists = false
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = true
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_indent_before_arrow_on_new_line = true
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_add_space_on_reformat = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
+ij_kotlin_name_count_to_use_star_import = 5
+ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_elvis = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false
+
+[{*.har,*.json,*.jsonc,*.mcmeta,.prettierrc}]
+ij_json_array_wrapping = split_into_lines
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_keep_trailing_comma = false
+ij_json_object_wrapping = split_into_lines
+ij_json_property_alignment = do_not_align
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = false
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.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_add_space = false
+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
+
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_format_tables = true
+ij_markdown_insert_quote_arrows_on_wrap = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_keep_line_breaks_inside_text_blocks = true
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+ij_markdown_wrap_text_if_long = true
+ij_markdown_wrap_text_inside_blockquotes = true
+
+[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock,uv.lock}]
+ij_toml_keep_indents_on_empty_lines = false
+
+[{*.yaml,*.yml}]
+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_line_comment_add_space = false
+ij_yaml_line_comment_add_space_on_reformat = false
+ij_yaml_line_comment_at_first_column = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true

.gitattributes

@@ -0,0 +1,11 @@
+# Use lf endings by default.
+* text=auto eol=lf
+
+# Declare text file types just in case
+*.java text
+*.yml text
+*.xml text
+*.md text
+
+# Exclude binary files
+*.png binary

.github/dependabot.yml

@@ -8,3 +8,12 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    ignore:
+      # The SQLite JDBC is provided by Spigot and, for now, Paper.
+      # To ensure it is still present even if Paper stops providing it,
+      # we need to declare it as a library.
+      # To prevent needlessly downloading (and loading) a second copy,
+      # we want to ensure that we are using the provided version.
+      - dependency-name: "org.xerial:sqlite-jdbc"
+      # Spigot and Spigot API updates are manual.
+      - dependency-name: "org.spigotmc:*"

.github/workflows/automerge_dependabot.yml

@@ -15,7 +15,7 @@ jobs:
       # Note: this is directly from GitHub's example for using data from a triggering workflow:
       # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
       - name: 'Download artifact'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           script: |
             let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({

.github/workflows/ci.yml

@@ -15,18 +15,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v6
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
-      # TODO convert to a Gradle plugin later for portability
-      - name: Install Spigot dependency
-        run: ./scripts/install_spigot.sh 1.21.4
-
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v5
 
       - name: Build with Gradle
         run: ./gradlew build
@@ -34,7 +30,7 @@ jobs:
       # Upload artifacts
       - name: Upload Distributable Jar
         id: upload-final
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: dist
           path: ./dist/*

.github/workflows/draft_release.yml

@@ -13,30 +13,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: dist
           path: dist
 
       - name: Create Release
         id: create-release
-        uses: softprops/action-gh-release@v2.2.1
+        uses: softprops/action-gh-release@v3.0.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          name: ${{ env.VERSIONED_NAME }}
-          # May actually want to manually specify Paper versions all the time; they won't all
-          # need to be specified in code thanks to Mojang-mapped server internals.
-          # A bit annoying, but not terribly so.
-          # Instead, fetch min and max (which will also be Spigot version) and manually list intermediate versions?
+          name: "OpenInv ${{ github.ref_name }}"
           body: |-
             ## Supported server versions
-            ### Paper
-            TODO COMMA-SEPARATED VERSIONS
-            ### Spigot
-            TODO VERSION
+            
+            **Paper:** TODO VERSION, 26.1.2, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6  
+            **Spigot:** TODO VERSION
             
             TODO HELLO HUMAN, PRESS THE GENERATE CHANGELOG BUTTON PLEASE.
+            Don't forget to add a newline after the resulting header and prettify the tag compare link!
           draft: true
           prerelease: false
           files: ./dist/**

.github/workflows/external_release.yml

@@ -1,4 +1,4 @@
-name: Release to CurseForge
+name: Release to external sites
 
 on:
   release:
@@ -8,30 +8,103 @@ jobs:
   curseforge_release:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+      - &parse-paper-versions
+        name: Parse Paper Versions
+        id: parse_versions
+        run: |
+          # Find line declaring Paper versions.
+          raw=$(grep "\\*\\*Paper:\\*\\*" <<< "${{ github.event.release.body }}")
 
-      - name: Fetch Github Release Asset
+          # Enable extended glob pattern to match 0 or more whitespace characters.
+          shopt -s extglob
+          # Trim Paper versions identifier prefix.
+          raw=${raw/*([[:space:]])'**'Paper:'**'*([[:space:]])/}
+          # Replace commas and optional spaces with a newline.
+          raw=${raw//,*([[:space:]])/$'\n'}
+          # Turn extglob back off.
+          shopt -u extglob
+
+          echo "$raw"
+          printf "PAPER_VERSIONS<<EOF\n%s\nEOF\n" "$raw" >> "$GITHUB_OUTPUT"
+
+      - &fetch-release-asset
+        name: Fetch Github Release Asset
         uses: dsaltares/fetch-gh-release-asset@1.1.2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: ${{ github.event.release.id }}
           file: OpenInv.jar
 
-      - name: Set CurseForge Variables
-        run: . scripts/set_curseforge_env.sh "${{ github.event.release.body }}"
-
       - name: Create CurseForge Release
-        uses: itsmeow/curseforge-upload@v3
+        uses: Kira-NT/mc-publish@v3.3
         with:
-          token: "${{ secrets.CURSEFORGE_TOKEN }}"
-          project_id: 31432
-          game_endpoint: minecraft
-          file_path: ./OpenInv.jar
-          display_name: "${{ github.event.release.name }}"
-          game_versions: "${{ env.CURSEFORGE_MINECRAFT_VERSIONS }}"
-          release_type: release
-          changelog_type: markdown
-          changelog: "${{ github.event.release.body }}"
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          curseforge-id: 31432
+          files: ./OpenInv.jar
+          game-versions: "${{ steps.parse_versions.outputs.PAPER_VERSIONS }}"
+          game-version-filter: releases
+          loaders: |
+            spigot
+            paper
+            folia
+
+  modrinth_release:
+    runs-on: ubuntu-latest
+    steps:
+      - *parse-paper-versions
+      - *fetch-release-asset
+
+      - name: Create Modrinth Release
+        uses: Kira-NT/mc-publish@v3.3
+        with:
+          modrinth-id: 1UlvXbzL
+          modrinth-featured: false
+          modrinth-unfeature-mode: none
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          files: ./OpenInv.jar
+          game-versions: "${{ steps.parse_versions.outputs.PAPER_VERSIONS }}"
+          game-version-filter: releases
+          loaders: |
+            spigot
+            paper
+            folia
+
+  hangar_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Parse Hangar Paper Versions
+        id: parse_versions
+        run: |
+          # Find line declaring Paper versions.
+          raw=$(grep "\\*\\*Paper:\\*\\*" <<< "${{ github.event.release.body }}")
+          # Trim Paper versions identifier prefix.
+          raw="${raw/'**'Paper:'**'/}"
+          # Trim leading and trailing spaces.
+          raw="${raw##[[:space:]]}"
+          raw="${raw%%[[:space:]]}"
+
+          # Generate JSON for Hangar. GitHub Actions provides jq 1.7 in the 24.04 image.
+          # Split on comma and optional spaces.
+          hangar_versions=$(jq -nc --arg versions "$raw" '{"PAPER": $versions | split(", *";null)}')
+
+          echo "$hangar_versions"
+          echo "HANGAR_PAPER_VERSIONS=$hangar_versions" >> "$GITHUB_OUTPUT"
+
+      - *fetch-release-asset
+
+      - name: Create Hangar Release
+        uses: benwoo1110/hangar-upload-action@v1
+        with:
+          api_token: ${{ secrets.HANGAR_TOKEN }}
+          slug: 'OpenInv'
+          version: ${{ github.event.release.tag_name }}
+          channel: release
+          description: "${{ github.event.release.body }}"
+          files: |-
+            [
+              {
+                "path": "./OpenInv.jar",
+                "platforms": ["PAPER"]
+              }
+            ]
+          platform_dependencies: "${{ steps.parse_versions.outputs.HANGAR_PAPER_VERSIONS }}"

.github/workflows/pull_request.yml

@@ -16,7 +16,7 @@ jobs:
         run: |
           mkdir -p ./pr
           echo ${{ github.event.number }} > ./pr/pr_number
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: pr_number
           path: pr/

.github/workflows/resource_pack_ci.yml

@@ -13,11 +13,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Build resource pack
         id: upload-resource-pack
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: openinv-legibility-pack
           path: ./resource-pack/openinv-legibility-pack/

.gitignore

@@ -11,3 +11,4 @@
 **/dist/
 **/dependency-reduced-pom.xml
 **/pom.xml.versionsBackup
+**/.vscode/

README.md

@@ -1,7 +1,12 @@
 ## About
-OpenInv is a [Bukkit plugin](https://dev.bukkit.org/projects/openinv) which allows users to open and edit anyone's inventory or ender chest - online or not!
+
+OpenInv is a Bukkit plugin which allows users to open and edit anyone's
+inventory or ender chest - online or not!
+
+Downloads are available on [GitHub](https://github.com/Jikoo/OpenInv/releases), [DBO](https://dev.bukkit.org/projects/openinv)/[CurseForge](https://www.curseforge.com/minecraft/bukkit-plugins/openinv), [Modrinth](https://modrinth.com/plugin/openinv), and [Hangar](https://hangar.papermc.io/jikoo/OpenInv).
 
 ## Features
+
 - **OpenInv**: Open anyone's inventory, even if they're offline.
   - Read-only mode! Don't grant edit permission.
   - Cross-world support! Allow access only from the same world.
@@ -14,17 +19,22 @@ OpenInv is a [Bukkit plugin](https://dev.bukkit.org/projects/openinv) which allo
   - Cross-world support! Allow access only from the same world.
 - **SilentContainer**: Open containers without displaying an animation or making sound.
 - **AnyContainer**: Open containers, even if blocked by ocelots or blocks.
+- **Resource Pack Support**: Personalize view using resource pack tricks like custom fonts and characters. See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Customizing-Inventories) for details.
 
 ## Commands
+
 See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Commands).
 
 ## Permissions
+
 See [the wiki](https://github.com/Jikoo/OpenInv/wiki/Permissions)
 
 ## For Developers
 
 ### As a Dependency
+
 The OpenInv API is available via [JitPack](https://jitpack.io/).
+
 ```xml
   <repositories>
     <repository>
@@ -33,6 +43,7 @@ The OpenInv API is available via [JitPack](https://jitpack.io/).
     </repository>
   </repositories>
 ```
+
 ```xml
   <dependencies>
     <dependency>
@@ -42,13 +53,13 @@ The OpenInv API is available via [JitPack](https://jitpack.io/).
     </dependency>
   </dependencies>
 ```
-Note that since JitPack only builds the API now, the "full" OpenInv jar on JitPack is actually the openinvapi artifact. This is a change from previous dependency declaration that I hope to revert.
+
+Note that since JitPack only builds the API now, the "full" OpenInv jar on JitPack is actually the openinvapi artifact.
+This is a change from previous dependency declaration that I hope to revert.
 
 ### Compilation
-To compile, the relevant Spigot jar must be installed in the local repository.
-As OpenInv is compiled against Mojang's mappings, you must run BuildTools with the `--remapped` argument:  
-`java -jar BuildTools.jar --remapped --rev $serverVersion`  
-`$serverVersion` is the version of the server, i.e. `1.21.4`
 
-Once Spigot is installed, execute the gradle wrapper:  
+Execute the gradle wrapper:  
 `./gradlew build`
+
+If you encounter issues with building the Spigot module, try running BuildTools manually.

addon/togglepersist/build.gradle.kts

@@ -1,11 +1,21 @@
-plugins {
-  `openinv-base`
+repositories {
+  mavenCentral()
+  maven("https://hub.spigotmc.org/nexus/content/groups/public/")
 }
 
 dependencies {
+  compileOnly(libs.spigotapi)
   implementation(project(":openinvapi"))
 }
 
+java {
+  toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
+}
+
 tasks.processResources {
   expand("version" to version)
 }

addon/togglepersist/src/main/java/com/github/jikoo/openinv/togglepersist/TogglePersist.java

@@ -64,13 +64,16 @@ public class TogglePersist extends JavaPlugin implements Listener {
   }
 
   private void set(UUID playerId, String toggleName) {
-    enabledToggles.compute(playerId, (uuid, toggles) -> {
-      if (toggles == null) {
-        toggles = new HashSet<>();
-      }
-      toggles.add(toggleName);
-      return toggles;
-    });
+    enabledToggles.compute(
+        playerId,
+        (uuid, toggles) -> {
+          if (toggles == null) {
+            toggles = new HashSet<>();
+          }
+          toggles.add(toggleName);
+          return toggles;
+        }
+    );
   }
 
   @Override
@@ -97,13 +100,16 @@ public class TogglePersist extends JavaPlugin implements Listener {
       String idString = playerToggles.getKey().toString();
       for (String toggleName : playerToggles.getValue()) {
         // Add player ID to listing for each enabled toggle.
-        converted.compute(toggleName, (name, ids) -> {
-          if (ids == null) {
-            ids = new ArrayList<>();
-          }
-          ids.add(idString);
-          return ids;
-        });
+        converted.compute(
+            toggleName,
+            (name, ids) -> {
+              if (ids == null) {
+                ids = new ArrayList<>();
+              }
+              ids.add(idString);
+              return ids;
+            }
+        );
       }
     }
     return converted;
@@ -133,10 +139,13 @@ public class TogglePersist extends JavaPlugin implements Listener {
     if (event.isEnabled()) {
       set(event.getPlayerId(), event.getToggle().getName());
     } else {
-      enabledToggles.computeIfPresent(event.getPlayerId(), (uuid, toggles) -> {
-        toggles.remove(event.getToggle().getName());
-        return toggles.isEmpty() ? null : toggles;
-      });
+      enabledToggles.computeIfPresent(
+          event.getPlayerId(),
+          (uuid, toggles) -> {
+            toggles.remove(event.getToggle().getName());
+            return toggles.isEmpty() ? null : toggles;
+          }
+      );
     }
   }
 

api/build.gradle.kts

@@ -1,13 +1,30 @@
 plugins {
-  `openinv-base`
   `maven-publish`
 }
 
+repositories {
+  mavenCentral()
+  maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+}
+
+dependencies {
+  compileOnly(libs.spigotapi)
+}
+
+java {
+  toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
+}
+
 publishing {
   publications {
     create<MavenPublication>("jitpack") {
       groupId = "com.github.Jikoo.OpenInv"
       artifactId = "openinvapi"
+      from(components["java"])
     }
   }
 }

api/src/main/java/com/lishid/openinv/IOpenInv.java

@@ -24,8 +24,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.UUID;
 import java.util.logging.Logger;
@@ -33,153 +33,167 @@ import java.util.logging.Logger;
 /**
  * Interface defining behavior for the OpenInv plugin.
  */
+@NullMarked
 public interface IOpenInv {
 
-    /**
-     * Check if the server version is supported by OpenInv.
-     *
-     * @return true if the server version is supported
-     */
-    boolean isSupportedVersion();
+  /**
+   * Check if the server version is supported by OpenInv.
+   *
+   * @return true if the server version is supported
+   */
+  boolean isSupportedVersion();
 
-    /**
-     * Check the configuration value for whether OpenInv saves player data when unloading players. This is exclusively
-     * for users who do not allow editing of inventories, only viewing, and wish to prevent any possibility of bugs such
-     * as lishid#40. If true, OpenInv will not ever save any edits made to players.
-     *
-     * @return false unless configured otherwise
-     */
-    boolean disableSaving();
+  /**
+   * Check the configuration value for whether OpenInv saves player data when unloading players. This is exclusively
+   * for users who do not allow editing of inventories, only viewing, and wish to prevent any possibility of bugs such
+   * as lishid#40. If true, OpenInv will not ever save any edits made to players.
+   *
+   * @return false unless configured otherwise
+   */
+  boolean disableSaving();
 
-    /**
-     * Check the configuration value for whether OpenInv allows offline access. If true, OpenInv will not load or allow
-     * modification of players while they are not online. This does not prevent other plugins from using existing loaded
-     * players who have gone offline.
-     *
-     * @return false unless configured otherwise
-     * @since 4.2.0
-     */
-    boolean disableOfflineAccess();
+  /**
+   * Check the configuration value for whether OpenInv allows offline access. If true, OpenInv will not load or allow
+   * modification of players while they are not online. This does not prevent other plugins from using existing loaded
+   * players who have gone offline.
+   *
+   * @return false unless configured otherwise
+   * @since 4.2.0
+   */
+  boolean disableOfflineAccess();
 
-    /**
-     * Check the configuration value for whether OpenInv uses history for opening commands. If false, OpenInv will use
-     * the previous parameterized search when no parameters are provided.
-     *
-     * @return false unless configured otherwise
-     * @since 4.3.0
-     */
-    boolean noArgsOpensSelf();
+  /**
+   * Check the configuration value for whether OpenInv uses history for opening commands. If false, OpenInv will use
+   * the previous parameterized search when no parameters are provided.
+   *
+   * @return false unless configured otherwise
+   * @since 4.3.0
+   */
+  boolean noArgsOpensSelf();
 
-    /**
-     * Get the active {@link IAnySilentContainer} implementation.
-     *
-     * @return the active implementation for the server version
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    @NotNull IAnySilentContainer getAnySilentContainer();
+  /**
+   * Get the active {@link IAnySilentContainer} implementation.
+   *
+   * @return the active implementation for the server version
+   * @throws IllegalStateException if the server version is unsupported
+   */
+  IAnySilentContainer getAnySilentContainer();
 
-    /**
-     * Get whether a user has AnyContainer mode enabled.
-     *
-     * @param offline the user to obtain the state of
-     * @return true if AnyContainer mode is enabled
-     */
-    boolean getAnyContainerStatus(@NotNull OfflinePlayer offline);
+  /**
+   * Get whether a user has AnyContainer mode enabled.
+   *
+   * @param offline the user to obtain the state of
+   * @return true if AnyContainer mode is enabled
+   */
+  boolean getAnyContainerStatus(OfflinePlayer offline);
 
-    /**
-     * Set whether a user has AnyContainer mode enabled.
-     *
-     * @param offline the user to set the state of
-     * @param status the state of the mode
-     */
-    void setAnyContainerStatus(@NotNull OfflinePlayer offline, boolean status);
+  /**
+   * Set whether a user has AnyContainer mode enabled.
+   *
+   * @param offline the user to set the state of
+   * @param status the state of the mode
+   */
+  void setAnyContainerStatus(OfflinePlayer offline, boolean status);
 
-    /**
-     * Get whether a user has SilentContainer mode enabled.
-     *
-     * @param offline the user to obtain the state of
-     * @return true if SilentContainer mode is enabled
-     */
-    boolean getSilentContainerStatus(@NotNull OfflinePlayer offline);
+  /**
+   * Get whether a user has SilentContainer mode enabled.
+   *
+   * @param offline the user to obtain the state of
+   * @return true if SilentContainer mode is enabled
+   */
+  boolean getSilentContainerStatus(OfflinePlayer offline);
 
-    /**
-     * Set whether a user has SilentContainer mode enabled.
-     *
-     * @param offline the user to set the state of
-     * @param status the state of the mode
-     */
-    void setSilentContainerStatus(@NotNull OfflinePlayer offline, boolean status);
+  /**
+   * Set whether a user has SilentContainer mode enabled.
+   *
+   * @param offline the user to set the state of
+   * @param status the state of the mode
+   */
+  void setSilentContainerStatus(OfflinePlayer offline, boolean status);
 
-    /**
-     * Get an {@link ISpecialEnderChest} for a user.
-     *
-     * @param player the {@link Player} owning the inventory
-     * @param online whether the owner is currently online
-     * @return the created inventory
-     * @throws IllegalStateException if the server version is unsupported
-     * @throws InstantiationException if there was an issue creating the inventory
-     */
-    @NotNull ISpecialEnderChest getSpecialEnderChest(@NotNull Player player, boolean online) throws InstantiationException;
+  /**
+   * Get an {@link ISpecialEnderChest} for a user.
+   *
+   * @param player the {@link Player} owning the inventory
+   * @param online whether the owner is currently online
+   * @return the created inventory
+   * @throws IllegalStateException if the server version is unsupported
+   * @throws InstantiationException if there was an issue creating the inventory
+   */
+  ISpecialEnderChest getSpecialEnderChest(
+      Player player,
+      boolean online
+  ) throws InstantiationException;
 
-    /**
-     * Get an {@link ISpecialPlayerInventory} for a user.
-     *
-     * @param player the {@link Player} owning the inventory
-     * @param online whether the owner is currently online
-     * @return the created inventory
-     * @throws IllegalStateException if the server version is unsupported
-     * @throws InstantiationException if there was an issue creating the inventory
-     */
-    @NotNull ISpecialPlayerInventory getSpecialInventory(@NotNull Player player, boolean online) throws InstantiationException;
+  /**
+   * Get an {@link ISpecialPlayerInventory} for a user.
+   *
+   * @param player the {@link Player} owning the inventory
+   * @param online whether the owner is currently online
+   * @return the created inventory
+   * @throws IllegalStateException if the server version is unsupported
+   * @throws InstantiationException if there was an issue creating the inventory
+   */
+  ISpecialPlayerInventory getSpecialInventory(
+      Player player,
+      boolean online
+  ) throws InstantiationException;
 
-    /**
-     * Open an {@link ISpecialInventory} for a {@link Player}.
-     *
-     * @param player the viewer
-     * @param inventory the inventory to open
-     * @return the resulting {@link InventoryView}
-     */
-    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory);
+  /**
+   * @deprecated Use {@link #openInventory(Player, ISpecialInventory, boolean)}
+   */
+  @Deprecated(forRemoval = true, since = "5.2.0")
+  @Nullable InventoryView openInventory(Player player, ISpecialInventory inventory);
 
-    /**
-     * Check if a {@link Player} is currently loaded by OpenInv.
-     *
-     * @param playerUuid the {@link UUID} of the {@code Player}
-     * @return whether the {@code Player} is loaded
-     * @since 4.2.0
-     */
-    boolean isPlayerLoaded(@NotNull UUID playerUuid);
+  /**
+   * Open an {@link ISpecialInventory} for a {@link Player}.
+   *
+   * @param player the viewer
+   * @param inventory the inventory to open
+   * @param viewOnly whether the inventory should be view-only
+   * @return the resulting {@link InventoryView}
+   */
+  @Nullable InventoryView openInventory(Player player, ISpecialInventory inventory, boolean viewOnly);
 
-    /**
-     * Load a {@link Player} from an {@link OfflinePlayer}. If the user has not played before or the default world for
-     * the server is not loaded, this will return {@code null}.
-     *
-     * @param offline the {@code OfflinePlayer} to load a {@code Player} for
-     * @return the loaded {@code Player}
-     * @throws IllegalStateException if the server version is unsupported
-     */
-    @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline);
+  /**
+   * Check if a {@link Player} is currently loaded by OpenInv.
+   *
+   * @param playerUuid the {@link UUID} of the {@code Player}
+   * @return whether the {@code Player} is loaded
+   * @since 4.2.0
+   */
+  boolean isPlayerLoaded(UUID playerUuid);
 
-    /**
-     * Match an existing {@link OfflinePlayer}. If the name is a {@link UUID#toString() UUID string}, this will only
-     * return the user if they have actually played on the server before, unlike {@link Bukkit#getOfflinePlayer(UUID)}.
-     *
-     * <p>This method is potentially very heavily blocking. It should not ever be called on the
-     * main thread, and if it is, a stack trace will be displayed alerting server owners to the
-     * call.
-     *
-     * @param name the string to match
-     * @return the user with the closest matching name
-     */
-    @Nullable OfflinePlayer matchPlayer(@NotNull String name);
+  /**
+   * Load a {@link Player} from an {@link OfflinePlayer}. If the user has not played before or the default world for
+   * the server is not loaded, this will return {@code null}.
+   *
+   * @param offline the {@code OfflinePlayer} to load a {@code Player} for
+   * @return the loaded {@code Player}
+   * @throws IllegalStateException if the server version is unsupported
+   */
+  @Nullable Player loadPlayer(final OfflinePlayer offline);
 
-    /**
-     * Forcibly close inventories of and unload any cached data for a user.
-     *
-     * @param offline the {@link OfflinePlayer} to unload
-     */
-    void unload(@NotNull OfflinePlayer offline);
+  /**
+   * Match an existing {@link OfflinePlayer}. If the name is a {@link UUID#toString() UUID string}, this will only
+   * return the user if they have actually played on the server before, unlike {@link Bukkit#getOfflinePlayer(UUID)}.
+   *
+   * <p>This method is potentially very heavily blocking. It should not ever be called on the
+   * main thread, and if it is, a stack trace will be displayed alerting server owners to the
+   * call.
+   *
+   * @param name the string to match
+   * @return the user with the closest matching name
+   */
+  @Nullable OfflinePlayer matchPlayer(String name);
 
-    Logger getLogger();
+  /**
+   * Forcibly close inventories of and unload any cached data for a user.
+   *
+   * @param offline the {@link OfflinePlayer} to unload
+   */
+  void unload(OfflinePlayer offline);
+
+  Logger getLogger();
 
 }

api/src/main/java/com/lishid/openinv/event/OpenPlayerSaveEvent.java

@@ -5,11 +5,12 @@ import com.lishid.openinv.internal.ISpecialInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Event fired before OpenInv saves a player's data when closing an {@link ISpecialInventory}.
  */
+@NullMarked
 public class OpenPlayerSaveEvent extends PlayerSaveEvent {
 
   private static final HandlerList HANDLERS = new HandlerList();
@@ -27,9 +28,10 @@ public class OpenPlayerSaveEvent extends PlayerSaveEvent {
   @RestrictedApi(
       explanation = "Constructor is not considered part of the API and may be subject to change.",
       link = "",
-      allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java")
+      allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java"
+  )
   @ApiStatus.Internal
-  OpenPlayerSaveEvent(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+  OpenPlayerSaveEvent(Player player, ISpecialInventory inventory) {
     super(player);
     this.inventory = inventory;
   }
@@ -39,11 +41,10 @@ public class OpenPlayerSaveEvent extends PlayerSaveEvent {
    *
    * @return the special inventory
    */
-  public @NotNull ISpecialInventory getInventory() {
+  public ISpecialInventory getInventory() {
     return inventory;
   }
 
-  @NotNull
   @Override
   public HandlerList getHandlers() {
     return HANDLERS;

api/src/main/java/com/lishid/openinv/event/PlayerSaveEvent.java

@@ -7,11 +7,12 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Event fired before a {@link Player} loaded via OpenInv is saved.
  */
+@NullMarked
 public class PlayerSaveEvent extends PlayerEvent implements Cancellable {
 
   private static final HandlerList HANDLERS = new HandlerList();
@@ -28,9 +29,10 @@ public class PlayerSaveEvent extends PlayerEvent implements Cancellable {
   @RestrictedApi(
       explanation = "Constructor is not considered part of the API and may be subject to change.",
       link = "",
-      allowedOnPath = ".*/com/lishid/openinv/event/(OpenPlayerSaveEvent|OpenEvents).java")
+      allowedOnPath = ".*/com/lishid/openinv/event/(OpenPlayerSaveEvent|OpenEvents).java"
+  )
   @ApiStatus.Internal
-  PlayerSaveEvent(@NotNull Player player) {
+  PlayerSaveEvent(Player player) {
     super(player);
   }
 
@@ -54,7 +56,6 @@ public class PlayerSaveEvent extends PlayerEvent implements Cancellable {
     this.cancelled = cancel;
   }
 
-  @NotNull
   @Override
   public HandlerList getHandlers() {
     return HANDLERS;

api/src/main/java/com/lishid/openinv/event/PlayerToggledEvent.java

@@ -5,27 +5,29 @@ import com.lishid.openinv.util.setting.PlayerToggle;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.UUID;
 
 /**
  * Event fired after OpenInv modifies a toggleable setting for a player.
  */
+@NullMarked
 public class PlayerToggledEvent extends Event {
 
   private static final HandlerList HANDLERS = new HandlerList();
 
-  private final @NotNull PlayerToggle toggle;
-  private final @NotNull UUID uuid;
+  private final PlayerToggle toggle;
+  private final UUID uuid;
   private final boolean enabled;
 
   @RestrictedApi(
       explanation = "Constructor is not considered part of the API and may be subject to change.",
       link = "",
-      allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java")
+      allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java"
+  )
   @ApiStatus.Internal
-  PlayerToggledEvent(@NotNull PlayerToggle toggle, @NotNull UUID uuid, boolean enabled) {
+  PlayerToggledEvent(PlayerToggle toggle, UUID uuid, boolean enabled) {
     this.toggle = toggle;
     this.uuid = uuid;
     this.enabled = enabled;
@@ -36,7 +38,7 @@ public class PlayerToggledEvent extends Event {
    *
    * @return the toggle
    */
-  public @NotNull PlayerToggle getToggle() {
+  public PlayerToggle getToggle() {
     return toggle;
   }
 
@@ -45,7 +47,7 @@ public class PlayerToggledEvent extends Event {
    *
    * @return the player ID
    */
-  public @NotNull UUID getPlayerId() {
+  public UUID getPlayerId() {
     return uuid;
   }
 
@@ -58,7 +60,6 @@ public class PlayerToggledEvent extends Event {
     return enabled;
   }
 
-  @NotNull
   @Override
   public HandlerList getHandlers() {
     return HANDLERS;

api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java

@@ -23,100 +23,111 @@ import org.bukkit.block.EnderChest;
 import org.bukkit.block.data.Directional;
 import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.util.BoundingBox;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public interface IAnySilentContainer {
 
-    /**
-     * Forcibly open the container at the given coordinates for the Player. This will open blocked containers! Be sure
-     * to check {@link #isAnyContainerNeeded(Block)} first if that is not desirable.
-     *
-     * @param player the {@link Player} opening the container
-     * @param silent whether the container's noise is to be silenced
-     * @param block  the {@link Block} of the container
-     * @return true if the container can be opened
-     */
-    boolean activateContainer(@NotNull Player player, boolean silent, @NotNull Block block);
+  /**
+   * Forcibly open the container at the given coordinates for the Player. This will open blocked containers! Be sure
+   * to check {@link #isAnyContainerNeeded(Block)} first if that is not desirable.
+   *
+   * @param player the {@link Player} opening the container
+   * @param silent whether the container's noise is to be silenced
+   * @param block  the {@link Block} of the container
+   * @return true if the container can be opened
+   */
+  boolean activateContainer(Player player, boolean silent, Block block);
 
-    /**
-     * Perform operations required to close the current container silently.
-     *
-     * @param player the {@link Player} closing a container
-     */
-    void deactivateContainer(@NotNull Player player);
+  /**
+   * Perform operations required to close the current container silently.
+   *
+   * @param player the {@link Player} closing a container
+   */
+  void deactivateContainer(Player player);
 
-    /**
-     * Check if the container at the given coordinates is blocked.
-     *
-     * @param block the {@link Block} of the container
-     * @return true if the container is blocked
-     */
-    boolean isAnyContainerNeeded(@NotNull Block block);
+  /**
+   * Check if the container at the given coordinates is blocked.
+   *
+   * @param block the {@link Block} of the container
+   * @return true if the container is blocked
+   */
+  boolean isAnyContainerNeeded(Block block);
 
-    /**
-     * Check if a shulker box block cannot be opened under ordinary circumstances.
-     *
-     * @param shulkerBox the shulker box block
-     * @return whether the container is blocked
-     */
-    default boolean isShulkerBlocked(@NotNull Block shulkerBox) {
-        Directional directional = (Directional) shulkerBox.getBlockData();
-        BlockFace facing = directional.getFacing();
-        // Construct a new 1-block bounding box at the origin.
-        BoundingBox box = new BoundingBox(0, 0, 0, 1, 1, 1);
-        // Expand the box in the direction the shulker will open.
-        box.expand(facing, 0.5);
-        // Move the box away from the origin by a block so only the expansion intersects with a box around the origin.
-        box.shift(facing.getOppositeFace().getDirection());
-        // Check if the relative block's collision shape (which will be at the origin) intersects with the expanded box.
-        return shulkerBox.getRelative(facing).getCollisionShape().overlaps(box);
-    }
+  /**
+   * Check if a shulker box block cannot be opened under ordinary circumstances.
+   *
+   * @param shulkerBox the shulker box block
+   * @return whether the container is blocked
+   */
+  default boolean isShulkerBlocked(Block shulkerBox) {
+    Directional directional = (Directional) shulkerBox.getBlockData();
+    BlockFace facing = directional.getFacing();
+    // Construct a new 1-block bounding box at the origin.
+    BoundingBox box = new BoundingBox(0, 0, 0, 1, 1, 1);
+    // Expand the box in the direction the shulker will open.
+    box.expand(facing, 0.5);
+    // Move the box away from the origin by a block so only the expansion intersects with a box around the origin.
+    box.shift(facing.getOppositeFace().getDirection());
+    // Check if the relative block's collision shape (which will be at the origin) intersects with the expanded box.
+    return shulkerBox.getRelative(facing).getCollisionShape().overlaps(box);
+  }
 
-    /**
-     * Check if a chest cannot be opened under ordinary circumstances.
-     *
-     * @param chest the chest block
-     * @return whether the container is blocked
-     */
-    default boolean isChestBlocked(@NotNull Block chest) {
-        org.bukkit.block.Block relative = chest.getRelative(0, 1, 0);
-        return relative.getType().isOccluding()
-                || !chest.getWorld().getNearbyEntities(BoundingBox.of(relative), Cat.class::isInstance).isEmpty();
-    }
+  /**
+   * Check if a chest cannot be opened under ordinary circumstances.
+   *
+   * @param chest the chest block
+   * @return whether the container is blocked
+   */
+  default boolean isChestBlocked(Block chest) {
+    org.bukkit.block.Block relative = chest.getRelative(0, 1, 0);
+    return relative.getType().isOccluding()
+        || !chest.getWorld().getNearbyEntities(BoundingBox.of(relative), Cat.class::isInstance).isEmpty();
+  }
 
-    /**
-     * Check if the given {@link Block} is a container which can be unblocked or silenced.
-     *
-     * @param block the potential container
-     * @return true if the type is a supported container
-     */
-    boolean isAnySilentContainer(@NotNull Block block);
+  /**
+   * Check if the given {@link Block} is a container which can be unblocked or silenced.
+   *
+   * @param block the potential container
+   * @return true if the type is a supported container
+   */
+  boolean isAnySilentContainer(Block block);
 
-    /**
-     * Check if the given {@link BlockState} is a container which can be unblocked or silenced.
-     *
-     * @param blockState the potential container
-     * @return true if the type is a supported container
-     */
-    default boolean isAnySilentContainer(@NotNull BlockState blockState) {
-        return (blockState instanceof InventoryHolder holder && isAnySilentContainer(holder))
-                || blockState instanceof EnderChest;
-    }
+  /**
+   * Check if the given {@link BlockState} is a container which can be unblocked or silenced.
+   *
+   * @param blockState the potential container
+   * @return true if the type is a supported container
+   */
+  default boolean isAnySilentContainer(BlockState blockState) {
+    return (blockState instanceof InventoryHolder holder && isAnySilentContainer(holder))
+        || blockState instanceof EnderChest;
+  }
 
-    /**
-     * Check if the given {@link InventoryHolder} is a container which can be unblocked or silenced.
-     *
-     * @param holder the potential container
-     * @return true if the type is a supported container
-     */
-    default boolean isAnySilentContainer(@NotNull InventoryHolder holder) {
-        return holder instanceof org.bukkit.block.EnderChest
-                || holder instanceof org.bukkit.block.Chest
-                || holder instanceof org.bukkit.block.DoubleChest
-                || holder instanceof org.bukkit.block.ShulkerBox
-                || holder instanceof org.bukkit.block.Barrel;
-    }
+  /**
+   * Check if the given {@link InventoryHolder} is a container which can be unblocked or silenced.
+   *
+   * @param holder the potential container
+   * @return true if the type is a supported container
+   */
+  default boolean isAnySilentContainer(@Nullable InventoryHolder holder) {
+    return holder instanceof org.bukkit.block.EnderChest
+        || holder instanceof org.bukkit.block.Chest
+        || holder instanceof org.bukkit.block.DoubleChest
+        || holder instanceof org.bukkit.block.ShulkerBox
+        || holder instanceof org.bukkit.block.Barrel;
+  }
+
+  /**
+   * Check if the given {@link Inventory} belongs to a container which can be unblocked or silenced.
+   * 
+   * @param inventory the potential container inventory
+   * @return true if the type is a supported container
+   */
+  boolean isAnySilentContainer(Inventory inventory);
 
 }

api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java

@@ -17,15 +17,16 @@
 package com.lishid.openinv.internal;
 
 import org.bukkit.event.inventory.InventoryType;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An {@link ISpecialInventory} representing an ender chest.
  */
+@NullMarked
 public interface ISpecialEnderChest extends ISpecialInventory {
 
   @Override
-  default @NotNull InventoryType getBukkitType() {
+  default InventoryType getBukkitType() {
     return InventoryType.ENDER_CHEST;
   }
 

api/src/main/java/com/lishid/openinv/internal/ISpecialInventory.java

@@ -20,53 +20,57 @@ import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Interface defining behavior for special inventories backed by other inventories' content listings.
  */
+@NullMarked
 public interface ISpecialInventory {
 
-    /**
-     * Get the {@link Inventory} associated with this {@code ISpecialInventory}.
-     *
-     * @return the Bukkit inventory
-     */
-    @NotNull Inventory getBukkitInventory();
+  /**
+   * Get the {@link Inventory} associated with this {@code ISpecialInventory}.
+   *
+   * @return the Bukkit inventory
+   */
+  Inventory getBukkitInventory();
 
-    /**
-     * Get the {@link InventoryType} corresponding to this {@code ISpecialInventory}.
-     *
-     * @return the type of Bukkit inventory
-     */
-    @NotNull InventoryType getBukkitType();
+  /**
+   * Get the {@link InventoryType} corresponding to this {@code ISpecialInventory}.
+   *
+   * @return the type of Bukkit inventory
+   */
+  InventoryType getBukkitType();
 
-    /**
-     * Set the owning {@link Player} instance to a newly-joined user.
-     *
-     * @param player the user coming online
-     */
-    void setPlayerOnline(@NotNull Player player);
+  /**
+   * Set the owning {@link Player} instance to a newly-joined user.
+   *
+   * @param player the user coming online
+   */
+  void setPlayerOnline(Player player);
 
-    /**
-     * Mark the owner of the inventory offline.
-     */
-    void setPlayerOffline();
+  /**
+   * Mark the owner of the inventory offline.
+   *
+   * @deprecated No longer used by implementations.
+   */
+  @Deprecated(forRemoval = true, since = "5.1.11")
+  default void setPlayerOffline() {}
 
-    /**
-     * Get whether the inventory is being viewed by any users.
-     *
-     * @return true if the inventory is being viewed
-     */
-    default boolean isInUse() {
-        return !getBukkitInventory().getViewers().isEmpty();
-    }
+  /**
+   * Get whether the inventory is being viewed by any users.
+   *
+   * @return true if the inventory is being viewed
+   */
+  default boolean isInUse() {
+    return !getBukkitInventory().getViewers().isEmpty();
+  }
 
-    /**
-     * Get the {@link Player} who owns the inventory.
-     *
-     * @return the {@link HumanEntity} who owns the inventory
-     */
-    @NotNull HumanEntity getPlayer();
+  /**
+   * Get the {@link Player} who owns the inventory.
+   *
+   * @return the {@link HumanEntity} who owns the inventory
+   */
+  HumanEntity getPlayer();
 
 }

api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java

@@ -17,16 +17,17 @@
 package com.lishid.openinv.internal;
 
 import org.bukkit.event.inventory.InventoryType;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * An {@link ISpecialInventory} representing a player inventory.
  */
+@NullMarked
 public interface ISpecialPlayerInventory extends ISpecialInventory {
 
-    @Override
-    default @NotNull InventoryType getBukkitType() {
-        return InventoryType.PLAYER;
-    }
+  @Override
+  default InventoryType getBukkitType() {
+    return InventoryType.PLAYER;
+  }
 
 }

api/src/main/java/com/lishid/openinv/util/InventoryAccess.java

@@ -22,83 +22,87 @@ import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.function.BiFunction;
 
+@NullMarked
 public final class InventoryAccess {
 
-    private static @Nullable BiFunction<Inventory, Class<? extends ISpecialInventory>, ISpecialInventory> provider;
+  private static @Nullable BiFunction<Inventory, Class<? extends ISpecialInventory>, @Nullable ISpecialInventory> provider;
 
-    public static boolean isUsable() {
-        return provider != null;
-    }
+  public static boolean isUsable() {
+    return provider != null;
+  }
 
-    /**
-     * Check if an {@link Inventory} is an {@link ISpecialPlayerInventory} implementation.
-     *
-     * @param inventory the Bukkit inventory
-     * @return true if backed by the correct implementation
-     */
-    public static boolean isPlayerInventory(@NotNull Inventory inventory) {
-        return getPlayerInventory(inventory) != null;
-    }
+  /**
+   * Check if an {@link Inventory} is an {@link ISpecialPlayerInventory} implementation.
+   *
+   * @param inventory the Bukkit inventory
+   * @return true if backed by the correct implementation
+   */
+  public static boolean isPlayerInventory(Inventory inventory) {
+    return getPlayerInventory(inventory) != null;
+  }
 
-    /**
-     * Get the {@link ISpecialPlayerInventory} backing an {@link Inventory}. Returns {@code null} if the inventory is
-     * not backed by the correct class.
-     *
-     * @param inventory the Bukkit inventory
-     * @return the backing implementation if available
-     */
-    public static @Nullable ISpecialPlayerInventory getPlayerInventory(@NotNull Inventory inventory) {
-        return provider == null ? null : (ISpecialPlayerInventory) provider.apply(inventory, ISpecialPlayerInventory.class);
-    }
+  /**
+   * Get the {@link ISpecialPlayerInventory} backing an {@link Inventory}. Returns {@code null} if the inventory is
+   * not backed by the correct class.
+   *
+   * @param inventory the Bukkit inventory
+   * @return the backing implementation if available
+   */
+  public static @Nullable ISpecialPlayerInventory getPlayerInventory(Inventory inventory) {
+    return provider == null ? null : (ISpecialPlayerInventory) provider.apply(inventory, ISpecialPlayerInventory.class);
+  }
 
-    /**
-     * Check if an {@link Inventory} is an {@link ISpecialEnderChest} implementation.
-     *
-     * @param inventory the Bukkit inventory
-     * @return true if backed by the correct implementation
-     */
-    public static boolean isEnderChest(@NotNull Inventory inventory) {
-        return getEnderChest(inventory) != null;
-    }
+  /**
+   * Check if an {@link Inventory} is an {@link ISpecialEnderChest} implementation.
+   *
+   * @param inventory the Bukkit inventory
+   * @return true if backed by the correct implementation
+   */
+  public static boolean isEnderChest(Inventory inventory) {
+    return getEnderChest(inventory) != null;
+  }
 
-    /**
-     * Get the {@link ISpecialEnderChest} backing an {@link Inventory}. Returns {@code null} if the inventory is
-     * not backed by the correct class.
-     *
-     * @param inventory the Bukkit inventory
-     * @return the backing implementation if available
-     */
-    public static @Nullable ISpecialEnderChest getEnderChest(@NotNull Inventory inventory) {
-        return provider == null ? null : (ISpecialEnderChest) provider.apply(inventory, ISpecialEnderChest.class);
-    }
+  /**
+   * Get the {@link ISpecialEnderChest} backing an {@link Inventory}. Returns {@code null} if the inventory is
+   * not backed by the correct class.
+   *
+   * @param inventory the Bukkit inventory
+   * @return the backing implementation if available
+   */
+  public static @Nullable ISpecialEnderChest getEnderChest(Inventory inventory) {
+    return provider == null ? null : (ISpecialEnderChest) provider.apply(inventory, ISpecialEnderChest.class);
+  }
 
-    /**
-     * Get a {@link ISpecialInventory} backing an {@link Inventory}. Returns {@code null} if the inventory is not backed
-     * by the correct class.
-     *
-     * @param inventory the Bukkit inventory
-     * @return the backing implementation if available
-     */
-    public static @Nullable ISpecialInventory getInventory(@NotNull Inventory inventory) {
-        return provider == null ? null : provider.apply(inventory, ISpecialInventory.class);
-    }
+  /**
+   * Get a {@link ISpecialInventory} backing an {@link Inventory}. Returns {@code null} if the inventory is not backed
+   * by the correct class.
+   *
+   * @param inventory the Bukkit inventory
+   * @return the backing implementation if available
+   */
+  public static @Nullable ISpecialInventory getInventory(Inventory inventory) {
+    return provider == null ? null : provider.apply(inventory, ISpecialInventory.class);
+  }
 
-    @RestrictedApi(
-        explanation = "Not part of the API.",
-        link = "",
-        allowedOnPath = ".*/com/lishid/openinv/util/InternalAccessor.java")
-    @ApiStatus.Internal
-    static void setProvider(@Nullable BiFunction<Inventory, Class<? extends ISpecialInventory>, ISpecialInventory> provider) {
-        InventoryAccess.provider = provider;
-    }
+  @RestrictedApi(
+      explanation = "Not part of the API.",
+      link = "",
+      allowedOnPath = ".*/com/lishid/openinv/util/InternalAccessor.java"
+  )
+  @ApiStatus.Internal
+  static void setProvider(
+      @Nullable BiFunction<Inventory, Class<? extends ISpecialInventory>, @Nullable ISpecialInventory> provider
+  ) {
+    InventoryAccess.provider = provider;
+  }
 
-    private InventoryAccess() {
-        throw new IllegalStateException("Cannot create instance of utility class.");
-    }
+  private InventoryAccess() {
+    throw new IllegalStateException("Cannot create instance of utility class.");
+  }
 
 }

api/src/main/java/com/lishid/openinv/util/Permissions.java

@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.util;
+
+import org.bukkit.permissions.Permissible;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * An enum containing all permissions directly checked by OpenInv.
+ *
+ * <p>Note that this is not an exhaustive list! This does not contain
+ * all permissions managed by Bukkit, largely parent nodes.</p>
+ */
+@NullMarked
+public enum Permissions {
+
+  /// Permission to open one's own inventory.
+  INVENTORY_OPEN_SELF("inventory.open.self"),
+  /// Permission to open someone else's inventory.
+  INVENTORY_OPEN_OTHER("inventory.open.other"),
+  /**
+   * Permission to edit one's own inventory.
+   *
+   * <p>Note that this does not guarantee that the user has access to open the inventory!
+   * Be sure to check {@link #INVENTORY_OPEN_SELF} first.</p>
+   */
+  INVENTORY_EDIT_SELF("inventory.edit.self"),
+  /**
+   * Permission to edit someone else's inventory.
+   *
+   * <p>Note that this does not guarantee that the user has access to open the inventory!
+   * Be sure to check {@link #INVENTORY_OPEN_OTHER} first.</p>
+   */
+  INVENTORY_EDIT_OTHER("inventory.edit.other"),
+  /// Permission to insert any item into the head slot.
+  INVENTORY_SLOT_HEAD_ANY("inventory.slot.head.any"),
+  /// Permission to insert any item into the chest slot.
+  INVENTORY_SLOT_CHEST_ANY("inventory.slot.chest.any"),
+  /// Permission to insert any item into the legs slot.
+  INVENTORY_SLOT_LEGS_ANY("inventory.slot.legs.any"),
+  /// Permission to insert any item into the feet slot.
+  INVENTORY_SLOT_FEET_ANY("inventory.slot.feet.any"),
+  /// Permission to drop items as the player via the drop slot.
+  INVENTORY_SLOT_DROP("inventory.slot.drop"),
+
+  /// Permission to open one's own ender chest.
+  ENDERCHEST_OPEN_SELF("enderchest.open.self"),
+  /// Permission to open someone else's ender chest.
+  ENDERCHEST_OPEN_OTHER("enderchest.open.other"),
+  /**
+   * Permission to edit one's own ender chest.
+   *
+   * <p>Note that this does not guarantee that the user has access to open the inventory!
+   * Be sure to check {@link #ENDERCHEST_OPEN_SELF} first.</p>
+   */
+  ENDERCHEST_EDIT_SELF("enderchest.edit.self"),
+  /**
+   * Permission to edit someone else's ender chest.
+   *
+   * <p>Note that this does not guarantee that the user has access to open the inventory!
+   * Be sure to check {@link #ENDERCHEST_OPEN_OTHER} first.</p>
+   */
+  ENDERCHEST_EDIT_OTHER("enderchest.edit.other"),
+
+  /// Permission to clear one's own inventory.
+  CLEAR_SELF("clear.self"),
+  /// Permission to clear someone else's inventory.
+  CLEAR_OTHER("clear.other"),
+
+  /// Permission to view inventories and ender chests from other worlds.
+  ACCESS_CROSSWORLD("access.crossworld"),
+  /// Permission to access offline players' inventories and ender chests.
+  ACCESS_OFFLINE("access.offline"),
+  /// Permission to access online players' inventories and ender chests.
+  ACCESS_ONLINE("access.online"),
+  /// Permission granting the ability to edit players with the same access level.
+  ACCESS_EQUAL_EDIT("access.equal.edit"),
+  /// Permission to view, but not edit, players with the same access level.
+  ACCESS_EQUAL_VIEW("access.equal.view"),
+  /// Permission to deny access to players with the same access level.
+  ACCESS_EQUAL_DENY("access.equal.deny"),
+
+  /// Permission to perform inventory interaction while in spectator mode.
+  SPECTATE_CLICK("spectate.click"),
+
+  /// Permission to use the AnyContainer feature.
+  CONTAINER_ANY("container.any"),
+  /// Permission to use the AnyContainer feature but not the command to toggle it.
+  CONTAINER_ANY_USE("container.any.use"),
+  /// Permission to use the SilentContainer feature.
+  CONTAINER_SILENT("container.silent"),
+  /// Permission to use the SilentContainer feature but not the command to toggle it.
+  CONTAINER_SILENT_USE("container.silent.use"),
+  /// Permission to search inventories and ender chests.
+  SEARCH_INVENTORY("search.inventory"),
+  /// Permission to search containers.
+  SEARCH_CONTAINER("search.container");
+
+  private final String permission;
+
+  Permissions(String permission) {
+    this.permission = "openinv." + permission;
+  }
+
+  /**
+   * Check if a {@link Permissible} has this permission.
+   *
+   * @param permissible the Permissible
+   * @return true if the permission is granted
+   */
+  public boolean hasPermission(Permissible permissible) {
+    return permissible.hasPermission(permission);
+  }
+
+}

api/src/main/java/com/lishid/openinv/util/setting/PlayerToggle.java

@@ -1,12 +1,14 @@
 package com.lishid.openinv.util.setting;
 
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.entity.Player;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.UUID;
 
 /**
  * A per-player setting that may be enabled or disabled.
  */
+@NullMarked
 public interface PlayerToggle {
 
   /**
@@ -14,7 +16,7 @@ public interface PlayerToggle {
    *
    * @return the setting name
    */
-  @NotNull String getName();
+  String getName();
 
   /**
    * Get the state of the toggle for a particular player ID.
@@ -22,7 +24,16 @@ public interface PlayerToggle {
    * @param uuid the player ID
    * @return true if the setting is enabled
    */
-  boolean is(@NotNull UUID uuid);
+  boolean is(UUID uuid);
+
+  /**
+   * Get the state of the toggle for a particular {@link Player},
+   * accounting for permissions required to use the feature.
+   *
+   * @param player the player
+   * @return true if the setting is enabled and the player has the required permissions
+   */
+  boolean is(Player player);
 
   /**
    * Set the state of the toggle for a particular player ID.
@@ -31,6 +42,6 @@ public interface PlayerToggle {
    * @param enabled whether the setting is enabled
    * @return true if the setting changed as a result of being set
    */
-  boolean set(@NotNull UUID uuid, boolean enabled);
+  boolean set(UUID uuid, boolean enabled);
 
 }

api/src/main/java/com/lishid/openinv/util/setting/PlayerToggles.java

@@ -1,8 +1,10 @@
 package com.lishid.openinv.util.setting;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import com.lishid.openinv.util.Permissions;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.UnmodifiableView;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -16,18 +18,31 @@ import java.util.UUID;
 /**
  * Utility class containing all of OpenInv's {@link PlayerToggle PlayerToggles}.
  */
+@NullMarked
 public final class PlayerToggles {
 
   private static final Map<String, PlayerToggle> TOGGLES = new HashMap<>();
-  private static final PlayerToggle ANY = add(new MemoryToggle("AnyContainer"));
-  private static final PlayerToggle SILENT = add(new MemoryToggle("SilentContainer"));
+  private static final PlayerToggle ANY = add(new MemoryToggle("AnyContainer") {
+    @Override
+    public boolean is(Player player) {
+      return is(player.getUniqueId())
+          && (Permissions.CONTAINER_ANY.hasPermission(player) || Permissions.CONTAINER_ANY_USE.hasPermission(player));
+    }
+  });
+  private static final PlayerToggle SILENT = add(new MemoryToggle("SilentContainer") {
+    @Override
+    public boolean is(Player player) {
+      return is(player.getUniqueId())
+          && (Permissions.CONTAINER_SILENT.hasPermission(player) || Permissions.CONTAINER_SILENT_USE.hasPermission(player));
+    }
+  });
 
   /**
    * Get the AnyContainer toggle.
    *
    * @return the AnyContainer toggle
    */
-  public static @NotNull PlayerToggle any() {
+  public static PlayerToggle any() {
     return ANY;
   }
 
@@ -36,7 +51,7 @@ public final class PlayerToggles {
    *
    * @return the SilentContainer toggle
    */
-  public static @NotNull PlayerToggle silent() {
+  public static PlayerToggle silent() {
     return SILENT;
   }
 
@@ -46,7 +61,7 @@ public final class PlayerToggles {
    * @param toggleName the name of the toggle
    * @return the toggle, or null if no such toggle exists.
    */
-  public static @Nullable PlayerToggle get(@NotNull String toggleName) {
+  public static @Nullable PlayerToggle get(String toggleName) {
     PlayerToggle toggle = TOGGLES.get(toggleName);
     if (toggle == null) {
       toggle = TOGGLES.get(toggleName.toLowerCase(Locale.ENGLISH));
@@ -59,11 +74,11 @@ public final class PlayerToggles {
    *
    * @return a view of all toggles available
    */
-  public static @UnmodifiableView @NotNull Collection<PlayerToggle> get() {
+  public static @UnmodifiableView Collection<PlayerToggle> get() {
     return Collections.unmodifiableCollection(TOGGLES.values());
   }
 
-  private static @NotNull PlayerToggle add(@NotNull PlayerToggle toggle) {
+  private static PlayerToggle add(PlayerToggle toggle) {
     TOGGLES.put(toggle.getName().toLowerCase(Locale.ENGLISH), toggle);
     return toggle;
   }
@@ -72,28 +87,28 @@ public final class PlayerToggles {
     throw new IllegalStateException("Cannot create instance of utility class.");
   }
 
-  private static class MemoryToggle implements PlayerToggle {
+  private static abstract class MemoryToggle implements PlayerToggle {
 
-    private final @NotNull Set<UUID> enabled;
-    private final @NotNull String name;
+    private final Set<UUID> enabled;
+    private final String name;
 
-    private MemoryToggle(@NotNull String name) {
+    private MemoryToggle(String name) {
       enabled = new HashSet<>();
       this.name = name;
     }
 
     @Override
-    public @NotNull String getName() {
+    public String getName() {
       return this.name;
     }
 
     @Override
-    public boolean is(@NotNull UUID uuid) {
+    public boolean is(UUID uuid) {
       return enabled.contains(uuid);
     }
 
     @Override
-    public boolean set(@NotNull UUID uuid, boolean enabled) {
+    public boolean set(UUID uuid, boolean enabled) {
       if (enabled) {
         return this.enabled.add(uuid);
       } else {

build.gradle.kts

@@ -2,20 +2,40 @@ plugins {
   `java-library`
   alias(libs.plugins.paperweight) apply false
   alias(libs.plugins.shadow) apply false
+  alias(libs.plugins.errorprone.gradle)
 }
 
-// Set by Spigot module, used by Paper module to convert to Spigot's version of Mojang mappings.
-project.ext.set("craftbukkitPackage", "UNKNOWN")
-
 repositories {
   maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 // Allow submodules to target higher Java release versions.
-// Not currently necessary (as lowest supported version is in the 1.21 range)
-// but may become relevant in the future.
 java.disableAutoTargetJvm()
 
+subprojects {
+  apply(plugin = "java-library")
+  apply(plugin = rootProject.libs.plugins.errorprone.gradle.get().pluginId)
+
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    compileOnly(rootProject.libs.jspecify)
+    compileOnly(rootProject.libs.annotations)
+    errorprone(rootProject.libs.errorprone.core)
+  }
+
+  tasks {
+    withType<JavaCompile>().configureEach {
+      options.encoding = Charsets.UTF_8.name()
+    }
+    withType<Javadoc>().configureEach {
+      options.encoding = Charsets.UTF_8.name()
+    }
+  }
+}
+
 // Task to delete ./dist where final files are output.
 tasks.register("cleanDist") {
   delete("dist")

buildSrc/build.gradle.kts

@@ -4,4 +4,5 @@ plugins {
 
 repositories {
   gradlePluginPortal()
+  mavenCentral()
 }

buildSrc/src/main/kotlin/com/github/jikoo/openinv/BuildToolsValueSource.kt

@@ -0,0 +1,107 @@
+package com.github.jikoo.openinv
+
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.ValueSource
+import org.gradle.api.provider.ValueSourceParameters
+import org.gradle.process.ExecOperations
+import java.io.File
+import java.net.URI
+import java.nio.file.Files
+import javax.inject.Inject
+
+abstract class BuildToolsValueSource : ValueSource<File, BuildToolsValueSource.Parameters> {
+
+  @get:Inject
+  abstract val exec: ExecOperations
+
+  interface Parameters : ValueSourceParameters {
+    val installDir: DirectoryProperty
+    val workingDir: DirectoryProperty
+
+    val spigotVersion: Property<String>
+    val spigotRevision: Property<String>
+
+    val ignoreCached: Property<Boolean>
+
+    val javaHome: DirectoryProperty
+    val javaExecutable: Property<String>
+  }
+
+  override fun obtain(): File {
+    val version = parameters.spigotVersion.get()
+    val revision = parameters.spigotRevision.get()
+    val spigotLocation = parameters.installDir.get().asFile.resolve("spigot-$version.jar")
+    // If Spigot is already installed, don't reinstall.
+    if (!parameters.ignoreCached.get() && spigotLocation.exists()) {
+      println("Skipping Spigot installation, $version is present")
+      return spigotLocation
+    }
+
+    val buildTools = installBuildTools(parameters.workingDir.get().asFile)
+
+    println("Installing Spigot $version (rev $revision)")
+
+    exec.javaexec {
+      environment["JAVA_HOME"] = parameters.javaHome.get()
+      executable = parameters.javaExecutable.get()
+      workingDir = buildTools.parentFile
+      classpath(buildTools)
+      args = listOf("--nogui", "--rev", revision)
+    }.rethrowFailure()
+
+    val spigotBuild = buildTools.parentFile.resolve("Spigot/Spigot-Server/target/spigot-$version.jar")
+
+    if (!spigotBuild.exists()) {
+      throw IllegalStateException(
+        "Spigot build completed, but $spigotBuild does not exist! Did BuildTools change output location?"
+      )
+    }
+
+    spigotBuild.copyTo(spigotLocation, overwrite = true)
+
+    // Mark work for delete.
+    cleanUp(buildTools.parentFile)
+
+    if (!spigotLocation.exists()) {
+      throw IllegalStateException(
+        "Failed to install Spigot $version from $revision. Does the revision point to a different version?"
+      )
+    }
+
+    return spigotLocation
+  }
+
+  private fun installBuildTools(workingDir: File): File {
+    val buildTools = workingDir.resolve("BuildTools.jar")
+    if (buildTools.exists()) {
+      return buildTools
+    }
+
+    workingDir.mkdirs()
+
+    val buildToolsUrl =
+      "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
+    println("Downloading $buildToolsUrl")
+    val stream = URI.create(buildToolsUrl).toURL().openStream()
+    Files.copy(stream, buildTools.toPath())
+    stream.close()
+
+    return buildTools
+  }
+
+  private fun cleanUp(dir: File) {
+    dir.deleteOnExit()
+    if (!dir.isDirectory) {
+      return
+    }
+
+    dir.listFiles()?.forEach {
+      if (it.isDirectory) {
+        cleanUp(it)
+      } else {
+        it.deleteOnExit()
+      }
+    }
+  }
+}

buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotDependencyExtension.kt

@@ -0,0 +1,19 @@
+package com.github.jikoo.openinv
+
+import org.gradle.api.model.ObjectFactory
+import org.gradle.jvm.toolchain.JavaToolchainSpec
+
+abstract class SpigotDependencyExtension(
+  objects: ObjectFactory
+) {
+
+  val version = objects.property(String::class.java)
+  val revision = objects.property(String::class.java)
+    .convention(version.map {
+      it.replace("-R\\d+\\.\\d+-SNAPSHOT".toRegex(), "")
+    })
+  val classifier = objects.property(String::class.java).convention("")
+  val java = objects.property(JavaToolchainSpec::class.java)
+  val ignoreCached = objects.property(Boolean::class.java).convention(false)
+
+}

buildSrc/src/main/kotlin/com/github/jikoo/openinv/SpigotSetup.kt

@@ -0,0 +1,50 @@
+package com.github.jikoo.openinv
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaToolchainService
+import java.io.File
+import javax.inject.Inject
+
+abstract class SpigotSetup : Plugin<Project> {
+
+  @get:Inject
+  abstract val javaToolchainService: JavaToolchainService
+
+  override fun apply(target: Project) {
+    target.plugins.apply("java")
+
+    // Set up extension for configuring Spigot dependency.
+    val spigotExt = target.dependencies.extensions.findByType(SpigotDependencyExtension::class.java)
+      ?: target.dependencies.extensions.create(
+        "spigot",
+        SpigotDependencyExtension::class.java,
+        target.objects
+      )
+
+    target.afterEvaluate {
+      // Get Java requirements, defaulting to version used for compilation.
+      spigotExt.java.convention(target.extensions.getByType(JavaPluginExtension::class.java).toolchain)
+      val launcher = javaToolchainService.launcherFor(spigotExt.java.get()).get()
+
+      // Install Spigot with BuildTools.
+      val spigot: File = target.providers.of(BuildToolsValueSource::class.java) {
+        parameters {
+          installDir.set(target.gradle.gradleUserHomeDir.resolve("caches/spigot"))
+          workingDir.set(target.layout.buildDirectory.dir("tmp/buildtools"))
+          spigotVersion.set(spigotExt.version)
+          spigotRevision.set(spigotExt.revision)
+          ignoreCached.set(spigotExt.ignoreCached)
+          javaHome.set(launcher.metadata.installationPath)
+          javaExecutable.set(launcher.executablePath.asFile.path)
+        }
+      }.get()
+
+      // Add Spigot dependency.
+      val dependency = target.dependencies.create(files(spigot))
+      target.dependencies.add("compileOnly", dependency)
+    }
+  }
+
+}

buildSrc/src/main/kotlin/openinv-base.gradle.kts

@@ -1,34 +0,0 @@
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.kotlin.dsl.maven
-import org.gradle.kotlin.dsl.repositories
-import org.gradle.kotlin.dsl.dependencies
-
-plugins {
-  `java-library`
-}
-
-java {
-  toolchain.languageVersion = JavaLanguageVersion.of(21)
-}
-
-repositories {
-  mavenCentral()
-  maven("https://repo.papermc.io/repository/maven-public/")
-  maven("https://hub.spigotmc.org/nexus/content/groups/public/")
-}
-
-dependencies {
-  val libs = versionCatalogs.named("libs")
-  compileOnly(libs.findLibrary("annotations").orElseThrow())
-  compileOnly(libs.findLibrary("spigotapi").orElseThrow())
-}
-
-tasks {
-  withType<JavaCompile>().configureEach {
-    options.release = 21
-    options.encoding = Charsets.UTF_8.name()
-  }
-  withType<Javadoc>().configureEach {
-    options.encoding = Charsets.UTF_8.name()
-  }
-}

buildSrc/src/main/kotlin/remap-spigot.gradle.kts

@@ -1,55 +0,0 @@
-import java.nio.file.Path
-import java.nio.file.Paths
-
-val spigotRemap = configurations.create("spigotRemap")
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-  spigotRemap("net.md-5:SpecialSource:1.11.4:shaded")
-}
-
-abstract class RemapTask
-  @Inject constructor(private val project: Project): DefaultTask() {
-
-  @get:Input
-  abstract var spigotVersion: String
-
-  @TaskAction
-  fun remapInputs() {
-    inputs.files.forEach {
-      remap(spigotVersion, it.toPath(), it.toPath().resolveSibling(it.name.replace(".jar", "-obf.jar")))
-    }
-  }
-
-  private fun remap(spigotVersion: String, jarPath: Path, obfPath: Path) {
-    // https://www.spigotmc.org/threads/510208/#post-4184317
-    val specialsource = project.configurations.named("spigotRemap").get().incoming.artifacts.artifacts
-      .first { it.id.componentIdentifier.toString() == "net.md-5:SpecialSource:1.11.4" }.file.path
-    val repo = Paths.get(project.repositories.mavenLocal().url)
-    val spigotDir = repo.resolve("org/spigotmc/spigot/$spigotVersion/")
-    val mappingDir = repo.resolve("org/spigotmc/minecraft-server/$spigotVersion/")
-
-    // Remap original Mojang-mapped jar to obfuscated intermediary
-    val mojangServer = spigotDir.resolve("spigot-$spigotVersion-remapped-mojang.jar")
-    val mojangMappings = mappingDir.resolve("minecraft-server-$spigotVersion-maps-mojang.txt")
-    remapPartial(specialsource, mojangServer, mojangMappings, jarPath, obfPath, true)
-
-    // Remap obfuscated intermediary jar to Spigot and replace original
-    val obfServer = spigotDir.resolve("spigot-$spigotVersion-remapped-obf.jar")
-    val spigotMappings = mappingDir.resolve("minecraft-server-$spigotVersion-maps-spigot.csrg")
-    remapPartial(specialsource, obfServer, spigotMappings, obfPath, jarPath, false)
-  }
-
-  private fun remapPartial(specialSource: String, serverJar: Path, mapping: Path, input: Path, output: Path, reverse: Boolean) {
-    project.providers.exec {
-      commandLine("java", "-cp", "$specialSource${File.pathSeparator}$serverJar",
-        "net.md_5.specialsource.SpecialSource", "--live",
-        "-i", "$input", "-o", "$output",
-        "-m", "$mapping",
-        if (reverse) "--reverse" else "")
-    }.result.get()
-  }
-}

common/build.gradle.kts

@@ -1,7 +1,20 @@
-plugins {
-  `openinv-base`
+repositories {
+  maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+}
+
+dependencies {
+  compileOnly(libs.spigotapi)
+}
+
+java {
+  toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
 }
 
 dependencies {
   implementation(project(":openinvapi"))
+  compileOnly(libs.slf4j.api)
 }

common/src/main/java/com/github/jikoo/openinv/internal/Accessor.java

@@ -0,0 +1,28 @@
+package com.github.jikoo.openinv.internal;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public interface Accessor {
+
+  PlayerManager getPlayerManager();
+
+  IAnySilentContainer getAnySilentContainer();
+
+  ISpecialPlayerInventory createPlayerInventory(Player player);
+
+  ISpecialEnderChest createEnderChest(Player player);
+
+  <T extends ISpecialInventory> @Nullable T get(Inventory bukkitInventory, Class<T> clazz);
+
+  void reload(ConfigurationSection config);
+
+}

common/src/main/java/com/github/jikoo/openinv/internal/PlayerManager.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011-2022 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.github.jikoo.openinv.internal;
+
+import com.lishid.openinv.internal.ISpecialInventory;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public interface PlayerManager {
+
+  /**
+   * Loads a Player for an OfflinePlayer.
+   * </p>
+   * This method is potentially blocking, and should not be called on the main thread.
+   *
+   * @param offline the OfflinePlayer
+   * @return the Player loaded
+   */
+  @Nullable Player loadPlayer(OfflinePlayer offline);
+
+  /**
+   * Creates a new Player from an existing one that will function slightly better offline.
+   *
+   * @return the Player
+   */
+  Player inject(Player player);
+
+  /**
+   * Opens an ISpecialInventory for a Player.
+   *
+   * @param player the Player opening the ISpecialInventory
+   * @param inventory the Inventory
+   *
+   * @return the InventoryView opened
+   */
+  @Nullable InventoryView openInventory(Player player, ISpecialInventory inventory, boolean viewOnly);
+
+}

common/src/main/java/com/github/jikoo/openinv/internal/container/AnySilentContainerBase.java

@@ -0,0 +1,107 @@
+package com.github.jikoo.openinv.internal.container;
+
+import com.lishid.openinv.internal.IAnySilentContainer;
+import org.bukkit.block.Barrel;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.EnderChest;
+import org.bukkit.block.ShulkerBox;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public abstract class AnySilentContainerBase implements IAnySilentContainer {
+
+  public enum StateType {
+    ENDER_CHEST,
+    SHULKER_BOX,
+    CHEST,
+    BARREL,
+    OTHER
+  }
+
+  @Override
+  public boolean isAnyContainerNeeded(Block block) {
+    return isAnyContainerNeeded(getStateType(block), block);
+  }
+
+  protected boolean isAnyContainerNeeded(StateType material, Block block) {
+    return switch (material) {
+      // Enderchests require a non-occluding block on top to open.
+      case ENDER_CHEST -> block.getRelative(0, 1, 0).getType().isOccluding();
+      // Shulker boxes require half a block clear in the direction they open.
+      case SHULKER_BOX -> isShulkerBlocked(block);
+      // Chests require that the block above not be occluding or occupied by a cat.
+      case CHEST -> isChestBlocked(block);
+      // Barrels need silent but not any. All others unsupported.
+      default -> false;
+    };
+  }
+
+  @Override
+  public boolean isChestBlocked(Block block) {
+    if (IAnySilentContainer.super.isChestBlocked(block)) {
+      return true;
+    }
+
+    BlockData blockData = block.getBlockData();
+    if (!(blockData instanceof Chest chest) || chest.getType() == Chest.Type.SINGLE) {
+      return false;
+    }
+
+    BlockFace relativeFace = switch (chest.getFacing()) {
+      case NORTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.WEST : BlockFace.EAST;
+      case EAST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.NORTH : BlockFace.SOUTH;
+      case SOUTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.EAST : BlockFace.WEST;
+      case WEST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.SOUTH : BlockFace.NORTH;
+      default -> BlockFace.SELF;
+    };
+    Block relative = block.getRelative(relativeFace);
+
+    if (relative.getType() != block.getType()) {
+      return false;
+    }
+
+    BlockData relativeData = relative.getBlockData();
+    if (!(relativeData instanceof Chest relativeChest)) {
+      return false;
+    }
+
+    if (relativeChest.getFacing() != chest.getFacing()
+        || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
+      return false;
+    }
+
+    return IAnySilentContainer.super.isChestBlocked(relative);
+  }
+
+  @Override
+  public boolean isAnySilentContainer(Block block) {
+    return isAnySilentContainer(getState(block));
+  }
+
+  @Override
+  public boolean isAnySilentContainer(Inventory inventory) {
+    return isAnySilentContainer(getHolder(inventory));
+  }
+
+  protected StateType getStateType(Block block) {
+    return switch (getState(block)) {
+      case Barrel ignored -> StateType.BARREL;
+      case EnderChest ignored -> StateType.ENDER_CHEST;
+      case ShulkerBox ignored -> StateType.SHULKER_BOX;
+      case org.bukkit.block.Chest ignored -> StateType.CHEST;
+      default -> StateType.OTHER;
+    };
+  }
+
+  protected abstract BlockState getState(Block block);
+
+  protected abstract @Nullable InventoryHolder getHolder(Inventory inventory);
+
+}

common/src/main/java/com/github/jikoo/openinv/internal/container/InternalOwned.java

@@ -0,0 +1,10 @@
+package com.github.jikoo.openinv.internal.container;
+
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public interface InternalOwned<T> {
+
+  T getOwnerHandle();
+
+}

common/src/main/java/com/github/jikoo/openinv/internal/container/ViewOnly.java

@@ -0,0 +1,4 @@
+package com.github.jikoo.openinv.internal.container;
+
+public interface ViewOnly {
+}

common/src/main/java/com/github/jikoo/openinv/internal/container/slot/Content.java

@@ -1,53 +1,50 @@
-package com.lishid.openinv.internal.common.container.slot;
+package com.github.jikoo.openinv.internal.container.slot;
 
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.Container;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 /**
- * An interface defining behaviors for entries in a {@link Container}. Used to reduce duplicate content reordering.
+ * An interface defining behaviors for entries in a {@link net.minecraft.world.Container Container}. Used to reduce duplicate content reordering.
  */
-public interface Content {
+@NullMarked
+public interface Content<P, I, C, S> {
 
   /**
    * Update internal holder.
    *
    * @param holder the new holder
    */
-  void setHolder(@NotNull ServerPlayer holder);
+  void setHolder(P holder);
 
   /**
    * Get the current item.
    *
    * @return the current item
    */
-  ItemStack get();
+  I get();
 
   /**
    * Remove the current item.
    *
    * @return the current item
    */
-  ItemStack remove();
+  I remove();
 
   /**
    * Remove some of the current item.
    *
    * @return the current item
    */
-  ItemStack removePartial(int amount);
+  I removePartial(int amount);
 
   /**
    * Set the current item. If slot is currently not usable, will drop item instead.
    *
    * @param itemStack the item to set
    */
-  void set(ItemStack itemStack);
+  void set(I itemStack);
 
   /**
-   * Get a {@link Slot} for use in a {@link net.minecraft.world.inventory.AbstractContainerMenu ContainerMenu}. Will
+   * Get a {@link net.minecraft.world.inventory.Slot Slot} for use in a {@link net.minecraft.world.inventory.AbstractContainerMenu ContainerMenu}. Will
    * impose any specific restrictions to insertion or removal.
    *
    * @param container the backing container
@@ -56,7 +53,7 @@ public interface Content {
    * @param y clientside y dimension from top left of inventory, not used
    * @return a menu slot
    */
-  Slot asSlot(Container container, int slot, int x, int y);
+  S asSlot(C container, int slot, int x, int y);
 
   /**
    * Get a loose Bukkit translation of what this slot stores. For example, any slot that drops items at the owner rather

common/src/main/java/com/github/jikoo/openinv/internal/container/slot/InventoryFactory.java

@@ -0,0 +1,35 @@
+package com.github.jikoo.openinv.internal.container.slot;
+
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.ItemStack;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.List;
+import java.util.function.Function;
+
+@NullMarked
+public interface InventoryFactory<P, I, C, S, E> {
+
+  Content<P, I, C, S> newCrafting(P holder, int index);
+
+  Content<P, I, C, S> newCraftingResult(P holder);
+
+  Content<P, I, C, S> newCursor(P holder);
+
+  Content<P, I, C, S> newDrop(P holder);
+
+  Content<P, I, C, S> newEquipment(P holder, E equipmentSlot);
+
+  Content<P, I, C, S> newList(P holder, int index, InventoryType.SlotType slotType, Function<P, List<I>> listSupplier);
+
+  Content<P, I, C, S> newOffHand(P holder);
+
+  Content<P, I, C, S> newViewOnly(P holder);
+
+  Content<P, I, C, S> newViewOnly(P holder, I itemStack);
+
+  S wrapViewOnly(S wrapped);
+
+  ItemStack asBukkitMirror(I itemStack);
+
+}

common/src/main/java/com/github/jikoo/openinv/lang/LanguageManager.java

@@ -0,0 +1,309 @@
+package com.github.jikoo.openinv.lang;
+
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+
+/**
+ * A simple language manager supporting both custom and bundled languages.
+ */
+@NullMarked
+public class LanguageManager {
+
+  private final Plugin plugin;
+  private final File folder;
+  private final String defaultLocale;
+  private final Map<String, YamlConfiguration> locales;
+
+  public LanguageManager(Plugin plugin, String defaultLocale) {
+    this.plugin = plugin;
+    this.defaultLocale = defaultLocale;
+    this.locales = new HashMap<>();
+    this.folder = new File(plugin.getDataFolder(), "locale");
+
+    if (!folder.exists() && !folder.mkdirs()) {
+      plugin.getLogger().warning(() -> "Unable to create " + folder.getPath() + "! Languages may not be editable.");
+    }
+
+    reload();
+  }
+
+  public void reload() {
+    this.locales.clear();
+    getOrLoadLocale(defaultLocale);
+  }
+
+  private YamlConfiguration getOrLoadLocale(String locale) {
+    YamlConfiguration loaded = locales.get(locale);
+    if (loaded != null) {
+      return loaded;
+    }
+
+    LangLocation lang = bestMatch(locale, null);
+
+    // If a parent was a better match, check if it is already loaded.
+    if (!locale.equals(lang.locale)) {
+      loaded = locales.get(lang.locale);
+      if (loaded != null) {
+        locales.put(locale, loaded);
+        return loaded;
+      }
+    }
+
+    // Load locale config from disk and bundled locale defaults.
+    YamlConfiguration localeConfig = loadLocale(lang);
+
+    // If the locale is not the default locale, also handle any missing translations from the default locale.
+    if (!locale.equals(defaultLocale)) {
+      addTranslationFallthrough(lang, localeConfig);
+
+      if (plugin.getConfig().getBoolean("settings.secret.warn-about-guess-section", true)
+          && localeConfig.isConfigurationSection("guess")) {
+        // Warn that guess section exists. This should run once per language per server restart
+        // when accessed by a user to hint to server owners that they can make UX improvements.
+        plugin.getLogger().info(() -> "[LanguageManager] Missing translations from " + lang.locale + ".yml! Check the guess section!");
+      }
+    }
+
+    locales.put(locale, localeConfig);
+    locales.put(lang.locale, localeConfig);
+
+    return localeConfig;
+  }
+
+  private LangLocation bestMatch(String locale, @Nullable LangLocation initial) {
+    File file = new File(folder, locale + ".yml");
+    InputStream bundled = plugin.getResource("locale/" + locale + ".yml");
+
+    if (file.exists() || bundled != null) {
+      return new LangLocation(locale, file, bundled);
+    }
+
+    if (initial == null) {
+      initial = new LangLocation(locale, file, null);
+    }
+
+    int lastSeparator = locale.lastIndexOf('_');
+
+    // Must be at least some content before separator.
+    if (lastSeparator < 1) {
+      return initial;
+    }
+
+    return bestMatch(locale.substring(0, lastSeparator), initial);
+  }
+
+  private YamlConfiguration loadLocale(LangLocation lang) {
+    YamlConfiguration localeConfigDefaults;
+    if (lang.bundled == null) {
+      localeConfigDefaults = new YamlConfiguration();
+    } else {
+      try (BufferedReader reader = new BufferedReader(new InputStreamReader(lang.bundled, StandardCharsets.UTF_8))) {
+        localeConfigDefaults = YamlConfiguration.loadConfiguration(reader);
+      } catch (IOException e) {
+        plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to load resource " + lang.locale + ".yml");
+        localeConfigDefaults = new YamlConfiguration();
+      }
+    }
+
+    if (!lang.file.exists()) {
+      // If the file does not exist on disk, save bundled defaults.
+      try {
+        localeConfigDefaults.save(lang.file);
+      } catch (IOException e) {
+        plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + lang.locale + ".yml");
+      }
+      // Return loaded bundled locale.
+      return localeConfigDefaults;
+    }
+
+    // If the file does exist on disk, load it.
+    YamlConfiguration localeConfig = YamlConfiguration.loadConfiguration(lang.file);
+    // Check for missing translations from the bundled file.
+    List<String> newKeys = getMissingKeys(localeConfigDefaults, localeConfig::isSet);
+
+    if (newKeys.isEmpty()) {
+      return localeConfig;
+    }
+
+    // Get guess section for missing keys.
+    ConfigurationSection guess = localeConfig.getConfigurationSection("guess");
+
+    for (String newKey : newKeys) {
+      // Set all missing keys to defaults.
+      localeConfig.set(newKey, localeConfigDefaults.get(newKey));
+
+      // Delete relevant guess keys in case this is a new translation.
+      if (guess != null) {
+        guess.set(newKey, null);
+      }
+    }
+
+    // If guess section is empty, delete it.
+    if (guess != null && guess.getKeys(false).isEmpty()) {
+      localeConfig.set("guess", null);
+    }
+
+    plugin.getLogger().info(() -> "[LanguageManager] Added new translation keys to " + lang.locale + ".yml: " + String.join(", ", newKeys));
+
+    // Write new keys to disk.
+    try {
+      localeConfig.save(lang.file);
+    } catch (IOException e) {
+      plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + lang.locale + ".yml");
+    }
+
+    return localeConfig;
+  }
+
+  private void addTranslationFallthrough(LangLocation location, YamlConfiguration localeConfig) {
+    YamlConfiguration defaultLocaleConfig = locales.get(defaultLocale);
+
+    // Get missing keys. Keys that already have a guess value are not new and don't need to trigger another write.
+    List<String> missingKeys = getMissingKeys(
+        defaultLocaleConfig,
+        key -> localeConfig.isSet(key) || localeConfig.isSet("guess." + key)
+    );
+
+    if (!missingKeys.isEmpty()) {
+      // Set up guess section for missing keys.
+      for (String key : missingKeys) {
+        localeConfig.set("guess." + key, defaultLocaleConfig.get(key));
+      }
+
+      // Write modified guess section to disk.
+      try {
+        localeConfig.save(location.file);
+      } catch (IOException e) {
+        plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + location.locale + ".yml");
+      }
+    }
+
+    // Fall through to default locale.
+    localeConfig.setDefaults(defaultLocaleConfig);
+  }
+
+  private List<String> getMissingKeys(
+      Configuration configurationDefault,
+      Predicate<String> nodeSetPredicate
+  ) {
+    List<String> missingKeys = new ArrayList<>();
+    for (String key : configurationDefault.getKeys(true)) {
+      if (!configurationDefault.isConfigurationSection(key) && !nodeSetPredicate.test(key)) {
+        // Missing keys are non-section keys that fail the predicate.
+        missingKeys.add(key);
+      }
+    }
+    return missingKeys;
+  }
+
+  public @Nullable String getValue(String key, @Nullable String locale) {
+    String value = getOrLoadLocale(locale == null ? defaultLocale : locale.toLowerCase(Locale.ENGLISH)).getString(key);
+    if (value == null || value.isBlank()) {
+      return null;
+    }
+
+    value = ChatColor.translateAlternateColorCodes('&', value);
+
+    return value;
+  }
+
+  public @Nullable String getValue(
+      String key,
+      @Nullable String locale,
+      Replacement... replacements
+  ) {
+    String value = getValue(key, locale);
+
+    if (value == null) {
+      return null;
+    }
+
+    for (Replacement replacement : replacements) {
+      value = value.replace(replacement.placeholder(), replacement.value());
+    }
+
+    return value;
+  }
+
+  public @Nullable String getLocalizedMessage(CommandSender sender, String key) {
+    return getValue(key, getLocale(sender));
+  }
+
+  public @Nullable String getLocalizedMessage(
+      CommandSender sender,
+      String key,
+      Replacement... replacements
+  ) {
+    return getValue(key, getLocale(sender), replacements);
+  }
+
+  private String getLocale(CommandSender sender) {
+    if (sender instanceof Player player) {
+      return player.getLocale();
+    } else {
+      return plugin.getConfig().getString("settings.locale", "en");
+    }
+  }
+
+  public void sendMessage(CommandSender sender, String key) {
+    String message = getLocalizedMessage(sender, key);
+
+    if (message != null && !message.isEmpty()) {
+      sender.sendMessage(message);
+    }
+  }
+
+  public void sendMessage(CommandSender sender, String key, Replacement... replacements) {
+    String message = getLocalizedMessage(sender, key, replacements);
+
+    if (message != null && !message.isEmpty()) {
+      sender.sendMessage(message);
+    }
+  }
+
+  public void sendSystemMessage(Player player, String key) {
+    String message = getLocalizedMessage(player, key);
+
+    if (message == null) {
+      return;
+    }
+
+    int newline = message.indexOf('\n');
+    if (newline != -1) {
+      // No newlines in action bar chat.
+      message = message.substring(0, newline);
+    }
+
+    if (message.isEmpty()) {
+      return;
+    }
+
+    player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacy(message));
+  }
+
+  private record LangLocation(String locale, File file, @Nullable InputStream bundled) {}
+
+}

common/src/main/java/com/github/jikoo/openinv/lang/Replacement.java

@@ -0,0 +1,14 @@
+package com.github.jikoo.openinv.lang;
+
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * A data holder for string replacement in translations.
+ *
+ * @param placeholder the placeholder to be replaced
+ * @param value the value to insert
+ */
+@NullMarked
+public record Replacement(String placeholder, String value) {
+
+}

common/src/main/java/com/github/jikoo/openinv/util/JulLoggerAdapter.java

@@ -0,0 +1,131 @@
+package com.github.jikoo.openinv.util;
+
+import org.jspecify.annotations.NullMarked;
+import org.slf4j.Marker;
+import org.slf4j.helpers.LegacyAbstractLogger;
+import org.slf4j.helpers.MessageFormatter;
+import org.slf4j.helpers.NormalizedParameters;
+import org.slf4j.spi.LocationAwareLogger;
+
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+/**
+ * An adapter for wrapping a {@link java.util.logging.Logger} as a {@link org.slf4j.Logger}.
+ * <br>Largely based on {@code JDK14LoggerAdapter}, which is not present at runtime.
+ */
+@NullMarked
+public class JulLoggerAdapter extends LegacyAbstractLogger implements LocationAwareLogger {
+
+  private final Logger wrapped;
+
+  public JulLoggerAdapter(Logger wrapped) {
+    this.wrapped = wrapped;
+    this.name = wrapped.getName();
+  }
+
+  @Override
+  protected String getFullyQualifiedCallerName() {
+    return JulLoggerAdapter.class.getName();
+  }
+
+  @Override
+  protected void handleNormalizedLoggingCall(
+      org.slf4j.event.Level slf4jLevel,
+      Marker marker,
+      String msg,
+      Object[] args,
+      Throwable thrown
+  ) {
+    Level level = fromSlf4jLevel(slf4jLevel);
+
+    if (wrapped.isLoggable(level)) {
+      normalizedLog(getFullyQualifiedCallerName(), level, msg, args, thrown);
+    }
+  }
+
+  private void normalizedLog(String fqcn, Level level, String msg, Object[] args, Throwable thrown) {
+    String formatted = MessageFormatter.basicArrayFormat(msg, args);
+    LogRecord logRecord = new LogRecord(level, formatted);
+    logRecord.setLoggerName(getName());
+    logRecord.setThrown(thrown);
+
+    addSource(fqcn, logRecord);
+
+    wrapped.log(logRecord);
+  }
+
+  private void addSource(String fqcn, LogRecord logRecord) {
+    StackWalker.getInstance().walk(stream -> stream
+        // Start at index 2 - this is an internal method, so we want at least the caller's caller.
+        .skip(2)
+        // Walk at maximum 10 frames.
+        .limit(10)
+        .filter(frame -> isIgnored(frame.getClassName(), fqcn))
+        .findFirst()
+    ).ifPresent(frame -> {
+      logRecord.setSourceClassName(frame.getClassName());
+      logRecord.setSourceMethodName(frame.getMethodName());
+    });
+  }
+
+  private boolean isIgnored(String className, String fqcn) {
+    if (className.equals(fqcn)) {
+      return true;
+    }
+    // Ignore slf4j classes - they shouldn't be the source.
+    if (className.startsWith("org.slf4j.")) {
+      return true;
+    }
+    return className.equals(getFullyQualifiedCallerName());
+  }
+
+  @Override
+  public void log(Marker marker, String callerFqn, int levelInt, String msg, Object[] args, Throwable thrown) {
+    Level level = fromSlf4jLevel(org.slf4j.event.Level.intToLevel(levelInt));
+
+    if (!wrapped.isLoggable(level)) {
+      return;
+    }
+
+    NormalizedParameters params = NormalizedParameters.normalize(msg, args, thrown);
+    normalizedLog(callerFqn, level, params.getMessage(), params.getArguments(), params.getThrowable());
+  }
+
+  private Level fromSlf4jLevel(org.slf4j.event.Level level) {
+    return switch (level) {
+      case TRACE -> Level.FINEST;
+      case DEBUG -> Level.FINE;
+      case INFO -> Level.INFO;
+      case WARN -> Level.WARNING;
+      case ERROR -> Level.SEVERE;
+    };
+  }
+
+  @Override
+  public boolean isTraceEnabled() {
+    return wrapped.isLoggable(Level.FINEST);
+  }
+
+  @Override
+  public boolean isDebugEnabled() {
+    return wrapped.isLoggable(Level.FINE);
+  }
+
+  @Override
+  public boolean isInfoEnabled() {
+    return wrapped.isLoggable(Level.INFO);
+  }
+
+  @Override
+  public boolean isWarnEnabled() {
+    return wrapped.isLoggable(Level.WARNING);
+  }
+
+  @Override
+  public boolean isErrorEnabled() {
+    return wrapped.isLoggable(Level.SEVERE);
+  }
+
+}

common/src/main/java/com/github/jikoo/openinv/util/ReflectionHelper.java

@@ -0,0 +1,64 @@
+package com.github.jikoo.openinv.util;
+
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.lang.reflect.Field;
+
+/**
+ * A utility for making reflection easier.
+ */
+@NullMarked
+public final class ReflectionHelper {
+
+  /**
+   * Grab an {@link Object} stored in a {@link Field} of another {@code Object}.
+   *
+   * <p>This casts the field to the correct class. Any issues will result in a {@code null} return value.
+   *
+   * @param fieldType the {@link Class} of {@code Object} stored in the {@code Field}
+   * @param holder the containing {@code Object}
+   * @param <T> the type of stored {@code Object}
+   * @return the first matching {@code Object} or {@code null} if none match
+   */
+  public static <T> @Nullable T grabObjectByType(final Object holder, final Class<T> fieldType) {
+    Field field = grabFieldByType(holder.getClass(), fieldType);
+
+    if (field != null) {
+      try {
+        return fieldType.cast(field.get(holder));
+      } catch (IllegalAccessException ignored) {
+        // Ignore issues obtaining field
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Grab a {@link Field} of an {@link Object}
+   *
+   * @param fieldType the {@link Class} of the object
+   * @param holderType the containing {@code Class}
+   * @return the first matching object or {@code null} if none match
+   */
+  public static @Nullable Field grabFieldByType(Class<?> holderType, Class<?> fieldType) {
+    for (Field field : holderType.getDeclaredFields()) {
+      if (fieldType.isAssignableFrom(field.getType())) {
+        field.setAccessible(true);
+        return field;
+      }
+    }
+
+    if (holderType.getSuperclass() != null) {
+      return grabFieldByType(fieldType, holderType.getSuperclass());
+    }
+
+    return null;
+  }
+
+  private ReflectionHelper() {
+    throw new IllegalStateException("Cannot create instance of utility class.");
+  }
+
+}

common/src/main/java/com/lishid/openinv/event/OpenEvents.java

@@ -6,24 +6,25 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
 
 import java.util.UUID;
 
 /**
  * Construct and call events.
  */
+@NullMarked
 public final class OpenEvents {
 
-  public static boolean saveCancelled(@NotNull Player player) {
+  public static boolean saveCancelled(Player player) {
     return call(new PlayerSaveEvent(player));
   }
 
-  public static boolean saveCancelled(@NotNull ISpecialInventory inventory) {
+  public static boolean saveCancelled(ISpecialInventory inventory) {
     return call(new OpenPlayerSaveEvent((Player) inventory.getPlayer(), inventory));
   }
 
-  public static void notifyPlayerToggle(@NotNull PlayerToggle toggle, @NotNull UUID uuid, boolean state) {
+  public static void notifyPlayerToggle(PlayerToggle toggle, UUID uuid, boolean state) {
     Bukkit.getPluginManager().callEvent(new PlayerToggledEvent(toggle, uuid, state));
   }
 

common/src/main/java/com/lishid/openinv/internal/Accessor.java

@@ -1,24 +0,0 @@
-package com.lishid.openinv.internal;
-
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface Accessor {
-
-  @NotNull
-  PlayerManager getPlayerManager();
-
-  @NotNull IAnySilentContainer getAnySilentContainer();
-
-  @NotNull ISpecialPlayerInventory createPlayerInventory(@NotNull Player player);
-
-  @NotNull ISpecialEnderChest createEnderChest(@NotNull Player player);
-
-  <T extends ISpecialInventory> @Nullable T get(@NotNull Inventory bukkitInventory, @NotNull Class<T> clazz);
-
-  void reload(@NotNull ConfigurationSection config);
-
-}

common/src/main/java/com/lishid/openinv/internal/AnySilentContainerBase.java

@@ -1,106 +0,0 @@
-package com.lishid.openinv.internal;
-
-import org.bukkit.block.Barrel;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.EnderChest;
-import org.bukkit.block.ShulkerBox;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Chest;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Method;
-
-public abstract class AnySilentContainerBase implements IAnySilentContainer {
-
-  private static final @Nullable Method BLOCK_GET_STATE_BOOLEAN;
-
-  static {
-    @Nullable Method getState;
-    try {
-      //noinspection JavaReflectionMemberAccess
-      getState = Block.class.getMethod("getState", boolean.class);
-    } catch (NoSuchMethodException e) {
-      getState = null;
-    }
-    BLOCK_GET_STATE_BOOLEAN = getState;
-  }
-
-  private static BlockState getBlockState(Block block) {
-    // Paper: Get state without snapshotting.
-    if (BLOCK_GET_STATE_BOOLEAN != null) {
-      try {
-        return (BlockState) BLOCK_GET_STATE_BOOLEAN.invoke(block, false);
-      } catch (ReflectiveOperationException ignored) {
-        // If we encounter an issue, fall through to regular snapshotting method.
-      }
-    }
-    return block.getState();
-  }
-
-  @Override
-  public boolean isAnyContainerNeeded(@NotNull Block block) {
-    BlockState blockState = getBlockState(block);
-
-    // Barrels do not require AnyContainer.
-    if (blockState instanceof Barrel) {
-      return false;
-    }
-
-    // Enderchests require a non-occluding block on top to open.
-    if (blockState instanceof EnderChest) {
-      return block.getRelative(0, 1, 0).getType().isOccluding();
-    }
-
-    // Shulker boxes require half a block clear in the direction they open.
-    if (blockState instanceof ShulkerBox) {
-      return isShulkerBlocked(block);
-    }
-
-    if (!(blockState instanceof org.bukkit.block.Chest)) {
-      return false;
-    }
-
-    if (isChestBlocked(block)) {
-      return true;
-    }
-
-    BlockData blockData = block.getBlockData();
-    if (!(blockData instanceof Chest chest) || chest.getType() == Chest.Type.SINGLE) {
-      return false;
-    }
-
-    BlockFace relativeFace = switch (chest.getFacing()) {
-      case NORTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.WEST : BlockFace.EAST;
-      case EAST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.NORTH : BlockFace.SOUTH;
-      case SOUTH -> chest.getType() == Chest.Type.RIGHT ? BlockFace.EAST : BlockFace.WEST;
-      case WEST -> chest.getType() == Chest.Type.RIGHT ? BlockFace.SOUTH : BlockFace.NORTH;
-      default -> BlockFace.SELF;
-    };
-    Block relative = block.getRelative(relativeFace);
-
-    if (relative.getType() != block.getType()) {
-      return false;
-    }
-
-    BlockData relativeData = relative.getBlockData();
-    if (!(relativeData instanceof Chest relativeChest)) {
-      return false;
-    }
-
-    if (relativeChest.getFacing() != chest.getFacing()
-        || relativeChest.getType() != (chest.getType() == Chest.Type.RIGHT ? Chest.Type.LEFT : Chest.Type.RIGHT)) {
-      return false;
-    }
-
-    return isChestBlocked(relative);
-  }
-
-  @Override
-  public boolean isAnySilentContainer(@NotNull Block block) {
-    return isAnySilentContainer(getBlockState(block));
-  }
-
-}

common/src/main/java/com/lishid/openinv/internal/InternalOwned.java

@@ -1,7 +0,0 @@
-package com.lishid.openinv.internal;
-
-public interface InternalOwned<T> {
-
-  T getOwnerHandle();
-
-}

common/src/main/java/com/lishid/openinv/internal/InventoryViewTitle.java

@@ -1,48 +0,0 @@
-package com.lishid.openinv.internal;
-
-import com.lishid.openinv.util.lang.LanguageManager;
-import com.lishid.openinv.util.lang.Replacement;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Objects;
-
-public enum InventoryViewTitle {
-
-  PLAYER_INVENTORY("container.player", "'s Inventory"),
-  ENDER_CHEST("container.enderchest", "'s Ender Chest");
-
-  private final String localizationKey;
-  private final String defaultSuffix;
-
-  InventoryViewTitle(String localizationKey, String defaultSuffix) {
-    this.localizationKey = localizationKey;
-    this.defaultSuffix = defaultSuffix;
-  }
-
-  public @NotNull String getTitle(
-      @NotNull LanguageManager lang,
-      @NotNull Player viewer,
-      @NotNull ISpecialInventory inventory) {
-    HumanEntity owner = inventory.getPlayer();
-
-    String localTitle = lang.getLocalizedMessage(
-            viewer,
-            localizationKey,
-            new Replacement("%player%", owner.getName()));
-    return Objects.requireNonNullElseGet(localTitle, () -> owner.getName() + defaultSuffix);
-  }
-
-  public static @Nullable InventoryViewTitle of(@NotNull ISpecialInventory inventory) {
-    if (inventory instanceof ISpecialPlayerInventory) {
-      return PLAYER_INVENTORY;
-    } else if (inventory instanceof ISpecialEnderChest) {
-      return ENDER_CHEST;
-    } else {
-      return null;
-    }
-  }
-
-}

common/src/main/java/com/lishid/openinv/internal/PlayerManager.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface PlayerManager {
-
-    /**
-     * Loads a Player for an OfflinePlayer.
-     * </p>
-     * This method is potentially blocking, and should not be called on the main thread.
-     *
-     * @param offline the OfflinePlayer
-     * @return the Player loaded
-     */
-    @Nullable Player loadPlayer(@NotNull OfflinePlayer offline);
-
-    /**
-     * Creates a new Player from an existing one that will function slightly better offline.
-     *
-     * @return the Player
-     */
-    @NotNull Player inject(@NotNull Player player);
-
-    /**
-     * Opens an ISpecialInventory for a Player.
-     *
-     * @param player the Player opening the ISpecialInventory
-     * @param inventory the Inventory
-     *`
-     * @return the InventoryView opened
-     */
-    @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory, boolean viewOnly);
-
-}

common/src/main/java/com/lishid/openinv/internal/ViewOnly.java

@@ -1,4 +0,0 @@
-package com.lishid.openinv.internal;
-
-public interface ViewOnly {
-}

common/src/main/java/com/lishid/openinv/util/Permissions.java

@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util;
-
-import org.bukkit.permissions.Permissible;
-import org.jetbrains.annotations.NotNull;
-
-public enum Permissions {
-
-    INVENTORY_OPEN_SELF("inventory.open.self"),
-    INVENTORY_OPEN_OTHER("inventory.open.other"),
-    INVENTORY_EDIT_SELF("inventory.edit.self"),
-    INVENTORY_EDIT_OTHER("inventory.edit.other"),
-    INVENTORY_SLOT_HEAD_ANY("inventory.slot.head.any"),
-    INVENTORY_SLOT_CHEST_ANY("inventory.slot.chest.any"),
-    INVENTORY_SLOT_LEGS_ANY("inventory.slot.legs.any"),
-    INVENTORY_SLOT_FEET_ANY("inventory.slot.feet.any"),
-    INVENTORY_SLOT_DROP("inventory.slot.drop"),
-
-    ENDERCHEST_OPEN_SELF("enderchest.open.self"),
-    ENDERCHEST_OPEN_OTHER("enderchest.open.other"),
-    ENDERCHEST_EDIT_SELF("enderchest.edit.self"),
-    ENDERCHEST_EDIT_OTHER("enderchest.edit.other"),
-
-    ACCESS_CROSSWORLD("access.crossworld"),
-    ACCESS_OFFLINE("access.offline"),
-    ACCESS_ONLINE("access.online"),
-
-    SPECTATE_CLICK("spectate.click"),
-
-    CONTAINER_ANY("container.any"),
-    CONTAINER_SILENT("container.silent"),
-    SEARCH_INVENTORY("search.inventory"),
-    SEARCH_CONTAINER("search.container");
-
-    private final String permission;
-
-    Permissions(String permission) {
-        this.permission = "openinv." + permission;
-    }
-
-    public boolean hasPermission(@NotNull Permissible permissible) {
-        return permissible.hasPermission(permission);
-    }
-
-}

common/src/main/java/com/lishid/openinv/util/ReflectionHelper.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-
-/**
- * A utility for making reflection easier.
- */
-public final class ReflectionHelper {
-
-    /**
-     * Grab an {@link Object} stored in a {@link Field} of another {@code Object}.
-     *
-     * <p>This casts the field to the correct class. Any issues will result in a {@code null} return value.
-     *
-     * @param fieldType the {@link Class} of {@code Object} stored in the {@code Field}
-     * @param holder the containing {@code Object}
-     * @param <T> the type of stored {@code Object}
-     * @return the first matching {@code Object} or {@code null} if none match
-     */
-    public static <T> @Nullable T grabObjectByType(final Object holder, final Class<T> fieldType) {
-        Field field = grabFieldByType(holder.getClass(), fieldType);
-
-        if (field != null) {
-            try {
-                return fieldType.cast(field.get(holder));
-            } catch (IllegalAccessException ignored) {
-                // Ignore issues obtaining field
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Grab a {@link Field} of an {@link Object}
-     *
-     * @param fieldType the {@link Class} of the object
-     * @param holderType the containing {@code Class}
-     * @return the first matching object or {@code null} if none match
-     */
-    public static @Nullable Field grabFieldByType(Class<?> holderType, Class<?> fieldType) {
-        for (Field field : holderType.getDeclaredFields()) {
-            if (fieldType.isAssignableFrom(field.getType())) {
-                field.setAccessible(true);
-                return field;
-            }
-        }
-
-        if (holderType.getSuperclass() != null) {
-            return grabFieldByType(fieldType, holderType.getSuperclass());
-        }
-
-        return null;
-    }
-
-    private ReflectionHelper() {
-        throw new IllegalStateException("Cannot create instance of utility class.");
-    }
-
-}

common/src/main/java/com/lishid/openinv/util/lang/LanguageManager.java

@@ -1,319 +0,0 @@
-/*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util.lang;
-
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.Configuration;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.logging.Level;
-
-/**
- * A simple language manager supporting both custom and bundled languages.
- *
- * @author Jikoo
- */
-public class LanguageManager {
-
-    private final Plugin plugin;
-    private final File folder;
-    private final String defaultLocale;
-    private final Map<String, YamlConfiguration> locales;
-
-    public LanguageManager(@NotNull Plugin plugin, @NotNull String defaultLocale) {
-        this.plugin = plugin;
-        this.defaultLocale = defaultLocale;
-        this.locales = new HashMap<>();
-        this.folder = new File(plugin.getDataFolder(), "locale");
-
-        if (!folder.exists() && !folder.mkdirs()) {
-            plugin.getLogger().warning(() -> "Unable to create " + folder.getPath() + "! Languages may not be editable.");
-        }
-
-        reload();
-    }
-
-    public void reload() {
-        this.locales.clear();
-        getOrLoadLocale(defaultLocale);
-    }
-
-    private @NotNull YamlConfiguration getOrLoadLocale(@NotNull String locale) {
-        YamlConfiguration loaded = locales.get(locale);
-        if (loaded != null) {
-            return loaded;
-        }
-
-        LangLocation lang = bestMatch(locale, null);
-
-        // If a parent was a better match, check if it is already loaded.
-        if (!locale.equals(lang.locale)) {
-            loaded = locales.get(lang.locale);
-            if (loaded != null) {
-                locales.put(locale, loaded);
-                return loaded;
-            }
-        }
-
-        // Load locale config from disk and bundled locale defaults.
-        YamlConfiguration localeConfig = loadLocale(lang);
-
-        // If the locale is not the default locale, also handle any missing translations from the default locale.
-        if (!locale.equals(defaultLocale)) {
-            addTranslationFallthrough(lang, localeConfig);
-
-            if (plugin.getConfig().getBoolean("settings.secret.warn-about-guess-section", true)
-                    && localeConfig.isConfigurationSection("guess")) {
-                // Warn that guess section exists. This should run once per language per server restart
-                // when accessed by a user to hint to server owners that they can make UX improvements.
-                plugin.getLogger().info(() -> "[LanguageManager] Missing translations from " + lang.locale + ".yml! Check the guess section!");
-            }
-        }
-
-        locales.put(locale, localeConfig);
-        locales.put(lang.locale, localeConfig);
-
-        return localeConfig;
-    }
-
-    private @NotNull LangLocation bestMatch(@NotNull String locale, @Nullable LangLocation initial) {
-        File file = new File(folder, locale + ".yml");
-        InputStream bundled = plugin.getResource("locale/" + locale + ".yml");
-
-        if (file.exists() || bundled != null) {
-            return new LangLocation(locale, file, bundled);
-        }
-
-        if (initial == null) {
-            initial = new LangLocation(locale, file, null);
-        }
-
-        int lastSeparator = locale.lastIndexOf('_');
-
-        // Must be at least some content before separator.
-        if (lastSeparator < 1) {
-            return initial;
-        }
-
-        return bestMatch(locale.substring(0, lastSeparator), initial);
-    }
-
-    private @NotNull YamlConfiguration loadLocale(@NotNull LangLocation lang) {
-        YamlConfiguration localeConfigDefaults;
-        if (lang.bundled == null) {
-            localeConfigDefaults = new YamlConfiguration();
-        } else {
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(lang.bundled, StandardCharsets.UTF_8))) {
-                localeConfigDefaults = YamlConfiguration.loadConfiguration(reader);
-            } catch (IOException e) {
-                plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to load resource " + lang.locale + ".yml");
-                localeConfigDefaults = new YamlConfiguration();
-            }
-        }
-
-        if (!lang.file.exists()) {
-            // If the file does not exist on disk, save bundled defaults.
-            try {
-                localeConfigDefaults.save(lang.file);
-            } catch (IOException e) {
-                plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + lang.locale + ".yml");
-            }
-            // Return loaded bundled locale.
-            return localeConfigDefaults;
-        }
-
-        // If the file does exist on disk, load it.
-        YamlConfiguration localeConfig = YamlConfiguration.loadConfiguration(lang.file);
-        // Check for missing translations from the bundled file.
-        List<String> newKeys = getMissingKeys(localeConfigDefaults, localeConfig::isSet);
-
-        if (newKeys.isEmpty()) {
-            return localeConfig;
-        }
-
-        // Get guess section for missing keys.
-        ConfigurationSection guess = localeConfig.getConfigurationSection("guess");
-
-        for (String newKey : newKeys) {
-            // Set all missing keys to defaults.
-            localeConfig.set(newKey, localeConfigDefaults.get(newKey));
-
-            // Delete relevant guess keys in case this is a new translation.
-            if (guess != null) {
-                guess.set(newKey, null);
-            }
-        }
-
-        // If guess section is empty, delete it.
-        if (guess != null && guess.getKeys(false).isEmpty()) {
-            localeConfig.set("guess", null);
-        }
-
-        plugin.getLogger().info(() -> "[LanguageManager] Added new translation keys to " + lang.locale + ".yml: " + String.join(", ", newKeys));
-
-        // Write new keys to disk.
-        try {
-            localeConfig.save(lang.file);
-        } catch (IOException e) {
-            plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + lang.locale + ".yml");
-        }
-
-        return localeConfig;
-    }
-
-    private void addTranslationFallthrough(@NotNull LangLocation location, @NotNull YamlConfiguration localeConfig) {
-        YamlConfiguration defaultLocaleConfig = locales.get(defaultLocale);
-
-        // Get missing keys. Keys that already have a guess value are not new and don't need to trigger another write.
-        List<String> missingKeys = getMissingKeys(
-                defaultLocaleConfig,
-                key -> localeConfig.isSet(key) || localeConfig.isSet("guess." + key));
-
-        if (!missingKeys.isEmpty()) {
-            // Set up guess section for missing keys.
-            for (String key : missingKeys) {
-                localeConfig.set("guess." + key, defaultLocaleConfig.get(key));
-            }
-
-            // Write modified guess section to disk.
-            try {
-                localeConfig.save(location.file);
-            } catch (IOException e) {
-                plugin.getLogger().log(Level.WARNING, e, () -> "[LanguageManager] Unable to save resource " + location.locale + ".yml");
-            }
-        }
-
-        // Fall through to default locale.
-        localeConfig.setDefaults(defaultLocaleConfig);
-    }
-
-    private @NotNull List<String> getMissingKeys(
-            @NotNull Configuration configurationDefault,
-            @NotNull Predicate<String> nodeSetPredicate) {
-        List<String> missingKeys = new ArrayList<>();
-        for (String key : configurationDefault.getKeys(true)) {
-            if (!configurationDefault.isConfigurationSection(key) && !nodeSetPredicate.test(key)) {
-                // Missing keys are non-section keys that fail the predicate.
-                missingKeys.add(key);
-            }
-        }
-        return missingKeys;
-    }
-
-    public @Nullable String getValue(@NotNull String key, @Nullable String locale) {
-        String value = getOrLoadLocale(locale == null ? defaultLocale : locale.toLowerCase(Locale.ENGLISH)).getString(key);
-        if (value == null || value.isBlank()) {
-            return null;
-        }
-
-        value = ChatColor.translateAlternateColorCodes('&', value);
-
-        return value;
-    }
-
-    public @Nullable String getValue(@NotNull String key, @Nullable String locale, Replacement @NotNull ... replacements) {
-        String value = getValue(key, locale);
-
-        if (value == null) {
-            return null;
-        }
-
-        for (Replacement replacement : replacements) {
-            value = value.replace(replacement.placeholder(), replacement.value());
-        }
-
-        return value;
-    }
-
-    public @Nullable String getLocalizedMessage(@NotNull CommandSender sender, @NotNull String key) {
-        return getValue(key, getLocale(sender));
-    }
-
-    public @Nullable String getLocalizedMessage(
-        @NotNull CommandSender sender,
-        @NotNull String key,
-        Replacement @NotNull ... replacements) {
-        return getValue(key, getLocale(sender), replacements);
-    }
-
-    private @NotNull String getLocale(@NotNull CommandSender sender) {
-        if (sender instanceof Player) {
-            return ((Player) sender).getLocale();
-        } else {
-            return plugin.getConfig().getString("settings.locale", "en");
-        }
-    }
-
-    public void sendMessage(@NotNull CommandSender sender, @NotNull String key) {
-        String message = getLocalizedMessage(sender, key);
-
-        if (message != null && !message.isEmpty()) {
-            sender.sendMessage(message);
-        }
-    }
-
-    public void sendMessage(@NotNull CommandSender sender, @NotNull String key, Replacement @NotNull... replacements) {
-        String message = getLocalizedMessage(sender, key, replacements);
-
-        if (message != null && !message.isEmpty()) {
-            sender.sendMessage(message);
-        }
-    }
-
-    public void sendSystemMessage(@NotNull Player player, @NotNull String key) {
-        String message = getLocalizedMessage(player, key);
-
-        if (message == null) {
-            return;
-        }
-
-        int newline = message.indexOf('\n');
-        if (newline != -1) {
-            // No newlines in action bar chat.
-            message = message.substring(0, newline);
-        }
-
-        if (message.isEmpty()) {
-            return;
-        }
-
-        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacy(message));
-    }
-
-    private record LangLocation(@NotNull String locale, @NotNull File file, @Nullable InputStream bundled) {}
-
-}

common/src/main/java/com/lishid/openinv/util/lang/Replacement.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.util.lang;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A data holder for string replacement in translations.
- *
- * @param placeholder the placeholder to be replaced
- * @param value the value to insert
- */
-public record Replacement(@NotNull String placeholder, @NotNull String value) {
-
-}

gradle.properties

@@ -1,6 +1,6 @@
 # Project meta
 group=com.lishid.openinv
-version=5.1.8
+version=5.3.6-SNAPSHOT
 description=A Bukkit plugin for opening normally-inaccessible inventories.
 
 # Gradle configuration

gradle/libs.versions.toml

@@ -1,17 +1,33 @@
 [versions]
-spigotapi = "1.21.4-R0.1-SNAPSHOT"
-specialsource = "1.11.4"
+spigotapi = "1.21.3-R0.1-SNAPSHOT"
 planarwrappers = "3.3.0"
-annotations = "26.0.2"
-paperweight = "2.0.0-beta.14"
-shadow = "8.3.6"
+jspecify = "1.0.1"
+annotations = "26.1.0"
+paperweight = "2.0.0-beta.24"
+shadow = "9.6.1"
+folia-scheduler-wrapper = "v0.0.3"
+errorprone-core = "2.51.0"
+errorprone-gradle = "5.1.1"
+slf4j = "2.0.20"
+sqlite-jdbc = "3.49.1.0"
+mockito-core = "5.24.0"
+junit-jupiter = "6.1.3"
+hamcrest = "3.0"
 
 [libraries]
 spigotapi = { module = "org.spigotmc:spigot-api", version.ref = "spigotapi" }
-specialsource = { module = "net.md-5:SpecialSource", version.ref = "specialsource" }
 planarwrappers = { module = "com.github.jikoo:planarwrappers", version.ref = "planarwrappers" }
+jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
 annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
+folia-scheduler-wrapper = { module = "com.github.NahuLD.folia-scheduler-wrapper:folia-scheduler-wrapper", version.ref = "folia-scheduler-wrapper" }
+errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone-core" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite-jdbc" }
+mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito-core" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
+hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 
 [plugins]
 paperweight = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight" }
-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+errorprone-gradle = { id = "net.ltgt.errorprone", version.ref = "errorprone-gradle" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip
+networkTimeout=10000
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,10 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -27,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +132,29 @@ 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.
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -165,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -193,18 +198,27 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -1,89 +1,112 @@
-@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
+@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
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  gradlew startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+@rem Catch executions from older scripts and ensure they exit cleanly.
+@rem This can be removed once we can be reasonably confident that few people
+@rem will be migrating directly to this new wrapper.
+goto afterSafetyNet
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+goto exitWithErrorLevel
+:afterSafetyNet
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+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% equ 0 goto execute
+
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
+
+"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
+
+"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
+
+@rem This label must not be changed. We rely on old scripts being able to jump to this point.
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

internal/common/build.gradle.kts

@@ -1,60 +0,0 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-  `openinv-base`
-  alias(libs.plugins.paperweight)
-}
-
-//tasks {
-//  withType<JavaCompile> {
-//    // OpenPlayer unchecked warning is due to superclass' messy inheritance and legacy methods.
-//    options.compilerArgs.add("-Xlint:unchecked")
-//    // PlayerManager uses "deprecated" method matching vanilla to support legacy save data.
-//    // While vanilla still feels that it is appropriate to use in the load process, we will too.
-//    options.compilerArgs.add("-Xlint:deprecation")
-//  }
-//}
-
-configurations.all {
-  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
-    val paper = candidates.firstOrNull {
-      it.id.let {
-        id -> id is ModuleComponentIdentifier && id.module == "paper-api"
-      }
-    }
-    if (paper != null) {
-      select(paper)
-    }
-    because("module is written for Paper servers")
-  }
-}
-
-dependencies {
-  implementation(project(":openinvapi"))
-  implementation(project(":openinvcommon"))
-
-  paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
-}
-
-val spigot = tasks.register<ShadowJar>("spigotRelocations") {
-  dependsOn(tasks.jar)
-  from(sourceSets.main.get().output)
-  relocate("com.lishid.openinv.internal.common", "com.lishid.openinv.internal.reobf")
-  relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.${rootProject.extra["craftbukkitPackage"]}")
-  archiveClassifier = "spigot"
-}
-
-configurations {
-  consumable("spigotRelocated") {
-    attributes {
-      attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
-      attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
-      attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
-      attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
-    }
-  }
-}
-
-artifacts {
-  add("spigotRelocated", spigot)
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/InternalAccessor.java

@@ -1,80 +0,0 @@
-package com.lishid.openinv.internal.common;
-
-import com.lishid.openinv.internal.Accessor;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.internal.common.container.AnySilentContainer;
-import com.lishid.openinv.internal.common.container.OpenEnderChest;
-import com.lishid.openinv.internal.common.container.OpenInventory;
-import com.lishid.openinv.internal.common.container.slot.placeholder.PlaceholderLoader;
-import com.lishid.openinv.internal.common.player.PlayerManager;
-import com.lishid.openinv.util.lang.LanguageManager;
-import net.minecraft.world.Container;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class InternalAccessor implements Accessor {
-
-  protected final @NotNull Logger logger;
-  private final @NotNull PlayerManager manager;
-  private final @NotNull AnySilentContainer anySilentContainer;
-
-  public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
-    this.logger = logger;
-    manager = new PlayerManager(logger);
-    anySilentContainer = new AnySilentContainer(logger, lang);
-  }
-
-  @Override
-  public @NotNull PlayerManager getPlayerManager() {
-    return manager;
-  }
-
-  @Override
-  public @NotNull IAnySilentContainer getAnySilentContainer() {
-    return anySilentContainer;
-  }
-
-  @Override
-  public @NotNull ISpecialPlayerInventory createPlayerInventory(@NotNull Player player) {
-    return new OpenInventory(player);
-  }
-
-  @Override
-  public @NotNull ISpecialEnderChest createEnderChest(@NotNull Player player) {
-    return new OpenEnderChest(player);
-  }
-
-  @Override
-  public <T extends ISpecialInventory> @Nullable T get(@NotNull Inventory bukkitInventory, @NotNull Class<T> clazz) {
-    if (!(bukkitInventory instanceof CraftInventory craftInventory)) {
-      return null;
-    }
-    Container container = craftInventory.getInventory();
-    if (clazz.isInstance(container)) {
-      return clazz.cast(container);
-    }
-    return null;
-  }
-
-  @Override
-  public void reload(@NotNull ConfigurationSection config) {
-    ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
-    try {
-      // Reset placeholders to defaults and try to load configuration.
-      new PlaceholderLoader().load(placeholders);
-    } catch (Exception e) {
-      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
-    }
-  }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/AnySilentContainer.java

@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2011-2023 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.common.container;
-
-import com.lishid.openinv.internal.AnySilentContainerBase;
-import com.lishid.openinv.internal.common.container.menu.OpenChestMenu;
-import com.lishid.openinv.internal.common.player.PlayerManager;
-import com.lishid.openinv.util.ReflectionHelper;
-import com.lishid.openinv.util.lang.LanguageManager;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.level.ServerPlayerGameMode;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.SimpleMenuProvider;
-import net.minecraft.world.inventory.ChestMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.PlayerEnderChestContainer;
-import net.minecraft.world.level.GameType;
-import net.minecraft.world.level.block.BarrelBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.ChestBlock;
-import net.minecraft.world.level.block.ShulkerBoxBlock;
-import net.minecraft.world.level.block.TrappedChestBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
-import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
-
-public class AnySilentContainer extends AnySilentContainerBase {
-
-    private final @NotNull Logger logger;
-    private final @NotNull LanguageManager lang;
-    private @Nullable Field serverPlayerGameModeGameType;
-
-    public AnySilentContainer(@NotNull Logger logger, @NotNull LanguageManager lang) {
-        this.logger = logger;
-        this.lang = lang;
-        try {
-            try {
-                this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("gameModeForPlayer");
-                this.serverPlayerGameModeGameType.setAccessible(true);
-            } catch (NoSuchFieldException e) {
-                logger.warning("The field ServerPlayerGameMode#gameModeForPlayer is no longer present!");
-                logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
-                logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
-                // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
-                this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
-            }
-        } catch (SecurityException e) {
-            logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
-            logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
-        }
-    }
-
-    @Override
-    public boolean activateContainer(
-            @NotNull final Player bukkitPlayer,
-            final boolean silentchest,
-            @NotNull final org.bukkit.block.Block bukkitBlock) {
-
-        // Silent ender chest is API-only
-        if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
-            bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
-
-        final net.minecraft.world.level.Level level = player.level();
-        final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
-        final BlockEntity blockEntity = level.getBlockEntity(blockPos);
-
-        if (blockEntity == null) {
-            return false;
-        }
-
-        if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
-            // Anychest ender chest. See net.minecraft.world.level.block.EnderChestBlock
-            PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
-            enderChest.setActiveChest(enderChestTile);
-            player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> {
-                MenuType<?> containers = OpenChestMenu.getChestMenuType(enderChest.getContainerSize());
-                int rows = enderChest.getContainerSize() / 9;
-                return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
-            }, Component.translatable("container.enderchest")));
-            bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
-            return true;
-        }
-
-        if (!(blockEntity instanceof MenuProvider menuProvider)) {
-            return false;
-        }
-
-        BlockState blockState = level.getBlockState(blockPos);
-        Block block = blockState.getBlock();
-
-        if (block instanceof ChestBlock chestBlock) {
-
-            // boolean flag: do not check if chest is blocked
-            menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
-
-            if (menuProvider == null) {
-                lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-
-            if (block instanceof TrappedChestBlock) {
-                bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
-            } else {
-                bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
-            }
-        }
-
-        if (block instanceof ShulkerBoxBlock) {
-            bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
-        }
-
-        if (block instanceof BarrelBlock) {
-            bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
-        }
-
-        // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
-        if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
-            player.openMenu(menuProvider);
-            return true;
-        }
-
-        // SilentChest requires access to setting players' game mode directly.
-        if (this.serverPlayerGameModeGameType == null) {
-            return false;
-        }
-
-        if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
-            if (lootable.lootTable != null) {
-                lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
-                return false;
-            }
-        }
-
-        GameType gameType = player.gameMode.getGameModeForPlayer();
-        this.forceGameType(player, GameType.SPECTATOR);
-        player.openMenu(menuProvider);
-        this.forceGameType(player, gameType);
-        return true;
-    }
-
-    @Override
-    public void deactivateContainer(@NotNull final Player bukkitPlayer) {
-        if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
-            return;
-        }
-
-        ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
-
-        // Force game mode change without informing plugins or players.
-        // Regular game mode set calls GameModeChangeEvent and is cancellable.
-        GameType gameType = player.gameMode.getGameModeForPlayer();
-        this.forceGameType(player, GameType.SPECTATOR);
-
-        // ServerPlayer#closeContainer cannot be called without entering an
-        // infinite loop because this method is called during inventory close.
-        // From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
-        player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
-        // From ServerPlayer#closeContainer
-        player.doCloseContainer();
-        // Regular inventory close will handle the rest - packet sending, etc.
-
-        // Revert forced game mode.
-        this.forceGameType(player, gameType);
-    }
-
-    private void forceGameType(final ServerPlayer player, final GameType gameMode) {
-        if (this.serverPlayerGameModeGameType == null) {
-            // No need to warn repeatedly, error on startup and lack of function should be enough.
-            return;
-        }
-        try {
-            this.serverPlayerGameModeGameType.setAccessible(true);
-            this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
-        }
-    }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/bukkit/OpenPlayerInventorySelf.java

@@ -1,26 +0,0 @@
-package com.lishid.openinv.internal.common.container.bukkit;
-
-import com.lishid.openinv.internal.common.container.OpenInventory;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-public class OpenPlayerInventorySelf extends OpenPlayerInventory {
-
-  private final int offset;
-
-  public OpenPlayerInventorySelf(@NotNull OpenInventory inventory, int offset) {
-    super(inventory);
-    this.offset = offset;
-  }
-
-  @Override
-  public ItemStack getItem(int index) {
-    return super.getItem(offset + index);
-  }
-
-  @Override
-  public void setItem(int index, ItemStack item) {
-    super.setItem(offset + index, item);
-  }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/menu/OpenChestMenu.java

@@ -1,477 +0,0 @@
-package com.lishid.openinv.internal.common.container.menu;
-
-import com.google.common.base.Suppliers;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.InternalOwned;
-import com.lishid.openinv.internal.common.container.bukkit.OpenDummyInventory;
-import com.lishid.openinv.internal.common.container.slot.SlotPlaceholder;
-import com.lishid.openinv.internal.common.container.slot.SlotViewOnly;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
-import it.unimi.dsi.fastutil.ints.IntList;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.Container;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.ChestMenu;
-import net.minecraft.world.inventory.ClickType;
-import net.minecraft.world.inventory.ContainerData;
-import net.minecraft.world.inventory.ContainerListener;
-import net.minecraft.world.inventory.ContainerSynchronizer;
-import net.minecraft.world.inventory.DataSlot;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import org.bukkit.craftbukkit.inventory.CraftInventoryView;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * An extension of {@link AbstractContainerMenu} that supports {@link SlotPlaceholder placeholders}.
- */
-public abstract class OpenChestMenu<T extends Container & ISpecialInventory & InternalOwned<ServerPlayer>>
-    extends AbstractContainerMenu {
-
-  protected static final int BOTTOM_INVENTORY_SIZE = 36;
-
-  protected final T container;
-  protected final ServerPlayer viewer;
-  protected final boolean viewOnly;
-  protected final boolean ownContainer;
-  protected final int topSize;
-  private CraftInventoryView<OpenChestMenu<T>, Inventory> bukkitEntity;
-  // Syncher fields
-  private @Nullable ContainerSynchronizer synchronizer;
-  private final List<DataSlot> dataSlots = new ArrayList<>();
-  private final IntList remoteDataSlots = new IntArrayList();
-  private final List<ContainerListener> containerListeners = new ArrayList<>();
-  private ItemStack remoteCarried = ItemStack.EMPTY;
-  private boolean suppressRemoteUpdates;
-
-  protected OpenChestMenu(
-      @NotNull MenuType<ChestMenu> type,
-      int containerCounter,
-      @NotNull T container,
-      @NotNull ServerPlayer viewer,
-      boolean viewOnly) {
-    super(type, containerCounter);
-    this.container = container;
-    this.viewer = viewer;
-    this.viewOnly = viewOnly;
-    ownContainer = container.getOwnerHandle().equals(viewer);
-    topSize = getTopSize(viewer);
-
-    preSlotSetup();
-
-    int upperRows = topSize / 9;
-    // View's upper inventory - our container
-    for (int row = 0; row < upperRows; ++row) {
-      for (int col = 0; col < 9; ++col) {
-        // x and y for client purposes, but hey, we're thorough here.
-        // Adapted from net.minecraft.world.inventory.ChestMenu
-        int x = 8 + col * 18;
-        int y = 18 + row * 18;
-        int index = row * 9 + col;
-
-        // Guard against weird inventory sizes.
-        if (index >= container.getContainerSize()) {
-          addSlot(new SlotViewOnly(container, index, x, y));
-          continue;
-        }
-
-        Slot slot = getUpperSlot(index, x, y);
-
-        addSlot(slot);
-      }
-    }
-
-    // View's lower inventory - viewer inventory
-    int playerInvPad = (upperRows - 4) * 18;
-    for (int row = 0; row < 3; ++row) {
-      for (int col = 0; col < 9; ++col) {
-        int x = 8 + col * 18;
-        int y = playerInvPad + row * 18 + 103;
-        addSlot(new Slot(viewer.getInventory(), row * 9 + col + 9, x, y));
-      }
-    }
-    // Hotbar
-    for (int col = 0; col < 9; ++col) {
-      int x = 8 + col * 18;
-      int y = playerInvPad + 161;
-      addSlot(new Slot(viewer.getInventory(), col, x, y));
-    }
-  }
-
-  public static @NotNull MenuType<ChestMenu> getChestMenuType(int inventorySize) {
-    inventorySize = ((int) Math.ceil(inventorySize / 9.0)) * 9;
-    return switch (inventorySize) {
-      case 9 -> MenuType.GENERIC_9x1;
-      case 18 -> MenuType.GENERIC_9x2;
-      case 27 -> MenuType.GENERIC_9x3;
-      case 36 -> MenuType.GENERIC_9x4;
-      case 45 -> MenuType.GENERIC_9x5;
-      case 54 -> MenuType.GENERIC_9x6;
-      default -> throw new IllegalArgumentException("Inventory size unsupported: " + inventorySize);
-    };
-  }
-
-  protected void preSlotSetup() {}
-
-  protected @NotNull Slot getUpperSlot(int index, int x, int y) {
-    Slot slot = new Slot(container, index, x, y);
-    if (viewOnly) {
-      return SlotViewOnly.wrap(slot);
-    }
-    return slot;
-  }
-
-
-  @Override
-  public final @NotNull CraftInventoryView<OpenChestMenu<T>, Inventory> getBukkitView() {
-    if (bukkitEntity == null) {
-      bukkitEntity = createBukkitEntity();
-    }
-
-    return bukkitEntity;
-  }
-
-  protected @NotNull CraftInventoryView<OpenChestMenu<T>, Inventory> createBukkitEntity() {
-    Inventory top;
-    if (viewOnly) {
-      top = new OpenDummyInventory(container, container.getBukkitType());
-    } else {
-      top = container.getBukkitInventory();
-    }
-    return new CraftInventoryView<>(viewer.getBukkitEntity(), top, this) {
-      @Override
-      public @Nullable Inventory getInventory(int rawSlot) {
-        if (viewOnly) {
-          return null;
-        }
-        return super.getInventory(rawSlot);
-      }
-
-      @Override
-      public int convertSlot(int rawSlot) {
-        if (viewOnly) {
-          return InventoryView.OUTSIDE;
-        }
-        return super.convertSlot(rawSlot);
-      }
-
-      @Override
-      public @NotNull InventoryType.SlotType getSlotType(int slot) {
-        if (viewOnly) {
-          return InventoryType.SlotType.OUTSIDE;
-        }
-        return super.getSlotType(slot);
-      }
-    };
-  }
-
-  private int getTopSize(ServerPlayer viewer) {
-    MenuType<?> menuType = getType();
-    if (menuType == MenuType.GENERIC_9x1) {
-      return 9;
-    } else if (menuType == MenuType.GENERIC_9x2) {
-      return 18;
-    } else if (menuType == MenuType.GENERIC_9x3) {
-      return 27;
-    } else if (menuType == MenuType.GENERIC_9x4) {
-      return 36;
-    } else if (menuType == MenuType.GENERIC_9x5) {
-      return 45;
-    } else if (menuType == MenuType.GENERIC_9x6) {
-      return 54;
-    }
-    // This is a bit gross, but allows us a safe fallthrough.
-    return menuType.create(-1, viewer.getInventory()).slots.size() - BOTTOM_INVENTORY_SIZE;
-  }
-
-  /**
-   * Reimplementation of {@link AbstractContainerMenu#moveItemStackTo(ItemStack, int, int, boolean)} that ignores fake
-   * slots and respects {@link Slot#hasItem()}.
-   *
-   * @param itemStack the stack to quick-move
-   * @param rangeLow the start of the range of slots that can be moved to, inclusive
-   * @param rangeHigh the end of the range of slots that can be moved to, exclusive
-   * @param topDown whether to start at the top of the range or bottom
-   * @return whether the stack was modified as a result of being quick-moved
-   */
-  @Override
-  protected boolean moveItemStackTo(ItemStack itemStack, int rangeLow, int rangeHigh, boolean topDown) {
-    boolean modified = false;
-    boolean stackable = itemStack.isStackable();
-    Slot firstEmpty = null;
-
-    for (int index = topDown ? rangeHigh - 1 : rangeLow;
-         !itemStack.isEmpty() && (topDown ? index >= rangeLow : index < rangeHigh);
-         index += topDown ? -1 : 1
-    ) {
-      Slot slot = slots.get(index);
-      // If the slot cannot be added to, check the next slot.
-      if (slot.isFake() || !slot.mayPlace(itemStack)) {
-        continue;
-      }
-
-      if (slot.hasItem()) {
-        // If the item isn't stackable, check the next slot.
-        if (!stackable) {
-          continue;
-        }
-        // Otherwise, add as many as we can from our stack to the slot.
-        modified |= addToExistingStack(itemStack, slot);
-      } else {
-        // If this is the first empty slot, keep track of it for later use.
-        if (firstEmpty == null) {
-          firstEmpty = slot;
-        }
-        // If the item isn't stackable, we've located the slot we're adding it to, so we're done.
-        if (!stackable) {
-          break;
-        }
-      }
-    }
-
-    // If the item hasn't been fully added yet, add as many as we can to the first open slot.
-    if (!itemStack.isEmpty() && firstEmpty != null) {
-      firstEmpty.setByPlayer(itemStack.split(Math.min(itemStack.getCount(), firstEmpty.getMaxStackSize(itemStack))));
-      firstEmpty.setChanged();
-      modified = true;
-    }
-
-    return modified;
-  }
-
-  private static boolean addToExistingStack(ItemStack itemStack, Slot slot) {
-    ItemStack existing = slot.getItem();
-
-    // If the items aren't the same, we can't add our item.
-    if (!ItemStack.isSameItemSameComponents(itemStack, existing)) {
-      return false;
-    }
-
-    int max = slot.getMaxStackSize(existing);
-    int existingCount = existing.getCount();
-
-    // If the stack is already full, we can't add more.
-    if (existingCount >= max) {
-      return false;
-    }
-
-    int total = existingCount + itemStack.getCount();
-
-    // If the existing item can accept the entirety of our item, we're done!
-    if (total <= max) {
-      itemStack.setCount(0);
-      existing.setCount(total);
-      slot.setChanged();
-      return true;
-    }
-
-    // Otherwise, add as many as we can.
-    itemStack.shrink(max - existingCount);
-    existing.setCount(max);
-    slot.setChanged();
-    return true;
-  }
-
-  @Override
-  public void clicked(int i, int j, @NotNull ClickType clickType, @NotNull Player player) {
-    if (viewOnly) {
-      if (clickType == ClickType.QUICK_CRAFT) {
-        sendAllDataToRemote();
-      }
-      return;
-    }
-    super.clicked(i, j, clickType, player);
-  }
-
-  @Override
-  public boolean stillValid(@NotNull Player player) {
-    return true;
-  }
-
-  // Overrides from here on are purely to modify the sync process to send placeholder items.
-  @Override
-  protected @NotNull Slot addSlot(@NotNull Slot slot) {
-    slot.index = this.slots.size();
-    this.slots.add(slot);
-    this.lastSlots.add(ItemStack.EMPTY);
-    this.remoteSlots.add(ItemStack.EMPTY);
-    return slot;
-  }
-
-  @Override
-  protected @NotNull DataSlot addDataSlot(@NotNull DataSlot dataSlot) {
-    this.dataSlots.add(dataSlot);
-    this.remoteDataSlots.add(0);
-    return dataSlot;
-  }
-
-  @Override
-  protected void addDataSlots(ContainerData containerData) {
-    for (int i = 0; i < containerData.getCount(); i++) {
-      this.addDataSlot(DataSlot.forContainer(containerData, i));
-    }
-  }
-
-  @Override
-  public void addSlotListener(@NotNull ContainerListener containerListener) {
-    if (!this.containerListeners.contains(containerListener)) {
-      this.containerListeners.add(containerListener);
-      this.broadcastChanges();
-    }
-  }
-
-  @Override
-  public void setSynchronizer(@NotNull ContainerSynchronizer containerSynchronizer) {
-    this.synchronizer = containerSynchronizer;
-    this.sendAllDataToRemote();
-  }
-
-  @Override
-  public void sendAllDataToRemote() {
-    for (int index = 0; index < slots.size(); ++index) {
-      Slot slot = slots.get(index);
-      this.remoteSlots.set(index, (slot instanceof SlotPlaceholder placeholder ? placeholder.getOrDefault() : slot.getItem()).copy());
-    }
-
-    remoteCarried = getCarried().copy();
-
-    for (int index = 0; index < this.dataSlots.size(); ++index) {
-      this.remoteDataSlots.set(index, this.dataSlots.get(index).get());
-    }
-
-    if (this.synchronizer != null) {
-      this.synchronizer.sendInitialData(this, this.remoteSlots, this.remoteCarried, this.remoteDataSlots.toIntArray());
-    }
-  }
-
-  @Override
-  public void broadcastCarriedItem() {
-    this.remoteCarried = this.getCarried().copy();
-    if (this.synchronizer != null) {
-      this.synchronizer.sendCarriedChange(this, this.remoteCarried);
-    }
-  }
-
-  @Override
-  public void removeSlotListener(@NotNull ContainerListener containerListener) {
-    this.containerListeners.remove(containerListener);
-  }
-
-  @Override
-  public void broadcastChanges() {
-    for (int index = 0; index < this.slots.size(); ++index) {
-      Slot slot = this.slots.get(index);
-      ItemStack itemstack = slot instanceof SlotPlaceholder placeholder ? placeholder.getOrDefault() : slot.getItem();
-      Supplier<ItemStack> supplier = Suppliers.memoize(itemstack::copy);
-      this.triggerSlotListeners(index, itemstack, supplier);
-      this.synchronizeSlotToRemote(index, itemstack, supplier);
-    }
-
-    this.synchronizeCarriedToRemote();
-
-    for (int index = 0; index < this.dataSlots.size(); ++index) {
-      DataSlot dataSlot = this.dataSlots.get(index);
-      int j = dataSlot.get();
-      if (dataSlot.checkAndClearUpdateFlag()) {
-        this.updateDataSlotListeners(index, j);
-      }
-
-      this.synchronizeDataSlotToRemote(index, j);
-    }
-  }
-
-  @Override
-  public void broadcastFullState() {
-    for (int index = 0; index < this.slots.size(); ++index) {
-      ItemStack itemstack = this.slots.get(index).getItem();
-      this.triggerSlotListeners(index, itemstack, itemstack::copy);
-    }
-
-    for (int index = 0; index < this.dataSlots.size(); ++index) {
-      DataSlot containerproperty = this.dataSlots.get(index);
-      if (containerproperty.checkAndClearUpdateFlag()) {
-        this.updateDataSlotListeners(index, containerproperty.get());
-      }
-    }
-
-    this.sendAllDataToRemote();
-  }
-
-  private void updateDataSlotListeners(int i, int j) {
-    for (ContainerListener containerListener : this.containerListeners) {
-      containerListener.dataChanged(this, i, j);
-    }
-  }
-
-  private void triggerSlotListeners(int index, ItemStack itemStack, Supplier<ItemStack> supplier) {
-    ItemStack itemStack1 = this.lastSlots.get(index);
-    if (!ItemStack.matches(itemStack1, itemStack)) {
-      ItemStack itemStack2 = supplier.get();
-      this.lastSlots.set(index, itemStack2);
-
-      for (ContainerListener containerListener : this.containerListeners) {
-        containerListener.slotChanged(this, index, itemStack2);
-      }
-    }
-  }
-
-  private void synchronizeSlotToRemote(int i, ItemStack itemStack, Supplier<ItemStack> supplier) {
-    if (!this.suppressRemoteUpdates) {
-      ItemStack itemStack1 = this.remoteSlots.get(i);
-      if (!ItemStack.matches(itemStack1, itemStack)) {
-        ItemStack itemstack2 = supplier.get();
-        this.remoteSlots.set(i, itemstack2);
-        if (this.synchronizer != null) {
-          this.synchronizer.sendSlotChange(this, i, itemstack2);
-        }
-      }
-    }
-  }
-
-  private void synchronizeDataSlotToRemote(int index, int value) {
-    if (!this.suppressRemoteUpdates) {
-      int existing = this.remoteDataSlots.getInt(index);
-      if (existing != value) {
-        this.remoteDataSlots.set(index, value);
-        if (this.synchronizer != null) {
-          this.synchronizer.sendDataChange(this, index, value);
-        }
-      }
-    }
-  }
-
-  private void synchronizeCarriedToRemote() {
-    if (!this.suppressRemoteUpdates && !ItemStack.matches(this.getCarried(), this.remoteCarried)) {
-      this.remoteCarried = this.getCarried().copy();
-      if (this.synchronizer != null) {
-        this.synchronizer.sendCarriedChange(this, this.remoteCarried);
-      }
-    }
-  }
-
-  @Override
-  public void setRemoteCarried(ItemStack itemstack) {
-    this.remoteCarried = itemstack.copy();
-  }
-
-  @Override
-  public void suppressRemoteUpdates() {
-    this.suppressRemoteUpdates = true;
-  }
-
-  @Override
-  public void resumeRemoteUpdates() {
-    this.suppressRemoteUpdates = false;
-  }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/ContentEquipment.java

@@ -1,78 +0,0 @@
-package com.lishid.openinv.internal.common.container.slot;
-
-import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.Container;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import org.bukkit.event.inventory.InventoryType;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A slot for equipment that displays placeholders if empty.
- */
-public class ContentEquipment extends ContentList {
-
-  private final ItemStack placeholder;
-  private final EquipmentSlot equipmentSlot;
-
-  public ContentEquipment(ServerPlayer holder, int index, EquipmentSlot equipmentSlot) {
-    super(holder, index, InventoryType.SlotType.ARMOR);
-    placeholder = switch (equipmentSlot) {
-      case HEAD -> Placeholders.emptyHelmet;
-      case CHEST -> Placeholders.emptyChestplate;
-      case LEGS -> Placeholders.emptyLeggings;
-      case FEET -> Placeholders.emptyBoots;
-      default -> Placeholders.emptyOffHand;
-    };
-    this.equipmentSlot = equipmentSlot;
-  }
-
-  @Override
-  public void setHolder(@NotNull ServerPlayer holder) {
-    this.items = holder.getInventory().armor;
-  }
-
-  @Override
-  public Slot asSlot(Container container, int slot, int x, int y) {
-    return new SlotEquipment(container, slot, x, y);
-  }
-
-  public class SlotEquipment extends SlotPlaceholder {
-
-    private ServerPlayer viewer;
-
-    SlotEquipment(Container container, int index, int x, int y) {
-      super(container, index, x, y);
-    }
-
-    @Override
-    public ItemStack getOrDefault() {
-      ItemStack itemStack = getItem();
-      if (!itemStack.isEmpty()) {
-        return itemStack;
-      }
-      return placeholder;
-    }
-
-    public EquipmentSlot getEquipmentSlot() {
-      return equipmentSlot;
-    }
-
-    public void onlyEquipmentFor(ServerPlayer viewer) {
-      this.viewer = viewer;
-    }
-
-    @Override
-    public boolean mayPlace(@NotNull ItemStack itemStack) {
-      if (viewer == null) {
-        return true;
-      }
-
-      return equipmentSlot == EquipmentSlot.OFFHAND || viewer.getEquipmentSlotForItem(itemStack) == equipmentSlot;
-    }
-
-  }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/SlotViewOnly.java

@@ -1,151 +0,0 @@
-package com.lishid.openinv.internal.common.container.slot;
-
-import com.lishid.openinv.internal.common.container.slot.placeholder.Placeholders;
-import net.minecraft.world.Container;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-/**
- * A view-only {@link Slot}. "Blank" by default, but can wrap another slot to display its content.
- */
-public class SlotViewOnly extends SlotPlaceholder {
-
-  public static @NotNull SlotViewOnly wrap(@NotNull Slot wrapped) {
-    SlotViewOnly wrapper;
-    if (wrapped instanceof SlotPlaceholder placeholder) {
-      wrapper = new SlotViewOnly(wrapped.container, wrapped.slot, wrapped.x, wrapped.y) {
-        @Override
-        public ItemStack getOrDefault() {
-          return placeholder.getOrDefault();
-        }
-      };
-    } else {
-      wrapper = new SlotViewOnly(wrapped.container, wrapped.slot, wrapped.x, wrapped.y) {
-        @Override
-        public ItemStack getOrDefault() {
-          return wrapped.getItem();
-        }
-      };
-    }
-    wrapper.index = wrapped.index;
-    return wrapper;
-  }
-
-  public SlotViewOnly(Container container, int index, int x, int y) {
-    super(container, index, x, y);
-  }
-
-  @Override
-  public ItemStack getOrDefault() {
-    return Placeholders.notSlot;
-  }
-
-  @Override
-  public void onQuickCraft(@NotNull ItemStack itemStack1, @NotNull ItemStack itemStack2) {
-  }
-
-  @Override
-  public void onTake(@NotNull Player player, @NotNull ItemStack itemStack) {
-  }
-
-  @Override
-  public boolean mayPlace(@NotNull ItemStack itemStack) {
-    return false;
-  }
-
-  @Override
-  public @NotNull ItemStack getItem() {
-    return ItemStack.EMPTY;
-  }
-
-  @Override
-  public boolean hasItem() {
-    return false;
-  }
-
-  @Override
-  public void setByPlayer(@NotNull ItemStack newStack) {
-  }
-
-  @Override
-  public void setByPlayer(@NotNull ItemStack newStack, @NotNull ItemStack oldStack) {
-  }
-
-  @Override
-  public void set(@NotNull ItemStack itemStack) {
-  }
-
-  @Override
-  public void setChanged() {
-  }
-
-  @Override
-  public int getMaxStackSize() {
-    return 0;
-  }
-
-  @Override
-  public int getMaxStackSize(@NotNull ItemStack itemStack) {
-    return 0;
-  }
-
-  @Override
-  public @NotNull ItemStack remove(int amount) {
-    return ItemStack.EMPTY;
-  }
-
-  @Override
-  public boolean mayPickup(@NotNull Player player) {
-    return false;
-  }
-
-  @Override
-  public boolean isActive() {
-    return false;
-  }
-
-  @Override
-  public @NotNull Optional<ItemStack> tryRemove(int var0, int var1, @NotNull Player player) {
-    return Optional.empty();
-  }
-
-  @Override
-  public @NotNull ItemStack safeTake(int var0, int var1, @NotNull Player player) {
-    return ItemStack.EMPTY;
-  }
-
-  @Override
-  public @NotNull ItemStack safeInsert(@NotNull ItemStack itemStack) {
-    return itemStack;
-  }
-
-  @Override
-  public @NotNull ItemStack safeInsert(@NotNull ItemStack itemStack, int amount) {
-    return itemStack;
-  }
-
-  @Override
-  public boolean allowModification(@NotNull Player player) {
-    return false;
-  }
-
-  @Override
-  public int getContainerSlot() {
-    return this.slot;
-  }
-
-  @Override
-  public boolean isHighlightable() {
-    return false;
-  }
-
-  @Override
-  public boolean isFake() {
-    return true;
-  }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/placeholder/PlaceholderLoader.java

@@ -1,18 +0,0 @@
-package com.lishid.openinv.internal.common.container.slot.placeholder;
-
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.component.CustomModelData;
-
-import java.util.List;
-
-public class PlaceholderLoader extends PlaceholderLoaderBase {
-
-  private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(List.of(), List.of(), List.of("openinv:custom"), List.of());
-
-  @Override
-  protected void addModelData(ItemStack itemStack) {
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
-  }
-
-}

internal/common/src/main/java/com/lishid/openinv/internal/common/container/slot/placeholder/Placeholders.java

@@ -1,37 +0,0 @@
-package com.lishid.openinv.internal.common.container.slot.placeholder;
-
-import com.lishid.openinv.internal.common.player.OpenPlayer;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.GameType;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.EnumMap;
-
-public final class Placeholders {
-
-  static final @NotNull EnumMap<GameType, ItemStack> BLOCKED_GAME_TYPE = new EnumMap<>(GameType.class);
-  public static @NotNull ItemStack craftingOutput = ItemStack.EMPTY;
-  public static @NotNull ItemStack cursor = ItemStack.EMPTY;
-  public static @NotNull ItemStack drop = ItemStack.EMPTY;
-  public static @NotNull ItemStack emptyHelmet = ItemStack.EMPTY;
-  public static @NotNull ItemStack emptyChestplate = ItemStack.EMPTY;
-  public static @NotNull ItemStack emptyLeggings = ItemStack.EMPTY;
-  public static @NotNull ItemStack emptyBoots = ItemStack.EMPTY;
-  public static @NotNull ItemStack emptyOffHand = ItemStack.EMPTY;
-  public static @NotNull ItemStack notSlot = ItemStack.EMPTY;
-  public static @NotNull ItemStack blockedOffline = ItemStack.EMPTY;
-
-  public static ItemStack survivalOnly(@NotNull ServerPlayer serverPlayer) {
-    if (!OpenPlayer.isConnected(serverPlayer.connection)) {
-      return blockedOffline;
-    }
-
-    return BLOCKED_GAME_TYPE.getOrDefault(serverPlayer.gameMode.getGameModeForPlayer(), ItemStack.EMPTY);
-  }
-
-  private Placeholders() {
-    throw new IllegalStateException("Cannot create instance of utility class.");
-  }
-
-}

internal/paper1_21_1/build.gradle.kts

@@ -1,27 +0,0 @@
-plugins {
-  `openinv-base`
-  alias(libs.plugins.paperweight)
-}
-
-configurations.all {
-  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
-    val paper = candidates.firstOrNull {
-      it.id.let {
-        id -> id is ModuleComponentIdentifier && id.module == "paper-api"
-      }
-    }
-    if (paper != null) {
-      select(paper)
-    }
-    because("module is written for Paper servers")
-  }
-}
-
-dependencies {
-  implementation(project(":openinvapi"))
-  implementation(project(":openinvcommon"))
-  implementation(project(":openinvadaptercommon"))
-  implementation(project(":openinvadapterpaper1_21_3"))
-
-  paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
-}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/InternalAccessor.java

@@ -1,80 +0,0 @@
-package com.lishid.openinv.internal.paper1_21_1;
-
-import com.lishid.openinv.internal.Accessor;
-import com.lishid.openinv.internal.IAnySilentContainer;
-import com.lishid.openinv.internal.ISpecialEnderChest;
-import com.lishid.openinv.internal.ISpecialInventory;
-import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import com.lishid.openinv.internal.common.container.AnySilentContainer;
-import com.lishid.openinv.internal.common.container.OpenEnderChest;
-import com.lishid.openinv.internal.paper1_21_1.container.OpenInventory;
-import com.lishid.openinv.internal.paper1_21_1.container.slot.placeholder.PlaceholderLoader;
-import com.lishid.openinv.internal.paper1_21_1.player.PlayerManager;
-import com.lishid.openinv.util.lang.LanguageManager;
-import net.minecraft.world.Container;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class InternalAccessor implements Accessor {
-
-  private final @NotNull Logger logger;
-  private final @NotNull PlayerManager manager;
-  private final @NotNull AnySilentContainer anySilentContainer;
-
-  public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
-    this.logger = logger;
-    this.manager = new PlayerManager(logger);
-    this.anySilentContainer = new AnySilentContainer(logger, lang);
-  }
-
-  @Override
-  public @NotNull PlayerManager getPlayerManager() {
-    return manager;
-  }
-
-  @Override
-  public @NotNull IAnySilentContainer getAnySilentContainer() {
-    return anySilentContainer;
-  }
-
-  @Override
-  public @NotNull ISpecialPlayerInventory createPlayerInventory(@NotNull Player player) {
-    return new OpenInventory(player);
-  }
-
-  @Override
-  public @NotNull ISpecialEnderChest createEnderChest(@NotNull Player player) {
-    return new OpenEnderChest(player);
-  }
-
-  @Override
-  public <T extends ISpecialInventory> @Nullable T get(@NotNull Inventory bukkitInventory, @NotNull Class<T> clazz) {
-    if (!(bukkitInventory instanceof CraftInventory craftInventory)) {
-      return null;
-    }
-    Container container = craftInventory.getInventory();
-    if (clazz.isInstance(container)) {
-      return clazz.cast(container);
-    }
-    return null;
-  }
-
-  @Override
-  public void reload(@NotNull ConfigurationSection config) {
-    ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
-    try {
-      // Reset placeholders to defaults and try to load configuration.
-      new PlaceholderLoader().load(placeholders);
-    } catch (Exception e) {
-      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
-    }
-  }
-
-}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/container/OpenInventory.java

@@ -1,20 +0,0 @@
-package com.lishid.openinv.internal.paper1_21_1.container;
-
-import com.lishid.openinv.internal.common.container.slot.Content;
-import com.lishid.openinv.internal.paper1_21_1.container.slot.ContentCraftingResult;
-import net.minecraft.server.level.ServerPlayer;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class OpenInventory extends com.lishid.openinv.internal.common.container.OpenInventory {
-
-  public OpenInventory(@NotNull Player bukkitPlayer) {
-    super(bukkitPlayer);
-  }
-
-  @Override
-  protected Content getCraftingResult(@NotNull ServerPlayer serverPlayer) {
-    return new ContentCraftingResult(serverPlayer);
-  }
-
-}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/container/slot/placeholder/PlaceholderLoader.java

@@ -1,65 +0,0 @@
-package com.lishid.openinv.internal.paper1_21_1.container.slot.placeholder;
-
-import com.lishid.openinv.internal.paper1_21_3.container.slot.placeholder.NumericDataPlaceholderLoader;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.util.Unit;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.level.block.entity.BannerPattern;
-import net.minecraft.world.level.block.entity.BannerPatternLayers;
-import net.minecraft.world.level.block.entity.BannerPatterns;
-import org.bukkit.craftbukkit.CraftRegistry;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public class PlaceholderLoader extends NumericDataPlaceholderLoader {
-
-  @Override
-  protected @NotNull ItemStack defaultCursor() {
-    // Cursor-like banner with no tooltip
-    ItemStack itemStack = new ItemStack(Items.WHITE_BANNER);
-    RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry();
-    Registry<BannerPattern> bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN);
-    BannerPattern halfDiagBottomRight = bannerPatterns.getOrThrow(BannerPatterns.DIAGONAL_RIGHT);
-    BannerPattern downRight = bannerPatterns.getOrThrow(BannerPatterns.STRIPE_DOWNRIGHT);
-    BannerPattern border = bannerPatterns.getOrThrow(BannerPatterns.BORDER);
-    itemStack.set(DataComponents.BANNER_PATTERNS,
-        new BannerPatternLayers(List.of(
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfDiagBottomRight), DyeColor.GRAY),
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(downRight), DyeColor.WHITE),
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(border), DyeColor.GRAY))));
-    addModelData(itemStack);
-    itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
-    return itemStack;
-  }
-
-  @Override
-  protected @NotNull ItemStack defaultShield() {
-    // Shield with "missing texture" pattern, magenta and black squares.
-    ItemStack itemStack = new ItemStack(Items.SHIELD);
-    itemStack.set(DataComponents.BASE_COLOR, DyeColor.MAGENTA);
-    RegistryAccess minecraftRegistry = CraftRegistry.getMinecraftRegistry();
-    Registry<BannerPattern> bannerPatterns = minecraftRegistry.registryOrThrow(Registries.BANNER_PATTERN);
-    BannerPattern halfLeft = bannerPatterns.getOrThrow(BannerPatterns.HALF_VERTICAL);
-    BannerPattern topLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_LEFT);
-    BannerPattern topRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_TOP_RIGHT);
-    BannerPattern bottomLeft = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_LEFT);
-    BannerPattern bottomRight = bannerPatterns.getOrThrow(BannerPatterns.SQUARE_BOTTOM_RIGHT);
-    itemStack.set(DataComponents.BANNER_PATTERNS,
-        new BannerPatternLayers(List.of(
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(halfLeft), DyeColor.BLACK),
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(topLeft), DyeColor.MAGENTA),
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(bottomLeft), DyeColor.MAGENTA),
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(topRight), DyeColor.BLACK),
-            new BannerPatternLayers.Layer(bannerPatterns.wrapAsHolder(bottomRight), DyeColor.BLACK))));
-    itemStack.set(DataComponents.HIDE_TOOLTIP, Unit.INSTANCE);
-    addModelData(itemStack);
-    return itemStack;
-  }
-
-}

internal/paper1_21_1/src/main/java/com/lishid/openinv/internal/paper1_21_1/player/PlayerManager.java

@@ -1,54 +0,0 @@
-package com.lishid.openinv.internal.paper1_21_1.player;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ClientInformation;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.ChatVisiblity;
-import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.logging.Logger;
-
-public class PlayerManager extends com.lishid.openinv.internal.common.player.PlayerManager {
-  public PlayerManager(@NotNull Logger logger) {
-    super(logger);
-  }
-
-  @Override
-  protected @NotNull ServerPlayer createNewPlayer(
-      @NotNull MinecraftServer server,
-      @NotNull ServerLevel worldServer,
-      @NotNull final OfflinePlayer offline) {
-    // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
-    // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
-    GameProfile profile = new GameProfile(offline.getUniqueId(),
-        offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
-
-    ClientInformation dummyInfo = new ClientInformation(
-        "en_us",
-        1, // Reduce distance just in case.
-        ChatVisiblity.HIDDEN, // Don't accept chat.
-        false,
-        ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
-        ServerPlayer.DEFAULT_MAIN_HAND,
-        true,
-        false // Don't list in player list (not that this player is in the list anyway).
-    );
-
-    ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
-
-    try {
-      injectPlayer(entity);
-    } catch (IllegalAccessException e) {
-      logger.log(
-          java.util.logging.Level.WARNING,
-          e,
-          () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
-    }
-
-    return entity;
-  }
-
-}

internal/paper1_21_11/build.gradle.kts

@@ -0,0 +1,25 @@
+plugins {
+  alias(libs.plugins.paperweight)
+}
+
+java {
+  toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
+}
+
+dependencies {
+  implementation(project(":openinvapi")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  implementation(project(":openinvcommon")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  implementation(project(":openinvadapterpaper26_1")) {
+    exclude(group = "io.papermc.paper", module = "dev-bundle")
+  }
+
+  paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
+}

internal/paper1_21_11/src/main/java/com/lishid/openinv/internal/paper1_21_11/InternalAccessor.java

@@ -0,0 +1,30 @@
+package com.lishid.openinv.internal.paper1_21_11;
+
+import com.github.jikoo.openinv.lang.LanguageManager;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.lishid.openinv.internal.paper1_21_11.container.OpenEnderChest;
+import com.lishid.openinv.internal.paper1_21_11.container.OpenInventory;
+import org.bukkit.entity.Player;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.logging.Logger;
+
+@NullMarked
+public class InternalAccessor extends com.lishid.openinv.internal.paper26_1.InternalAccessor {
+
+  public InternalAccessor(Logger logger, LanguageManager lang) {
+    super(logger, lang);
+  }
+
+  @Override
+  public ISpecialEnderChest createEnderChest(Player player) {
+    return new OpenEnderChest(player);
+  }
+
+  @Override
+  public ISpecialPlayerInventory createPlayerInventory(Player player) {
+    return new OpenInventory(factory, player);
+  }
+
+}

internal/paper1_21_11/src/main/java/com/lishid/openinv/internal/paper1_21_11/container/OpenEnderChest.java

@@ -0,0 +1,35 @@
+package com.lishid.openinv.internal.paper1_21_11.container;
+
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper1_21_11.container.menu.OpenEnderChestMenu;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenChestMenu;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class OpenEnderChest extends com.lishid.openinv.internal.paper26_3.container.OpenEnderChest {
+
+  public OpenEnderChest(org.bukkit.entity.Player player) {
+    super(player);
+  }
+
+  @Override
+  public @Nullable OpenChestMenu<?> createMenu(
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory,
+      Player player,
+      int i,
+      boolean viewOnly
+  ) {
+    if (player instanceof ServerPlayer serverPlayer) {
+      return new OpenEnderChestMenu(factory, this, serverPlayer, i, viewOnly);
+    }
+    return null;
+  }
+
+}

internal/paper1_21_11/src/main/java/com/lishid/openinv/internal/paper1_21_11/container/OpenInventory.java

@@ -0,0 +1,33 @@
+package com.lishid.openinv.internal.paper1_21_11.container;
+
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper1_21_11.container.menu.OpenInventoryMenu;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenChestMenu;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class OpenInventory extends com.lishid.openinv.internal.paper26_3.container.OpenInventory {
+
+  public OpenInventory(
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory,
+      org.bukkit.entity.Player bukkitPlayer
+  ) {
+    super(factory, bukkitPlayer);
+  }
+
+  @Override
+  public @Nullable OpenChestMenu<?> createMenu(Player player, int i, boolean viewOnly) {
+    if (player instanceof ServerPlayer serverPlayer) {
+      return new OpenInventoryMenu(factory, this, serverPlayer, i, viewOnly);
+    }
+    return null;
+  }
+
+}

internal/paper1_21_11/src/main/java/com/lishid/openinv/internal/paper1_21_11/container/menu/OpenEnderChestMenu.java

@@ -0,0 +1,72 @@
+package com.lishid.openinv.internal.paper1_21_11.container.menu;
+
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_3.container.OpenEnderChest;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenSyncMenu;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickType;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class OpenEnderChestMenu extends OpenSyncMenu<OpenEnderChest> {
+
+  public OpenEnderChestMenu(
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory,
+      OpenEnderChest enderChest,
+      ServerPlayer viewer,
+      int containerId,
+      boolean viewOnly
+  ) {
+    super(getChestMenuType(enderChest.getContainerSize()), containerId, factory, enderChest, viewer, viewOnly);
+  }
+
+  @Override
+  public ItemStack quickMoveStack(Player player, int index) {
+    if (viewOnly) {
+      return ItemStack.EMPTY;
+    }
+
+    // See ChestMenu
+    Slot slot = this.slots.get(index);
+
+    if (slot.isFake() || !slot.hasItem()) {
+      return ItemStack.EMPTY;
+    }
+
+    ItemStack itemStack = slot.getItem();
+    ItemStack original = itemStack.copy();
+
+    if (index < topSize) {
+      if (!this.moveItemStackTo(itemStack, topSize, this.slots.size(), true)) {
+        return ItemStack.EMPTY;
+      }
+    } else if (!this.moveItemStackTo(itemStack, 0, topSize, false)) {
+      return ItemStack.EMPTY;
+    }
+
+    if (itemStack.isEmpty()) {
+      slot.setByPlayer(ItemStack.EMPTY);
+    } else {
+      slot.setChanged();
+    }
+
+    return original;
+  }
+
+  @Override
+  public void clicked(int i, int j, ClickType clickType, Player player) {
+    if (viewOnly) {
+      if (clickType == ClickType.QUICK_CRAFT) {
+        sendAllDataToRemote();
+      }
+      return;
+    }
+    super.clicked(i, j, clickType, player);
+  }
+
+}

internal/paper1_21_11/src/main/java/com/lishid/openinv/internal/paper1_21_11/container/menu/OpenInventoryMenu.java

@@ -0,0 +1,39 @@
+package com.lishid.openinv.internal.paper1_21_11.container.menu;
+
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_3.container.BaseOpenInventory;
+import com.lishid.openinv.internal.paper26_3.container.menu.BaseOpenInventoryMenu;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickType;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class OpenInventoryMenu extends BaseOpenInventoryMenu {
+
+  public OpenInventoryMenu(
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory,
+      BaseOpenInventory inventory,
+      ServerPlayer viewer,
+      int i,
+      boolean viewOnly
+  ) {
+    super(factory, inventory, viewer, i, viewOnly);
+  }
+
+  @Override
+  public void clicked(int i, int j, ClickType clickType, Player player) {
+    if (viewOnly) {
+      if (clickType == ClickType.QUICK_CRAFT) {
+        sendAllDataToRemote();
+      }
+      return;
+    }
+    super.clicked(i, j, clickType, player);
+  }
+
+}

internal/paper1_21_3/build.gradle.kts

@@ -1,26 +0,0 @@
-plugins {
-  `openinv-base`
-  alias(libs.plugins.paperweight)
-}
-
-configurations.all {
-  resolutionStrategy.capabilitiesResolution.withCapability("org.spigotmc:spigot-api") {
-    val paper = candidates.firstOrNull {
-      it.id.let {
-        id -> id is ModuleComponentIdentifier && id.module == "paper-api"
-      }
-    }
-    if (paper != null) {
-      select(paper)
-    }
-    because("module is written for Paper servers")
-  }
-}
-
-dependencies {
-  implementation(project(":openinvapi"))
-  implementation(project(":openinvcommon"))
-  implementation(project(":openinvadaptercommon"))
-
-  paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
-}

internal/paper1_21_3/src/main/java/com/lishid/openinv/internal/paper1_21_3/InternalAccessor.java

@@ -1,28 +0,0 @@
-package com.lishid.openinv.internal.paper1_21_3;
-
-import com.lishid.openinv.internal.paper1_21_3.container.slot.placeholder.NumericDataPlaceholderLoader;
-import com.lishid.openinv.util.lang.LanguageManager;
-import org.bukkit.configuration.ConfigurationSection;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class InternalAccessor extends com.lishid.openinv.internal.common.InternalAccessor {
-
-  public InternalAccessor(@NotNull Logger logger, @NotNull LanguageManager lang) {
-    super(logger, lang);
-  }
-
-  @Override
-  public void reload(@NotNull ConfigurationSection config) {
-    ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
-    try {
-      // Reset placeholders to defaults and try to load configuration.
-      new NumericDataPlaceholderLoader().load(placeholders);
-    } catch (Exception e) {
-      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
-    }
-  }
-
-}

internal/paper1_21_3/src/main/java/com/lishid/openinv/internal/paper1_21_3/container/slot/placeholder/NumericDataPlaceholderLoader.java

@@ -1,31 +0,0 @@
-package com.lishid.openinv.internal.paper1_21_3.container.slot.placeholder;
-
-import com.lishid.openinv.internal.common.container.slot.placeholder.PlaceholderLoaderBase;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.component.DataComponents;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.util.Unit;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.component.CustomModelData;
-import net.minecraft.world.level.block.entity.BannerPattern;
-import net.minecraft.world.level.block.entity.BannerPatternLayers;
-import net.minecraft.world.level.block.entity.BannerPatterns;
-import org.bukkit.craftbukkit.CraftRegistry;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public class NumericDataPlaceholderLoader extends PlaceholderLoaderBase {
-
-  private static final CustomModelData DEFAULT_CUSTOM_MODEL_DATA = new CustomModelData(9999);
-
-  @Override
-  protected void addModelData(ItemStack itemStack) {
-    itemStack.set(DataComponents.CUSTOM_MODEL_DATA, DEFAULT_CUSTOM_MODEL_DATA);
-  }
-
-}

internal/paper26_1/build.gradle.kts

@@ -0,0 +1,45 @@
+plugins {
+  alias(libs.plugins.paperweight)
+}
+
+repositories {
+  maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+// Paper is compiled with Java 25, so we have to use a Java 25 toolchain.
+java {
+  toolchain.languageVersion.set(JavaLanguageVersion.of(25))
+}
+
+// To minimize duplicate code, the adapter for 1.21.11 is built off of this module, so we need to target Java 21.
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
+}
+
+// As a result, we have to specifically tell Gradle it's okay if our dependencies require Java 25,
+// because secretly sometimes they don't!
+configurations.matching { it.isCanBeResolved && it.name.endsWith("Classpath") }.all {
+  attributes {
+    attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
+  }
+}
+
+dependencies {
+  implementation(project(":openinvapi")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  implementation(project(":openinvcommon")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  api(project(":openinvadapterpaper26_2")) {
+    exclude(group = "io.papermc.paper", module = "dev-bundle")
+  }
+
+  paperweight.paperDevBundle("26.1.2.build.+")
+}
+
+tasks.reobfJar {
+  enabled = false
+}
+
+configurations.reobf.get().outgoing.artifacts.clear()

internal/paper26_1/src/main/java/com/lishid/openinv/internal/paper26_1/InternalAccessor.java

@@ -0,0 +1,53 @@
+package com.lishid.openinv.internal.paper26_1;
+
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_1.container.AnySilentContainer;
+import com.lishid.openinv.internal.paper26_1.container.OpenEnderChest;
+import com.lishid.openinv.internal.paper26_1.player.PlayerManager;
+import com.lishid.openinv.internal.paper26_3.container.slot.placeholder.PlaceholderLoader;
+import com.github.jikoo.openinv.lang.LanguageManager;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.entity.Player;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.logging.Logger;
+
+@NullMarked
+public class InternalAccessor extends com.lishid.openinv.internal.paper26_2.InternalAccessor {
+
+  public InternalAccessor(Logger logger, LanguageManager lang) {
+    super(logger, lang);
+  }
+
+  @Override
+  protected PlayerManager createPlayerManager(
+      Logger logger,
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory
+  ) {
+    return new PlayerManager(logger, factory);
+  }
+
+  @Override
+  protected AnySilentContainer createAnySilentContainer(
+      Logger logger,
+      LanguageManager lang
+  ) {
+    return new AnySilentContainer(logger, lang);
+  }
+
+  @Override
+  protected PlaceholderLoader createPlaceholderLoader() {
+    return new com.lishid.openinv.internal.paper26_1.container.slot.placeholder.PlaceholderLoader();
+  }
+
+  @Override
+  public ISpecialEnderChest createEnderChest(Player player) {
+    return new OpenEnderChest(player);
+  }
+
+}

internal/paper26_1/src/main/java/com/lishid/openinv/internal/paper26_1/container/AnySilentContainer.java

@@ -0,0 +1,21 @@
+package com.lishid.openinv.internal.paper26_1.container;
+
+import com.github.jikoo.openinv.lang.LanguageManager;
+import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.logging.Logger;
+
+@NullMarked
+public class AnySilentContainer extends com.lishid.openinv.internal.paper26_3.container.AnySilentContainer {
+
+  public AnySilentContainer(Logger logger, LanguageManager lang) {
+    super(logger, lang);
+  }
+
+  @Override
+  protected boolean hasLootTable(RandomizableContainerBlockEntity lootable) {
+    return lootable.lootTable != null;
+  }
+
+}

internal/paper26_1/src/main/java/com/lishid/openinv/internal/paper26_1/container/OpenEnderChest.java

@@ -0,0 +1,20 @@
+package com.lishid.openinv.internal.paper26_1.container;
+
+import net.minecraft.core.NonNullList;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class OpenEnderChest extends com.lishid.openinv.internal.paper26_3.container.OpenEnderChest {
+
+  public OpenEnderChest(org.bukkit.entity.Player player) {
+    super(player);
+  }
+
+  @Override
+  protected NonNullList<ItemStack> getEnderChestItems(ServerPlayer owner) {
+    return owner.getEnderChestInventory().items;
+  }
+
+}

internal/paper26_1/src/main/java/com/lishid/openinv/internal/paper26_1/container/slot/placeholder/PlaceholderLoader.java

@@ -0,0 +1,20 @@
+package com.lishid.openinv.internal.paper26_1.container.slot.placeholder;
+
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class PlaceholderLoader extends com.lishid.openinv.internal.paper26_3.container.slot.placeholder.PlaceholderLoader {
+
+  @Override
+  protected Item getDefaultCursorItem() {
+    return Items.WHITE_BANNER;
+  }
+
+  @Override
+  protected Item getDefaultNotSlotItem() {
+    return Items.WHITE_STAINED_GLASS_PANE;
+  }
+
+}

internal/paper26_1/src/main/java/com/lishid/openinv/internal/paper26_1/player/PlayerManager.java

@@ -0,0 +1,50 @@
+package com.lishid.openinv.internal.paper26_1.player;
+
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.LevelData;
+import net.minecraft.world.phys.Vec3;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.logging.Logger;
+
+@NullMarked
+public class PlayerManager extends com.lishid.openinv.internal.paper26_3.player.PlayerManager {
+
+  public PlayerManager(
+      Logger logger,
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory
+  ) {
+    super(logger, factory);
+  }
+
+  @Override
+  protected void removeAdvancementListeners(ServerPlayer entity) {
+    entity.getAdvancements().stopListening();
+  }
+
+  @Override
+  protected LevelData.RespawnData getRespawnData(ServerLevel level) {
+    return level.levelData.getRespawnData();
+  }
+
+  @Override
+  protected Vec3 getAdjustedSpawnLocation(
+      ServerPlayer player,
+      ServerLevel level,
+      LevelData.RespawnData respawnData
+  ) {
+    return player.adjustSpawnLocation(level, respawnData.pos()).getBottomCenter();
+  }
+
+  @Override
+  protected void setServerLevel(ServerPlayer player, ServerLevel level) {
+    player.spawnIn(level);
+  }
+
+}

internal/paper26_2/build.gradle.kts

@@ -0,0 +1,45 @@
+plugins {
+  alias(libs.plugins.paperweight)
+}
+
+repositories {
+  maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+// Paper is compiled with Java 25, so we have to use a Java 25 toolchain.
+java {
+  toolchain.languageVersion.set(JavaLanguageVersion.of(25))
+}
+
+// To minimize duplicate code, the adapter for 1.21.11 is built off of this module, so we need to target Java 21.
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
+}
+
+// As a result, we have to specifically tell Gradle it's okay if our dependencies require Java 25,
+// because secretly sometimes they don't!
+configurations.matching { it.isCanBeResolved && it.name.endsWith("Classpath") }.all {
+  attributes {
+    attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
+  }
+}
+
+dependencies {
+  implementation(project(":openinvapi")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  implementation(project(":openinvcommon")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  api(project(":openinvadapterpaper26_3")) {
+    exclude(group = "io.papermc.paper", module = "dev-bundle")
+  }
+
+  paperweight.paperDevBundle("26.2.build.+")
+}
+
+tasks.reobfJar {
+  enabled = false
+}
+
+configurations.reobf.get().outgoing.artifacts.clear()

internal/paper26_2/src/main/java/com/lishid/openinv/internal/paper26_2/InternalAccessor.java

@@ -0,0 +1,27 @@
+package com.lishid.openinv.internal.paper26_2;
+
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_2.container.slot.OpenInventoryFactory;
+import com.github.jikoo.openinv.lang.LanguageManager;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.logging.Logger;
+
+@NullMarked
+public class InternalAccessor extends com.lishid.openinv.internal.paper26_3.InternalAccessor {
+
+  public InternalAccessor(Logger logger, LanguageManager lang) {
+    super(logger, lang);
+  }
+
+  @Override
+  protected InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> createInventoryFactory() {
+    return new OpenInventoryFactory();
+  }
+
+}

internal/paper26_2/src/main/java/com/lishid/openinv/internal/paper26_2/container/slot/OpenInventoryFactory.java

@@ -0,0 +1,95 @@
+package com.lishid.openinv.internal.paper26_2.container.slot;
+
+import com.github.jikoo.openinv.internal.container.slot.Content;
+import com.lishid.openinv.internal.paper26_3.container.slot.ContentCrafting;
+import com.lishid.openinv.internal.paper26_3.container.slot.ContentCursor;
+import com.lishid.openinv.internal.paper26_3.container.slot.ContentDrop;
+import com.lishid.openinv.internal.paper26_3.container.slot.ContentViewOnly;
+import com.lishid.openinv.internal.paper26_3.container.slot.SlotViewOnly;
+import com.lishid.openinv.internal.paper26_3.container.slot.placeholder.Placeholders;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class OpenInventoryFactory extends com.lishid.openinv.internal.paper26_3.container.slot.OpenInventoryFactory {
+
+  @Override
+  public Content<ServerPlayer, ItemStack, Container, Slot> newCrafting(
+      ServerPlayer holder,
+      int index
+  ) {
+    return new ContentCrafting(holder, index) {
+      @Override
+      public void set(ItemStack itemStack) {
+        if (isAvailable(holder)) {
+          items.set(index, itemStack);
+          holder.inventoryMenu.slotsChanged(holder.inventoryMenu.getCraftSlots());
+        } else {
+          this.holder.drop(itemStack, false);
+        }
+      }
+    };
+  }
+
+  @Override
+  public Content<ServerPlayer, ItemStack, Container, Slot> newCursor(ServerPlayer holder) {
+    return new ContentCursor(holder) {
+      @Override
+      public void set(ItemStack itemStack) {
+        if (isAvailable()) {
+          holder.containerMenu.setCarried(itemStack);
+        } else {
+          this.holder.drop(itemStack, false);
+        }
+      }
+    };
+  }
+
+  @Override
+  public Content<ServerPlayer, ItemStack, Container, Slot> newDrop(ServerPlayer holder) {
+    return new ContentDrop(holder) {
+      @Override
+      public void set(ItemStack itemStack) {
+        this.holder.drop(itemStack, false);
+      }
+    };
+  }
+
+  @Override
+  public Content<ServerPlayer, ItemStack, Container, Slot> newViewOnly(ServerPlayer holder) {
+    return newViewOnly(holder, Placeholders.notSlot);
+  }
+
+  @Override
+  public Content<ServerPlayer, ItemStack, Container, Slot> newViewOnly(
+      ServerPlayer holder,
+      ItemStack itemStack
+  ) {
+    return new ContentViewOnly(holder) {
+      @Override
+      public void set(ItemStack itemStack) {
+        this.holder.drop(itemStack, false);
+      }
+
+      @Override
+      public Slot asSlot(Container container, int slot, int x, int y) {
+        return new SlotViewOnly(container, slot, x, y) {
+          @Override
+          public ItemStack getOrDefault() {
+            return itemStack;
+          }
+        };
+      }
+    };
+  }
+
+  @Override
+  public org.bukkit.inventory.ItemStack asBukkitMirror(ItemStack itemStack) {
+    return CraftItemStack.asCraftMirror(itemStack);
+  }
+
+}

internal/paper26_3/build.gradle.kts

@@ -0,0 +1,42 @@
+plugins {
+  alias(libs.plugins.paperweight)
+}
+
+repositories {
+  maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+// Paper is compiled with Java 25, so we have to use a Java 25 toolchain.
+java {
+  toolchain.languageVersion.set(JavaLanguageVersion.of(25))
+}
+
+// To minimize duplicate code, the adapter for 1.21.11 is built off of this module, so we need to target Java 21.
+tasks.withType<JavaCompile>().configureEach {
+  options.release = 21
+}
+
+// As a result, we have to specifically tell Gradle it's okay if our dependencies require Java 25,
+// because secretly sometimes they don't!
+configurations.matching { it.isCanBeResolved && it.name.endsWith("Classpath") }.all {
+  attributes {
+    attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
+  }
+}
+
+dependencies {
+  implementation(project(":openinvapi")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+  implementation(project(":openinvcommon")) {
+    exclude(group = "org.spigotmc", module = "spigot-api")
+  }
+
+  paperweight.paperDevBundle("26.3.build.+")
+}
+
+tasks.reobfJar {
+  enabled = false
+}
+
+configurations.reobf.get().outgoing.artifacts.clear()

internal/paper26_3/src/main/java/com/lishid/openinv/internal/paper26_3/InternalAccessor.java

@@ -0,0 +1,111 @@
+package com.lishid.openinv.internal.paper26_3;
+
+import com.github.jikoo.openinv.internal.Accessor;
+import com.lishid.openinv.internal.IAnySilentContainer;
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.lishid.openinv.internal.ISpecialInventory;
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_3.container.AnySilentContainer;
+import com.lishid.openinv.internal.paper26_3.container.OpenEnderChest;
+import com.lishid.openinv.internal.paper26_3.container.OpenInventory;
+import com.lishid.openinv.internal.paper26_3.container.slot.OpenInventoryFactory;
+import com.lishid.openinv.internal.paper26_3.container.slot.placeholder.PlaceholderLoader;
+import com.lishid.openinv.internal.paper26_3.player.PlayerManager;
+import com.github.jikoo.openinv.lang.LanguageManager;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@NullMarked
+public class InternalAccessor implements Accessor {
+
+  protected final Logger logger;
+  private final PlayerManager manager;
+  protected final InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory;
+  private final AnySilentContainer anySilentContainer;
+
+  public InternalAccessor(Logger logger, LanguageManager lang) {
+    this.logger = logger;
+    factory = createInventoryFactory();
+    manager = createPlayerManager(logger, factory);
+    anySilentContainer = createAnySilentContainer(logger, lang);
+  }
+
+  protected InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> createInventoryFactory() {
+    return new OpenInventoryFactory();
+  }
+
+  protected PlayerManager createPlayerManager(
+      Logger logger,
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory
+  ) {
+    return new PlayerManager(logger, factory);
+  }
+
+  protected AnySilentContainer createAnySilentContainer(
+      Logger logger,
+      LanguageManager lang
+  ) {
+    return new AnySilentContainer(logger, lang);
+  }
+
+  protected PlaceholderLoader createPlaceholderLoader() {
+    return new PlaceholderLoader();
+  }
+
+  @Override
+  public PlayerManager getPlayerManager() {
+    return manager;
+  }
+
+  @Override
+  public IAnySilentContainer getAnySilentContainer() {
+    return anySilentContainer;
+  }
+
+  @Override
+  public ISpecialPlayerInventory createPlayerInventory(Player player) {
+    return new OpenInventory(factory, player);
+  }
+
+  @Override
+  public ISpecialEnderChest createEnderChest(Player player) {
+    return new OpenEnderChest(player);
+  }
+
+  @Override
+  public <T extends ISpecialInventory> @Nullable T get(Inventory bukkitInventory, Class<T> clazz) {
+    if (!(bukkitInventory instanceof CraftInventory craftInventory)) {
+      return null;
+    }
+    Container container = craftInventory.getInventory();
+    if (clazz.isInstance(container)) {
+      return clazz.cast(container);
+    }
+    return null;
+  }
+
+  @Override
+  public void reload(ConfigurationSection config) {
+    ConfigurationSection placeholders = config.getConfigurationSection("placeholders");
+    try {
+      // Reset placeholders to defaults and try to load configuration.
+      createPlaceholderLoader().load(placeholders);
+    } catch (Exception e) {
+      logger.log(Level.WARNING, "Caught exception loading placeholder overrides!", e);
+    }
+  }
+
+}

internal/paper26_3/src/main/java/com/lishid/openinv/internal/paper26_3/container/AnySilentContainer.java

@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.paper26_3.container;
+
+import com.github.jikoo.openinv.internal.container.AnySilentContainerBase;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenChestMenu;
+import com.lishid.openinv.internal.paper26_3.player.PlayerManager;
+import com.github.jikoo.openinv.util.ReflectionHelper;
+import com.github.jikoo.openinv.lang.LanguageManager;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.level.ServerPlayerGameMode;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.inventory.PlayerEnderChestContainer;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.block.BarrelBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.ChestBlock;
+import net.minecraft.world.level.block.ShulkerBoxBlock;
+import net.minecraft.world.level.block.TrappedChestBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
+import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
+@NullMarked
+public class AnySilentContainer extends AnySilentContainerBase {
+
+  private final Logger logger;
+  private final LanguageManager lang;
+  private @Nullable Field serverPlayerGameModeGameType;
+
+  public AnySilentContainer(Logger logger, LanguageManager lang) {
+    this.logger = logger;
+    this.lang = lang;
+    try {
+      try {
+        this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("gameModeForPlayer");
+        this.serverPlayerGameModeGameType.setAccessible(true);
+      } catch (NoSuchFieldException e) {
+        logger.warning("The field ServerPlayerGameMode#gameModeForPlayer is no longer present!");
+        logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues");
+        logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail.");
+        // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break.
+        this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class);
+      }
+    } catch (SecurityException e) {
+      logger.warning("Unable to directly write player game mode! SilentContainer will fail.");
+      logger.log(java.util.logging.Level.WARNING, "Error obtaining GameType field", e);
+    }
+  }
+
+  @Override
+  public boolean activateContainer(
+      final Player bukkitPlayer,
+      final boolean silentchest,
+      final org.bukkit.block.Block bukkitBlock
+  ) {
+
+    // Silent ender chest is API-only
+    if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
+      bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
+      bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+      return true;
+    }
+
+    ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
+
+    final net.minecraft.world.level.Level level = ((Entity) player).level();
+    final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
+    final BlockEntity blockEntity = level.getBlockEntity(blockPos);
+
+    if (blockEntity == null) {
+      return false;
+    }
+
+    if (blockEntity instanceof EnderChestBlockEntity enderChestTile) {
+      // Anychest ender chest. See net.minecraft.world.level.block.EnderChestBlock
+      PlayerEnderChestContainer enderChest = player.getEnderChestInventory();
+      enderChest.setActiveChest(enderChestTile);
+      player.openMenu(
+          new SimpleMenuProvider(
+              (containerCounter, playerInventory, ignored) -> {
+                MenuType<?> containers = OpenChestMenu.getChestMenuType(enderChest.getContainerSize());
+                int rows = enderChest.getContainerSize() / 9;
+                return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows);
+              }, Component.translatable("container.enderchest")
+          )
+      );
+      bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
+      return true;
+    }
+
+    if (!(blockEntity instanceof @Nullable MenuProvider menuProvider)) {
+      return false;
+    }
+
+    BlockState blockState = level.getBlockState(blockPos);
+    Block block = blockState.getBlock();
+
+    if (block instanceof ChestBlock chestBlock) {
+
+      // boolean flag: do not check if chest is blocked
+      menuProvider = chestBlock.getMenuProvider(blockState, level, blockPos, true);
+
+      if (menuProvider == null) {
+        lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
+        return false;
+      }
+
+      if (block instanceof TrappedChestBlock) {
+        bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED);
+      } else {
+        bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED);
+      }
+    }
+
+    if (block instanceof ShulkerBoxBlock) {
+      bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED);
+    }
+
+    if (block instanceof BarrelBlock) {
+      bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL);
+    }
+
+    // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
+    if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
+      player.openMenu(menuProvider);
+      return true;
+    }
+
+    // SilentChest requires access to setting players' game mode directly.
+    if (this.serverPlayerGameModeGameType == null) {
+      return false;
+    }
+
+    if (blockEntity instanceof RandomizableContainerBlockEntity lootable) {
+      if (hasLootTable(lootable)) {
+        lang.sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated");
+        return false;
+      }
+    }
+
+    GameType gameType = player.gameMode.getGameModeForPlayer();
+    this.forceGameType(player, GameType.SPECTATOR);
+    player.openMenu(menuProvider);
+    this.forceGameType(player, gameType);
+    return true;
+  }
+
+  protected boolean hasLootTable(RandomizableContainerBlockEntity lootable) {
+    return lootable.getLootTable() != null;
+  }
+
+  @Override
+  public void deactivateContainer(final Player bukkitPlayer) {
+    if (this.serverPlayerGameModeGameType == null || bukkitPlayer.getGameMode() == GameMode.SPECTATOR) {
+      return;
+    }
+
+    ServerPlayer player = PlayerManager.getHandle(bukkitPlayer);
+
+    // Force game mode change without informing plugins or players.
+    // Regular game mode set calls GameModeChangeEvent and is cancellable.
+    GameType gameType = player.gameMode.getGameModeForPlayer();
+    this.forceGameType(player, GameType.SPECTATOR);
+
+    // ServerPlayer#closeContainer cannot be called without entering an
+    // infinite loop because this method is called during inventory close.
+    // From ServerPlayer#closeContainer -> CraftEventFactory#handleInventoryCloseEvent
+    player.containerMenu.transferTo(player.inventoryMenu, player.getBukkitEntity());
+    // From ServerPlayer#closeContainer
+    player.doCloseContainer();
+    // Regular inventory close will handle the rest - packet sending, etc.
+
+    // Revert forced game mode.
+    this.forceGameType(player, gameType);
+  }
+
+  private void forceGameType(final ServerPlayer player, final GameType gameMode) {
+    if (this.serverPlayerGameModeGameType == null) {
+      // No need to warn repeatedly, error on startup and lack of function should be enough.
+      return;
+    }
+    try {
+      this.serverPlayerGameModeGameType.setAccessible(true);
+      this.serverPlayerGameModeGameType.set(player.gameMode, gameMode);
+    } catch (IllegalArgumentException | IllegalAccessException e) {
+      logger.log(java.util.logging.Level.WARNING, "Error bypassing GameModeChangeEvent", e);
+    }
+  }
+
+  @Override
+  protected org.bukkit.block.BlockState getState(org.bukkit.block.Block block) {
+    return block.getState(false);
+  }
+
+  @Override
+  protected @Nullable InventoryHolder getHolder(Inventory inventory) {
+    return inventory.getHolder(false);
+  }
+
+}

internal/paper26_3/src/main/java/com/lishid/openinv/internal/paper26_3/container/BaseOpenInventory.java

@@ -0,0 +1,313 @@
+package com.lishid.openinv.internal.paper26_3.container;
+
+import com.lishid.openinv.internal.ISpecialPlayerInventory;
+import com.github.jikoo.openinv.internal.container.InternalOwned;
+import com.github.jikoo.openinv.internal.container.slot.Content;
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_3.container.bukkit.OpenPlayerInventory;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenChestMenu;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenInventoryMenu;
+import com.lishid.openinv.internal.paper26_3.container.slot.placeholder.Placeholders;
+import com.lishid.openinv.internal.paper26_3.player.PlayerManager;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import net.minecraft.core.NonNullList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.event.inventory.InventoryType;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+@NullMarked
+public abstract class BaseOpenInventory implements Container, InternalOwned<ServerPlayer>, ISpecialPlayerInventory {
+
+  protected final InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory;
+  protected final List<Content<ServerPlayer, ItemStack, Container, Slot>> slots;
+  private final int size;
+  protected ServerPlayer owner;
+  private int maxStackSize = 99;
+  protected @Nullable CraftInventory bukkitEntity;
+  public List<HumanEntity> transaction = new ArrayList<>();
+
+  public BaseOpenInventory(
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory,
+      org.bukkit.entity.Player bukkitPlayer
+  ) {
+    this.factory = factory;
+    owner = PlayerManager.getHandle(bukkitPlayer);
+
+    // Get total size, rounding up to nearest 9 for client compatibility.
+    int rawSize = owner.getInventory().getContainerSize() + owner.inventoryMenu.getCraftSlots().getContainerSize() + 1;
+    size = ((int) Math.ceil(rawSize / 9.0)) * 9;
+
+    slots = NonNullList.withSize(size, factory.newViewOnly(owner));
+    setupSlots();
+  }
+
+  protected void setupSlots() {
+    // Top of inventory: Regular contents.
+    int nextIndex = addMainInventory();
+
+    // If inventory is expected size, we can arrange slots to be pretty.
+    Inventory ownerInv = owner.getInventory();
+    if (ownerInv.getNonEquipmentItems().size() == 36
+        && owner.inventoryMenu.getCraftSlots().getContainerSize() == 4
+        && (Inventory.EQUIPMENT_SLOT_MAPPING.size() == 5 || Inventory.EQUIPMENT_SLOT_MAPPING.size() == 7)) {
+      // Armor slots: Bottom left.
+      addArmor(36);
+      // Off-hand: Below chestplate.
+      addOffHand(46);
+      // Drop slot: Bottom right.
+      slots.set(53, factory.newDrop(owner));
+      // Cursor slot: Above drop.
+      slots.set(44, factory.newCursor(owner));
+
+      // Crafting is displayed in the bottom right corner.
+      // As we're using the pretty view, this is a 3x2.
+      addCrafting(41, true);
+      return;
+    }
+
+    // Otherwise we'll just add elements linearly.
+    nextIndex = addArmor(nextIndex);
+    nextIndex = addOffHand(nextIndex);
+    nextIndex = addCrafting(nextIndex, false);
+    slots.set(nextIndex, factory.newCursor(owner));
+    // Drop slot last.
+    slots.set(slots.size() - 1, factory.newDrop(owner));
+  }
+
+  private int addMainInventory() {
+    int listSize = owner.getInventory().getNonEquipmentItems().size();
+    // Hotbar slots are 0-8. We want those to appear on the bottom of the inventory like a normal player inventory,
+    // so everything else needs to move up a row.
+    int hotbarDiff = listSize - 9;
+    for (int localIndex = 0; localIndex < listSize; ++localIndex) {
+      InventoryType.SlotType type;
+      int invIndex;
+      if (localIndex < hotbarDiff) {
+        invIndex = localIndex + 9;
+        type = InventoryType.SlotType.CONTAINER;
+      } else {
+        type = InventoryType.SlotType.QUICKBAR;
+        invIndex = localIndex - hotbarDiff;
+      }
+
+      slots.set(
+          localIndex,
+          factory.newList(owner, invIndex, type, holder -> holder.getInventory().getNonEquipmentItems())
+      );
+    }
+    return listSize;
+  }
+
+  private int addArmor(int startIndex) {
+    // Armor slots go bottom to top; boots are first and helmet is last.
+    // Since we have to display horizontally due to space restrictions,
+    // making the left side the "top" is more user-friendly.
+    EquipmentSlot[] sorted = Inventory.EQUIPMENT_SLOT_MAPPING.int2ObjectEntrySet()
+        .stream()
+        .sorted(Comparator.comparingInt(Int2ObjectMap.Entry::getIntKey))
+        .map(Map.Entry::getValue)
+        .toArray(EquipmentSlot[]::new);
+    int localIndex = 0;
+    for (int i = sorted.length - 1; i >= 0; --i) {
+      // Skip off-hand, handled separately. Also skip non-player slots.
+      if (sorted[i].getType() != EquipmentSlot.Type.HUMANOID_ARMOR) {
+        continue;
+      }
+
+      slots.set(startIndex + localIndex, factory.newEquipment(owner, sorted[i]));
+      ++localIndex;
+    }
+
+    return startIndex + localIndex;
+  }
+
+  private int addOffHand(int startIndex) {
+    // No off-hand?
+    if (!Inventory.EQUIPMENT_SLOT_MAPPING.containsValue(EquipmentSlot.OFFHAND)) {
+      return startIndex;
+    }
+
+    slots.set(startIndex, factory.newOffHand(owner));
+    return startIndex + 1;
+  }
+
+  private int addCrafting(int startIndex, boolean pretty) {
+    int listSize = owner.inventoryMenu.getCraftSlots().getContents().size();
+    pretty &= listSize == 4;
+
+    for (int localIndex = 0; localIndex < listSize; ++localIndex) {
+      // Pretty display is a 2x2 rather than linear.
+      // If index is in top row, grid is not 2x2, or pretty is disabled, just use current index.
+      // Otherwise, subtract 2 and add 9 to start in the same position on the next row.
+      int modIndex = startIndex + (localIndex < 2 || !pretty ? localIndex : localIndex + 7);
+
+      slots.set(modIndex, factory.newCrafting(owner, localIndex));
+    }
+
+    if (pretty) {
+      slots.set(startIndex + 2, factory.newViewOnly(owner, Placeholders.craftingOutput));
+      slots.set(startIndex + 11, factory.newCraftingResult(owner));
+    }
+
+    return startIndex + listSize;
+  }
+
+  public Slot getMenuSlot(int index, int x, int y) {
+    return slots.get(index).asSlot(this, index, x, y);
+  }
+
+  public InventoryType.SlotType getSlotType(int index) {
+    return slots.get(index).getSlotType();
+  }
+
+  public abstract Component getTitle(ServerPlayer player, @Nullable OpenChestMenu<?> menu);
+
+  @Override
+  public ServerPlayer getOwnerHandle() {
+    return owner;
+  }
+
+  @Override
+  public org.bukkit.inventory.Inventory getBukkitInventory() {
+    if (bukkitEntity == null) {
+      bukkitEntity = new OpenPlayerInventory(this);
+    }
+    return bukkitEntity;
+  }
+
+  @Override
+  public void setPlayerOnline(org.bukkit.entity.Player player) {
+    ServerPlayer newOwner = PlayerManager.getHandle(player);
+    // Only transfer regular inventory - crafting and cursor slots are transient.
+    newOwner.getInventory().replaceWith(owner.getInventory());
+    owner = newOwner;
+    // Update slots to point to new inventory.
+    slots.forEach(slot -> slot.setHolder(newOwner));
+  }
+
+  @Override
+  public boolean isInUse() {
+    return !transaction.isEmpty();
+  }
+
+  @Override
+  public org.bukkit.entity.Player getPlayer() {
+    return getOwner();
+  }
+
+  @Override
+  public int getContainerSize() {
+    return size;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return slots.stream().map(Content::get).allMatch(ItemStack::isEmpty);
+  }
+
+  @Override
+  public ItemStack getItem(int index) {
+    return slots.get(index).get();
+  }
+
+  @Override
+  public ItemStack removeItem(int index, int amount) {
+    return slots.get(index).removePartial(amount);
+  }
+
+  @Override
+  public ItemStack removeItemNoUpdate(int index) {
+    return slots.get(index).remove();
+  }
+
+  @Override
+  public void setItem(int index, ItemStack itemStack) {
+    slots.get(index).set(itemStack);
+  }
+
+  @Override
+  public int getMaxStackSize() {
+    return maxStackSize;
+  }
+
+  @Override
+  public void setMaxStackSize(int maxStackSize) {
+    this.maxStackSize = maxStackSize;
+  }
+
+  @Override
+  public void setChanged() {
+  }
+
+  @Override
+  public boolean stillValid(Player player) {
+    return true;
+  }
+
+  @Override
+  public List<ItemStack> getContents() {
+    NonNullList<ItemStack> contents = NonNullList.withSize(getContainerSize(), ItemStack.EMPTY);
+    for (int i = 0; i < getContainerSize(); ++i) {
+      contents.set(i, getItem(i));
+    }
+    return contents;
+  }
+
+  @Override
+  public void onOpen(CraftHumanEntity viewer) {
+    transaction.add(viewer);
+  }
+
+  @Override
+  public void onClose(CraftHumanEntity viewer) {
+    transaction.remove(viewer);
+  }
+
+  @Override
+  public List<HumanEntity> getViewers() {
+    return transaction;
+  }
+
+  @Override
+  public org.bukkit.entity.Player getOwner() {
+    return owner.getBukkitEntity();
+  }
+
+  @Override
+  public Location getLocation() {
+    return owner.getBukkitEntity().getLocation();
+  }
+
+  @Override
+  public void clearContent() {
+    owner.getInventory().clearContent();
+    owner.inventoryMenu.getCraftSlots().clearContent();
+    owner.inventoryMenu.slotsChanged(owner.inventoryMenu.getCraftSlots());
+    owner.containerMenu.setCarried(ItemStack.EMPTY);
+  }
+
+  public @Nullable OpenChestMenu<?> createMenu(Player player, int i, boolean viewOnly) {
+    if (player instanceof ServerPlayer serverPlayer) {
+      return new OpenInventoryMenu(factory, this, serverPlayer, i, viewOnly);
+    }
+    return null;
+  }
+
+}

internal/paper26_3/src/main/java/com/lishid/openinv/internal/paper26_3/container/OpenEnderChest.java

@@ -0,0 +1,214 @@
+package com.lishid.openinv.internal.paper26_3.container;
+
+import com.lishid.openinv.internal.ISpecialEnderChest;
+import com.github.jikoo.openinv.internal.container.InternalOwned;
+import com.github.jikoo.openinv.internal.container.slot.InventoryFactory;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenChestMenu;
+import com.lishid.openinv.internal.paper26_3.container.menu.OpenEnderChestMenu;
+import com.lishid.openinv.internal.paper26_3.player.PlayerManager;
+import net.minecraft.core.NonNullList;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.Container;
+import net.minecraft.world.ContainerHelper;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedItemContents;
+import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.inventory.StackedContentsCompatible;
+import net.minecraft.world.item.ItemStack;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.CraftInventory;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.event.inventory.InventoryType;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@NullMarked
+public class OpenEnderChest implements Container, StackedContentsCompatible, InternalOwned<ServerPlayer>,
+    ISpecialEnderChest {
+
+  private @Nullable CraftInventory inventory;
+  private ServerPlayer owner;
+  private NonNullList<ItemStack> items;
+  private int maxStack = 64;
+  private final List<HumanEntity> transaction = new ArrayList<>();
+
+  public OpenEnderChest(org.bukkit.entity.Player player) {
+    this.owner = PlayerManager.getHandle(player);
+    this.items = getEnderChestItems(owner);
+  }
+
+  @Override
+  public ServerPlayer getOwnerHandle() {
+    return owner;
+  }
+
+  @Override
+  public org.bukkit.inventory.Inventory getBukkitInventory() {
+    if (inventory == null) {
+      inventory = new CraftInventory(this) {
+        @Override
+        public InventoryType getType() {
+          return InventoryType.ENDER_CHEST;
+        }
+      };
+    }
+    return inventory;
+  }
+
+  @Override
+  public void setPlayerOnline(org.bukkit.entity.Player player) {
+    owner = PlayerManager.getHandle(player);
+    NonNullList<ItemStack> activeItems = getEnderChestItems(owner);
+
+    // Guard against size changing. Theoretically on Purpur all row variations still have 6 rows internally.
+    int max = Math.min(items.size(), activeItems.size());
+    for (int index = 0; index < max; ++index) {
+      activeItems.set(index, items.get(index));
+    }
+
+    items = activeItems;
+  }
+
+  protected NonNullList<ItemStack> getEnderChestItems(ServerPlayer owner) {
+    return owner.getEnderChestInventory().getItems();
+  }
+
+  @Override
+  public org.bukkit.entity.Player getPlayer() {
+    return owner.getBukkitEntity();
+  }
+
+  @Override
+  public int getContainerSize() {
+    return items.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return items.stream().allMatch(ItemStack::isEmpty);
+  }
+
+  @Override
+  public ItemStack getItem(int index) {
+    return index >= 0 && index < items.size() ? items.get(index) : ItemStack.EMPTY;
+  }
+
+  @Override
+  public ItemStack removeItem(int index, int amount) {
+    ItemStack itemstack = ContainerHelper.removeItem(items, index, amount);
+
+    if (!itemstack.isEmpty()) {
+      setChanged();
+    }
+
+    return itemstack;
+  }
+
+  @Override
+  public ItemStack removeItemNoUpdate(int index) {
+    return index >= 0 && index < items.size() ? items.set(index, ItemStack.EMPTY) : ItemStack.EMPTY;
+  }
+
+  @Override
+  public void setItem(int index, ItemStack itemStack) {
+    if (index >= 0 && index < items.size()) {
+      items.set(index, itemStack);
+    }
+  }
+
+  @Override
+  public int getMaxStackSize() {
+    return maxStack;
+  }
+
+  @Override
+  public void setChanged() {
+    this.owner.getEnderChestInventory().setChanged();
+  }
+
+  @Override
+  public boolean stillValid(Player player) {
+    return true;
+  }
+
+  @Override
+  public List<ItemStack> getContents() {
+    return items;
+  }
+
+  @Override
+  public void onOpen(CraftHumanEntity craftHumanEntity) {
+    transaction.add(craftHumanEntity);
+  }
+
+  @Override
+  public void onClose(CraftHumanEntity craftHumanEntity) {
+    transaction.remove(craftHumanEntity);
+  }
+
+  @Override
+  public List<HumanEntity> getViewers() {
+    return transaction;
+  }
+
+  @Override
+  public org.bukkit.entity.Player getOwner() {
+    return getPlayer();
+  }
+
+  @Override
+  public void setMaxStackSize(int size) {
+    maxStack = size;
+  }
+
+  @Override
+  public @Nullable Location getLocation() {
+    return null;
+  }
+
+  @Override
+  public void clearContent() {
+    items.clear();
+    setChanged();
+  }
+
+  @Override
+  public void fillStackedContents(StackedItemContents stackedContents) {
+    for (ItemStack itemstack : items) {
+      stackedContents.accountStack(itemstack);
+    }
+  }
+
+  public Component getTitle(@Nullable OpenChestMenu<?> menu) {
+    MutableComponent component;
+    if (menu != null && menu.isViewOnly()) {
+      component = Component.translatableWithFallback("openinv.container.enderchest.viewonly", "[RO] ");
+    } else {
+      component = Component.translatableWithFallback("openinv.container.enderchest.editable", "");
+    }
+    return component
+        .append(Component.translatableWithFallback("openinv.container.enderchest.prefix", "", owner.getName()))
+        .append(Component.translatable("container.enderchest"))
+        .append(Component.translatableWithFallback("openinv.container.enderchest.suffix", " - %s", owner.getName()));
+  }
+
+  public @Nullable OpenChestMenu<?> createMenu(
+      InventoryFactory<ServerPlayer, ItemStack, Container, Slot, EquipmentSlot> factory,
+      Player player,
+      int i,
+      boolean viewOnly
+  ) {
+    if (player instanceof ServerPlayer serverPlayer) {
+      return new OpenEnderChestMenu(factory, this, serverPlayer, i, viewOnly);
+    }
+    return null;
+  }
+
+}