chore: Use WorldEdit logger interface

.editorconfig

@@ -13,6 +13,40 @@ ij_formatter_tags_enabled = false
 ij_smart_tabs = false
 ij_wrap_on_typing = true
 
+[*.conf]
+indent_size = 2
+tab_width = 2
+ij_continuation_indent_size = 2
+ij_hocon_keep_blank_lines_before_right_brace = 2
+ij_hocon_keep_indents_on_empty_lines = false
+ij_hocon_keep_line_breaks = true
+ij_hocon_space_after_colon = true
+ij_hocon_space_after_comma = true
+ij_hocon_space_before_colon = true
+ij_hocon_space_before_comma = false
+ij_hocon_spaces_within_braces = false
+ij_hocon_spaces_within_brackets = false
+ij_hocon_spaces_within_method_call_parentheses = false
+
+[*.css]
+ij_css_align_closing_brace_with_properties = false
+ij_css_blank_lines_around_nested_selector = 1
+ij_css_blank_lines_between_blocks = 1
+ij_css_brace_placement = end_of_line
+ij_css_enforce_quotes_on_format = false
+ij_css_hex_color_long_format = false
+ij_css_hex_color_lower_case = false
+ij_css_hex_color_short_format = false
+ij_css_hex_color_upper_case = false
+ij_css_keep_blank_lines_in_code = 2
+ij_css_keep_indents_on_empty_lines = false
+ij_css_keep_single_line_blocks = false
+ij_css_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_css_space_after_colon = true
+ij_css_space_before_opening_brace = true
+ij_css_use_double_quotes = true
+ij_css_value_alignment = do_not_align
+
 [*.java]
 ij_java_align_consecutive_assignments = false
 ij_java_align_consecutive_variable_declarations = false
@@ -243,12 +277,63 @@ ij_java_wrap_comments = false
 ij_java_wrap_first_method_in_call_chain = true
 ij_java_wrap_long_lines = false
 
+[*.nbtt]
+max_line_length = 150
+ij_continuation_indent_size = 4
+ij_nbtt_keep_indents_on_empty_lines = false
+ij_nbtt_space_after_colon = true
+ij_nbtt_space_after_comma = true
+ij_nbtt_space_before_colon = true
+ij_nbtt_space_before_comma = false
+ij_nbtt_spaces_within_brackets = false
+ij_nbtt_spaces_within_parentheses = false
+
 [*.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
 
+[*.sass]
+indent_size = 2
+ij_sass_align_closing_brace_with_properties = false
+ij_sass_blank_lines_around_nested_selector = 1
+ij_sass_blank_lines_between_blocks = 1
+ij_sass_brace_placement = 0
+ij_sass_enforce_quotes_on_format = false
+ij_sass_hex_color_long_format = false
+ij_sass_hex_color_lower_case = false
+ij_sass_hex_color_short_format = false
+ij_sass_hex_color_upper_case = false
+ij_sass_keep_blank_lines_in_code = 2
+ij_sass_keep_indents_on_empty_lines = false
+ij_sass_keep_single_line_blocks = false
+ij_sass_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_sass_space_after_colon = true
+ij_sass_space_before_opening_brace = true
+ij_sass_use_double_quotes = true
+ij_sass_value_alignment = 0
+
+[*.scss]
+indent_size = 2
+ij_scss_align_closing_brace_with_properties = false
+ij_scss_blank_lines_around_nested_selector = 1
+ij_scss_blank_lines_between_blocks = 1
+ij_scss_brace_placement = 0
+ij_scss_enforce_quotes_on_format = false
+ij_scss_hex_color_long_format = false
+ij_scss_hex_color_lower_case = false
+ij_scss_hex_color_short_format = false
+ij_scss_hex_color_upper_case = false
+ij_scss_keep_blank_lines_in_code = 2
+ij_scss_keep_indents_on_empty_lines = false
+ij_scss_keep_single_line_blocks = false
+ij_scss_properties_order = font, font-family, font-size, font-weight, font-style, font-variant, font-size-adjust, font-stretch, line-height, position, z-index, top, right, bottom, left, display, visibility, float, clear, overflow, overflow-x, overflow-y, clip, zoom, align-content, align-items, align-self, flex, flex-flow, flex-basis, flex-direction, flex-grow, flex-shrink, flex-wrap, justify-content, order, box-sizing, width, min-width, max-width, height, min-height, max-height, margin, margin-top, margin-right, margin-bottom, margin-left, padding, padding-top, padding-right, padding-bottom, padding-left, table-layout, empty-cells, caption-side, border-spacing, border-collapse, list-style, list-style-position, list-style-type, list-style-image, content, quotes, counter-reset, counter-increment, resize, cursor, user-select, nav-index, nav-up, nav-right, nav-down, nav-left, transition, transition-delay, transition-timing-function, transition-duration, transition-property, transform, transform-origin, animation, animation-name, animation-duration, animation-play-state, animation-timing-function, animation-delay, animation-iteration-count, animation-direction, text-align, text-align-last, vertical-align, white-space, text-decoration, text-emphasis, text-emphasis-color, text-emphasis-style, text-emphasis-position, text-indent, text-justify, letter-spacing, word-spacing, text-outline, text-transform, text-wrap, text-overflow, text-overflow-ellipsis, text-overflow-mode, word-wrap, word-break, tab-size, hyphens, pointer-events, opacity, color, border, border-width, border-style, border-color, border-top, border-top-width, border-top-style, border-top-color, border-right, border-right-width, border-right-style, border-right-color, border-bottom, border-bottom-width, border-bottom-style, border-bottom-color, border-left, border-left-width, border-left-style, border-left-color, border-radius, border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius, border-image, border-image-source, border-image-slice, border-image-width, border-image-outset, border-image-repeat, outline, outline-width, outline-style, outline-color, outline-offset, background, background-color, background-image, background-repeat, background-attachment, background-position, background-position-x, background-position-y, background-clip, background-origin, background-size, box-decoration-break, box-shadow, text-shadow
+ij_scss_space_after_colon = true
+ij_scss_space_before_opening_brace = true
+ij_scss_use_double_quotes = true
+ij_scss_value_alignment = 0
+
 [.editorconfig]
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
@@ -257,6 +342,548 @@ ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
+[{*.ant, *.fxml, *.jhm, *.jnlp, *.jrxml, *.pom, *.rng, *.tld, *.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_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = true
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = false
+ij_xml_text_wrap = normal
+
+[{*.ats, *.ts}]
+ij_continuation_indent_size = 4
+ij_typescript_align_imports = false
+ij_typescript_align_multiline_array_initializer_expression = false
+ij_typescript_align_multiline_binary_operation = false
+ij_typescript_align_multiline_chained_methods = false
+ij_typescript_align_multiline_extends_list = false
+ij_typescript_align_multiline_for = true
+ij_typescript_align_multiline_parameters = true
+ij_typescript_align_multiline_parameters_in_calls = false
+ij_typescript_align_multiline_ternary_operation = false
+ij_typescript_align_object_properties = 0
+ij_typescript_align_union_types = false
+ij_typescript_align_var_statements = 0
+ij_typescript_array_initializer_new_line_after_left_brace = false
+ij_typescript_array_initializer_right_brace_on_new_line = false
+ij_typescript_array_initializer_wrap = off
+ij_typescript_assignment_wrap = off
+ij_typescript_binary_operation_sign_on_next_line = false
+ij_typescript_binary_operation_wrap = off
+ij_typescript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
+ij_typescript_blank_lines_after_imports = 1
+ij_typescript_blank_lines_around_class = 1
+ij_typescript_blank_lines_around_field = 0
+ij_typescript_blank_lines_around_field_in_interface = 0
+ij_typescript_blank_lines_around_function = 1
+ij_typescript_blank_lines_around_method = 1
+ij_typescript_blank_lines_around_method_in_interface = 1
+ij_typescript_block_brace_style = end_of_line
+ij_typescript_call_parameters_new_line_after_left_paren = false
+ij_typescript_call_parameters_right_paren_on_new_line = false
+ij_typescript_call_parameters_wrap = off
+ij_typescript_catch_on_new_line = false
+ij_typescript_chained_call_dot_on_new_line = true
+ij_typescript_class_brace_style = end_of_line
+ij_typescript_comma_on_new_line = false
+ij_typescript_do_while_brace_force = never
+ij_typescript_else_on_new_line = false
+ij_typescript_enforce_trailing_comma = keep
+ij_typescript_extends_keyword_wrap = off
+ij_typescript_extends_list_wrap = off
+ij_typescript_field_prefix = _
+ij_typescript_file_name_style = relaxed
+ij_typescript_finally_on_new_line = false
+ij_typescript_for_brace_force = never
+ij_typescript_for_statement_new_line_after_left_paren = false
+ij_typescript_for_statement_right_paren_on_new_line = false
+ij_typescript_for_statement_wrap = off
+ij_typescript_force_quote_style = false
+ij_typescript_force_semicolon_style = false
+ij_typescript_function_expression_brace_style = end_of_line
+ij_typescript_if_brace_force = never
+ij_typescript_import_merge_members = global
+ij_typescript_import_prefer_absolute_path = global
+ij_typescript_import_sort_members = true
+ij_typescript_import_sort_module_name = false
+ij_typescript_import_use_node_resolution = true
+ij_typescript_imports_wrap = on_every_item
+ij_typescript_indent_case_from_switch = true
+ij_typescript_indent_chained_calls = true
+ij_typescript_indent_package_children = 0
+ij_typescript_jsdoc_include_types = false
+ij_typescript_jsx_attribute_value = braces
+ij_typescript_keep_blank_lines_in_code = 2
+ij_typescript_keep_first_column_comment = true
+ij_typescript_keep_indents_on_empty_lines = false
+ij_typescript_keep_line_breaks = true
+ij_typescript_keep_simple_blocks_in_one_line = false
+ij_typescript_keep_simple_methods_in_one_line = false
+ij_typescript_line_comment_add_space = true
+ij_typescript_line_comment_at_first_column = false
+ij_typescript_method_brace_style = end_of_line
+ij_typescript_method_call_chain_wrap = off
+ij_typescript_method_parameters_new_line_after_left_paren = false
+ij_typescript_method_parameters_right_paren_on_new_line = false
+ij_typescript_method_parameters_wrap = off
+ij_typescript_object_literal_wrap = on_every_item
+ij_typescript_parentheses_expression_new_line_after_left_paren = false
+ij_typescript_parentheses_expression_right_paren_on_new_line = false
+ij_typescript_place_assignment_sign_on_next_line = false
+ij_typescript_prefer_as_type_cast = false
+ij_typescript_prefer_explicit_types_function_expression_returns = false
+ij_typescript_prefer_explicit_types_function_returns = false
+ij_typescript_prefer_explicit_types_vars_fields = false
+ij_typescript_prefer_parameters_wrap = false
+ij_typescript_reformat_c_style_comments = false
+ij_typescript_space_after_colon = true
+ij_typescript_space_after_comma = true
+ij_typescript_space_after_dots_in_rest_parameter = false
+ij_typescript_space_after_generator_mult = true
+ij_typescript_space_after_property_colon = true
+ij_typescript_space_after_quest = true
+ij_typescript_space_after_type_colon = true
+ij_typescript_space_after_unary_not = false
+ij_typescript_space_before_async_arrow_lparen = true
+ij_typescript_space_before_catch_keyword = true
+ij_typescript_space_before_catch_left_brace = true
+ij_typescript_space_before_catch_parentheses = true
+ij_typescript_space_before_class_lbrace = true
+ij_typescript_space_before_class_left_brace = true
+ij_typescript_space_before_colon = true
+ij_typescript_space_before_comma = false
+ij_typescript_space_before_do_left_brace = true
+ij_typescript_space_before_else_keyword = true
+ij_typescript_space_before_else_left_brace = true
+ij_typescript_space_before_finally_keyword = true
+ij_typescript_space_before_finally_left_brace = true
+ij_typescript_space_before_for_left_brace = true
+ij_typescript_space_before_for_parentheses = true
+ij_typescript_space_before_for_semicolon = false
+ij_typescript_space_before_function_left_parenth = true
+ij_typescript_space_before_generator_mult = false
+ij_typescript_space_before_if_left_brace = true
+ij_typescript_space_before_if_parentheses = true
+ij_typescript_space_before_method_call_parentheses = false
+ij_typescript_space_before_method_left_brace = true
+ij_typescript_space_before_method_parentheses = false
+ij_typescript_space_before_property_colon = false
+ij_typescript_space_before_quest = true
+ij_typescript_space_before_switch_left_brace = true
+ij_typescript_space_before_switch_parentheses = true
+ij_typescript_space_before_try_left_brace = true
+ij_typescript_space_before_type_colon = false
+ij_typescript_space_before_unary_not = false
+ij_typescript_space_before_while_keyword = true
+ij_typescript_space_before_while_left_brace = true
+ij_typescript_space_before_while_parentheses = true
+ij_typescript_spaces_around_additive_operators = true
+ij_typescript_spaces_around_arrow_function_operator = true
+ij_typescript_spaces_around_assignment_operators = true
+ij_typescript_spaces_around_bitwise_operators = true
+ij_typescript_spaces_around_equality_operators = true
+ij_typescript_spaces_around_logical_operators = true
+ij_typescript_spaces_around_multiplicative_operators = true
+ij_typescript_spaces_around_relational_operators = true
+ij_typescript_spaces_around_shift_operators = true
+ij_typescript_spaces_around_unary_operator = false
+ij_typescript_spaces_within_array_initializer_brackets = false
+ij_typescript_spaces_within_brackets = false
+ij_typescript_spaces_within_catch_parentheses = false
+ij_typescript_spaces_within_for_parentheses = false
+ij_typescript_spaces_within_if_parentheses = false
+ij_typescript_spaces_within_imports = false
+ij_typescript_spaces_within_interpolation_expressions = false
+ij_typescript_spaces_within_method_call_parentheses = false
+ij_typescript_spaces_within_method_parentheses = false
+ij_typescript_spaces_within_object_literal_braces = false
+ij_typescript_spaces_within_object_type_braces = true
+ij_typescript_spaces_within_parentheses = false
+ij_typescript_spaces_within_switch_parentheses = false
+ij_typescript_spaces_within_type_assertion = false
+ij_typescript_spaces_within_union_types = true
+ij_typescript_spaces_within_while_parentheses = false
+ij_typescript_special_else_if_treatment = true
+ij_typescript_ternary_operation_signs_on_next_line = false
+ij_typescript_ternary_operation_wrap = off
+ij_typescript_union_types_wrap = on_every_item
+ij_typescript_use_chained_calls_group_indents = false
+ij_typescript_use_double_quotes = true
+ij_typescript_use_explicit_js_extension = global
+ij_typescript_use_path_mapping = always
+ij_typescript_use_public_modifier = false
+ij_typescript_use_semicolon_after_statement = true
+ij_typescript_var_declaration_wrap = normal
+ij_typescript_while_brace_force = never
+ij_typescript_while_on_new_line = false
+ij_typescript_wrap_comments = false
+
+[{*.bash, *.sh, *.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+
+[{*.cjs, *.js}]
+ij_continuation_indent_size = 4
+ij_javascript_align_imports = false
+ij_javascript_align_multiline_array_initializer_expression = false
+ij_javascript_align_multiline_binary_operation = false
+ij_javascript_align_multiline_chained_methods = false
+ij_javascript_align_multiline_extends_list = false
+ij_javascript_align_multiline_for = true
+ij_javascript_align_multiline_parameters = true
+ij_javascript_align_multiline_parameters_in_calls = false
+ij_javascript_align_multiline_ternary_operation = false
+ij_javascript_align_object_properties = 0
+ij_javascript_align_union_types = false
+ij_javascript_align_var_statements = 0
+ij_javascript_array_initializer_new_line_after_left_brace = false
+ij_javascript_array_initializer_right_brace_on_new_line = false
+ij_javascript_array_initializer_wrap = off
+ij_javascript_assignment_wrap = off
+ij_javascript_binary_operation_sign_on_next_line = false
+ij_javascript_binary_operation_wrap = off
+ij_javascript_blacklist_imports = rxjs/Rx, node_modules/**, **/node_modules/**, @angular/material, @angular/material/typings/**
+ij_javascript_blank_lines_after_imports = 1
+ij_javascript_blank_lines_around_class = 1
+ij_javascript_blank_lines_around_field = 0
+ij_javascript_blank_lines_around_function = 1
+ij_javascript_blank_lines_around_method = 1
+ij_javascript_block_brace_style = end_of_line
+ij_javascript_call_parameters_new_line_after_left_paren = false
+ij_javascript_call_parameters_right_paren_on_new_line = false
+ij_javascript_call_parameters_wrap = off
+ij_javascript_catch_on_new_line = false
+ij_javascript_chained_call_dot_on_new_line = true
+ij_javascript_class_brace_style = end_of_line
+ij_javascript_comma_on_new_line = false
+ij_javascript_do_while_brace_force = never
+ij_javascript_else_on_new_line = false
+ij_javascript_enforce_trailing_comma = keep
+ij_javascript_extends_keyword_wrap = off
+ij_javascript_extends_list_wrap = off
+ij_javascript_field_prefix = _
+ij_javascript_file_name_style = relaxed
+ij_javascript_finally_on_new_line = false
+ij_javascript_for_brace_force = never
+ij_javascript_for_statement_new_line_after_left_paren = false
+ij_javascript_for_statement_right_paren_on_new_line = false
+ij_javascript_for_statement_wrap = off
+ij_javascript_force_quote_style = false
+ij_javascript_force_semicolon_style = false
+ij_javascript_function_expression_brace_style = end_of_line
+ij_javascript_if_brace_force = never
+ij_javascript_import_merge_members = global
+ij_javascript_import_prefer_absolute_path = global
+ij_javascript_import_sort_members = true
+ij_javascript_import_sort_module_name = false
+ij_javascript_import_use_node_resolution = true
+ij_javascript_imports_wrap = on_every_item
+ij_javascript_indent_case_from_switch = true
+ij_javascript_indent_chained_calls = true
+ij_javascript_indent_package_children = 0
+ij_javascript_jsx_attribute_value = braces
+ij_javascript_keep_blank_lines_in_code = 2
+ij_javascript_keep_first_column_comment = true
+ij_javascript_keep_indents_on_empty_lines = false
+ij_javascript_keep_line_breaks = true
+ij_javascript_keep_simple_blocks_in_one_line = false
+ij_javascript_keep_simple_methods_in_one_line = false
+ij_javascript_line_comment_add_space = true
+ij_javascript_line_comment_at_first_column = false
+ij_javascript_method_brace_style = end_of_line
+ij_javascript_method_call_chain_wrap = off
+ij_javascript_method_parameters_new_line_after_left_paren = false
+ij_javascript_method_parameters_right_paren_on_new_line = false
+ij_javascript_method_parameters_wrap = off
+ij_javascript_object_literal_wrap = on_every_item
+ij_javascript_parentheses_expression_new_line_after_left_paren = false
+ij_javascript_parentheses_expression_right_paren_on_new_line = false
+ij_javascript_place_assignment_sign_on_next_line = false
+ij_javascript_prefer_as_type_cast = false
+ij_javascript_prefer_explicit_types_function_expression_returns = false
+ij_javascript_prefer_explicit_types_function_returns = false
+ij_javascript_prefer_explicit_types_vars_fields = false
+ij_javascript_prefer_parameters_wrap = false
+ij_javascript_reformat_c_style_comments = false
+ij_javascript_space_after_colon = true
+ij_javascript_space_after_comma = true
+ij_javascript_space_after_dots_in_rest_parameter = false
+ij_javascript_space_after_generator_mult = true
+ij_javascript_space_after_property_colon = true
+ij_javascript_space_after_quest = true
+ij_javascript_space_after_type_colon = true
+ij_javascript_space_after_unary_not = false
+ij_javascript_space_before_async_arrow_lparen = true
+ij_javascript_space_before_catch_keyword = true
+ij_javascript_space_before_catch_left_brace = true
+ij_javascript_space_before_catch_parentheses = true
+ij_javascript_space_before_class_lbrace = true
+ij_javascript_space_before_class_left_brace = true
+ij_javascript_space_before_colon = true
+ij_javascript_space_before_comma = false
+ij_javascript_space_before_do_left_brace = true
+ij_javascript_space_before_else_keyword = true
+ij_javascript_space_before_else_left_brace = true
+ij_javascript_space_before_finally_keyword = true
+ij_javascript_space_before_finally_left_brace = true
+ij_javascript_space_before_for_left_brace = true
+ij_javascript_space_before_for_parentheses = true
+ij_javascript_space_before_for_semicolon = false
+ij_javascript_space_before_function_left_parenth = true
+ij_javascript_space_before_generator_mult = false
+ij_javascript_space_before_if_left_brace = true
+ij_javascript_space_before_if_parentheses = true
+ij_javascript_space_before_method_call_parentheses = false
+ij_javascript_space_before_method_left_brace = true
+ij_javascript_space_before_method_parentheses = false
+ij_javascript_space_before_property_colon = false
+ij_javascript_space_before_quest = true
+ij_javascript_space_before_switch_left_brace = true
+ij_javascript_space_before_switch_parentheses = true
+ij_javascript_space_before_try_left_brace = true
+ij_javascript_space_before_type_colon = false
+ij_javascript_space_before_unary_not = false
+ij_javascript_space_before_while_keyword = true
+ij_javascript_space_before_while_left_brace = true
+ij_javascript_space_before_while_parentheses = true
+ij_javascript_spaces_around_additive_operators = true
+ij_javascript_spaces_around_arrow_function_operator = true
+ij_javascript_spaces_around_assignment_operators = true
+ij_javascript_spaces_around_bitwise_operators = true
+ij_javascript_spaces_around_equality_operators = true
+ij_javascript_spaces_around_logical_operators = true
+ij_javascript_spaces_around_multiplicative_operators = true
+ij_javascript_spaces_around_relational_operators = true
+ij_javascript_spaces_around_shift_operators = true
+ij_javascript_spaces_around_unary_operator = false
+ij_javascript_spaces_within_array_initializer_brackets = false
+ij_javascript_spaces_within_brackets = false
+ij_javascript_spaces_within_catch_parentheses = false
+ij_javascript_spaces_within_for_parentheses = false
+ij_javascript_spaces_within_if_parentheses = false
+ij_javascript_spaces_within_imports = false
+ij_javascript_spaces_within_interpolation_expressions = false
+ij_javascript_spaces_within_method_call_parentheses = false
+ij_javascript_spaces_within_method_parentheses = false
+ij_javascript_spaces_within_object_literal_braces = false
+ij_javascript_spaces_within_object_type_braces = true
+ij_javascript_spaces_within_parentheses = false
+ij_javascript_spaces_within_switch_parentheses = false
+ij_javascript_spaces_within_type_assertion = false
+ij_javascript_spaces_within_union_types = true
+ij_javascript_spaces_within_while_parentheses = false
+ij_javascript_special_else_if_treatment = true
+ij_javascript_ternary_operation_signs_on_next_line = false
+ij_javascript_ternary_operation_wrap = off
+ij_javascript_union_types_wrap = on_every_item
+ij_javascript_use_chained_calls_group_indents = false
+ij_javascript_use_double_quotes = true
+ij_javascript_use_explicit_js_extension = global
+ij_javascript_use_path_mapping = always
+ij_javascript_use_public_modifier = false
+ij_javascript_use_semicolon_after_statement = true
+ij_javascript_var_declaration_wrap = normal
+ij_javascript_while_brace_force = never
+ij_javascript_while_on_new_line = false
+ij_javascript_wrap_comments = false
+
+[{*.ft, *.vm, *.vsl}]
+ij_vtl_keep_indents_on_empty_lines = false
+
+[{*.gant, *.gradle, *.groovy, *.gy}]
+ij_groovy_align_group_field_declarations = false
+ij_groovy_align_multiline_array_initializer_expression = false
+ij_groovy_align_multiline_assignment = false
+ij_groovy_align_multiline_binary_operation = false
+ij_groovy_align_multiline_chained_methods = false
+ij_groovy_align_multiline_extends_list = false
+ij_groovy_align_multiline_for = true
+ij_groovy_align_multiline_list_or_map = true
+ij_groovy_align_multiline_method_parentheses = false
+ij_groovy_align_multiline_parameters = true
+ij_groovy_align_multiline_parameters_in_calls = false
+ij_groovy_align_multiline_resources = true
+ij_groovy_align_multiline_ternary_operation = false
+ij_groovy_align_multiline_throws_list = false
+ij_groovy_align_named_args_in_map = true
+ij_groovy_align_throws_keyword = false
+ij_groovy_array_initializer_new_line_after_left_brace = false
+ij_groovy_array_initializer_right_brace_on_new_line = false
+ij_groovy_array_initializer_wrap = off
+ij_groovy_assert_statement_wrap = off
+ij_groovy_assignment_wrap = off
+ij_groovy_binary_operation_wrap = off
+ij_groovy_blank_lines_after_class_header = 0
+ij_groovy_blank_lines_after_imports = 1
+ij_groovy_blank_lines_after_package = 1
+ij_groovy_blank_lines_around_class = 1
+ij_groovy_blank_lines_around_field = 0
+ij_groovy_blank_lines_around_field_in_interface = 0
+ij_groovy_blank_lines_around_method = 1
+ij_groovy_blank_lines_around_method_in_interface = 1
+ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_method_body = 0
+ij_groovy_blank_lines_before_package = 0
+ij_groovy_block_brace_style = end_of_line
+ij_groovy_block_comment_at_first_column = true
+ij_groovy_call_parameters_new_line_after_left_paren = false
+ij_groovy_call_parameters_right_paren_on_new_line = false
+ij_groovy_call_parameters_wrap = off
+ij_groovy_catch_on_new_line = false
+ij_groovy_class_annotation_wrap = split_into_lines
+ij_groovy_class_brace_style = end_of_line
+ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_do_while_brace_force = never
+ij_groovy_else_on_new_line = false
+ij_groovy_enum_constants_wrap = off
+ij_groovy_extends_keyword_wrap = off
+ij_groovy_extends_list_wrap = off
+ij_groovy_field_annotation_wrap = split_into_lines
+ij_groovy_finally_on_new_line = false
+ij_groovy_for_brace_force = never
+ij_groovy_for_statement_new_line_after_left_paren = false
+ij_groovy_for_statement_right_paren_on_new_line = false
+ij_groovy_for_statement_wrap = off
+ij_groovy_if_brace_force = never
+ij_groovy_import_annotation_wrap = 2
+ij_groovy_imports_layout = *, |, javax.**, java.**, |, $*
+ij_groovy_indent_case_from_switch = true
+ij_groovy_indent_label_blocks = true
+ij_groovy_insert_inner_class_imports = false
+ij_groovy_keep_blank_lines_before_right_brace = 2
+ij_groovy_keep_blank_lines_in_code = 2
+ij_groovy_keep_blank_lines_in_declarations = 2
+ij_groovy_keep_control_statement_in_one_line = true
+ij_groovy_keep_first_column_comment = true
+ij_groovy_keep_indents_on_empty_lines = false
+ij_groovy_keep_line_breaks = true
+ij_groovy_keep_multiple_expressions_in_one_line = false
+ij_groovy_keep_simple_blocks_in_one_line = false
+ij_groovy_keep_simple_classes_in_one_line = true
+ij_groovy_keep_simple_lambdas_in_one_line = true
+ij_groovy_keep_simple_methods_in_one_line = true
+ij_groovy_label_indent_absolute = false
+ij_groovy_label_indent_size = 0
+ij_groovy_lambda_brace_style = end_of_line
+ij_groovy_layout_static_imports_separately = true
+ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_at_first_column = true
+ij_groovy_method_annotation_wrap = split_into_lines
+ij_groovy_method_brace_style = end_of_line
+ij_groovy_method_call_chain_wrap = off
+ij_groovy_method_parameters_new_line_after_left_paren = false
+ij_groovy_method_parameters_right_paren_on_new_line = false
+ij_groovy_method_parameters_wrap = off
+ij_groovy_modifier_list_wrap = false
+ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_parameter_annotation_wrap = off
+ij_groovy_parentheses_expression_new_line_after_left_paren = false
+ij_groovy_parentheses_expression_right_paren_on_new_line = false
+ij_groovy_prefer_parameters_wrap = false
+ij_groovy_resource_list_new_line_after_left_paren = false
+ij_groovy_resource_list_right_paren_on_new_line = false
+ij_groovy_resource_list_wrap = off
+ij_groovy_space_after_assert_separator = true
+ij_groovy_space_after_colon = true
+ij_groovy_space_after_comma = true
+ij_groovy_space_after_comma_in_type_arguments = true
+ij_groovy_space_after_for_semicolon = true
+ij_groovy_space_after_quest = true
+ij_groovy_space_after_type_cast = true
+ij_groovy_space_before_annotation_parameter_list = false
+ij_groovy_space_before_array_initializer_left_brace = false
+ij_groovy_space_before_assert_separator = false
+ij_groovy_space_before_catch_keyword = true
+ij_groovy_space_before_catch_left_brace = true
+ij_groovy_space_before_catch_parentheses = true
+ij_groovy_space_before_class_left_brace = true
+ij_groovy_space_before_closure_left_brace = true
+ij_groovy_space_before_colon = true
+ij_groovy_space_before_comma = false
+ij_groovy_space_before_do_left_brace = true
+ij_groovy_space_before_else_keyword = true
+ij_groovy_space_before_else_left_brace = true
+ij_groovy_space_before_finally_keyword = true
+ij_groovy_space_before_finally_left_brace = true
+ij_groovy_space_before_for_left_brace = true
+ij_groovy_space_before_for_parentheses = true
+ij_groovy_space_before_for_semicolon = false
+ij_groovy_space_before_if_left_brace = true
+ij_groovy_space_before_if_parentheses = true
+ij_groovy_space_before_method_call_parentheses = false
+ij_groovy_space_before_method_left_brace = true
+ij_groovy_space_before_method_parentheses = false
+ij_groovy_space_before_quest = true
+ij_groovy_space_before_switch_left_brace = true
+ij_groovy_space_before_switch_parentheses = true
+ij_groovy_space_before_synchronized_left_brace = true
+ij_groovy_space_before_synchronized_parentheses = true
+ij_groovy_space_before_try_left_brace = true
+ij_groovy_space_before_try_parentheses = true
+ij_groovy_space_before_while_keyword = true
+ij_groovy_space_before_while_left_brace = true
+ij_groovy_space_before_while_parentheses = true
+ij_groovy_space_in_named_argument = true
+ij_groovy_space_in_named_argument_before_colon = false
+ij_groovy_space_within_empty_array_initializer_braces = false
+ij_groovy_space_within_empty_method_call_parentheses = false
+ij_groovy_spaces_around_additive_operators = true
+ij_groovy_spaces_around_assignment_operators = true
+ij_groovy_spaces_around_bitwise_operators = true
+ij_groovy_spaces_around_equality_operators = true
+ij_groovy_spaces_around_lambda_arrow = true
+ij_groovy_spaces_around_logical_operators = true
+ij_groovy_spaces_around_multiplicative_operators = true
+ij_groovy_spaces_around_regex_operators = true
+ij_groovy_spaces_around_relational_operators = true
+ij_groovy_spaces_around_shift_operators = true
+ij_groovy_spaces_within_annotation_parentheses = false
+ij_groovy_spaces_within_array_initializer_braces = false
+ij_groovy_spaces_within_braces = true
+ij_groovy_spaces_within_brackets = false
+ij_groovy_spaces_within_cast_parentheses = false
+ij_groovy_spaces_within_catch_parentheses = false
+ij_groovy_spaces_within_for_parentheses = false
+ij_groovy_spaces_within_gstring_injection_braces = false
+ij_groovy_spaces_within_if_parentheses = false
+ij_groovy_spaces_within_list_or_map = false
+ij_groovy_spaces_within_method_call_parentheses = false
+ij_groovy_spaces_within_method_parentheses = false
+ij_groovy_spaces_within_parentheses = false
+ij_groovy_spaces_within_switch_parentheses = false
+ij_groovy_spaces_within_synchronized_parentheses = false
+ij_groovy_spaces_within_try_parentheses = false
+ij_groovy_spaces_within_tuple_expression = false
+ij_groovy_spaces_within_while_parentheses = false
+ij_groovy_special_else_if_treatment = true
+ij_groovy_ternary_operation_wrap = off
+ij_groovy_throws_keyword_wrap = off
+ij_groovy_throws_list_wrap = off
+ij_groovy_use_flying_geese_braces = false
+ij_groovy_use_fq_class_names = false
+ij_groovy_use_fq_class_names_in_javadoc = true
+ij_groovy_use_relative_indents = false
+ij_groovy_use_single_class_imports = true
+ij_groovy_variable_annotation_wrap = off
+ij_groovy_while_brace_force = never
+ij_groovy_while_on_new_line = false
+ij_groovy_wrap_long_lines = false
+
 [{*.gradle.kts, *.kt, *.kts, *.main.kts}]
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
@@ -336,8 +963,7 @@ ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 0
 ij_kotlin_wrap_first_method_in_call_chain = false
 
-
-[*.json]
+[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config, mcmod.info}]
 indent_size = 2
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,12 +27,10 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
-        - '1.19.3'
-        - '1.19.2'
-        - '1.19.1'
         - '1.19'
         - '1.18.2'
         - '1.18.1'
+        - '1.18'
         - '1.17.1'
         - '1.16.5'
     validations:

.github/workflows/announce-release-on-discord.yml

@@ -1,25 +0,0 @@
-name: Announce release on discord
-on:
-  release:
-    types: [published]
-
-jobs:
-  send_announcement:
-    runs-on: ubuntu-latest
-    steps:
-      - name: send custom message with args
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-          DISCORD_USERNAME: PlotSquared Release
-          DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: |
-            "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"
-            ""
-            "<:plotsquared:730750385886593039> **PlotSquared ${{ github.event.release.tag_name }} has been released!**"
-            ""
-            "Click here to view changelog: https://github.com/IntellectualSites/PlotSquared/releases/tag/${{ github.event.release.tag_name }}"
-            ""
-            "The download is available at:"
-            "- Spigot: <https://www.spigotmc.org/resources/77506/>"

.github/workflows/build-pr.yml

@@ -1,23 +0,0 @@
-name: Build PR
-
-on: [ pull_request ]
-
-jobs:
-  build_pr:
-    if: github.repository_owner == 'IntellectualSites'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
-      - name: Clean Build
-        run: ./gradlew clean build

.github/workflows/build.yml

@@ -1,18 +1,15 @@
 name: build
 
-on:
-  push:
-    branches:
-      - v6
+on: [ pull_request, push ]
 
 jobs:
   build:
-    if: github.repository_owner == 'IntellectualSites'
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-      - name: Validate Gradle Wrapper
+      - name: Validate Gradle Wrapper"
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v3

.github/workflows/codeql.yml

@@ -1,6 +1,8 @@
 name: "CodeQL"
 
 on:
+  push:
+    branches: [ v6 ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ v6 ]

Bukkit/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     implementation("org.bstats:bstats-bukkit")
 
     // Paper
-    compileOnly("io.papermc.paper:paper-api")
+    compileOnly(libs.paper)
     implementation("io.papermc:paperlib")
 
     // Plugins
@@ -50,7 +50,6 @@ dependencies {
     implementation(libs.arkitektonika)
     implementation(libs.http4j)
     implementation("com.intellectualsites.paster:Paster")
-    implementation("com.intellectualsites.informative-annotations:informative-annotations")
 
     // Adventure
     implementation("net.kyori:adventure-platform-bukkit")
@@ -88,7 +87,6 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("javax.inject", "com.plotsquared.core.annotation.inject")
     relocate("net.jcip", "com.plotsquared.core.annotations.jcip")
     relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs")
-    relocate("com.intellectualsites.informative-annotations", "com.plotsquared.core.annotation.informative")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
@@ -98,7 +96,6 @@ tasks.named<ShadowJar>("shadowJar") {
 
 tasks {
     withType<Javadoc> {
-        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://jd.papermc.io/paper/1.18/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
@@ -106,11 +103,5 @@ tasks {
         opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
-        opt.isLinkSource = true
-        opt.bottom(File("$rootDir/javadocfooter.html").readText())
-        opt.isUse = true
-        opt.encoding("UTF-8")
-        opt.keyWords()
-        opt.addStringOption("-since", isRelease)
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -36,11 +36,11 @@ import com.plotsquared.bukkit.listener.ChunkListener;
 import com.plotsquared.bukkit.listener.EntityEventListener;
 import com.plotsquared.bukkit.listener.EntitySpawnListener;
 import com.plotsquared.bukkit.listener.PaperListener;
+import com.plotsquared.bukkit.listener.PaperListener113;
 import com.plotsquared.bukkit.listener.PlayerEventListener;
 import com.plotsquared.bukkit.listener.ProjectileEventListener;
 import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
-import com.plotsquared.bukkit.listener.SpigotListener;
 import com.plotsquared.bukkit.listener.WorldEvents;
 import com.plotsquared.bukkit.placeholder.PAPIPlaceholders;
 import com.plotsquared.bukkit.placeholder.PlaceholderFormatter;
@@ -109,11 +109,11 @@ import com.plotsquared.core.uuid.CacheUUIDService;
 import com.plotsquared.core.uuid.UUIDPipeline;
 import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.DrilldownPie;
@@ -165,7 +165,7 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 @Singleton
 public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPlatform<Player> {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlatform.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final int BSTATS_ID = 1404;
 
     static {
@@ -355,9 +355,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
             getServer().getPluginManager().registerEvents(injector().getInstance(ServerListener.class), this);
             getServer().getPluginManager().registerEvents(injector().getInstance(EntitySpawnListener.class), this);
             if (PaperLib.isPaper() && Settings.Paper_Components.PAPER_LISTENERS) {
+                if (serverVersion()[1] == 13) {
+                    getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener113.class), this);
+                } else {
                     getServer().getPluginManager().registerEvents(injector().getInstance(PaperListener.class), this);
-            } else {
-                getServer().getPluginManager().registerEvents(injector().getInstance(SpigotListener.class), this);
+                }
             }
             this.plotListener.startRunnable();
         }
@@ -654,15 +656,20 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
             final @NonNull SQLiteUUIDService sqLiteUUIDService,
             final @NonNull CacheUUIDService cacheUUIDService
     ) {
-        // Record all unique UUID's and put them into a queue
-        final Set<UUID> uuidSet = new HashSet<>();
+        // Load all uuids into a big chunky boi queue
+        final Queue<UUID> uuidQueue = new LinkedBlockingQueue<>();
         PlotSquared.get().forEachPlotRaw(plot -> {
-            uuidSet.add(plot.getOwnerAbs());
-            uuidSet.addAll(plot.getMembers());
-            uuidSet.addAll(plot.getTrusted());
-            uuidSet.addAll(plot.getDenied());
+            final Set<UUID> uuids = new HashSet<>();
+            uuids.add(plot.getOwnerAbs());
+            uuids.addAll(plot.getMembers());
+            uuids.addAll(plot.getTrusted());
+            uuids.addAll(plot.getDenied());
+            for (final UUID uuid : uuids) {
+                if (!uuidQueue.contains(uuid)) {
+                    uuidQueue.add(uuid);
+                }
+            }
         });
-        final Queue<UUID> uuidQueue = new LinkedBlockingQueue<>(uuidSet);
 
         LOGGER.info("(UUID) {} UUIDs will be cached", uuidQueue.size());
 
@@ -725,11 +732,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         this.getServer().getPluginManager().disablePlugin(this);
     }
 
-    @Override
-    public void shutdownServer() {
-        getServer().shutdown();
-    }
-
     private void registerCommands() {
         final BukkitCommand bukkitCommand = new BukkitCommand();
         final PluginCommand plotCommand = getCommand("plots");
@@ -844,11 +846,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                             // managed elsewhere
                             continue;
                         case "SHULKER":
-                            if (Settings.Enabled_Components.KILL_ROAD_MOBS && (Settings.Enabled_Components.KILL_NAMED_ROAD_MOBS || entity.getCustomName() == null)) {
+                            if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
                                 LivingEntity livingEntity = (LivingEntity) entity;
                                 List<MetadataValue> meta = entity.getMetadata("shulkerPlot");
                                 if (!meta.isEmpty()) {
-                                    if (livingEntity.isLeashed() && !Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS) {
+                                    if (livingEntity.isLeashed()) {
                                         continue;
                                     }
                                     List<MetadataValue> keep = entity.getMetadata("keep");
@@ -861,8 +863,10 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                         com.plotsquared.core.location.Location pLoc = BukkitUtil.adapt(entity.getLocation());
                                         PlotArea area = pLoc.getPlotArea();
                                         if (area != null) {
-                                            Plot currentPlot = area.getPlotAbs(pLoc);
-                                            if (currentPlot == null || !originalPlotId.equals(currentPlot.getId())) {
+                                            PlotId currentPlotId = area.getPlotAbs(pLoc).getId();
+                                            if (!originalPlotId.equals(currentPlotId) && (currentPlotId == null || !area.getPlot(
+                                                            originalPlotId)
+                                                    .equals(area.getPlot(currentPlotId)))) {
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
@@ -876,11 +880,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                     com.plotsquared.core.location.Location pLoc = BukkitUtil.adapt(entity.getLocation());
                                     PlotArea area = pLoc.getPlotArea();
                                     if (area != null) {
-                                        Plot currentPlot = area.getPlotAbs(pLoc);
-                                        if (currentPlot != null) {
+                                        PlotId currentPlotId = area.getPlotAbs(pLoc).getId();
+                                        if (currentPlotId != null) {
                                             entity.setMetadata(
                                                     "shulkerPlot",
-                                                    new FixedMetadataValue((Plugin) PlotSquared.platform(), currentPlot.getId())
+                                                    new FixedMetadataValue((Plugin) PlotSquared.platform(), currentPlotId)
                                             );
                                         }
                                     }
@@ -966,9 +970,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                                 || !entity.hasMetadata("keep")) {
                                             Entity passenger = entity.getPassenger();
                                             if ((Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS
-                                                    || !((passenger instanceof Player) || livingEntity.isLeashed()))
-                                                    && (Settings.Enabled_Components.KILL_NAMED_ROAD_MOBS || entity.getCustomName() == null)
-                                                    && entity.getMetadata("keep").isEmpty()) {
+                                                    || !(passenger instanceof Player)) && entity.getMetadata("keep").isEmpty()) {
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
@@ -978,9 +980,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                         }
                                     } else {
                                         Entity passenger = entity.getPassenger();
-                                        if ((Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS || !(passenger instanceof Player))
-                                                && (Settings.Enabled_Components.KILL_NAMED_ROAD_MOBS && entity.getCustomName() != null)
-                                                && entity.getMetadata("keep").isEmpty()) {
+                                        if ((Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS
+                                                || !(passenger instanceof Player)) && entity.getMetadata("keep").isEmpty()) {
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }

Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java

@@ -19,7 +19,7 @@
 package com.plotsquared.bukkit.entity;
 
 import com.plotsquared.core.configuration.Settings;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Art;
 import org.bukkit.DyeColor;
@@ -55,7 +55,7 @@ import java.util.List;
 
 public final class ReplicatingEntityWrapper extends EntityWrapper {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ReplicatingEntityWrapper.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final short depth;
     private final int hash;

Bukkit/src/main/java/com/plotsquared/bukkit/generator/LegacyBlockStatePopulator.java

@@ -33,6 +33,7 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
@@ -50,7 +51,7 @@ final class LegacyBlockStatePopulator extends BlockPopulator {
     }
 
     @Override
-    public void populate(@NonNull final World world, @NonNull final Random random, @NonNull final Chunk source) {
+    public void populate(@NotNull final World world, @NotNull final Random random, @NotNull final Chunk source) {
         int chunkMinX = source.getX() << 4;
         int chunkMinZ = source.getZ() << 4;
         PlotArea area = Location.at(world.getName(), chunkMinX, 0, chunkMinZ).getPlotArea();

Bukkit/src/main/java/com/plotsquared/bukkit/inject/BackupModule.java

@@ -26,12 +26,12 @@ import com.plotsquared.core.backup.NullBackupManager;
 import com.plotsquared.core.backup.PlayerBackupProfile;
 import com.plotsquared.core.backup.SimpleBackupManager;
 import com.plotsquared.core.inject.factory.PlayerBackupProfileFactory;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 
 public class BackupModule extends AbstractModule {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BackupModule.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     @Override
     protected void configure() {

Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java

@@ -65,7 +65,7 @@ import com.plotsquared.core.util.SetupUtils;
 import com.plotsquared.core.util.WorldUtil;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extension.platform.Actor;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.command.ConsoleCommandSender;
@@ -74,7 +74,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class BukkitModule extends AbstractModule {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitModule.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final BukkitPlatform bukkitPlatform;
 

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java

@@ -56,7 +56,6 @@ import com.plotsquared.core.plot.flag.types.BlockTypeWrapper;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
-import com.plotsquared.core.util.PlotFlagUtil;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.WorldEdit;
@@ -71,7 +70,6 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Dispenser;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -101,6 +99,7 @@ import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
 import org.bukkit.event.block.SpongeAbsorbEvent;
 import org.bukkit.event.world.StructureGrowEvent;
+import org.bukkit.material.Directional;
 import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.util.Vector;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -110,8 +109,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @SuppressWarnings("unused")
 public class BlockEventListener implements Listener {
@@ -124,11 +121,6 @@ public class BlockEventListener implements Listener {
             Material.TURTLE_EGG,
             Material.TURTLE_SPAWN_EGG
     );
-    private static final Set<Material> SNOW = Stream.of(Material.values()) // needed as Tag.SNOW isn't present in 1.16.5
-            .filter(material -> material.name().contains("SNOW"))
-            .filter(Material::isBlock)
-            .collect(Collectors.toUnmodifiableSet());
-
     private final PlotAreaManager plotAreaManager;
     private final WorldEdit worldEdit;
 
@@ -167,7 +159,7 @@ public class BlockEventListener implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, RedstoneFlag.class, false)) {
+            if (area.isRoadFlags() && !area.getRoadFlag(RedstoneFlag.class)) {
                 event.setNewCurrent(0);
             }
             return;
@@ -273,9 +265,15 @@ public class BlockEventListener implements Listener {
         BukkitPlayer pp = BukkitUtil.adapt(player);
         Plot plot = area.getPlot(location);
         if (plot != null) {
-            if (area.notifyIfOutsideBuildArea(pp, location.getY())) {
+            if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area
+                    .getMinBuildHeight()) && !Permissions
+                    .hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
                 event.setCancelled(true);
-                return;
+                pp.sendMessage(
+                        TranslatableCaption.of("height.height_limit"),
+                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
+                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
+                );
             }
             if (!plot.hasOwner()) {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
@@ -353,9 +351,15 @@ public class BlockEventListener implements Listener {
                     event.setCancelled(true);
                     return;
                 }
-            } else if (area.notifyIfOutsideBuildArea(plotPlayer, location.getY())) {
+            } else if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area
+                    .getMinBuildHeight()) && !Permissions
+                    .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
                 event.setCancelled(true);
-                return;
+                plotPlayer.sendMessage(
+                        TranslatableCaption.of("height.height_limit"),
+                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
+                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
+                );
             }
             if (!plot.hasOwner()) {
                 if (!Permissions
@@ -443,7 +447,6 @@ public class BlockEventListener implements Listener {
             case "TWISTING_VINES":
             case "CAVE_VINES":
             case "VINE":
-            case "GLOW_BERRIES":
                 if (!plot.getFlag(VineGrowFlag.class)) {
                     plot.debug("Vine could not grow because vine-grow = false");
                     event.setCancelled(true);
@@ -534,11 +537,11 @@ public class BlockEventListener implements Listener {
         if (plot == null) {
             return;
         }
-        if (!area.buildRangeContainsY(location.getY())) {
+        if (location.getY() >= area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) {
             event.setCancelled(true);
             return;
         }
-        if (SNOW.contains(event.getNewState().getType())) {
+        if (Tag.SNOW.isTagged(event.getNewState().getType())) {
             if (!plot.getFlag(SnowFormFlag.class)) {
                 plot.debug("Snow could not form because snow-form = false");
                 event.setCancelled(true);
@@ -570,7 +573,7 @@ public class BlockEventListener implements Listener {
             return;
         }
         Class<? extends BooleanFlag<?>> flag;
-        if (SNOW.contains(event.getNewState().getType())) {
+        if (Tag.SNOW.isTagged(event.getNewState().getType())) {
             flag = SnowFormFlag.class;
         } else if (Tag.ICE.isTagged(event.getNewState().getType())) {
             flag = IceFormFlag.class;
@@ -687,7 +690,7 @@ public class BlockEventListener implements Listener {
             }
             return;
         }
-        if (SNOW.contains(blockType)) {
+        if (Tag.SNOW.isTagged(blockType)) {
             if (!plot.getFlag(SnowMeltFlag.class)) {
                 plot.debug("Snow could not melt because snow-melt = false");
                 event.setCancelled(true);
@@ -701,7 +704,7 @@ public class BlockEventListener implements Listener {
             }
             return;
         }
-        if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType) || Tag.WALL_CORALS.isTagged(blockType)) {
+        if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType)) {
             if (!plot.getFlag(CoralDryFlag.class)) {
                 plot.debug("Coral could not dry because coral-dry = false");
                 event.setCancelled(true);
@@ -736,7 +739,7 @@ public class BlockEventListener implements Listener {
             }
             return;
         }
-        if (!toArea.buildRangeContainsY(toLocation.getY())) {
+        if (toLocation.getY() >= toArea.getMaxBuildHeight() || toLocation.getY() < toArea.getMinBuildHeight()) {
             event.setCancelled(true);
             return;
         }
@@ -810,11 +813,6 @@ public class BlockEventListener implements Listener {
             return;
         }
 
-        if (!area.buildRangeContainsY(location.getY())) {
-            event.setCancelled(true);
-            return;
-        }
-
         Plot plot = location.getOwnedPlot();
         if (plot == null || !plot.getFlag(CropGrowFlag.class)) {
             if (plot != null) {
@@ -858,16 +856,15 @@ public class BlockEventListener implements Listener {
         }
         for (Block block1 : event.getBlocks()) {
             Location bloc = BukkitUtil.adapt(block1.getLocation());
-            Location newLoc = bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ());
-            if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains(newLoc)) {
+            if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains(
+                    bloc.getX() + relative.getBlockX(),
+                    bloc.getZ() + relative.getBlockZ()
+            )) {
                 event.setCancelled(true);
                 return;
             }
-            if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(newLoc))) {
-                event.setCancelled(true);
-                return;
-            }
-            if (!area.buildRangeContainsY(bloc.getY()) || !area.buildRangeContainsY(newLoc.getY())) {
+            if (!plot.equals(area.getOwnedPlot(bloc)) || !plot
+                    .equals(area.getOwnedPlot(bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) {
                 event.setCancelled(true);
                 return;
             }
@@ -893,8 +890,9 @@ public class BlockEventListener implements Listener {
             }
             for (Block block1 : event.getBlocks()) {
                 Location bloc = BukkitUtil.adapt(block1.getLocation());
-                Location newLoc = bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ());
-                if (bloc.isPlotArea() || newLoc.isPlotArea()) {
+                if (bloc.isPlotArea() || bloc
+                        .add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())
+                        .isPlotArea()) {
                     event.setCancelled(true);
                     return;
                 }
@@ -908,16 +906,15 @@ public class BlockEventListener implements Listener {
         }
         for (Block block1 : event.getBlocks()) {
             Location bloc = BukkitUtil.adapt(block1.getLocation());
-            Location newLoc = bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ());
-            if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains(newLoc)) {
+            if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains(
+                    bloc.getX() + relative.getBlockX(),
+                    bloc.getZ() + relative.getBlockZ()
+            )) {
                 event.setCancelled(true);
                 return;
             }
-            if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(newLoc))) {
-                event.setCancelled(true);
-                return;
-            }
-            if (!area.buildRangeContainsY(bloc.getY()) || !area.buildRangeContainsY(newLoc.getY())) {
+            if (!plot.equals(area.getOwnedPlot(bloc)) || !plot
+                    .equals(area.getOwnedPlot(bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) {
                 event.setCancelled(true);
                 return;
             }
@@ -926,9 +923,6 @@ public class BlockEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockDispense(BlockDispenseEvent event) {
-        if (!this.plotAreaManager.hasPlotArea(event.getBlock().getWorld().getName())) {
-            return;
-        }
         Material type = event.getItem().getType();
         switch (type.toString()) {
             case "SHULKER_BOX", "WHITE_SHULKER_BOX", "ORANGE_SHULKER_BOX", "MAGENTA_SHULKER_BOX", "LIGHT_BLUE_SHULKER_BOX",
@@ -940,15 +934,10 @@ public class BlockEventListener implements Listener {
                 if (event.getBlock().getType() == Material.DROPPER) {
                     return;
                 }
-                BlockFace targetFace = ((Dispenser) event.getBlock().getBlockData()).getFacing();
+                BlockFace targetFace = ((Directional) event.getBlock().getState().getData()).getFacing();
                 Location location = BukkitUtil.adapt(event.getBlock().getRelative(targetFace).getLocation());
                 if (location.isPlotRoad()) {
                     event.setCancelled(true);
-                    return;
-                }
-                PlotArea area = location.getPlotArea();
-                if (area != null && !area.buildRangeContainsY(location.getY())) {
-                    event.setCancelled(true);
                 }
             }
         }
@@ -988,10 +977,6 @@ public class BlockEventListener implements Listener {
                 Plot plot = area.getOwnedPlot(location);
                 if (!Objects.equals(plot, origin)) {
                     event.getBlocks().remove(i);
-                    continue;
-                }
-                if (!area.buildRangeContainsY(location.getY())) {
-                    event.getBlocks().remove(i);
                 }
             }
         }
@@ -1083,15 +1068,8 @@ public class BlockEventListener implements Listener {
         Plot plot = area.getOwnedPlot(location1);
         if (player != null) {
             BukkitPlayer pp = BukkitUtil.adapt(player);
-            if (area.notifyIfOutsideBuildArea(pp, location1.getY())) {
-                event.setCancelled(true);
-                return;
-            }
             if (plot == null) {
-                if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, BlockIgnitionFlag.class, true) && !Permissions.hasPermission(
-                        pp,
-                        Permission.PERMISSION_ADMIN_BUILD_ROAD
-                )) {
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
                             Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_ROAD))
@@ -1099,10 +1077,7 @@ public class BlockEventListener implements Listener {
                     event.setCancelled(true);
                 }
             } else if (!plot.hasOwner()) {
-                if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, BlockIgnitionFlag.class, true) && !Permissions.hasPermission(
-                        pp,
-                        Permission.PERMISSION_ADMIN_BUILD_UNOWNED
-                )) {
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
                             Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_BUILD_UNOWNED))
@@ -1200,10 +1175,7 @@ public class BlockEventListener implements Listener {
                     return true;
                 }
                 Plot plot = area.getOwnedPlot(blockLocation);
-                if (!Objects.equals(plot, origin)) {
-                    return true;
-                }
-                return !area.buildRangeContainsY(location.getY());
+                return !Objects.equals(plot, origin);
             });
         }
         if (blocks.isEmpty()) {
@@ -1245,7 +1217,15 @@ public class BlockEventListener implements Listener {
                 event.setCancelled(true);
                 break;
             }
-            if (area.notifyIfOutsideBuildArea(pp, currentLocation.getY())) {
+            if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
+                continue;
+            }
+            if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) {
+                pp.sendMessage(
+                        TranslatableCaption.of("height.height_limit"),
+                        Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
+                        Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
+                );
                 event.setCancelled(true);
                 break;
             }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java

@@ -26,7 +26,6 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
-import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
@@ -81,20 +80,10 @@ public class BlockEventListener117 implements Listener {
             return;
         }
 
-        BukkitPlayer plotPlayer = null;
-
-        if (entity instanceof Player player) {
-            plotPlayer = BukkitUtil.adapt(player);
-            if (area.notifyIfOutsideBuildArea(plotPlayer, location.getY())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
         Plot plot = location.getOwnedPlot();
-        if (plot == null && !PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) || plot != null && !plot.getFlag(
-                MiscInteractFlag.class)) {
-            if (plotPlayer != null) {
+        if (plot == null || !plot.getFlag(MiscInteractFlag.class)) {
+            if (entity instanceof Player player) {
+                BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
                 if (plot != null) {
                     if (!plot.isAdded(plotPlayer.getUUID())) {
                         plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because misc-interact = false");
@@ -106,12 +95,6 @@ public class BlockEventListener117 implements Listener {
             if (entity instanceof Item item) {
                 UUID itemThrower = item.getThrower();
                 if (plot != null) {
-                    if (itemThrower == null && (itemThrower = item.getOwner()) == null) {
-                        plot.debug(
-                                "A thrown item couldn't trigger sculk sensors because misc-interact = false and the item's owner could not be resolved.");
-                        event.setCancelled(true);
-                        return;
-                    }
                     if (!plot.isAdded(itemThrower)) {
                         if (!plot.isAdded(itemThrower)) {
                             plot.debug("A thrown item couldn't trigger sculk sensors because misc-interact = false");
@@ -132,12 +115,12 @@ public class BlockEventListener117 implements Listener {
         PlotArea area = location.getPlotArea();
         if (area == null) {
             for (int i = blocks.size() - 1; i >= 0; i--) {
-                Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
-                blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
-                if (blockLocation.isPlotArea()) {
+                location = BukkitUtil.adapt(blocks.get(i).getLocation());
+                if (location.isPlotArea()) {
                     blocks.remove(i);
                 }
             }
+            return;
         } else {
             Plot origin = area.getOwnedPlot(location);
             if (origin == null) {
@@ -145,21 +128,29 @@ public class BlockEventListener117 implements Listener {
                 return;
             }
             for (int i = blocks.size() - 1; i >= 0; i--) {
-                Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
-                if (!area.contains(blockLocation.getX(), blockLocation.getZ())) {
+                location = BukkitUtil.adapt(blocks.get(i).getLocation());
+                if (!area.contains(location.getX(), location.getZ())) {
                     blocks.remove(i);
                     continue;
                 }
-                Plot plot = area.getOwnedPlot(blockLocation);
+                Plot plot = area.getOwnedPlot(location);
                 if (!Objects.equals(plot, origin)) {
                     event.getBlocks().remove(i);
-                    continue;
-                }
-                if (!area.buildRangeContainsY(location.getY())) {
-                    event.getBlocks().remove(i);
                 }
             }
         }
+        Plot origin = area.getPlot(location);
+        if (origin == null) {
+            event.setCancelled(true);
+            return;
+        }
+        for (int i = blocks.size() - 1; i >= 0; i--) {
+            location = BukkitUtil.adapt(blocks.get(i).getLocation());
+            Plot plot = area.getOwnedPlot(location);
+            if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) {
+                event.getBlocks().remove(i);
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java

@@ -38,7 +38,6 @@ import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.Permissions;
-import com.plotsquared.core.util.PlotFlagUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockType;
 import org.bukkit.Material;
@@ -262,7 +261,7 @@ public class EntityEventListener implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, InvincibleFlag.class, true)) {
+            if (area.isRoadFlags() && area.getRoadFlag(InvincibleFlag.class)) {
                 event.setCancelled(true);
             }
             return;

Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java

@@ -126,16 +126,16 @@ public class EntitySpawnListener implements Listener {
         Plot plot = location.getOwnedPlotAbs();
         EntityType type = entity.getType();
         if (plot == null) {
-            if (type == EntityType.DROPPED_ITEM) {
-                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
             if (!area.isMobSpawning()) {
                 if (type == EntityType.PLAYER) {
                     return;
                 }
+                if (type == EntityType.DROPPED_ITEM) {
+                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
                 if (type.isAlive()) {
                     event.setCancelled(true);
                 }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java

@@ -18,6 +18,7 @@
  */
 package com.plotsquared.bukkit.listener;
 
+import com.google.common.collect.Iterables;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.location.Location;
@@ -38,11 +39,8 @@ public class ForceFieldListener {
 
     private static Set<PlotPlayer<?>> getNearbyPlayers(Player player, Plot plot) {
         Set<PlotPlayer<?>> players = new HashSet<>();
-        for (Player nearPlayer : player.getNearbyEntities(5d, 5d, 5d).stream()
-                .filter(entity -> entity instanceof Player)
-                .map(entity -> (Player) entity)
-                .toList()
-        ) {
+        for (Player nearPlayer : Iterables
+                .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
             PlotPlayer<?> plotPlayer;
             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot
                     .equals(plotPlayer.getCurrentPlot())) {
@@ -56,11 +54,8 @@ public class ForceFieldListener {
     }
 
     private static PlotPlayer<?> hasNearbyPermitted(Player player, Plot plot) {
-        for (Player nearPlayer : player.getNearbyEntities(5d, 5d, 5d).stream()
-                .filter(entity -> entity instanceof Player)
-                .map(entity -> (Player) entity)
-                .toList()
-        ) {
+        for (Player nearPlayer : Iterables
+                .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
             PlotPlayer<?> plotPlayer;
             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot
                     .equals(plotPlayer.getCurrentPlot())) {

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -18,7 +18,6 @@
  */
 package com.plotsquared.bukkit.listener;
 
-import com.destroystokyo.paper.event.block.BeaconEffectEvent;
 import com.destroystokyo.paper.event.entity.EntityPathfindEvent;
 import com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent;
 import com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent;
@@ -37,14 +36,10 @@ import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.flag.FlagContainer;
-import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
-import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.Chunk;
 import org.bukkit.block.Block;
@@ -234,17 +229,17 @@ public class PaperListener implements Listener {
         Plot plot = location.getOwnedPlotAbs();
         if (plot == null) {
             EntityType type = event.getType();
-            // PreCreatureSpawnEvent **should** not be called for DROPPED_ITEM, just for the sake of consistency
-            if (type == EntityType.DROPPED_ITEM) {
-                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
             if (!area.isMobSpawning()) {
                 if (type == EntityType.PLAYER) {
                     return;
                 }
+                if (type == EntityType.DROPPED_ITEM) {
+                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                        event.setShouldAbortSpawn(true);
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
                 if (type.isAlive()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
@@ -327,18 +322,14 @@ public class PaperListener implements Listener {
             return;
         }
         Location location = BukkitUtil.adapt(entity.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
+        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
             return;
         }
         PlotPlayer<Player> pp = BukkitUtil.adapt((Player) shooter);
         Plot plot = location.getOwnedPlot();
 
         if (plot == null) {
-            if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !Permissions.hasPermission(
-                    pp,
-                    Permission.PERMISSION_ADMIN_PROJECTILE_ROAD
-            )) {
+            if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
                         Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
@@ -409,50 +400,4 @@ public class PaperListener implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onBeaconEffect(final BeaconEffectEvent event) {
-        Block block = event.getBlock();
-        Location beaconLocation = BukkitUtil.adapt(block.getLocation());
-        Plot beaconPlot = beaconLocation.getPlot();
-
-        PlotArea area = beaconLocation.getPlotArea();
-        if (area == null) {
-            return;
-        }
-
-        Player player = event.getPlayer();
-        Location playerLocation = BukkitUtil.adapt(player.getLocation());
-
-        PlotPlayer<Player> plotPlayer = BukkitUtil.adapt(player);
-        Plot playerStandingPlot = playerLocation.getPlot();
-        if (playerStandingPlot == null) {
-            FlagContainer container = area.getRoadFlagContainer();
-            if (!getBooleanFlagValue(container, BeaconEffectsFlag.class, true) ||
-                    (beaconPlot != null && Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW)) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-
-        FlagContainer container = playerStandingPlot.getFlagContainer();
-        boolean plotBeaconEffects = getBooleanFlagValue(container, BeaconEffectsFlag.class, true);
-        if (playerStandingPlot.equals(beaconPlot)) {
-            if (!plotBeaconEffects) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-
-        if (!plotBeaconEffects || Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW) {
-            event.setCancelled(true);
-        }
-    }
-
-    private boolean getBooleanFlagValue(@NonNull FlagContainer container,
-                                        @NonNull Class<? extends BooleanFlag<?>> flagClass,
-                                        boolean defaultValue) {
-        BooleanFlag<?> flag = container.getFlag(flagClass);
-        return flag == null ? defaultValue : flag.getValue();
-    }
-
 }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener113.java

@@ -48,10 +48,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-/**
- * @deprecated P2 effectively no longer supports 1.13
- */
-@Deprecated(forRemoval = true, since = "6.10.4")
 public class PaperListener113 extends PaperListener {
 
     @Inject

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -68,7 +68,6 @@ import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.Permissions;
-import com.plotsquared.core.util.PlotFlagUtil;
 import com.plotsquared.core.util.PremiumVerification;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.TaskManager;
@@ -107,7 +106,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.EntityPlaceEvent;
-import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
@@ -144,22 +142,23 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
+import java.util.regex.Pattern;
 
 /**
  * Player Events involving plots.
  */
 @SuppressWarnings("unused")
-public class PlayerEventListener implements Listener {
+public class PlayerEventListener extends PlotListener implements Listener {
 
     private static final Set<Material> MINECARTS = Set.of(
             Material.MINECART,
@@ -178,7 +177,6 @@ public class PlayerEventListener implements Listener {
     private final EventDispatcher eventDispatcher;
     private final WorldEdit worldEdit;
     private final PlotAreaManager plotAreaManager;
-    private final PlotListener plotListener;
     // To prevent recursion
     private boolean tmpTeleport = true;
     private Field fieldPlayer;
@@ -198,36 +196,12 @@ public class PlayerEventListener implements Listener {
     public PlayerEventListener(
             final @NonNull PlotAreaManager plotAreaManager,
             final @NonNull EventDispatcher eventDispatcher,
-            final @NonNull WorldEdit worldEdit,
-            final @NonNull PlotListener plotListener
+            final @NonNull WorldEdit worldEdit
     ) {
+        super(eventDispatcher);
         this.eventDispatcher = eventDispatcher;
         this.worldEdit = worldEdit;
         this.plotAreaManager = plotAreaManager;
-        this.plotListener = plotListener;
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    public void onEffect(@NonNull EntityPotionEffectEvent event) {
-        if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
-                event.getCause() != EntityPotionEffectEvent.Cause.BEACON ||
-                !(event.getEntity() instanceof Player player)) {
-            return;
-        }
-
-        UUID uuid = player.getUniqueId();
-        PotionEffect effect = event.getNewEffect();
-        if (effect == null) {
-            PotionEffect oldEffect = event.getOldEffect();
-            if (oldEffect != null) {
-                String name = oldEffect.getType().getName();
-                plotListener.addEffect(uuid, name, -1);
-            }
-        } else {
-            long expiresAt = System.currentTimeMillis() + effect.getDuration() * 50L; //Convert ticks to milliseconds
-            String name = effect.getType().getName();
-            plotListener.addEffect(uuid, name, expiresAt);
-        }
     }
 
     @EventHandler
@@ -380,7 +354,7 @@ public class PlayerEventListener implements Listener {
         if (area != null) {
             Plot plot = area.getPlot(location);
             if (plot != null) {
-                plotListener.plotEntry(pp, plot);
+                plotEntry(pp, plot);
             }
         }
         // Delayed
@@ -432,7 +406,7 @@ public class PlayerEventListener implements Listener {
                 PlotArea area = location.getPlotArea();
                 if (area == null) {
                     if (lastPlot != null) {
-                        plotListener.plotExit(pp, lastPlot);
+                        plotExit(pp, lastPlot);
                         lastPlotAccess.remove();
                     }
                     try (final MetaDataAccess<Location> lastLocationAccess =
@@ -566,7 +540,7 @@ public class PlayerEventListener implements Listener {
             if (now == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
+                    if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
                                 Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
@@ -584,7 +558,7 @@ public class PlayerEventListener implements Listener {
                 }
             } else if (now.equals(lastPlot)) {
                 ForceFieldListener.handleForcefield(player, pp, now);
-            } else if (!plotListener.plotEntry(pp, now) && this.tmpTeleport) {
+            } else if (!plotEntry(pp, now) && this.tmpTeleport) {
                 pp.sendMessage(
                         TranslatableCaption.of("deny.no_enter"),
                         Template.of("plot", now.toString())
@@ -656,7 +630,7 @@ public class PlayerEventListener implements Listener {
             if (plot == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
+                    if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
                                 Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED))
@@ -674,7 +648,7 @@ public class PlayerEventListener implements Listener {
                 }
             } else if (plot.equals(lastPlot)) {
                 ForceFieldListener.handleForcefield(player, pp, plot);
-            } else if (!plotListener.plotEntry(pp, plot) && this.tmpTeleport) {
+            } else if (!plotEntry(pp, plot) && this.tmpTeleport) {
                 pp.sendMessage(
                         TranslatableCaption.of("deny.no_enter"),
                         Template.of("plot", plot.toString())
@@ -821,7 +795,7 @@ public class PlayerEventListener implements Listener {
             lastLocationAccess.remove();
         }
         if (plot != null) {
-            plotListener.plotExit(pp, plot);
+            plotExit(pp, plot);
         }
         if (this.worldEdit != null) {
             if (!Permissions.hasPermission(pp, Permission.PERMISSION_WORLDEDIT_BYPASS)) {
@@ -835,7 +809,7 @@ public class PlayerEventListener implements Listener {
         if (location.isPlotArea()) {
             plot = location.getPlot();
             if (plot != null) {
-                plotListener.plotEntry(pp, plot);
+                plotEntry(pp, plot);
             }
         }
     }
@@ -890,7 +864,8 @@ public class PlayerEventListener implements Listener {
                 }
             } else {
                 PlotArea area = pp.getPlotAreaAbs();
-                if (area != null && PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, PreventCreativeCopyFlag.class, true)) {
+                if (area != null && area.isRoadFlags() && area
+                        .getRoadFlag(PreventCreativeCopyFlag.class)) {
                     final ItemStack newStack =
                             new ItemStack(newItem.getType(), newItem.getAmount());
                     event.setCursor(newStack);
@@ -998,10 +973,8 @@ public class PlayerEventListener implements Listener {
         Plot plot = location.getPlotAbs();
         BukkitPlayer pp = BukkitUtil.adapt(e.getPlayer());
         if (plot == null) {
-            if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, MiscInteractFlag.class, true) && !Permissions.hasPermission(
-                    pp,
-                    Permission.PERMISSION_ADMIN_INTERACT_ROAD
-            )) {
+            if (!area.isRoadFlags() && !area.getRoadFlag(MiscInteractFlag.class) && !Permissions
+                    .hasPermission(pp, Permission.PERMISSION_ADMIN_INTERACT_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
                         Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_INTERACT_ROAD))
@@ -1011,7 +984,9 @@ public class PlayerEventListener implements Listener {
         } else {
             if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
                 if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    pp.sendMessage(TranslatableCaption.of("done.building_restricted"));
+                    pp.sendMessage(
+                            TranslatableCaption.of("done.building_restricted")
+                    );
                     e.setCancelled(true);
                     return;
                 }
@@ -1307,7 +1282,7 @@ public class PlayerEventListener implements Listener {
         TaskManager.removeFromTeleportQueue(event.getPlayer().getName());
         BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer());
         pp.unregister();
-        plotListener.logout(pp.getUUID());
+        this.logout(pp.getUUID());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -1594,10 +1569,7 @@ public class PlayerEventListener implements Listener {
             BukkitPlayer pp = BukkitUtil.adapt(p);
             Plot plot = area.getPlot(location);
             if (plot == null) {
-                if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, VehicleBreakFlag.class, true) && !Permissions.hasPermission(
-                        pp,
-                        Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD
-                )) {
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD)) {
                     pp.sendMessage(
                             TranslatableCaption.of("permission.no_permission_event"),
                             Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD))
@@ -1645,7 +1617,7 @@ public class PlayerEventListener implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ItemDropFlag.class, false)) {
+            if (area.isRoadFlags() && !area.getRoadFlag(ItemDropFlag.class)) {
                 event.setCancelled(true);
             }
             return;
@@ -1671,7 +1643,7 @@ public class PlayerEventListener implements Listener {
             }
             Plot plot = location.getOwnedPlot();
             if (plot == null) {
-                if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, DropProtectionFlag.class, true)) {
+                if (area.isRoadFlags() && area.getRoadFlag(DropProtectionFlag.class)) {
                     event.setCancelled(true);
                 }
                 return;
@@ -1693,15 +1665,17 @@ public class PlayerEventListener implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, KeepInventoryFlag.class, true)) {
+            if (area.isRoadFlags() && area.getRoadFlag(KeepInventoryFlag.class)) {
                 event.setCancelled(true);
             }
             return;
         }
         if (plot.getFlag(KeepInventoryFlag.class)) {
-            plot.debug(event.getEntity().getName() + " kept their inventory because of keep-inventory = true");
-            event.getDrops().clear();
-            event.setKeepInventory(true);
+            if (plot.getFlag(KeepInventoryFlag.class)) {
+                plot.debug(event.getEntity().getName() + " kept their inventory because of keep-inventory = true");
+                event.getDrops().clear();
+                event.setKeepInventory(true);
+            }
         }
     }
 
@@ -1726,14 +1700,16 @@ public class PlayerEventListener implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, DenyPortalTravelFlag.class, true)) {
+            if (area.isRoadFlags() && area.getRoadFlag(DenyPortalTravelFlag.class)) {
                 event.setCancelled(true);
             }
             return;
         }
         if (plot.getFlag(DenyPortalTravelFlag.class)) {
-            plot.debug(event.getPlayer().getName() + " did not travel thru a portal because of deny-portal-travel = true");
-            event.setCancelled(true);
+            if (plot.getFlag(DenyPortalTravelFlag.class)) {
+                plot.debug(event.getPlayer().getName() + " did not travel thru a portal because of deny-portal-travel = true");
+                event.setCancelled(true);
+            }
         }
     }
 
@@ -1743,7 +1719,6 @@ public class PlayerEventListener implements Listener {
         if (PlotSquared.get().getPlotAreaManager().getPlotAreasSet(world).size() == 0) {
             return;
         }
-        BukkitPlayer pp = (event.getEntity() instanceof Player player) ? BukkitUtil.adapt(player) : null;
         int minX = Integer.MAX_VALUE;
         int maxX = Integer.MIN_VALUE;
         int minZ = Integer.MAX_VALUE;
@@ -1755,23 +1730,19 @@ public class PlayerEventListener implements Listener {
             maxZ = Math.max(state.getZ(), maxZ);
         }
         int y = event.getBlocks().get(0).getY(); // Don't need to worry about this too much
-        for (Location location : List.of( // We don't care about duplicate locations
-                Location.at(world, minX, y, minZ),
+        for (Location location : Set.of( // Use Set to lazily avoid duplicate locations
+                Location.at(world, minX, y, maxX),
+                Location.at(world, minZ, y, maxZ),
                 Location.at(world, minX, y, maxZ),
-                Location.at(world, maxX, y, minZ),
-                Location.at(world, maxX, y, maxZ)
+                Location.at(world, minZ, y, maxX)
         )) {
             PlotArea area = location.getPlotArea();
             if (area == null) {
                 continue;
             }
-            if (area.notifyIfOutsideBuildArea(pp, location.getY())) {
-                event.setCancelled(true);
-                return;
-            }
             Plot plot = location.getOwnedPlot();
             if (plot == null) {
-                if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, DenyPortalsFlag.class, true)) {
+                if (area.isRoadFlags() && area.getRoadFlag(DenyPortalsFlag.class)) {
                     event.setCancelled(true);
                     return;
                 }
@@ -1800,14 +1771,16 @@ public class PlayerEventListener implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, LecternReadBookFlag.class, true)) {
+            if (area.isRoadFlags() && area.getRoadFlag(LecternReadBookFlag.class)) {
                 event.setCancelled(true);
             }
             return;
         }
         if (plot.getFlag(LecternReadBookFlag.class)) {
-            plot.debug(event.getPlayer().getName() + " could not take the book because of lectern-read-book = true");
-            event.setCancelled(true);
+            if (plot.getFlag(LecternReadBookFlag.class)) {
+                plot.debug(event.getPlayer().getName() + " could not take the book because of lectern-read-book = true");
+                event.setCancelled(true);
+            }
         }
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java

@@ -31,7 +31,6 @@ import com.plotsquared.core.plot.PlotHandler;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.Permissions;
-import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.Template;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -90,7 +89,7 @@ public class ProjectileEventListener implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     public void onProjectileLaunch(ProjectileLaunchEvent event) {
         Projectile entity = event.getEntity();
         ProjectileSource shooter = entity.getShooter();
@@ -98,18 +97,14 @@ public class ProjectileEventListener implements Listener {
             return;
         }
         Location location = BukkitUtil.adapt(entity.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
+        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
             return;
         }
         PlotPlayer<Player> pp = BukkitUtil.adapt((Player) shooter);
         Plot plot = location.getOwnedPlot();
 
         if (plot == null) {
-            if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !Permissions.hasPermission(
-                    pp,
-                    Permission.PERMISSION_ADMIN_PROJECTILE_ROAD
-            )) {
+            if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)) {
                 pp.sendMessage(
                         TranslatableCaption.of("permission.no_permission_event"),
                         Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD))
@@ -154,26 +149,9 @@ public class ProjectileEventListener implements Listener {
         Plot plot = area.getPlot(location);
         ProjectileSource shooter = entity.getShooter();
         if (shooter instanceof Player) {
-            if (!((Player) shooter).isOnline()) {
-                if (plot != null) {
-                    if (plot.isAdded(((Player) shooter).getUniqueId()) || plot.getFlag(ProjectilesFlag.class)) {
-                        return;
-                    }
-                } else if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true)) {
-                    return;
-                }
-
-                entity.remove();
-                event.setCancelled(true);
-                return;
-            }
-
             PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
             if (plot == null) {
-                if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !Permissions.hasPermission(
-                        pp,
-                        Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED
-                )) {
+                if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
                     entity.remove();
                     event.setCancelled(true);
                 }
@@ -204,6 +182,7 @@ public class ProjectileEventListener implements Listener {
             if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
                 entity.remove();
                 event.setCancelled(true);
+                return;
             }
         }
     }

Bukkit/src/main/java/com/plotsquared/bukkit/listener/SpigotListener.java

@@ -1,57 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.listener;
-
-import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.location.Location;
-import com.plotsquared.core.plot.Plot;
-import com.plotsquared.core.plot.flag.FlagContainer;
-import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityPotionEffectEvent;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Fallback listener for paper events on spigot
- */
-public class SpigotListener implements Listener {
-
-    @EventHandler(ignoreCancelled = true)
-    public void onEffect(@NonNull EntityPotionEffectEvent event) {
-        if (event.getCause() != EntityPotionEffectEvent.Cause.BEACON) {
-            return;
-        }
-
-        Entity entity = event.getEntity();
-        Location location = BukkitUtil.adapt(entity.getLocation());
-        Plot plot = location.getPlot();
-        if (plot == null) {
-            return;
-        }
-
-        FlagContainer container = plot.getFlagContainer();
-        BeaconEffectsFlag effectsEnabled = container.getFlag(BeaconEffectsFlag.class);
-        if (effectsEnabled != null && !effectsEnabled.getValue()) {
-            event.setCancelled(true);
-        }
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java

@@ -30,9 +30,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  *
  * @deprecated Deprecated and scheduled for removal without replacement
  *         in favor of the build in setup wizard.
- *         However, this class will be kept around for a while, given it's not a maintenance burden.
  */
-@Deprecated
+@Deprecated(forRemoval = true, since = "6.0.0")
 @Singleton
 public class MultiverseWorldManager extends BukkitWorldManager {
 

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java

@@ -47,13 +47,13 @@ import org.bukkit.event.EventException;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.RegisteredListener;
-import org.bukkit.potion.PotionEffectType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static com.sk89q.worldedit.world.gamemode.GameModes.ADVENTURE;
 import static com.sk89q.worldedit.world.gamemode.GameModes.CREATIVE;
@@ -67,15 +67,14 @@ public class BukkitPlayer extends PlotPlayer<Player> {
     private String name;
 
     /**
+     * <p>Please do not use this method. Instead use
+     * BukkitUtil.getPlayer(Player), as it caches player objects.</p>
+     *
      * @param plotAreaManager   PlotAreaManager instance
      * @param eventDispatcher   EventDispatcher instance
      * @param player            Bukkit player instance
      * @param permissionHandler PermissionHandler instance
-     *
-     * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
-     * This method will be made private in a future release.
      */
-    @Deprecated(forRemoval = true, since = "TODO")
     public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher,
             final @NonNull Player player, final @NonNull PermissionHandler permissionHandler
@@ -83,16 +82,6 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         this(plotAreaManager, eventDispatcher, player, false, permissionHandler);
     }
 
-    /**
-     * @param plotAreaManager   PlotAreaManager instance
-     * @param eventDispatcher   EventDispatcher instance
-     * @param player            Bukkit player instance
-     * @param permissionHandler PermissionHandler instance
-     *
-     * @deprecated Please do not use this method. Instead use {@link BukkitUtil#adapt(Player)}, as it caches player objects.
-     * This method will be made private in a future release.
-     */
-    @Deprecated(forRemoval = true, since = "TODO")
     public BukkitPlayer(
             final @NonNull PlotAreaManager plotAreaManager, final @NonNull
             EventDispatcher eventDispatcher, final @NonNull Player player,
@@ -359,14 +348,6 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         return BukkitUtil.BUKKIT_AUDIENCES.player(this.player);
     }
 
-    @Override
-    public void removeEffect(@NonNull String name) {
-        PotionEffectType type = PotionEffectType.getByName(name);
-        if (type != null) {
-            player.removePotionEffect(type);
-        }
-    }
-
     @Override
     public boolean canSee(final PlotPlayer<?> other) {
         if (other instanceof ConsolePlayer) {

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java

@@ -54,7 +54,6 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
 
     @NonNull
     @Override
-    @SuppressWarnings("deprecation")
     public BukkitPlayer getPlayer(final @NonNull Player object) {
         if (object.getUniqueId().version() == 2) { // not a real player
             return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);
@@ -66,7 +65,6 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public @NonNull BukkitPlayer createPlayer(final @NonNull UUID uuid) {
         final Player player = Bukkit.getPlayer(uuid);
         if (player == null || !player.isOnline()) {

Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java

@@ -19,12 +19,12 @@
 package com.plotsquared.bukkit.queue;
 
 import com.google.common.base.Preconditions;
-import com.intellectualsites.annotations.DoNotUse;
 import com.plotsquared.bukkit.util.BukkitBlockUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.location.ChunkWrapper;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.queue.ScopedQueueCoordinator;
+import com.plotsquared.core.util.AnnotationHelper;
 import com.plotsquared.core.util.ChunkUtil;
 import com.plotsquared.core.util.PatternUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -44,7 +44,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Arrays;
 
-@DoNotUse
+@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
 public class GenChunk extends ScopedQueueCoordinator {
 
     public final Biome[] biomes;
@@ -183,11 +183,7 @@ public class GenChunk extends ScopedQueueCoordinator {
 
     @Override
     public boolean setBlock(int x, int y, int z, @NonNull Pattern pattern) {
-        final BaseBlock block = PatternUtil.apply(Preconditions.checkNotNull(
-                pattern,
-                "Pattern may not be null"
-        ), x + (chunkX << 4), y, z + (chunkZ << 4));
-        return setBlock(x, y, z, block);
+        return setBlock(x, y, z, PatternUtil.apply(Preconditions.checkNotNull(pattern, "Pattern may not be null"), x, y, z));
     }
 
     @Override

Bukkit/src/main/java/com/plotsquared/bukkit/queue/LimitedRegionWrapperQueue.java

@@ -27,7 +27,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
@@ -41,10 +41,9 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  */
 public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final LimitedRegion limitedRegion;
-    private boolean useOtherRestoreTagMethod = false;
 
     /**
      * @since 6.9.0
@@ -66,18 +65,10 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
             CompoundTag tag = id.getNbtData();
             StateWrapper sw = new StateWrapper(tag);
             try {
-                if (useOtherRestoreTagMethod && getWorld() != null) {
-                    sw.restoreTag(getWorld().getName(), x, y, z);
-                } else {
-                    sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
-                }
+                sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
             } catch (IllegalArgumentException e) {
                 LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
                 return false;
-            } catch (IllegalStateException e) {
-                useOtherRestoreTagMethod = true;
-                LOGGER.warn("IllegalStateException attempting to populate tile entity into the world at location {},{},{}. " +
-                        "Possibly on <=1.17.1, switching to secondary method.", x, y, z, e);
             }
         }
         return result;

Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java

@@ -47,7 +47,7 @@ import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -58,7 +58,6 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
 import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.type.WallSign;
-import org.bukkit.entity.Allay;
 import org.bukkit.entity.Ambient;
 import org.bukkit.entity.Animals;
 import org.bukkit.entity.AreaEffectCloud;
@@ -109,7 +108,7 @@ public class BukkitUtil extends WorldUtil {
     public static final BukkitAudiences BUKKIT_AUDIENCES = BukkitAudiences.create(BukkitPlatform.getPlugin(BukkitPlatform.class));
     public static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.legacySection();
     public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitUtil.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private final Collection<BlockType> tileEntityTypes = new HashSet<>();
 
     /**
@@ -438,9 +437,6 @@ public class BukkitUtil extends WorldUtil {
                 allowedInterfaces.add(Animals.class);
                 allowedInterfaces.add(WaterMob.class);
                 allowedInterfaces.add(Ambient.class);
-                if (PlotSquared.platform().serverVersion()[1] >= 19) {
-                    allowedInterfaces.add(Allay.class);
-                }
             }
             case "tameable" -> allowedInterfaces.add(Tameable.class);
             case "vehicle" -> allowedInterfaces.add(Vehicle.class);

Bukkit/src/main/java/com/plotsquared/bukkit/util/ContentMap.java

@@ -26,7 +26,7 @@ import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -40,7 +40,7 @@ import java.util.Set;
 
 public class ContentMap {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ContentMap.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     final Set<EntityWrapper> entities;
     final Map<PlotLoc, BaseBlock[]> allBlocks;

Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java

@@ -25,7 +25,7 @@ import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.PlotVersion;
 import com.plotsquared.core.configuration.Settings;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
@@ -39,7 +39,7 @@ import java.net.URL;
 
 public class UpdateUtility implements Listener {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + UpdateUtility.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     public static PlotVersion internalVersion;
     public static String spigotVersion;

Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweRegionManager.java

@@ -36,7 +36,8 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
 
@@ -45,7 +46,10 @@ public class FaweRegionManager extends BukkitRegionManager {
     private final FaweDelegateRegionManager delegate = new FaweDelegateRegionManager();
 
     @Inject
-    public FaweRegionManager(WorldUtil worldUtil, GlobalBlockQueue blockQueue, ProgressSubscriberFactory subscriberFactory) {
+    public FaweRegionManager(
+            @NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull
+            ProgressSubscriberFactory subscriberFactory
+    ) {
         super(worldUtil, blockQueue, subscriberFactory);
     }
 
@@ -72,9 +76,9 @@ public class FaweRegionManager extends BukkitRegionManager {
 
     @Override
     public boolean handleClear(
-            @NonNull Plot plot,
+            @NotNull Plot plot,
             @Nullable Runnable whenDone,
-            @NonNull PlotManager manager,
+            @NotNull PlotManager manager,
             final @Nullable PlotPlayer<?> player
     ) {
         if (!Settings.FAWE_Components.CLEAR || !(manager instanceof HybridPlotManager)) {

Bukkit/src/main/java/com/plotsquared/bukkit/util/fawe/FaweSchematicHandler.java

@@ -29,7 +29,7 @@ import com.plotsquared.core.util.SchematicHandler;
 import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.sk89q.jnbt.CompoundTag;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -40,7 +40,7 @@ public class FaweSchematicHandler extends SchematicHandler {
     private final FaweDelegateSchematicHandler delegate = new FaweDelegateSchematicHandler();
 
     @Inject
-    public FaweSchematicHandler(WorldUtil worldUtil, ProgressSubscriberFactory subscriberFactory) {
+    public FaweSchematicHandler(@NotNull WorldUtil worldUtil, @NotNull ProgressSubscriberFactory subscriberFactory) {
         super(worldUtil, subscriberFactory);
     }
 
@@ -75,7 +75,7 @@ public class FaweSchematicHandler extends SchematicHandler {
     }
 
     @Override
-    public Schematic getSchematic(@NonNull InputStream is) {
+    public Schematic getSchematic(@NotNull InputStream is) {
         return delegate.getSchematic(is);
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java

@@ -22,7 +22,7 @@ import com.google.common.util.concurrent.RateLimiter;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.uuid.UUIDMapping;
 import com.plotsquared.core.uuid.UUIDService;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.enginehub.squirrelid.Profile;
@@ -41,7 +41,7 @@ import java.util.UUID;
 @SuppressWarnings("UnstableApiUsage")
 public class SquirrelIdUUIDService implements UUIDService {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SquirrelIdUUIDService.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final ProfileService profileService;
     private final RateLimiter rateLimiter;

Core/build.gradle.kts

@@ -43,7 +43,6 @@ dependencies {
     api(libs.cloudServices)
     api(libs.arkitektonika)
     api("com.intellectualsites.paster:Paster")
-    api("com.intellectualsites.informative-annotations:informative-annotations")
 }
 
 tasks.processResources {
@@ -54,29 +53,14 @@ tasks.processResources {
                 "date" to rootProject.grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd"))
         )
     }
-
-    doLast {
-        copy {
-            from(File("$rootDir/LICENSE"))
-            into("$buildDir/resources/main/")
-        }
-    }
 }
 
 tasks {
     withType<Javadoc> {
-        val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
         opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
-        opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")
-        opt.isLinkSource = true
-        opt.bottom(File("$rootDir/javadocfooter.html").readText())
-        opt.isUse = true
-        opt.encoding("UTF-8")
-        opt.keyWords()
-        opt.addStringOption("-since", isRelease)
     }
 }

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -22,7 +22,6 @@ import cloud.commandframework.services.ServicePipeline;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import com.intellectualsites.annotations.DoNotUse;
 import com.plotsquared.core.backup.BackupManager;
 import com.plotsquared.core.configuration.caption.LocaleHolder;
 import com.plotsquared.core.generator.GeneratorWrapper;
@@ -32,9 +31,9 @@ import com.plotsquared.core.inject.annotations.DefaultGenerator;
 import com.plotsquared.core.location.World;
 import com.plotsquared.core.permissions.PermissionHandler;
 import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.queue.GlobalBlockQueue;
+import com.plotsquared.core.util.AnnotationHelper;
 import com.plotsquared.core.util.ChunkManager;
 import com.plotsquared.core.util.EconHandler;
 import com.plotsquared.core.util.PlatformWorldManager;
@@ -76,11 +75,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     void shutdown();
 
-    /**
-     * Completely shuts down the server.
-     */
-    void shutdownServer();
-
     /**
      * Get the name of the plugin
      *
@@ -285,16 +279,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
         return injector().getInstance(ChunkManager.class);
     }
 
-    /**
-     * Get the {@link ExpireManager} implementation for the platform
-     *
-     * @return Expire manager
-     * @since 6.10.2
-     */
-    default @NonNull ExpireManager expireManager() {
-        return injector().getInstance(ExpireManager.class);
-    }
-
     /**
      * Get the {@link PlotAreaManager} implementation.
      *
@@ -324,7 +308,7 @@ public interface PlotPlatform<P> extends LocaleHolder {
      * @return worldedit implementations
      * @since 6.3.0
      */
-    @DoNotUse
+    @AnnotationHelper.ApiDescription(info = "Internal use only")
     @NonNull String worldEditImplementations();
 
     /**

Core/src/main/java/com/plotsquared/core/PlotSquared.java

@@ -69,7 +69,7 @@ import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.util.eventbus.EventHandler;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -117,7 +117,7 @@ import java.util.zip.ZipInputStream;
 @SuppressWarnings({"WeakerAccess"})
 public class PlotSquared {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotSquared.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static @MonotonicNonNull PlotSquared instance;
 
     // Implementation
@@ -197,9 +197,6 @@ public class PlotSquared {
             this.loadCaptionMap();
         } catch (final Exception e) {
             LOGGER.error("Failed to load caption map", e);
-            LOGGER.error("Shutting down server to prevent further issues");
-            this.platform.shutdownServer();
-            throw new RuntimeException("Abort loading PlotSquared");
         }
 
         // Setup the global flag container
@@ -270,7 +267,7 @@ public class PlotSquared {
             captionMap = this.captionLoader.loadAll(this.platform.getDirectory().toPath().resolve("lang"));
         } else {
             String fileName = "messages_" + Settings.Enabled_Components.DEFAULT_LOCALE + ".json";
-            captionMap = this.captionLoader.loadOrCreateSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName));
+            captionMap = this.captionLoader.loadSingle(this.platform.getDirectory().toPath().resolve("lang").resolve(fileName));
         }
         this.captionMaps.put(TranslatableCaption.DEFAULT_NAMESPACE, captionMap);
         LOGGER.info(
@@ -290,11 +287,11 @@ public class PlotSquared {
 
     public void startExpiryTasks() {
         if (Settings.Enabled_Components.PLOT_EXPIRY) {
-            ExpireManager expireManager = PlotSquared.platform().expireManager();
-            expireManager.runAutomatedTask();
+            ExpireManager.IMP = new ExpireManager(this.eventDispatcher);
+            ExpireManager.IMP.runAutomatedTask();
             for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
                 ExpiryTask task = new ExpiryTask(settings, this.getPlotAreaManager());
-                expireManager.addTask(task);
+                ExpireManager.IMP.addTask(task);
             }
         }
     }
@@ -645,8 +642,7 @@ public class PlotSquared {
         } else {
             list = new ArrayList<>(input);
         }
-        ExpireManager expireManager = PlotSquared.platform().expireManager();
-        list.sort(Comparator.comparingLong(a -> expireManager.getTimestamp(a.getOwnerAbs())));
+        list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.getOwnerAbs())));
         return list;
     }
 

Core/src/main/java/com/plotsquared/core/command/Auto.java

@@ -251,7 +251,6 @@ public class Auto extends SubCommand {
                     TranslatableCaption.of("permission.no_permission"),
                     Template.of("node", String.valueOf(Permission.PERMISSION_AUTO_MEGA))
             );
-            return false;
         }
         if (!force && sizeX * sizeZ > Settings.Claim.MAX_AUTO_AREA) {
             player.sendMessage(

Core/src/main/java/com/plotsquared/core/command/Buy.java

@@ -126,7 +126,6 @@ public class Buy extends Command {
                 plot.removeFlag(event.getFlag());
             }
             plot.setOwner(player.getUUID());
-            plot.getPlotModificationManager().setSign(player.getName());
             player.sendMessage(
                     TranslatableCaption.of("working.claimed"),
                     Template.of("plot", plot.getId().toString())

Core/src/main/java/com/plotsquared/core/command/Claim.java

@@ -39,7 +39,7 @@ import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PlotExpression;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -51,7 +51,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
         usage = "/plot claim")
 public class Claim extends SubCommand {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Claim.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final EventDispatcher eventDispatcher;
     private final EconHandler econHandler;

Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java

@@ -176,7 +176,7 @@ public class DatabaseCommand extends SubCommand {
                                                         );
                                                 worldFile.renameTo(newFile);
                                             }
-                                            plot.setId(newId);
+                                            plot.setId(newId.copy());
                                             plot.setArea(pa);
                                             plots.add(plot);
                                             continue;

Core/src/main/java/com/plotsquared/core/command/DebugExec.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.caption.StaticCaption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotFlagRemoveEvent;
@@ -140,7 +139,10 @@ public class DebugExec extends SubCommand {
                     return true;
                 }
                 case "start-expire" -> {
-                    if (PlotSquared.platform().expireManager().runAutomatedTask()) {
+                    if (ExpireManager.IMP == null) {
+                        ExpireManager.IMP = new ExpireManager(this.eventDispatcher);
+                    }
+                    if (ExpireManager.IMP.runAutomatedTask()) {
                         player.sendMessage(TranslatableCaption.of("debugexec.expiry_started"));
                     } else {
                         player.sendMessage(TranslatableCaption.of("debugexec.expiry_already_started"));
@@ -148,7 +150,7 @@ public class DebugExec extends SubCommand {
                     return true;
                 }
                 case "stop-expire" -> {
-                    if (!PlotSquared.platform().expireManager().cancelTask()) {
+                    if (ExpireManager.IMP == null || !ExpireManager.IMP.cancelTask()) {
                         player.sendMessage(TranslatableCaption.of("debugexec.task_halted"));
                     } else {
                         player.sendMessage(TranslatableCaption.of("debugexec.task_cancelled"));

Core/src/main/java/com/plotsquared/core/command/Done.java

@@ -19,7 +19,6 @@
 package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlotDoneEvent;
@@ -30,6 +29,7 @@ import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.expiration.PlotAnalysis;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
@@ -94,7 +94,7 @@ public class Done extends SubCommand {
                 Template.of("plot", plot.getId().toString())
         );
         final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
-        if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
+        if (ExpireManager.IMP == null || doneRequirements == null) {
             finish(plot, player, true);
             plot.removeRunning();
         } else {

Core/src/main/java/com/plotsquared/core/command/Download.java

@@ -181,7 +181,6 @@ public class Download extends SubCommand {
                         schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() {
                             @Override
                             public void run(URL value) {
-                                plot.removeRunning();
                                 player.sendMessage(
                                         TranslatableCaption.of("web.generation_link_success"),
                                         Template.of("download", value.toString()),

Core/src/main/java/com/plotsquared/core/command/FlagCommand.java

@@ -462,7 +462,6 @@ public final class FlagCommand extends Command {
             return;
         }
         final Plot plot = player.getLocation().getPlotAbs();
-        final PlotFlag<?, ?> flagWithOldValue = plot.getFlagContainer().getFlag(flag.getClass());
         PlotFlagRemoveEvent event = eventDispatcher.callFlagRemove(flag, plot);
         if (event.getEventResult() == Result.DENY) {
             player.sendMessage(
@@ -507,7 +506,7 @@ public final class FlagCommand extends Command {
                     if (plot.removeFlag(flag)) {
                         player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
                                 "value",
-                                String.valueOf(flagWithOldValue)
+                                String.valueOf(flag)
                         ));
                         return;
                     } else {
@@ -545,7 +544,7 @@ public final class FlagCommand extends Command {
         }
         player.sendMessage(TranslatableCaption.of("flag.flag_removed"), Template.of("flag", args[0]), Template.of(
                 "value",
-                String.valueOf(flagWithOldValue)
+                String.valueOf(flag)
         ));
     }
 

Core/src/main/java/com/plotsquared/core/command/Grant.java

@@ -32,6 +32,7 @@ import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
+import com.plotsquared.core.uuid.UUIDMapping;
 import net.kyori.adventure.text.minimessage.Template;
 
 import java.util.Collection;
@@ -39,7 +40,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
@@ -88,8 +88,8 @@ public class Grant extends Command {
                                 Template.of("value", String.valueOf(uuids))
                         );
                     } else {
-                        final UUID uuid = uuids.iterator().next();
-                        PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuid);
+                        final UUIDMapping uuid = uuids.toArray(new UUIDMapping[0])[0];
+                        PlotPlayer<?> pp = PlotSquared.platform().playerManager().getPlayerIfExists(uuid.getUuid());
                         if (pp != null) {
                             try (final MetaDataAccess<Integer> access = pp.accessPersistentMetaData(
                                     PlayerMetaDataKeys.PERSISTENT_GRANTED_PLOTS)) {
@@ -103,7 +103,7 @@ public class Grant extends Command {
                                 }
                             }
                         } else {
-                            DBFunc.getPersistentMeta(uuid, new RunnableVal<>() {
+                            DBFunc.getPersistentMeta(uuid.getUuid(), new RunnableVal<>() {
                                 @Override
                                 public void run(Map<String, byte[]> value) {
                                     final byte[] array = value.get("grantedPlots");
@@ -128,7 +128,7 @@ public class Grant extends Command {
                                         boolean replace = array != null;
                                         String key = "grantedPlots";
                                         byte[] rawData = Ints.toByteArray(amount);
-                                        DBFunc.addPersistentMeta(uuid, key, rawData, replace);
+                                        DBFunc.addPersistentMeta(uuid.getUuid(), key, rawData, replace);
                                         player.sendMessage(
                                                 TranslatableCaption.of("grants.added"),
                                                 Template.of("grants", String.valueOf(amount))

Core/src/main/java/com/plotsquared/core/command/ListCmd.java

@@ -30,6 +30,7 @@ import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.PriceFlag;
 import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
@@ -239,7 +240,7 @@ public class ListCmd extends SubCommand {
                     );
                     return false;
                 }
-                if (PlotSquared.platform().expireManager() == null) {
+                if (ExpireManager.IMP == null) {
                     plotConsumer.accept(PlotQuery.newQuery().noPlots());
                 } else {
                     plotConsumer.accept(PlotQuery.newQuery().expiredPlots());

Core/src/main/java/com/plotsquared/core/command/MainCommand.java

@@ -36,7 +36,7 @@ import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PlotExpression;
 import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 
 import java.util.Arrays;
@@ -51,7 +51,7 @@ import java.util.concurrent.CompletableFuture;
         aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
 public class MainCommand extends Command {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + MainCommand.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private static MainCommand instance;
     public Help help;

Core/src/main/java/com/plotsquared/core/command/Merge.java

@@ -282,28 +282,7 @@ public class Merge extends SubCommand {
                 run.run();
             }
         }
-        if (force || !isOnline) {
-            if (force || Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE_OTHER_OFFLINE)) {
-                if (plot.getPlotModificationManager().autoMerge(direction, maxSize - size, uuids.iterator().next(), player, terrain)) {
-                    if (this.econHandler.isEnabled(plotArea) && price > 0d) {
-                        if (!force && this.econHandler.getMoney(player) < price) {
-                            player.sendMessage(
-                                    TranslatableCaption.of("economy.cannot_afford_merge"),
-                                    Template.of("money", this.econHandler.format(price))
-                            );
-                            return false;
-                        }
-                        this.econHandler.withdrawMoney(player, price);
-                        player.sendMessage(
-                                TranslatableCaption.of("economy.removed_balance"),
-                                Template.of("money", this.econHandler.format(price))
-                        );
-                    }
-                    player.sendMessage(TranslatableCaption.of("merge.success_merge"));
-                    eventDispatcher.callPostMerge(player, plot);
-                    return true;
-                }
-            }
+        if (!force && !isOnline) {
             player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
             return false;
         }

Core/src/main/java/com/plotsquared/core/command/Near.java

@@ -26,7 +26,6 @@ import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
 import net.kyori.adventure.text.minimessage.Template;
 
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @CommandDeclaration(command = "near",
@@ -49,13 +48,9 @@ public class Near extends Command {
         final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot"));
         player.sendMessage(
                 TranslatableCaption.of("near.plot_near"),
-                Template.of("list", StringMan.join(getPlayersInPlotVisible(plot, player), ", "))
+                Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", "))
         );
         return CompletableFuture.completedFuture(true);
     }
 
-    private List<PlotPlayer<?>> getPlayersInPlotVisible(Plot plot, PlotPlayer<?> executor) {
-        return plot.getPlayersInPlot().stream().filter(executor::canSee).toList();
-    }
-
 }

Core/src/main/java/com/plotsquared/core/command/Purge.java

@@ -34,7 +34,7 @@ import com.plotsquared.core.util.query.PlotQuery;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.uuid.UUIDMapping;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
         confirmation = true)
 public class Purge extends SubCommand {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Purge.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final PlotAreaManager plotAreaManager;
     private final PlotListener plotListener;

Core/src/main/java/com/plotsquared/core/command/Remove.java

@@ -115,8 +115,8 @@ public class Remove extends SubCommand {
             }
             if (count == 0) {
                 player.sendMessage(
-                        TranslatableCaption.of("member.player_not_removed"),
-                        Template.of("player", args[0])
+                        TranslatableCaption.of("errors.invalid_player"),
+                        Template.of("value", args[0])
                 );
             } else {
                 player.sendMessage(

Core/src/main/java/com/plotsquared/core/command/Trim.java

@@ -25,6 +25,7 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
@@ -38,7 +39,7 @@ import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -54,7 +55,7 @@ import java.util.Set;
         category = CommandCategory.ADMINISTRATION)
 public class Trim extends SubCommand {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Trim.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static volatile boolean TASK = false;
 
     private final PlotAreaManager plotAreaManager;
@@ -91,8 +92,8 @@ public class Trim extends SubCommand {
         }
         TranslatableCaption.of("trim.trim_starting");
         final List<Plot> plots = PlotQuery.newQuery().inWorld(world).asList();
-        if (PlotSquared.platform().expireManager() != null) {
-            plots.removeAll(PlotSquared.platform().expireManager().getPendingExpired());
+        if (ExpireManager.IMP != null) {
+            plots.removeAll(ExpireManager.IMP.getPendingExpired());
         }
         result.value1 = new HashSet<>(PlotSquared.platform().worldUtil().getChunkChunks(world));
         result.value2 = new HashSet<>();

Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java

@@ -40,7 +40,7 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -61,7 +61,7 @@ import java.util.stream.Collectors;
 public class ComponentPresetManager {
 
     private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ComponentPresetManager.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final List<ComponentPreset> presets;
     private final EconHandler econHandler;

Core/src/main/java/com/plotsquared/core/configuration/Config.java

@@ -21,7 +21,7 @@ package com.plotsquared.core.configuration;
 import com.plotsquared.core.configuration.Settings.Enabled_Components;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.util.StringMan;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
@@ -40,7 +40,7 @@ import java.util.Map;
 
 public class Config {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Config.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     /**
      * Get the value for a node<br>

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -759,8 +759,6 @@ public class Settings extends Config {
         @Comment("Also kill any road mobs that are being ridden, or are leashed")
         public static boolean
                 KILL_OWNED_ROAD_MOBS = false;
-        @Comment("Also kill any road mobs that are named")
-        public static boolean KILL_NAMED_ROAD_MOBS = false;
         @Comment("Kill items on roads (Stick, Paper, etc.)")
         public static boolean KILL_ROAD_ITEMS = false;
         @Comment("Kill vehicles on roads (Boat, Minecart, etc.)")
@@ -810,8 +808,6 @@ public class Settings extends Config {
         );
         @Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not")
         public static boolean USE_MVDWAPI = true;
-        @Comment("Prevent cross plot beacon effects")
-        public static boolean DISABLE_BEACON_EFFECT_OVERFLOW = true;
 
     }
 

Core/src/main/java/com/plotsquared/core/configuration/caption/ClickStripTransform.java

@@ -21,15 +21,16 @@ package com.plotsquared.core.configuration.caption;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.EnumSet;
 import java.util.Set;
 
 final class ClickStripTransform implements ComponentTransform {
 
-    private final Set<ClickEvent.@NonNull Action> actionsToStrip;
+    private final Set<ClickEvent.@NotNull Action> actionsToStrip;
 
-    public ClickStripTransform(final Set<ClickEvent.@NonNull Action> actionsToStrip) {
+    public ClickStripTransform(final Set<ClickEvent.@NotNull Action> actionsToStrip) {
         this.actionsToStrip = EnumSet.copyOf(actionsToStrip);
     }
 

Core/src/main/java/com/plotsquared/core/configuration/caption/load/CaptionLoader.java

@@ -25,7 +25,7 @@ import com.plotsquared.core.configuration.caption.CaptionMap;
 import com.plotsquared.core.configuration.caption.LocalizedCaptionMap;
 import com.plotsquared.core.configuration.caption.PerUserLocaleCaptionMap;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -54,7 +54,7 @@ import java.util.stream.Stream;
  */
 public final class CaptionLoader {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + CaptionLoader.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private static final Gson GSON;
 
@@ -174,7 +174,7 @@ public final class CaptionLoader {
     public @NonNull CaptionMap loadAll(final @NonNull Path directory) throws IOException {
         final Map<Locale, CaptionMap> localeMaps = new HashMap<>();
         try (final Stream<Path> files = Files.list(directory)) {
-            final List<Path> captionFiles = files.filter(Files::isRegularFile).toList();
+            final List<Path> captionFiles = files.filter(Files::isRegularFile).collect(Collectors.toList());
             for (Path file : captionFiles) {
                 try {
                     final CaptionMap localeMap = loadSingle(file);
@@ -190,14 +190,13 @@ public final class CaptionLoader {
 
     /**
      * Load a message file into a new CaptionMap. The file name must match
-     * the pattern expected by the {@link #localeExtractor}.
-     * Note that this method does not attempt to create a new file.
+     * the pattern {@code messages_<locale>.json} where {@code <locale>}
+     * is a valid {@link Locale} string.
      *
      * @param file The file to load
      * @return A new CaptionMap containing the loaded messages
      * @throws IOException              if the file couldn't be accessed or read successfully.
      * @throws IllegalArgumentException if the file name doesn't match the specified format.
-     * @see #loadOrCreateSingle(Path)
      */
     public @NonNull CaptionMap loadSingle(final @NonNull Path file) throws IOException {
         final Locale locale = this.localeExtractor.apply(file);
@@ -206,43 +205,15 @@ public final class CaptionLoader {
             if (patch(map, locale)) {
                 save(file, map); // update the file using the modified map
             }
-            return new LocalizedCaptionMap(locale, mapToCaptions(map));
+            return new LocalizedCaptionMap(locale, map.entrySet().stream()
+                    .collect(Collectors.toMap(
+                                    entry -> TranslatableCaption.of(this.namespace, entry.getKey()),
+                                    Map.Entry::getValue
+                            )
+                    ));
         }
     }
 
-    /**
-     * Load a message file into a new CaptionMap. The file name must match
-     * the pattern expected by the {@link #localeExtractor}.
-     * If no file exists at the given path, this method will
-     * attempt to create one and fill it with default values.
-     *
-     * @param file The file to load
-     * @return A new CaptionMap containing the loaded messages
-     * @throws IOException              if the file couldn't be accessed or read successfully.
-     * @throws IllegalArgumentException if the file name doesn't match the specified format.
-     * @see #loadSingle(Path)
-     * @since 6.9.3
-     */
-    public @NonNull CaptionMap loadOrCreateSingle(final @NonNull Path file) throws IOException {
-        final Locale locale = this.localeExtractor.apply(file);
-        if (!Files.exists(file) ) {
-            Map<String, String> map = new LinkedHashMap<>();
-            patch(map, locale);
-            save(file, map);
-            return new LocalizedCaptionMap(locale, mapToCaptions(map));
-        } else {
-            return loadSingle(file);
-        }
-    }
-
-    private @NonNull Map<TranslatableCaption, String> mapToCaptions(Map<String, String> map) {
-        return map.entrySet().stream().collect(
-                Collectors.toMap(
-                        entry -> TranslatableCaption.of(this.namespace, entry.getKey()),
-                        Map.Entry::getValue
-                ));
-    }
-
     /**
      * Add missing entries to the given map.
      * Entries are missing if the key exists in {@link #defaultLocale} but isn't present

Core/src/main/java/com/plotsquared/core/configuration/caption/load/ClassLoaderCaptionProvider.java

@@ -18,7 +18,7 @@
  */
 package com.plotsquared.core.configuration.caption.load;
 
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -35,7 +35,7 @@ import static com.plotsquared.core.configuration.caption.load.CaptionLoader.load
 
 final class ClassLoaderCaptionProvider implements DefaultCaptionProvider {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassLoaderCaptionProvider.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private final ClassLoader classLoader;
     private final Function<@NonNull Locale, @NonNull String> urlProvider;
 
@@ -53,10 +53,7 @@ final class ClassLoaderCaptionProvider implements DefaultCaptionProvider {
         try {
             final InputStream stream = this.classLoader.getResourceAsStream(url);
             if (stream == null) {
-                LOGGER.info("No resource for locale '{}' found in the plugin file." +
-                                "Please ensure you have placed the latest version of the file messages_{}.json in the 'lang' folder." +
-                                "You may be able to find completed translations at https://intellectualsites.crowdin.com/plotsquared",
-                        locale, locale);
+                LOGGER.warn("No resource for locale '{}' found", locale);
                 return null;
             }
             try (final BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) {

Core/src/main/java/com/plotsquared/core/configuration/file/YamlConfiguration.java

@@ -21,7 +21,7 @@ package com.plotsquared.core.configuration.file;
 import com.plotsquared.core.configuration.Configuration;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.InvalidConfigurationException;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -40,7 +40,7 @@ import java.util.Map;
  */
 public class YamlConfiguration extends FileConfiguration {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + YamlConfiguration.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private static final String COMMENT_PREFIX = "# ";
     private static final String BLANK_CONFIG = "{}\n";

Core/src/main/java/com/plotsquared/core/database/SQLManager.java

@@ -44,7 +44,7 @@ import com.plotsquared.core.util.HashUtil;
 import com.plotsquared.core.util.StringMan;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -78,7 +78,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 @SuppressWarnings("SqlDialectInspection")
 public class SQLManager implements AbstractDB {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SQLManager.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     // Public final
     public final String SET_OWNER;

Core/src/main/java/com/plotsquared/core/database/SQLite.java

@@ -19,7 +19,7 @@
 package com.plotsquared.core.database;
 
 import com.plotsquared.core.PlotSquared;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
@@ -35,7 +35,7 @@ import java.sql.Statement;
  */
 public class SQLite extends Database {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SQLite.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final String dbLocation;
     private Connection connection;

Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java

@@ -114,7 +114,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     }
 
     /**
-     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)}
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeX(int)} )}
      */
     @Deprecated(forRemoval = true, since = "6.1.0")
     public void setSize_x(int sizeX) {
@@ -130,7 +130,7 @@ public class PlayerAutoPlotEvent extends PlotEvent implements CancellablePlotEve
     }
 
     /**
-     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)}
+     * @deprecated for removal. Use {@link PlayerAutoPlotEvent#setSizeZ(int)} )}
      */
     @Deprecated(forRemoval = true, since = "6.1.0")
     public void setSize_z(int sizeZ) {

Core/src/main/java/com/plotsquared/core/generator/ClassicPlotWorld.java

@@ -28,17 +28,13 @@ import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.plot.BlockBucket;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.queue.GlobalBlockQueue;
-import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import javax.annotation.Nullable;
 
 @SuppressWarnings("WeakerAccess")
 public abstract class ClassicPlotWorld extends SquarePlotWorld {
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ClassicPlotWorld.class.getSimpleName());
 
     public int ROAD_HEIGHT = 62;
     public int PLOT_HEIGHT = 62;
@@ -125,15 +121,15 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         super.loadConfiguration(config);
         this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
         this.PLOT_HEIGHT = Math.min(getMaxGenHeight(), config.getInt("plot.height"));
-        this.MAIN_BLOCK = createCheckedBlockBucket(config.getString("plot.filling"), MAIN_BLOCK);
-        this.TOP_BLOCK = createCheckedBlockBucket(config.getString("plot.floor"), TOP_BLOCK);
-        this.WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block"), WALL_BLOCK);
+        this.MAIN_BLOCK = new BlockBucket(config.getString("plot.filling"));
+        this.TOP_BLOCK = new BlockBucket(config.getString("plot.floor"));
+        this.WALL_BLOCK = new BlockBucket(config.getString("wall.block"));
         this.ROAD_HEIGHT = Math.min(getMaxGenHeight(), config.getInt("road.height"));
-        this.ROAD_BLOCK = createCheckedBlockBucket(config.getString("road.block"), ROAD_BLOCK);
-        this.WALL_FILLING = createCheckedBlockBucket(config.getString("wall.filling"), WALL_FILLING);
+        this.ROAD_BLOCK = new BlockBucket(config.getString("road.block"));
+        this.WALL_FILLING = new BlockBucket(config.getString("wall.filling"));
         this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
         this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
-        this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
+        this.CLAIMED_WALL_BLOCK = new BlockBucket(config.getString("wall.block_claimed"));
     }
 
     int schematicStartHeight() {
@@ -144,19 +140,4 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         return Math.min(WALL_HEIGHT, plotRoadMin);
     }
 
-    private static BlockBucket createCheckedBlockBucket(String input, BlockBucket def) {
-        final BlockBucket bucket = new BlockBucket(input);
-        Pattern pattern = null;
-        try {
-            pattern = bucket.toPattern();
-        } catch (Exception ignore) {
-        }
-        if (pattern == null) {
-            LOGGER.error("Failed to parse pattern '{}', check your worlds.yml", input);
-            LOGGER.error("Falling back to {}", def);
-            return def;
-        }
-        return bucket;
-    }
-
 }

Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java

@@ -174,9 +174,8 @@ public class HybridPlotManager extends ClassicPlotManager {
                     for (int y = 0; y < blocks.length; y++) {
                         if (blocks[y] != null) {
                             queue.setBlock(x, minY + y, z, blocks[y]);
-                        } else if (!isRoad) {
+                        } else {
                             // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear
-                            //  Do not set air for road as this may cause cavernous roads when debugroadregen is used
                             queue.setBlock(x, minY + y, z, airBlock);
                         }
                     }

Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java

@@ -20,7 +20,6 @@ package com.plotsquared.core.generator;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.intellectualsites.annotations.DoNotUse;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.Settings;
@@ -34,6 +33,7 @@ import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.plot.PlotManager;
 import com.plotsquared.core.plot.schematic.Schematic;
 import com.plotsquared.core.queue.GlobalBlockQueue;
+import com.plotsquared.core.util.AnnotationHelper;
 import com.plotsquared.core.util.FileUtils;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.SchematicHandler;
@@ -50,7 +50,7 @@ import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -64,7 +64,7 @@ import java.util.Locale;
 
 public class HybridPlotWorld extends ClassicPlotWorld {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridPlotWorld.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final AffineTransform transform = new AffineTransform().rotateY(90);
     public boolean ROAD_SCHEMATIC_ENABLED;
     public boolean PLOT_SCHEMATIC = false;
@@ -93,10 +93,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     @Inject
     public HybridPlotWorld(
             @Assisted("world") final String worldName,
-            @javax.annotation.Nullable @Assisted("id") final String id,
+            @Nullable @Assisted("id") final String id,
             @Assisted final @NonNull IndependentPlotGenerator generator,
-            @javax.annotation.Nullable @Assisted("min") final PlotId min,
-            @javax.annotation.Nullable @Assisted("max") final PlotId max,
+            @Nullable @Assisted("min") final PlotId min,
+            @Nullable @Assisted("max") final PlotId max,
             @WorldConfig final @NonNull YamlConfiguration worldConfiguration,
             final @NonNull GlobalBlockQueue blockQueue
     ) {
@@ -281,12 +281,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
 
         int maxSchematicHeight = 0;
-        int plotSchemHeight = 0;
 
         // SCHEM_Y should be normalised to the plot "start" height
         if (schematic3 != null) {
-            plotSchemHeight = maxSchematicHeight = schematic3.getClipboard().getDimensions().getY();
-            if (maxSchematicHeight == worldGenHeight) {
+            if ((maxSchematicHeight = schematic3.getClipboard().getDimensions().getY()) == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();
                 plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
@@ -295,15 +293,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             }
         }
 
-        int roadSchemHeight;
-
         if (schematic1 != null) {
-            roadSchemHeight = Math.max(
+            if ((maxSchematicHeight = Math.max(
                     schematic1.getClipboard().getDimensions().getY(),
-                    schematic2.getClipboard().getDimensions().getY()
-            );
-            maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
-            if (maxSchematicHeight == worldGenHeight) {
+                    maxSchematicHeight
+            )) == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();
                 roadY = 0; // Road is the lowest schematic
                 if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
@@ -325,11 +319,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                         // Road is the lowest schematic. Normalize plotY to it.
                         plotY = PLOT_HEIGHT - getMinBuildHeight();
                     }
-                    maxSchematicHeight = Math.max(maxSchematicHeight, plotY + plotSchemHeight);
+                    // If plot schematic is not paste-on-top, it will be from min build height thus plotY = 0 as well already.
                 }
-            } else {
-                roadY = minRoadWall - SCHEM_Y;
-                maxSchematicHeight = Math.max(maxSchematicHeight, roadY + roadSchemHeight);
             }
         }
 
@@ -489,7 +480,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /**
      * @deprecated This method should not be available for public API usage and will be made private.
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
+    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
             z += this.SIZE;
@@ -507,14 +498,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int pair = MathMan.pair(x, z);
         BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
         if (y >= height) {
-            if (y > lastOverlayHeightError) {
+            if (y != lastOverlayHeightError) {
                 lastOverlayHeightError = y;
-                LOGGER.error(
-                        "Error adding overlay block in world {}. `y > height`. y={}, height={}",
-                        getWorldName(),
-                        y,
-                        height
-                );
+                LOGGER.error(String.format("Error adding overlay block. `y > height`. y=%s, height=%s", y, height));
             }
             return;
         }
@@ -524,7 +510,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /**
      * @deprecated This method should not be available for public API usage and will be made private.
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
+    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBiome(short x, short z, BiomeType id) {
         if (z < 0) {
             z += this.SIZE;
@@ -545,7 +531,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      *
      * @since 6.9.0
      */
-    @DoNotUse
+    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
     public @Nullable List<Entity> getPlotSchematicEntities() {
         return schem3Entities;
     }
@@ -555,7 +541,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      *
      * @since 6.9.0
      */
-    @DoNotUse
+    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
     public @Nullable BlockVector3 getPlotSchematicMinPoint() {
         return schem3MinPoint;
     }
@@ -565,7 +551,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      *
      * @since 6.9.0
      */
-    @DoNotUse
+    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
     public boolean populationNeeded() {
         return schem1PopulationNeeded || schem2PopulationNeeded || schem3PopulationNeeded;
     }

Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java

@@ -55,7 +55,7 @@ import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -75,7 +75,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class HybridUtils {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridUtils.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
 
     public static HybridUtils manager;
@@ -189,13 +189,13 @@ public class HybridUtils {
                 if (X == ctx) {
                     maxX = tx & 15;
                 } else {
-                    maxX = 15;
+                    maxX = 16;
                 }
                 int maxZ;
                 if (Z == ctz) {
                     maxZ = tz & 15;
                 } else {
-                    maxZ = 15;
+                    maxZ = 16;
                 }
 
                 int chunkBlockX = X << 4;
@@ -221,7 +221,7 @@ public class HybridUtils {
                 }
             });
 
-            final Runnable run = () -> {
+            final Runnable run = () -> TaskManager.runTaskAsync(() -> {
                 int size = width * length;
                 int[] changes = new int[size];
                 int[] faces = new int[size];
@@ -234,52 +234,44 @@ public class HybridUtils {
                         Set<BlockType> types = new HashSet<>();
                         for (int yIndex = 0; yIndex < height; yIndex++) {
                             BlockState old = oldBlocks[yIndex][x][z]; // Nullable
-                            BlockState now = newBlocks[yIndex][x][z]; // Not null
-                            if (now == null) {
-                                throw new NullPointerException(String.format(
-                                        "\"now\" block null attempting to perform plot analysis. Indexes: x=%d of %d, yIndex=%d" +
-                                                " of %d, z=%d of %d",
-                                        x,
-                                        width,
-                                        yIndex,
-                                        height,
-                                        z,
-                                        length
-                                ));
-                            }
-                            if (!now.equals(old) && !(old == null && now.getBlockType().equals(BlockTypes.AIR))) {
-                                changes[i]++;
-                            }
-                            if (now.getBlockType().getMaterial().isAir()) {
-                                air[i]++;
-                            } else {
-                                // check vertices
-                                // modifications_adjacent
-                                if (x > 0 && z > 0 && yIndex > 0 && x < width - 1 && z < length - 1 && yIndex < (height - 1)) {
-                                    if (newBlocks[yIndex - 1][x][z].getBlockType().getMaterial().isAir()) {
-                                        faces[i]++;
-                                    }
-                                    if (newBlocks[yIndex][x - 1][z].getBlockType().getMaterial().isAir()) {
-                                        faces[i]++;
-                                    }
-                                    if (newBlocks[yIndex][x][z - 1].getBlockType().getMaterial().isAir()) {
-                                        faces[i]++;
-                                    }
-                                    if (newBlocks[yIndex + 1][x][z].getBlockType().getMaterial().isAir()) {
-                                        faces[i]++;
-                                    }
-                                    if (newBlocks[yIndex][x + 1][z].getBlockType().getMaterial().isAir()) {
-                                        faces[i]++;
-                                    }
-                                    if (newBlocks[yIndex][x][z + 1].getBlockType().getMaterial().isAir()) {
-                                        faces[i]++;
-                                    }
+                            try {
+                                BlockState now = newBlocks[yIndex][x][z]; // Not null
+                                if (!now.equals(old) && !(old == null && now.getBlockType().equals(BlockTypes.AIR))) {
+                                    changes[i]++;
                                 }
+                                if (now.getBlockType().getMaterial().isAir()) {
+                                    air[i]++;
+                                } else {
+                                    // check vertices
+                                    // modifications_adjacent
+                                    if (x > 0 && z > 0 && yIndex > 0 && x < width - 1 && z < length - 1 && yIndex < (height - 1)) {
+                                        if (newBlocks[yIndex - 1][x][z].getBlockType().getMaterial().isAir()) {
+                                            faces[i]++;
+                                        }
+                                        if (newBlocks[yIndex][x - 1][z].getBlockType().getMaterial().isAir()) {
+                                            faces[i]++;
+                                        }
+                                        if (newBlocks[yIndex][x][z - 1].getBlockType().getMaterial().isAir()) {
+                                            faces[i]++;
+                                        }
+                                        if (newBlocks[yIndex + 1][x][z].getBlockType().getMaterial().isAir()) {
+                                            faces[i]++;
+                                        }
+                                        if (newBlocks[yIndex][x + 1][z].getBlockType().getMaterial().isAir()) {
+                                            faces[i]++;
+                                        }
+                                        if (newBlocks[yIndex][x][z + 1].getBlockType().getMaterial().isAir()) {
+                                            faces[i]++;
+                                        }
+                                    }
 
-                                if (!now.equals(now.getBlockType().getDefaultState())) {
-                                    data[i]++;
+                                    if (!now.equals(now.getBlockType().getDefaultState())) {
+                                        data[i]++;
+                                    }
+                                    types.add(now.getBlockType());
                                 }
-                                types.add(now.getBlockType());
+                            } catch (NullPointerException e) {
+                                e.printStackTrace();
                             }
                         }
                         variety[i] = types.size();
@@ -304,7 +296,7 @@ public class HybridUtils {
                 analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety) * 100);
                 whenDone.value = analysis;
                 whenDone.run();
-            };
+            });
             queue.setCompleteTask(run);
             queue.enqueue();
         });

Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java

@@ -28,7 +28,7 @@ import com.plotsquared.core.queue.QueueCoordinator;
 import com.plotsquared.core.util.HashUtil;
 import com.plotsquared.core.util.RegionManager;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -41,7 +41,7 @@ import java.util.Set;
  */
 public abstract class SquarePlotManager extends GridPlotManager {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SquarePlotManager.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final SquarePlotWorld squarePlotWorld;
     private final RegionManager regionManager;
@@ -114,14 +114,26 @@ public abstract class SquarePlotManager extends GridPlotManager {
             end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
         }
         int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
-        int dx = Math.floorDiv(x, size) + 1;
-        int rx = Math.floorMod(x, size);
-        int dz = Math.floorDiv(z, size) + 1;
-        int rz = Math.floorMod(z, size);
-        if (rz <= pathWidthLower || rz > end || rx <= pathWidthLower || rx > end) {
+        int idx;
+        if (x < 0) {
+            idx = x / size;
+            x = size + (x % size);
+        } else {
+            idx = (x / size) + 1;
+            x = x % size;
+        }
+        int idz;
+        if (z < 0) {
+            idz = z / size;
+            z = size + (z % size);
+        } else {
+            idz = (z / size) + 1;
+            z = z % size;
+        }
+        if (z <= pathWidthLower || z > end || x <= pathWidthLower || x > end) {
             return null;
         } else {
-            return PlotId.of(dx, dz);
+            return PlotId.of(idx, idz);
         }
     }
 
@@ -168,10 +180,24 @@ public abstract class SquarePlotManager extends GridPlotManager {
                 }
                 end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
             }
-            int dx = Math.floorDiv(x, size) + 1;
-            int rx = Math.floorMod(x, size);
-            int dz = Math.floorDiv(z, size) + 1;
-            int rz = Math.floorMod(z, size);
+            int dx;
+            int rx;
+            if (x < 0) {
+                dx = x / size;
+                rx = size + (x % size);
+            } else {
+                dx = (x / size) + 1;
+                rx = x % size;
+            }
+            int dz;
+            int rz;
+            if (z < 0) {
+                dz = z / size;
+                rz = size + (z % size);
+            } else {
+                dz = (z / size) + 1;
+                rz = z % size;
+            }
             PlotId id = PlotId.of(dx, dz);
             boolean[] merged = new boolean[]{rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
             int hash = HashUtil.hash(merged);

Core/src/main/java/com/plotsquared/core/generator/SquarePlotWorld.java

@@ -24,14 +24,14 @@ import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.queue.GlobalBlockQueue;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public abstract class SquarePlotWorld extends GridPlotWorld {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SquarePlotWorld.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     public int PLOT_WIDTH = 42;
     public int ROAD_WIDTH = 7;

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -36,6 +36,7 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotTitle;
 import com.plotsquared.core.plot.PlotWeather;
 import com.plotsquared.core.plot.comment.CommentManager;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.flag.GlobalFlagContainer;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.DenyExitFlag;
@@ -66,13 +67,10 @@ import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -84,7 +82,6 @@ public class PlotListener {
 
     private final HashMap<UUID, Interval> feedRunnable = new HashMap<>();
     private final HashMap<UUID, Interval> healRunnable = new HashMap<>();
-    private final Map<UUID, List<StatusEffect>> playerEffects = new HashMap<>();
 
     private final EventDispatcher eventDispatcher;
 
@@ -134,17 +131,6 @@ public class PlotListener {
                     }
                 }
             }
-
-            if (!playerEffects.isEmpty()) {
-                long currentTime = System.currentTimeMillis();
-                for (Iterator<Map.Entry<UUID, List<StatusEffect>>> iterator =
-                     playerEffects.entrySet().iterator(); iterator.hasNext(); ) {
-                    Map.Entry<UUID, List<StatusEffect>> entry = iterator.next();
-                    List<StatusEffect> effects = entry.getValue();
-                    effects.removeIf(effect -> currentTime > effect.expiresAt);
-                    if (effects.isEmpty()) iterator.remove();
-                }
-            }
         }, TaskTime.seconds(1L));
     }
 
@@ -162,8 +148,8 @@ public class PlotListener {
             if ((last != null) && !last.getId().equals(plot.getId())) {
                 plotExit(player, last);
             }
-            if (PlotSquared.platform().expireManager() != null) {
-                PlotSquared.platform().expireManager().handleEntry(player, plot);
+            if (ExpireManager.IMP != null) {
+                ExpireManager.IMP.handleEntry(player, plot);
             }
             lastPlot.set(plot);
         }
@@ -374,17 +360,6 @@ public class PlotListener {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             final Plot previous = lastPlot.remove();
             this.eventDispatcher.callLeave(player, plot);
-
-            List<StatusEffect> effects = playerEffects.remove(player.getUUID());
-            if (effects != null) {
-                long currentTime = System.currentTimeMillis();
-                effects.forEach(effect -> {
-                    if (currentTime <= effect.expiresAt) {
-                        player.removeEffect(effect.name);
-                    }
-                });
-            }
-
             if (plot.hasOwner()) {
                 PlotArea pw = plot.getArea();
                 if (pw == null) {
@@ -493,23 +468,6 @@ public class PlotListener {
     public void logout(UUID uuid) {
         feedRunnable.remove(uuid);
         healRunnable.remove(uuid);
-        playerEffects.remove(uuid);
-    }
-
-    /**
-     * Marks an effect as a status effect that will be removed on leaving a plot
-     * @param uuid The uuid of the player the effect belongs to
-     * @param name The name of the status effect
-     * @param expiresAt The time when the effect expires
-     * @since 6.10.0
-     */
-    public void addEffect(@NonNull UUID uuid, @NonNull String name, long expiresAt) {
-        List<StatusEffect> effects = playerEffects.getOrDefault(uuid, new ArrayList<>());
-        effects.removeIf(effect -> effect.name.equals(name));
-        if (expiresAt != -1) {
-            effects.add(new StatusEffect(name, expiresAt));
-        }
-        playerEffects.put(uuid, effects);
     }
 
     private static class Interval {
@@ -527,13 +485,4 @@ public class PlotListener {
 
     }
 
-    private record StatusEffect(@NonNull String name, long expiresAt) {
-
-        private StatusEffect(@NonNull String name, long expiresAt) {
-                this.name = name;
-                this.expiresAt = expiresAt;
-            }
-
-        }
-
 }

Core/src/main/java/com/plotsquared/core/location/Location.java

@@ -313,7 +313,7 @@ public sealed class Location extends BlockLoc implements Comparable<Location> pe
     /**
      * Get the absolute {@link Plot}, if any, that contains this location
      *
-     * @return (Absolute) plot containing the location, or {@code null}
+     * @return (Absolute) plot containing the location, or {code null}
      */
     public @Nullable Plot getPlotAbs() {
         final PlotArea area = this.getPlotArea();
@@ -327,7 +327,7 @@ public sealed class Location extends BlockLoc implements Comparable<Location> pe
     /**
      * Get the {@link Plot}, if any, that contains this location
      *
-     * @return plot containing the location, or {@code null}
+     * @return plot containing the location, or {code null}
      */
     public @Nullable Plot getPlot() {
         final PlotArea area = this.getPlotArea();

Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java

@@ -18,7 +18,7 @@
  */
 package com.plotsquared.core.location;
 
-import com.intellectualsites.annotations.DoNotUse;
+import com.plotsquared.core.util.AnnotationHelper;
 import com.sk89q.worldedit.math.BlockVector3;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -28,7 +28,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  *
  * @since 6.9.0
  */
-@DoNotUse
+@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
 public final class UncheckedWorldLocation extends Location {
 
     private final String worldName;
@@ -54,7 +54,7 @@ public final class UncheckedWorldLocation extends Location {
      *
      * @since 6.9.0
      */
-    @DoNotUse
+    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
     public static @NonNull UncheckedWorldLocation at(
             final @NonNull String world, final int x, final int y, final int z
     ) {
@@ -62,7 +62,7 @@ public final class UncheckedWorldLocation extends Location {
     }
 
     @Override
-    @DoNotUse
+    @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.")
     public @NonNull String getWorldName() {
         return this.worldName;
     }

Core/src/main/java/com/plotsquared/core/permissions/Permission.java

@@ -162,7 +162,6 @@ public enum Permission {
     PERMISSION_LIST_AREA("plots.list.area"),
     PERMISSION_ADMIN_COMMAND_LOAD("plots.admin.command.load"),
     PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge"),
-    PERMISSION_ADMIN_COMMAND_MERGE_OTHER_OFFLINE("plots.admin.command.merge.other.offline"),
     PERMISSION_ADMIN_COMMAND_SET_OWNER("plots.admin.command.setowner"),
     PERMISSION_COMMENT("plots.comment"),
     PERMISSION_INBOX("plots.inbox"),

Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java

@@ -246,10 +246,6 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
         return PlotSquared.platform().consoleAudience();
     }
 
-    @Override
-    public void removeEffect(@NonNull String name) {
-    }
-
     @Override
     public boolean canSee(final PlotPlayer<?> other) {
         return true;

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -42,6 +42,7 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotCluster;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.plot.PlotWeather;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.plot.world.SinglePlotArea;
@@ -60,7 +61,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.title.Title;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -90,7 +91,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     private static final String NON_EXISTENT_CAPTION = "<red>PlotSquared does not recognize the caption: ";
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotPlayer.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     // Used to track debug mode
     private static final Set<PlotPlayer<?>> debugModeEnabled =
@@ -617,8 +618,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
                 LOGGER.info("Plot {} was deleted + cleared due to {} getting banned", owned.getId(), getName());
             }
         }
-        if (PlotSquared.platform().expireManager() != null) {
-            PlotSquared.platform().expireManager().storeDate(getUUID(), System.currentTimeMillis());
+        if (ExpireManager.IMP != null) {
+            ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
         }
         PlotSquared.platform().playerManager().removePlayer(this);
         PlotSquared.platform().unregister(this);
@@ -1015,14 +1016,6 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         return this.lockRepository;
     }
 
-    /**
-     * Removes any effects present of the given type.
-     *
-     * @param name the name of the type to remove
-     * @since 6.10.0
-     */
-    public abstract void removeEffect(@NonNull String name);
-
     @FunctionalInterface
     public interface PlotPlayerConverter<BaseObject> {
 

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -40,6 +40,7 @@ import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.expiration.PlotAnalysis;
 import com.plotsquared.core.plot.flag.FlagContainer;
 import com.plotsquared.core.plot.flag.GlobalFlagContainer;
@@ -72,7 +73,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -117,11 +118,14 @@ public class Plot {
     @Deprecated(forRemoval = true, since = "6.6.0")
     public static final int MAX_HEIGHT = 256;
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + Plot.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
     private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
     private static final Cleaner CLEANER = Cleaner.create();
 
+    static Set<Plot> connected_cache;
+    static Set<CuboidRegion> regions_cache;
+
     static {
         FLAG_DECIMAL_FORMAT.setMaximumFractionDigits(340);
     }
@@ -204,8 +208,6 @@ public class Plot {
      */
     private Plot origin;
 
-    private Set<Plot> connectedCache;
-
     /**
      * Constructor for a new plot.
      * (Only changes after plot.create() will be properly set in the database)
@@ -455,7 +457,7 @@ public class Plot {
      * that could alter the de facto owner of the plot.
      *
      * @return The plot owner of this particular (sub-)plot
-     *         as stored in the database, if one exists. Else, null.
+     * as stored in the database, if one exists. Else, null.
      */
     public @Nullable UUID getOwnerAbs() {
         return this.owner;
@@ -575,14 +577,7 @@ public class Plot {
             return false;
         }
         final Set<Plot> connected = getConnectedPlots();
-        for (Plot current : connected) {
-            // can skip ServerPlotFlag check in getOwner()
-            // as flags are synchronized between plots
-            if (uuid.equals(current.getOwnerAbs())) {
-                return true;
-            }
-        }
-        return false;
+        return connected.stream().anyMatch(current -> uuid.equals(current.getOwner()));
     }
 
     /**
@@ -1110,8 +1105,8 @@ public class Plot {
      * @return A boolean indicating whether or not the operation succeeded
      */
     public <V> boolean setFlag(final @NonNull PlotFlag<V, ?> flag) {
-        if (flag instanceof KeepFlag && PlotSquared.platform().expireManager() != null) {
-            PlotSquared.platform().expireManager().updateExpired(this);
+        if (flag instanceof KeepFlag && ExpireManager.IMP != null) {
+            ExpireManager.IMP.updateExpired(this);
         }
         for (final Plot plot : this.getConnectedPlots()) {
             plot.getFlagContainer().addFlag(flag);
@@ -1300,7 +1295,6 @@ public class Plot {
             DBFunc.delete(current);
             current.setOwnerAbs(null);
             current.settings = null;
-            current.clearCache();
             for (final PlotPlayer<?> pp : players) {
                 this.plotListener.plotEntry(pp, current);
             }
@@ -1842,8 +1836,8 @@ public class Plot {
         }
         // Swap cached
         final PlotId temp = PlotId.of(this.getId().getX(), this.getId().getY());
-        this.id = plot.getId();
-        plot.id = temp;
+        this.id = plot.getId().copy();
+        plot.id = temp.copy();
         this.area.removePlot(this.getId());
         plot.area.removePlot(plot.getId());
         this.area.addPlotAbs(this);
@@ -1869,9 +1863,8 @@ public class Plot {
             return false;
         }
         this.area.removePlot(this.id);
-        this.id = plot.getId();
+        this.id = plot.getId().copy();
         this.area.addPlotAbs(this);
-        clearCache();
         DBFunc.movePlot(this, plot);
         TaskManager.runTaskLater(whenDone, TaskTime.ticks(1L));
         return true;
@@ -2136,16 +2129,17 @@ public class Plot {
                     this.origin.origin = base;
                     other.origin = base;
                     this.origin = base;
-                    this.connectedCache = null;
+                    connected_cache = null;
                 }
             } else {
                 if (this.origin != null) {
                     this.origin.origin = null;
                     this.origin = null;
                 }
-                this.connectedCache = null;
+                connected_cache = null;
             }
             DBFunc.setMerged(this, this.getSettings().getMerged());
+            regions_cache = null;
         }
     }
 
@@ -2180,7 +2174,8 @@ public class Plot {
     }
 
     public void clearCache() {
-        this.connectedCache = null;
+        connected_cache = null;
+        regions_cache = null;
         if (this.origin != null) {
             this.origin.origin = null;
             this.origin = null;
@@ -2307,9 +2302,10 @@ public class Plot {
         if (!this.isMerged()) {
             return Collections.singleton(this);
         }
-        if (this.connectedCache != null && this.connectedCache.contains(this)) {
-            return this.connectedCache;
+        if (connected_cache != null && connected_cache.contains(this)) {
+            return connected_cache;
         }
+        regions_cache = null;
 
         HashSet<Plot> tmpSet = new HashSet<>();
         tmpSet.add(this);
@@ -2414,7 +2410,7 @@ public class Plot {
                 }
             }
         }
-        this.connectedCache = tmpSet;
+        connected_cache = tmpSet;
         return tmpSet;
     }
 
@@ -2426,15 +2422,19 @@ public class Plot {
      * @return all regions within the plot
      */
     public @NonNull Set<CuboidRegion> getRegions() {
+        if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
+            return regions_cache;
+        }
         if (!this.isMerged()) {
             Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
             Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
-            this.connectedCache = Sets.newHashSet(this);
+            connected_cache = Sets.newHashSet(this);
             CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
-            return Collections.singleton(rg);
+            regions_cache = Collections.singleton(rg);
+            return regions_cache;
         }
         Set<Plot> plots = this.getConnectedPlots();
-        Set<CuboidRegion> regions = new HashSet<>();
+        Set<CuboidRegion> regions = regions_cache = new HashSet<>();
         Set<PlotId> visited = new HashSet<>();
         for (Plot current : plots) {
             if (visited.contains(current.getId())) {
@@ -2831,11 +2831,11 @@ public class Plot {
                     Component members = PlayerManager.getPlayerList(this.getMembers(), player);
                     Component denied = PlayerManager.getPlayerList(this.getDenied(), player);
                     String seen;
-                    if (Settings.Enabled_Components.PLOT_EXPIRY && PlotSquared.platform().expireManager() != null) {
+                    if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
                         if (this.isOnline()) {
                             seen = TranslatableCaption.of("info.now").getComponent(player);
                         } else {
-                            int time = (int) (PlotSquared.platform().expireManager().getAge(this, false) / 1000);
+                            int time = (int) (ExpireManager.IMP.getAge(this, false) / 1000);
                             if (time != 0) {
                                 seen = TimeUtil.secToTime(time);
                             } else {

Core/src/main/java/com/plotsquared/core/plot/PlotArea.java

@@ -36,7 +36,6 @@ import com.plotsquared.core.location.BlockLoc;
 import com.plotsquared.core.location.Direction;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.location.PlotLoc;
-import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.MetaDataAccess;
 import com.plotsquared.core.player.PlayerMetaDataKeys;
@@ -49,7 +48,6 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.queue.GlobalBlockQueue;
 import com.plotsquared.core.queue.QueueCoordinator;
 import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PlotExpression;
 import com.plotsquared.core.util.RegionUtil;
 import com.plotsquared.core.util.StringMan;
@@ -62,7 +60,7 @@ import com.sk89q.worldedit.world.gamemode.GameMode;
 import com.sk89q.worldedit.world.gamemode.GameModes;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -87,7 +85,7 @@ import java.util.function.Consumer;
  */
 public abstract class PlotArea {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotArea.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();
     private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0");
 
@@ -626,38 +624,6 @@ public abstract class PlotArea {
                 getRegionAbs() == null || this.region.contains(location.getBlockVector3()));
     }
 
-    /**
-     * Get if the {@code PlotArea}'s build range (min build height -> max build height) contains the given y value
-     *
-     * @param y y height
-     * @return if build height contains y
-     */
-    public boolean buildRangeContainsY(int y) {
-        return y >= minBuildHeight && y < maxBuildHeight;
-    }
-
-    /**
-     * Utility method to check if the player is attempting to place blocks outside the build area, and notify of this if the
-     * player does not have permissions.
-     *
-     * @param player Player to check
-     * @param y      y height to check
-     * @return true if outside build area with no permissions
-     * @since 6.9.1
-     */
-    public boolean notifyIfOutsideBuildArea(PlotPlayer<?> player, int y) {
-        if (!buildRangeContainsY(y) && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
-            player.sendMessage(
-                    TranslatableCaption.of("height.height_limit"),
-                    Template.of("minHeight", String.valueOf(minBuildHeight)),
-                    Template.of("maxHeight", String.valueOf(maxBuildHeight))
-            );
-            // Return true if "failed" as the method will always be inverted otherwise
-            return true;
-        }
-        return false;
-    }
-
     public @NonNull Set<Plot> getPlotsAbs(final UUID uuid) {
         if (uuid == null) {
             return Collections.emptySet();

Core/src/main/java/com/plotsquared/core/plot/PlotId.java

@@ -110,11 +110,9 @@ public final class PlotId {
      * Get a copy of the plot ID
      *
      * @return Plot ID copy
-     * @deprecated PlotId is immutable, copy is not required.
      */
-    @Deprecated(forRemoval = true, since = "6.10.2")
     public @NonNull PlotId copy() {
-        return this;
+        return of(this.getX(), this.getY());
     }
 
     /**

Core/src/main/java/com/plotsquared/core/plot/PlotModificationManager.java

@@ -47,7 +47,7 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -68,7 +68,7 @@ import java.util.stream.Collectors;
  */
 public final class PlotModificationManager {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotModificationManager.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final Plot plot;
     private final ProgressSubscriberFactory subscriberFactory;
@@ -263,7 +263,6 @@ public final class PlotModificationManager {
                     return;
                 }
                 Plot current = queue.poll();
-                current.clearCache();
                 if (plot.getArea().getTerrain() != PlotAreaTerrainType.NONE) {
                     try {
                         PlotSquared.platform().regionManager().regenerateRegion(
@@ -328,7 +327,6 @@ public final class PlotModificationManager {
         ArrayList<PlotId> ids = new ArrayList<>(plots.size());
         for (Plot current : plots) {
             current.setHome(null);
-            current.clearCache();
             ids.add(current.getId());
         }
         this.plot.clearRatings();
@@ -480,7 +478,8 @@ public final class PlotModificationManager {
                 this.plot.updateWorldBorder();
             }
         }
-        this.plot.clearCache();
+        Plot.connected_cache = null;
+        Plot.regions_cache = null;
         this.plot.getTrusted().clear();
         this.plot.getMembers().clear();
         this.plot.getDenied().clear();
@@ -631,7 +630,6 @@ public final class PlotModificationManager {
         if (queue.size() > 0) {
             queue.enqueue();
         }
-        visited.forEach(Plot::clearCache);
         return toReturn;
     }
 

Core/src/main/java/com/plotsquared/core/plot/PlotTitle.java

@@ -18,8 +18,7 @@
  */
 package com.plotsquared.core.plot;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
-
+import javax.annotation.Nullable;
 import java.util.Objects;
 
 public class PlotTitle {

Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java

@@ -18,8 +18,6 @@
  */
 package com.plotsquared.core.plot.expiration;
 
-import com.google.inject.Inject;
-import com.plotsquared.core.PlotPlatform;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.caption.Caption;
 import com.plotsquared.core.configuration.caption.Templates;
@@ -62,10 +60,6 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class ExpireManager {
 
-    /**
-     * @deprecated Use {@link PlotPlatform#expireManager()} instead
-     */
-    @Deprecated(forRemoval = true, since = "6.10.2")
     public static ExpireManager IMP;
     private final ConcurrentHashMap<UUID, Long> dates_cache;
     private final ConcurrentHashMap<UUID, Long> account_age_cache;
@@ -77,7 +71,6 @@ public class ExpireManager {
      */
     private int running;
 
-    @Inject
     public ExpireManager(final @NonNull EventDispatcher eventDispatcher) {
         this.tasks = new ArrayDeque<>();
         this.dates_cache = new ConcurrentHashMap<>();

Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java

@@ -18,7 +18,6 @@
  */
 package com.plotsquared.core.plot.expiration;
 
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
@@ -73,9 +72,8 @@ public class ExpiryTask {
                         min = false;
                         diff = plots.size() - settings.REQUIRED_PLOTS;
                     }
-                    ExpireManager expireManager = PlotSquared.platform().expireManager();
                     List<Long> entireList =
-                            plots.stream().map(plot -> expireManager.getAge(plot, settings.DELETE_IF_OWNER_IS_UNKNOWN))
+                            plots.stream().map(plot -> ExpireManager.IMP.getAge(plot, settings.DELETE_IF_OWNER_IS_UNKNOWN))
                                     .collect(Collectors.toList());
                     List<Long> top = new ArrayList<>(diff + 1);
                     if (diff > 1000) {

Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java

@@ -27,7 +27,7 @@ import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.query.PlotQuery;
 import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 
 import java.lang.reflect.Array;
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class PlotAnalysis {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotAnalysis.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     public static boolean running = false;
     public int changes;

Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java

@@ -20,9 +20,9 @@ package com.plotsquared.core.plot.flag;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
-import com.intellectualsites.annotations.NotPublic;
 import com.plotsquared.core.configuration.caption.CaptionUtility;
-import org.apache.logging.log4j.LogManager;
+import com.plotsquared.core.util.AnnotationHelper;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -32,13 +32,14 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Container type for {@link PlotFlag plot flags}.
  */
 public class FlagContainer {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + FlagContainer.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private final Map<String, String> unknownFlags = new HashMap<>();
     private final Map<Class<?>, PlotFlag<?, ?>> flagMap = new HashMap<>();
@@ -352,7 +353,7 @@ public class FlagContainer {
      * @return a new Runnable that cleans up once the FlagContainer isn't needed anymore.
      * @since 6.0.10
      */
-    @NotPublic
+    @AnnotationHelper.ApiDescription(info = "This method should not be considered as public or API.")
     public Runnable createCleanupHook() {
         return () -> GlobalFlagContainer.getInstance().unsubscribe(unknownsRef);
     }

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -23,7 +23,6 @@ import com.plotsquared.core.plot.flag.implementations.AnalysisFlag;
 import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag;
 import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag;
 import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag;
-import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
@@ -138,7 +137,6 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE);
         this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE);
         this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE);
-        this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
         this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
         this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
         this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/BeaconEffectsFlag.java

@@ -1,39 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.plot.flag.implementations;
-
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public class BeaconEffectsFlag extends BooleanFlag<BeaconEffectsFlag> {
-
-    public static final BeaconEffectsFlag BEACON_EFFECT_TRUE = new BeaconEffectsFlag(true);
-    public static final BeaconEffectsFlag BEACON_EFFECT_FALSE = new BeaconEffectsFlag(false);
-
-    private BeaconEffectsFlag(boolean value){
-        super(value, TranslatableCaption.of("flags.flag_description_beacon_effect"));
-    }
-
-    @Override
-    protected BeaconEffectsFlag flagOf(@NonNull final Boolean value) {
-        return value ? BEACON_EFFECT_TRUE : BEACON_EFFECT_FALSE;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java

@@ -24,7 +24,7 @@ import com.plotsquared.core.configuration.Settings;
 import com.sk89q.worldedit.world.block.BlockCategory;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -38,7 +38,7 @@ import java.util.Map;
  */
 public class BlockTypeWrapper {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BlockTypeWrapper.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     private static final Map<BlockType, BlockTypeWrapper> blockTypes = new HashMap<>();
     private static final Map<String, BlockTypeWrapper> blockCategories = new HashMap<>();

Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java

@@ -18,8 +18,8 @@
  */
 package com.plotsquared.core.queue;
 
-import com.intellectualsites.annotations.DoNotUse;
 import com.plotsquared.core.location.Location;
+import com.plotsquared.core.util.AnnotationHelper;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -37,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * in {@link BlockArrayCacheScopedQueueCoordinator#setOffsetX(int)} and
  * {@link BlockArrayCacheScopedQueueCoordinator#setOffsetZ(int)}
  */
-@DoNotUse
+@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to change at any time and created for specific use cases.")
 public class BlockArrayCacheScopedQueueCoordinator extends ScopedQueueCoordinator {
 
     private final BlockState[][][] blockStates;
@@ -116,7 +116,7 @@ public class BlockArrayCacheScopedQueueCoordinator extends ScopedQueueCoordinato
         x += offsetX;
         z += offsetZ;
         if (x >= scopeMinX && x < scopeMaxX && y >= minY && y <= maxY && z >= scopeMinZ && z < scopeMaxZ) {
-            blockStates[y - minY][x - scopeMinX][z - scopeMinZ] = id.toImmutableState();
+            blockStates[y - minY][x][z] = id.toImmutableState();
         }
         return false;
     }

Core/src/main/java/com/plotsquared/core/queue/QueueProvider.java

@@ -20,13 +20,13 @@ package com.plotsquared.core.queue;
 
 import com.plotsquared.core.PlotSquared;
 import com.sk89q.worldedit.world.World;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public abstract class QueueProvider {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotSquared.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     public static QueueProvider of(final @NonNull Class<? extends QueueCoordinator> primary) {
         return new QueueProvider() {

Core/src/main/java/com/plotsquared/core/util/AnnotationHelper.java

@@ -0,0 +1,55 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.MODULE;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.RECORD_COMPONENT;
+import static java.lang.annotation.ElementType.TYPE;
+
+/**
+ * @since 6.2.2
+ */
+@AnnotationHelper.ApiDescription(info = "An internal class for custom annotations." +
+        "This is in no form part of the API and is subject to change at any time.")
+public final class AnnotationHelper {
+
+    private AnnotationHelper() {
+    }
+
+    @Documented
+    @Retention(RetentionPolicy.CLASS)
+    @Target(value = {METHOD, PACKAGE, MODULE, RECORD_COMPONENT, TYPE})
+    public @interface ApiDescription {
+        /**
+         * Returns additional information how to use a class for the API
+         *
+         * @return the version string
+         * @since 6.2.2
+         */
+        String info() default "";
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java

@@ -19,8 +19,6 @@
 package com.plotsquared.core.util;
 
 import com.google.common.eventbus.EventBus;
-import com.intellectualsites.annotations.DoNotUse;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlayerAutoPlotEvent;
@@ -60,6 +58,7 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotId;
 import com.plotsquared.core.plot.Rating;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscPlaceFlag;
@@ -82,7 +81,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-@DoNotUse
+@AnnotationHelper.ApiDescription(info = "This is an internal class used by PlotSquared to dispatch events." +
+        "This is in no form part of the API and is subject to change at any time.")
 public class EventDispatcher {
 
     private final EventBus eventBus = new EventBus("PlotSquaredEvents");
@@ -300,8 +300,8 @@ public class EventDispatcher {
         if (player == null) {
             return; //possible future warning message to figure out where we are retrieving null
         }
-        if (PlotSquared.platform().expireManager() != null) {
-            PlotSquared.platform().expireManager().handleJoin(player);
+        if (ExpireManager.IMP != null) {
+            ExpireManager.IMP.handleJoin(player);
         }
         if (this.worldEdit != null) {
             if (player.getAttribute("worldedit")) {
@@ -332,15 +332,6 @@ public class EventDispatcher {
     ) {
         PlotArea area = location.getPlotArea();
         assert area != null;
-        if (!area.buildRangeContainsY(location.getY()) && !Permissions
-                .hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
-            player.sendMessage(
-                    TranslatableCaption.of("height.height_limit"),
-                    Template.of("minHeight", String.valueOf(area.getMinBuildHeight())),
-                    Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight()))
-            );
-            return false;
-        }
         Plot plot = area.getPlot(location);
         if (plot != null) {
             if (plot.isAdded(player.getUUID())) {

Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java

@@ -25,7 +25,7 @@ import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.plot.BlockBucket;
 import com.sk89q.worldedit.world.block.BlockState;
 import net.kyori.adventure.text.minimessage.Template;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -41,7 +41,7 @@ import java.util.Map;
 public final class LegacyConverter {
 
     public static final String CONFIGURATION_VERSION = "post_flattening";
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LegacyConverter.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final HashMap<String, ConfigurationType> TYPE_MAP = new HashMap<>();
 
     static {

Core/src/main/java/com/plotsquared/core/util/PatternUtil.java

@@ -29,6 +29,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.function.pattern.RandomPattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
@@ -43,7 +44,7 @@ public class PatternUtil {
 
     public static BaseBlock apply(@NonNull Pattern pattern, int x, int y, int z) {
         Preconditions.checkNotNull(pattern, "Pattern may not be null");
-        if (pattern instanceof BlockPattern
+        if (pattern instanceof BlockPattern || pattern instanceof RandomPattern
                 || pattern instanceof BlockState || pattern instanceof BlockType
                 || pattern instanceof BaseBlock) {
             return pattern.applyBlock(BlockVector3.ZERO);

Core/src/main/java/com/plotsquared/core/util/Permissions.java

@@ -30,18 +30,9 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  * The Permissions class handles checking user permissions.<br>
  * - This will respect * nodes and plots.admin and can be used to check permission ranges (e.g. plots.plot.5)<br>
  * - Checking the PlotPlayer class directly will not take the above into account<br>
- *
- * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
- * classes
  */
-@Deprecated(forRemoval = true, since = "6.9.3")
 public class Permissions {
 
-    /**
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
-     */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static boolean hasPermission(PlotPlayer<?> player, Permission permission, boolean notify) {
         return hasPermission(player, permission.toString(), notify);
     }
@@ -52,25 +43,18 @@ public class Permissions {
      * @param caller     permission holder
      * @param permission Permission
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull Permission permission) {
         return caller.hasPermission(permission.toString());
     }
 
     /**
-     * Check if the owner of the profile has a given (global) permission. There is no guarantee that per-world permissions will
-     * be checked because unmaintained crap plugins like PEX exist.
+     * Check if the owner of the profile has a given (global) permission
      *
      * @param caller     permission holder
      * @param permission Permission
      * @return {@code true} if the owner has the given permission, else {@code false}
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static boolean hasPermission(final @NonNull PermissionHolder caller, final @NonNull String permission) {
         return caller.hasPermission(permission);
     }
@@ -84,10 +68,7 @@ public class Permissions {
      * @param key        Permission "key"
      * @return {@code true} if the owner has the given permission, else {@code false}
      * @since 6.0.10
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static boolean hasKeyedPermission(
             final @NonNull PermissionHolder caller, final @NonNull String permission,
             final @NonNull String key
@@ -102,10 +83,7 @@ public class Permissions {
      * @param permission permission
      * @param notify     if to notify the permission holder
      * @return if permission is had
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static boolean hasPermission(PlotPlayer<?> player, String permission, boolean notify) {
         if (!hasPermission(player, permission)) {
             if (notify) {
@@ -119,11 +97,6 @@ public class Permissions {
         return true;
     }
 
-    /**
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
-     */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static int hasPermissionRange(PlotPlayer<?> player, Permission Permission, int range) {
         return hasPermissionRange(player, Permission.toString(), range);
     }
@@ -137,10 +110,7 @@ public class Permissions {
      * @param stub   The permission stub to check e.g. for `plots.plot.#` the stub is `plots.plot`
      * @param range  The range to check
      * @return The highest permission they have within that range
-     * @deprecated all logic that may once have been in the class lives elsewhere. We also want to do away with statically-accessed
-     * classes
      */
-    @Deprecated(forRemoval = true, since = "6.9.3")
     public static int hasPermissionRange(PlotPlayer<?> player, String stub, int range) {
         return player.hasPermissionRange(stub, range);
     }

Core/src/main/java/com/plotsquared/core/util/PlotFlagUtil.java

@@ -1,53 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.util;
-
-import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.flag.PlotFlag;
-
-import java.util.Objects;
-
-/**
- * Util class for generic methods relating to plot flags.
- *
- * @since 6.10.4
- */
-public final class PlotFlagUtil {
-
-    private PlotFlagUtil() {
-        //No-op
-    }
-
-    /**
-     * Check if the value of a {@link PlotFlag} matches the given value. If
-     * road flags are disabled for the given plot area, returns false.
-     *
-     * @param flagClass boolean flag to get value of
-     * @param value     boolean value to check flag value against
-     * @param <T>       The flag value type
-     * @return true if road flag value matches with road flags enabled
-     * @since 6.10.4
-     */
-    public static <T> boolean isAreaRoadFlagsAndFlagEquals(
-            PlotArea area, final Class<? extends PlotFlag<T, ?>> flagClass, T value
-    ) {
-        return area.isRoadFlags() && Objects.equals(area.getRoadFlag(flagClass), value);
-    }
-
-}

Core/src/main/java/com/plotsquared/core/util/PlotUploader.java

@@ -26,7 +26,7 @@ import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.plot.Plot;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.NBTOutputStream;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -45,7 +45,7 @@ import java.util.zip.GZIPOutputStream;
  */
 public class PlotUploader {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PlotUploader.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final Path TEMP_DIR = Paths.get(PlotSquared.platform().getDirectory().getPath());
     private final SchematicHandler schematicHandler;
     private final Arkitektonika arkitektonika;

Core/src/main/java/com/plotsquared/core/util/RegionManager.java

@@ -40,7 +40,7 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BiomeType;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -51,7 +51,7 @@ import java.util.Set;
 
 public abstract class RegionManager {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + RegionManager.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
 
     public static RegionManager manager = null;
     protected final WorldUtil worldUtil;

Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java

@@ -64,7 +64,7 @@ import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import org.apache.logging.log4j.LogManager;
+import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -107,7 +107,7 @@ import java.util.zip.GZIPOutputStream;
 
 public abstract class SchematicHandler {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + SchematicHandler.class.getSimpleName());
+    private static final Logger LOGGER = LogManagerCompat.getLogger();
     private static final Gson GSON = new Gson();
     public static SchematicHandler manager;
     private final WorldUtil worldUtil;

Core/src/main/java/com/plotsquared/core/util/StringMan.java

@@ -36,8 +36,7 @@ import java.util.regex.Pattern;
 
 public class StringMan {
 
-    // Stolen from https://stackoverflow.com/a/366532/12620913 | Debug: https://regex101.com/r/DudJLb/1
-    private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("[^\\s\"]+|\"([^\"]*)\"");
+    private static final Pattern STRING_SPLIT_PATTERN = Pattern.compile("(?<quoted>\"[\\w ]+\")|(?<single>\\w+)");
 
     public static String replaceFromMap(String string, Map<String, String> replacements) {
         StringBuilder sb = new StringBuilder(string);
@@ -356,7 +355,7 @@ public class StringMan {
         var matcher = StringMan.STRING_SPLIT_PATTERN.matcher(message);
         List<String> splitMessages = new ArrayList<>();
         while (matcher.find()) {
-            splitMessages.add(matcher.group(matcher.groupCount() - 1).replaceAll("\"", ""));
+            splitMessages.add(matcher.group(0).replaceAll("\"", ""));
         }
         return splitMessages;
     }

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -164,7 +164,7 @@ public final class PlaceholderRegistry {
                     PlayerManager.getPlayerList(plot.getDenied(), player));
         });
         this.createPlaceholder("currentplot_creationdate", (player, plot) -> {
-            if (plot.getTimestamp() == 0 || !plot.hasOwner()) {
+            if (plot.getTimestamp() == 0) {
                 return legacyComponent(TranslatableCaption.of("info.unknown"), player);
             }
             long creationDate = plot.getTimestamp();

Core/src/main/java/com/plotsquared/core/util/query/ExpiredPlotProvider.java

@@ -18,8 +18,8 @@
  */
 package com.plotsquared.core.util.query;
 
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.expiration.ExpireManager;
 
 import java.util.Collection;
 
@@ -27,7 +27,7 @@ class ExpiredPlotProvider implements PlotProvider {
 
     @Override
     public Collection<Plot> getPlots() {
-        return PlotSquared.platform().expireManager().getPendingExpired();
+        return ExpireManager.IMP.getPendingExpired();
     }
 
 }