fix: correct reflected fields for chunk needs saving

- fixes #4064

.editorconfig

@@ -0,0 +1,387 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 130
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = false
+ij_wrap_on_typing = true
+
+[*.java]
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 1
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 1
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_at_first_column = true
+ij_java_call_parameters_new_line_after_left_paren = true
+ij_java_call_parameters_right_paren_on_new_line = true
+ij_java_call_parameters_wrap = on_every_item
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 100000
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_while_brace_force = always
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = true
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = false
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_enum_constants_wrap = split_into_lines
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = normal
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = always
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = true
+ij_java_generate_final_parameters = true
+ij_java_if_brace_force = always
+ij_java_imports_layout = *, |, javax.**, java.**, |, $*
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_at_first_column = true
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = on_every_item
+ij_java_method_parameters_new_line_after_left_paren = true
+ij_java_method_parameters_right_paren_on_new_line = true
+ij_java_method_parameters_wrap = on_every_item
+ij_java_modifier_list_wrap = false
+ij_java_names_count_to_use_import_on_demand = 100000
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = false
+ij_java_prefer_parameters_wrap = true
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = true
+ij_java_ternary_operation_wrap = on_every_item
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = normal
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = always
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = true
+ij_java_wrap_long_lines = false
+
+[*.properties]
+ij_properties_align_group_field_declarations = false
+ij_properties_keep_blank_lines = false
+ij_properties_key_value_delimiter = equals
+ij_properties_spaces_around_key_value_delimiter = false
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.gradle.kts, *.kt, *.kts, *.main.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = off
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = false
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = off
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = true
+ij_kotlin_continuation_indent_in_if_conditions = true
+ij_kotlin_continuation_indent_in_parameter_lists = true
+ij_kotlin_continuation_indent_in_supertype_lists = true
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = off
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = off
+ij_kotlin_method_parameters_new_line_after_left_paren = false
+ij_kotlin_method_parameters_right_paren_on_new_line = false
+ij_kotlin_method_parameters_wrap = off
+ij_kotlin_name_count_to_use_star_import = 5
+ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 0
+ij_kotlin_wrap_first_method_in_call_chain = false
+
+
+[*.json]
+indent_size = 2
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = true
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm, *.html, *.sht, *.shtm, *.shtml}]
+ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title, h1, h2, h3, h4, h5, h6, p
+ij_html_do_not_indent_children_of_tags = html, body, thead, tbody, tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a, abbr, acronym, b, basefont, bdo, big, br, cite, cite, code, dfn, em, font, i, img, input, kbd, label, q, s, samp, select, small, span, strike, strong, sub, sup, textarea, tt, u, var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span, pre, textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+ij_html_uniform_ident = false
+
+[{*.yaml, *.yml}]
+indent_size = 2
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto
+
+*.java text
+*.jar binary

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: [NotMyFault, dordsor21, SirYwell]
-patreon: IntellectualSites # Replace with a single Patreon username
-open_collective: IntellectualSites
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: https://www.paypal.me/AlexanderBrandes # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,8 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
-        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki).
+        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
+        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://github.com/IntellectualSites/PlotSquared/security/policy) GitHub form!
 
   - type: dropdown
     attributes:
@@ -17,8 +18,6 @@ body:
       options:
         - Paper
         - Spigot
-        - Tuinity
-        - Purpur
     validations:
       required: true
 
@@ -28,10 +27,17 @@ 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.20.1'
+        - '1.20'
+        - '1.19.4'
+        - '1.19.3'
+        - '1.19.2'
+        - '1.19.1'
+        - '1.19'
+        - '1.18.2'
+        - '1.18.1'
+        - '1.17.1'
         - '1.16.5'
-        - '1.15.2'
-        - '1.14.4'
-        - '1.13.2'
     validations:
       required: true
 
@@ -99,4 +105,4 @@ body:
   - type: textarea
     attributes:
       label: Anything else?
-      description: You can provide additional context below.
+      description: You can provide additional context below.

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
     url: https://discord.gg/intellectualsites
     about: Our support Discord, please ask questions and seek support here.
   - name: PlotSquared Wiki
-    url: https://github.com/IntellectualSites/PlotSquared/wiki
+    url: https://intellectualsites.github.io/plotsquared-documentation/
     about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -7,7 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
-        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://github.com/IntellectualSites/PlotSquared/wiki).
+        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
 
   - type: textarea
     attributes:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-## Overview
-<!--  Please describe which issue this Pull Request targets
-
-If there is no issue, please create one so we can look into it before approving your PR.
-You can do so here: https://github.com/IntellectualSites/PlotSquared/issues
--->
-
-**Fixes {Link to issue}**
-
-## Description
-
-## Checklist
-<!-- Make sure you have completed the following steps (put an "X" between of brackets): -->
-- [] I included all information required in the sections above
-- [] I tested my changes and approved their functionality
-- [] I ensured my changes do not break other parts of the code
-- [] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/PlotSquared/blob/v5/CONTRIBUTING.md)

.github/release-drafter.yml

@@ -0,0 +1 @@
+_extends: .github

.github/renovate.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":semanticCommitsDisabled"
+  ],
+  "automerge": true,
+  "labels": [
+    "dependencies"
+  ],
+  "rebaseWhen": "conflicted",
+  "schedule": ["on the first day of the month"]
+}

.github/stale.yml

@@ -1,4 +1,4 @@
-daysUntilStale: 60
+daysUntilStale: 30
 daysUntilClose: 7
 only: issues
 exemptLabels:

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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,21 @@
+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,20 +1,67 @@
-name: "build"
-
-on: ["pull_request", "push"]
- 
+name: build
+on:
+  push:
+    branches:
+      - main
 jobs:
   build:
-    strategy:
-      matrix:
-        java: ["1.8", "11"]
-        os: ["ubuntu-18.04"]
-    runs-on: "${{ matrix.os }}"
+    if: github.repository_owner == 'IntellectualSites'
+    runs-on: ubuntu-latest
     steps:
-    - name: "Checkout Repository"
-      uses: "actions/checkout@v2.3.4"
-    - name: "Setup JDK ${{ matrix.java }}"
-      uses: "actions/setup-java@v1.4.3"
-      with:
-          java-version: "${{ matrix.java }}"
-    - name: "Clean Build"
-      run: "./gradlew clean build"
+      - 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
+      - name: Determine release status
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          if [ "$(./gradlew properties | awk '/^version:/ { print $2; }' | grep '\-SNAPSHOT')" ]; then
+            echo "STATUS=snapshot" >> $GITHUB_ENV
+          else
+            echo "STATUS=release" >> $GITHUB_ENV
+          fi
+      - name: Publish Release
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+        env:
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
+      - name: Publish Snapshot
+        if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        run: ./gradlew publishToSonatype
+        env:
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+      - name: Publish core javadoc
+       # if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: 'Core/build/docs/javadoc'
+          destination-github-username: 'IntellectualSites'
+          destination-repository-name: 'plotsquared-javadocs'
+          user-email: ${{ secrets.USER_EMAIL }}
+          target-branch: main
+          target-directory: v7/core
+      - name: Publish bukkit javadoc
+      #  if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+        with:
+          source-directory: 'Bukkit/build/docs/javadoc'
+          destination-github-username: 'IntellectualSites'
+          destination-repository-name: 'plotsquared-javadocs'
+          user-email: ${{ secrets.USER_EMAIL }}
+          target-branch: main
+          target-directory: v7/bukkit

.github/workflows/codeql.yml

@@ -0,0 +1,36 @@
+name: "CodeQL"
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/release-drafter.yml

@@ -0,0 +1,17 @@
+name: draft release
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [ opened, reopened, synchronize ]
+  pull_request_target:
+    types: [ opened, reopened, synchronize ]
+jobs:
+  update_release_draft:
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/validate-gradle-wrapper.yml

@@ -1,12 +0,0 @@
-name: "validate gradle wrapper"
-
-on: ["pull_request", "push"]
-
-jobs:
-  build:
-    runs-on: "ubuntu-18.04"
-    steps:
-      - name: "Checkout Repository"
-        uses: "actions/checkout@v2.3.4"
-      - name: "Validate Gradle Wrapper"
-        uses: "gradle/wrapper-validation-action@v1.0.3"

.gitignore

@@ -2,11 +2,7 @@
 *.cmd
 *.sh
 *.prefs
-Sponge/build
 Core/build
-Bukkit/build
-Nukkit/build
-buildSrc/
 
 ### Maven ###
 /mvn
@@ -45,7 +41,8 @@ hs_err_pid*
 *.iml
 
 ## Directory-based project format:
-.idea/
+/.idea/*
+!/.idea/icon.svg
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:
@@ -78,9 +75,6 @@ hs_err_pid*
 # IntelliJ
 /out/
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
 # JIRA plugin
 atlassian-ide-plugin.xml
 
@@ -134,12 +128,16 @@ local.properties
 # STS (Spring Tool Suite)
 .springBeans
 /target/
-Nukkit/build/classes/
-Nukkit/build/dependency-cache/
 checkstyle.xml
 classes/
-p2error.txt
 *.bat
-Nukkit/build/resources/main/plugin.yml
+
+# Other
 docs/
 build/
+
+.DS_Store
+# Ignore run folders
+run-[0-0].[0-9]/
+run-[0-0].[0-9].[0-9]/
+

.idea/icon.svg

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512.00001"
+   sodipodi:docname="icon.svg"
+   inkscape:version="1.1.2 (b8e25be8, 2022-02-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+		<metadata
+   id="metadata8">
+			<rdf:RDF>
+				<cc:Work
+   rdf:about="">
+					<dc:format>image/svg+xml</dc:format>
+                    <dc:type
+   rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+				</cc:Work>
+			</rdf:RDF>
+		</metadata>
+    <defs
+   id="defs6">
+			<clipPath
+   clipPathUnits="userSpaceOnUse"
+   id="clipPath18">
+				<path
+   d="M 0,2500 H 3000 V 0 H 0 Z"
+   id="path16" />
+			</clipPath>
+		</defs>
+    <sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="900"
+   id="namedview4"
+   inkscape:pagecheckerboard="0"
+   showgrid="false"
+   inkscape:zoom="0.1632"
+   inkscape:cx="1087.6225"
+   inkscape:cy="1666.6666"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="g10" />
+    <g
+   id="g10"
+   inkscape:groupmode="layer"
+   inkscape:label="PlotSquared"
+   transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)">
+			<g
+   id="g12"
+   transform="matrix(0.16955078,0,0,0.16955078,-68.456969,2101.8529)">
+				<g
+   id="g14"
+   clip-path="url(#clipPath18)">
+					<g
+   id="g20"
+   transform="translate(1486.1511,2242.6453)">
+						<path
+   d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0"
+   style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path22" />
+					</g>
+                    <g
+   id="g24"
+   transform="translate(1201.7948,1741.5303)">
+						<path
+   d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z"
+   style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path26" />
+					</g>
+                    <g
+   id="g28"
+   transform="translate(919.3342,1429.7462)">
+						<path
+   d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0"
+   style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path30" />
+					</g>
+                    <g
+   id="g32"
+   transform="translate(1649.134,1700.6166)">
+						<path
+   d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0"
+   style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path34" />
+					</g>
+                    <g
+   id="g36"
+   transform="translate(1262.7214,1613.126)">
+						<path
+   d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667"
+   style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path38" />
+					</g>
+                    <g
+   id="g40"
+   transform="translate(1966.3174,1675.6364)">
+						<path
+   d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0"
+   style="fill:#042338;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path42" />
+					</g>
+                    <g
+   id="g44"
+   transform="translate(1499.3971,1669.1094)">
+						<path
+   d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0"
+   style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path46" />
+					</g>
+                    <g
+   id="g48"
+   transform="translate(1748.0469,1601.6797)">
+						<path
+   d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0"
+   style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path50" />
+					</g>
+                    <g
+   id="g52"
+   transform="translate(1262.7214,1613.126)">
+						<path
+   d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z"
+   style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none"
+   id="path54" />
+					</g>
+				</g>
+			</g>
+		</g>
+</svg>

Bukkit/build.gradle

@@ -1,125 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow"
-}
-repositories {
-    maven { url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
-    maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
-    maven { url = "https://jitpack.io" }
-    maven { url = "https://repo.codemc.org/repository/maven-public" }
-    maven { url = "https://repo.extendedclip.com/content/repositories/placeholderapi/" }
-    maven {
-        name = "papermc"
-        url = "https://papermc.io/repo/repository/maven-public/"
-    }
-    maven { url = "https://ci.ender.zone/plugin/repository/everything/" }
-    maven { url = "https://mvn.intellectualsites.com/content/repositories/releases" }
-    maven { url = "https://mvn.intellectualsites.com/content/repositories/thirdparty"}
-    maven { url = "https://mvn.intellectualsites.com/content/repositories/snapshots" }
-    maven { url = "http://repo.mvdw-software.be/content/groups/public/" }
-    mavenLocal()
-}
-
-
-dependencies {
-    implementation(project(":PlotSquared-Core"))
-    compile("org.bstats:bstats-bukkit:1.7")
-    compile(project(":PlotSquared-Core"))
-    compile("com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT")
-    implementation("org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT")
-    compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.2.0") {
-        exclude(module: "bukkit")
-    }
-    compile("io.papermc:paperlib:1.0.5")
-    implementation("net.kyori:text-adapter-bukkit:3.0.3")
-    compile("com.github.MilkBowl:VaultAPI:1.7") {
-        exclude(module: "bukkit")
-    }
-    implementation("me.clip:placeholderapi:2.10.6")
-    implementation("net.luckperms:api:5.1")
-    implementation("net.ess3:EssentialsX:2.18.0") {
-        exclude(group: "io.papermc", module: "paperlib")
-    }
-    compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
-    compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false }
-    compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1'){ transitive = false }
-    implementation("org.incendo.serverlib:ServerLib:2.2.0")
-}
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-processResources {
-    from("src/main/resources") {
-        include("plugin.yml")
-        expand(
-                name: project.parent.name,
-                version: project.parent.version
-        )
-    }
-}
-
-//noinspection GroovyAssignabilityCheck
-jar.archiveFileName = "PlotSquared-Bukkit-${project.parent.version}.jar"
-jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-Bukkit/" + project.parent.version)
-task createPom {
-    doLast {
-        pom {
-            project {
-                groupId = rootProject.group
-                artifactId = "PlotSquared-Bukkit"
-                version = rootProject.version
-            }
-        }.writeTo("../mvn/com/plotsquared/PlotSquared-Bukkit/${project.parent.version}/PlotSquared-Bukkit-${project.parent.version}.pom")
-        pom {
-            project {
-                groupId = rootProject.group
-                artifactId = "PlotSquared-Bukkit"
-                version = "latest"
-            }
-        }.writeTo("../mvn/com/plotsquared/PlotSquared-Bukkit/latest/PlotSquared-Bukkit-latest.pom")
-         .writeTo("pom.xml")
-    }
-}
-
-task copyFiles {
-    doLast {
-        copy {
-            from("../mvn/com/plotsquared/PlotSquared-Bukkit/${project.parent.version}/")
-            into("../mvn/com/plotsquared/PlotSquared-Bukkit/latest/")
-            include("PlotSquared-Bukkit*.jar")
-            rename("PlotSquared-Bukkit-${project.parent.version}.jar", "PlotSquared-Bukkit-latest.jar")
-        }
-    }
-}
-
-
-shadowJar {
-    dependencies {
-        include(dependency(":PlotSquared-Core"))
-        include(dependency("io.papermc:paperlib:1.0.5"))
-        include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
-        include(dependency("org.bstats:bstats-bukkit:1.7"))
-        include(dependency("org.khelekore:prtree:1.7.0-SNAPSHOT"))
-        include(dependency("com.sk89q:squirrelid:1.0.0-SNAPSHOT"))
-        include(dependency("com.intellectualsites.paster:Paster:1.0.2-SNAPSHOT"))
-        include(dependency("org.incendo.serverlib:ServerLib:2.2.0"))
-    }
-    relocate('net.kyori.text', 'com.plotsquared.formatting.text')
-    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
-    relocate("org.bstats", "com.plotsquared.metrics")
-    relocate('com.sk89q.squirrelid', 'com.plotsquared.squirrelid')
-    relocate('org.khelekore.prtree', 'com.plotsquared.prtree')
-    relocate('com.intellectualsites.paster', 'com.plotsquared.core.paster')
-    relocate('org.incendo.serverlib', 'com.plotsquared.bukkit')
-    archiveFileName = "${project.name}-${parent.version}.jar"
-    destinationDirectory = file "../target"
-}
-
-shadowJar.doLast {
-    task ->
-        ant.checksum file: task.archivePath
-}
-
-build.dependsOn(shadowJar)
-build.finalizedBy(copyFiles)
-copyFiles.dependsOn(createPom)

Bukkit/build.gradle.kts

@@ -0,0 +1,116 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+repositories {
+    maven {
+        name = "PlaceholderAPI"
+        url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+    }
+
+    maven {
+        name = "PaperMC"
+        url = uri("https://repo.papermc.io/repository/maven-public/")
+    }
+
+    maven {
+        name = "EssentialsX"
+        url = uri("https://repo.essentialsx.net/releases/")
+    }
+}
+
+dependencies {
+    api(projects.plotsquaredCore)
+
+    // Metrics
+    implementation("org.bstats:bstats-bukkit")
+
+    // Paper
+    compileOnly("io.papermc.paper:paper-api")
+    implementation("io.papermc:paperlib")
+
+    // Plugins
+    compileOnly(libs.worldeditBukkit) {
+        exclude(group = "org.bukkit")
+        exclude(group = "org.spigotmc")
+    }
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    compileOnly("com.github.MilkBowl:VaultAPI") {
+        exclude(group = "org.bukkit")
+    }
+    compileOnly(libs.placeholderapi)
+    compileOnly(libs.luckperms)
+    compileOnly(libs.essentialsx)
+    compileOnly(libs.mvdwapi) { isTransitive = false }
+
+    // Other libraries
+    implementation(libs.squirrelid) { isTransitive = false }
+    implementation("dev.notmyfault.serverlib:ServerLib")
+
+    // Our libraries
+    implementation(libs.arkitektonika)
+    implementation("com.intellectualsites.paster:Paster")
+    implementation("com.intellectualsites.informative-annotations:informative-annotations")
+
+    // Adventure
+    implementation("net.kyori:adventure-platform-bukkit")
+}
+
+tasks.processResources {
+    filesMatching("plugin.yml") {
+        expand("version" to project.version)
+    }
+}
+
+tasks.named<ShadowJar>("shadowJar") {
+    dependsOn(":plotsquared-core:shadowJar")
+    dependencies {
+        exclude(dependency("org.checkerframework:"))
+    }
+
+    relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
+    relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
+    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
+    relocate("org.bstats", "com.plotsquared.metrics")
+    relocate("org.enginehub", "com.plotsquared.squirrelid")
+    relocate("org.khelekore.prtree", "com.plotsquared.prtree")
+    relocate("com.google.inject", "com.plotsquared.google")
+    relocate("org.aopalliance", "com.plotsquared.core.aopalliance")
+    relocate("cloud.commandframework.services", "com.plotsquared.core.services")
+    relocate("io.leangen.geantyref", "com.plotsquared.core.geantyref")
+    relocate("com.intellectualsites.arkitektonika", "com.plotsquared.core.arkitektonika")
+    relocate("com.intellectualsites.http", "com.plotsquared.core.http")
+    relocate("com.intellectualsites.paster", "com.plotsquared.core.paster")
+    relocate("org.incendo.serverlib", "com.plotsquared.bukkit.serverlib")
+    relocate("org.jetbrains", "com.plotsquared.core.annotations")
+    relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations")
+    relocate("javax.annotation", "com.plotsquared.core.annotation")
+    relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs")
+    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.annotations", "com.plotsquared.core.annotations.informative")
+
+    // Get rid of all the libs which are 100% unused.
+    minimize()
+
+    mergeServiceFiles()
+}
+
+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.19/")
+        opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
+        opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
+        opt.links("https://jd.advntr.dev/api/4.14.0/")
+        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/pom.xml

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.plotsquared</groupId>
-  <artifactId>PlotSquared-Bukkit</artifactId>
-  <version>latest</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20200518</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bstats</groupId>
-      <artifactId>bstats-bukkit</artifactId>
-      <version>1.7</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.plotsquared</groupId>
-      <artifactId>PlotSquared-Core</artifactId>
-      <version>5.13.13</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.destroystokyo.paper</groupId>
-      <artifactId>paper-api</artifactId>
-      <version>1.16.4-R0.1-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q.worldedit</groupId>
-      <artifactId>worldedit-bukkit</artifactId>
-      <version>7.2.0</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>bukkit</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.papermc</groupId>
-      <artifactId>paperlib</artifactId>
-      <version>1.0.5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.MilkBowl</groupId>
-      <artifactId>VaultAPI</artifactId>
-      <version>1.7</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>bukkit</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>se.hyperver.hyperverse</groupId>
-      <artifactId>Core</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>squirrelid</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>be.maximvdw</groupId>
-      <artifactId>MVdWPlaceholderAPI</artifactId>
-      <version>3.1.1</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q.worldedit</groupId>
-      <artifactId>worldedit-core</artifactId>
-      <version>7.2.0</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>dummypermscompat</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>bukkit-classloader-check</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>mockito-core</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>net.kyori</groupId>
-      <artifactId>text-api</artifactId>
-      <version>3.0.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.kyori</groupId>
-      <artifactId>text-serializer-gson</artifactId>
-      <version>3.0.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.kyori</groupId>
-      <artifactId>text-serializer-legacy</artifactId>
-      <version>3.0.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.kyori</groupId>
-      <artifactId>text-serializer-plain</artifactId>
-      <version>3.0.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>21.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.16.4-R0.1-SNAPSHOT</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.kyori</groupId>
-      <artifactId>text-adapter-bukkit</artifactId>
-      <version>3.0.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>me.clip</groupId>
-      <artifactId>placeholderapi</artifactId>
-      <version>2.10.6</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.luckperms</groupId>
-      <artifactId>api</artifactId>
-      <version>5.1</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.ess3</groupId>
-      <artifactId>EssentialsX</artifactId>
-      <version>2.18.0</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>paperlib</artifactId>
-          <groupId>io.papermc</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.incendo.serverlib</groupId>
-      <artifactId>ServerLib</artifactId>
-      <version>2.2.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>

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

@@ -1,32 +1,26 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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;
 
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.command.MainCommand;
+import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import org.bukkit.command.Command;
@@ -42,35 +36,43 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 public class BukkitCommand implements CommandExecutor, TabCompleter {
 
     @Override
-    public boolean onCommand(CommandSender commandSender, Command command, String commandLabel,
-        String[] args) {
+    public boolean onCommand(
+            CommandSender commandSender, Command command, String commandLabel,
+            String[] args
+    ) {
         if (commandSender instanceof Player) {
-            return MainCommand.onCommand(BukkitUtil.getPlayer((Player) commandSender), args);
+            return MainCommand.onCommand(BukkitUtil.adapt((Player) commandSender), args);
         }
         if (commandSender instanceof ConsoleCommandSender
-            || commandSender instanceof ProxiedCommandSender
-            || commandSender instanceof RemoteConsoleCommandSender) {
+                || commandSender instanceof ProxiedCommandSender
+                || commandSender instanceof RemoteConsoleCommandSender) {
             return MainCommand.onCommand(ConsolePlayer.getConsole(), args);
         }
         return false;
     }
 
     @Override
-    public List<String> onTabComplete(CommandSender commandSender, Command command, String s,
-        String[] args) {
+    public List<String> onTabComplete(
+            CommandSender commandSender, Command command, String label,
+            String[] args
+    ) {
         if (!(commandSender instanceof Player)) {
             return null;
         }
-        PlotPlayer player = BukkitUtil.getPlayer((Player) commandSender);
+        PlotPlayer<?> player = BukkitUtil.adapt((Player) commandSender);
         if (args.length == 0) {
             return Collections.singletonList("plots");
         }
+        if (!Settings.Enabled_Components.TAB_COMPLETED_ALIASES.contains(label.toLowerCase(Locale.ENGLISH))) {
+            return List.of();
+        }
         Collection<com.plotsquared.core.command.Command> objects =
-            MainCommand.getInstance().tab(player, args, s.endsWith(" "));
+                MainCommand.getInstance().tab(player, args, label.endsWith(" "));
         if (objects == null) {
             return null;
         }
@@ -80,4 +82,5 @@ public class BukkitCommand implements CommandExecutor, TabCompleter {
         }
         return result;
     }
+
 }

Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java

@@ -1,132 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import org.apache.commons.lang.Validate;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Represents a wrapper around an array class of an arbitrary reference type,
- * which properly implements "value" hash code and equality functions.
- * <p>
- * This class is intended for use as a key to a map.
- * </p>
- *
- * @param <E> The type of elements in the array.
- * @author Glen Husman
- * @see Arrays
- */
-public final class ArrayWrapper<E> {
-
-    private E[] _array;
-
-    /**
-     * Creates an array wrapper with some elements.
-     *
-     * @param elements The elements of the array.
-     */
-    public ArrayWrapper(E... elements) {
-        setArray(elements);
-    }
-
-    /**
-     * Converts an iterable element collection to an array of elements.
-     * The iteration order of the specified object will be used as the array element order.
-     *
-     * @param list The iterable of objects which will be converted to an array.
-     * @param c    The type of the elements of the array.
-     * @return An array of elements in the specified iterable.
-     */
-    @SuppressWarnings("unchecked") public static <T> T[] toArray(Iterable<? extends T> list,
-        Class<T> c) {
-        int size = -1;
-        if (list instanceof Collection<?>) {
-            @SuppressWarnings("rawtypes") Collection coll = (Collection) list;
-            size = coll.size();
-        }
-
-
-        if (size < 0) {
-            size = 0;
-            // Ugly hack: Count it ourselves
-            for (@SuppressWarnings("unused") T element : list) {
-                size++;
-            }
-        }
-
-        T[] result = (T[]) Array.newInstance(c, size);
-        int i = 0;
-        for (T element : list) { // Assumes iteration order is consistent
-            result[i++] = element; // Assign array element at index THEN increment counter
-        }
-        return result;
-    }
-
-    /**
-     * Retrieves a reference to the wrapped array instance.
-     *
-     * @return The array wrapped by this instance.
-     */
-    public E[] getArray() {
-        return _array;
-    }
-
-    /**
-     * Set this wrapper to wrap a new array instance.
-     *
-     * @param array The new wrapped array.
-     */
-    public void setArray(E[] array) {
-        Validate.notNull(array, "The array must not be null.");
-        _array = array;
-    }
-
-    /**
-     * Determines if this object has a value equivalent to another object.
-     *
-     * @see Arrays#equals(Object[], Object[])
-     */
-    @SuppressWarnings("rawtypes") @Override public boolean equals(Object other) {
-        if (!(other instanceof ArrayWrapper)) {
-            return false;
-        }
-        return Arrays.equals(_array, ((ArrayWrapper) other)._array);
-    }
-
-    /**
-     * Gets the hash code represented by this objects value.
-     *
-     * @return This object's hash code.
-     * @see Arrays#hashCode(Object[])
-     */
-    @Override public int hashCode() {
-        return Arrays.hashCode(_array);
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java

@@ -1,944 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.stream.JsonWriter;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
-import org.bukkit.Statistic.Type;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.logging.Level;
-
-/**
- * Represents a formattable message. Such messages can use elements such as colors, formatting codes, hover and click data, and other features provided by the vanilla Minecraft <a href="http://minecraft.gamepedia.com/Tellraw#Raw_JSON_Text">JSON message formatter</a>.
- * This class allows plugins to emulate the functionality of the vanilla Minecraft <a href="http://minecraft.gamepedia.com/Commands#tellraw">tellraw command</a>.
- * <p>
- * This class follows the builder pattern, allowing for method chaining.
- * It is set up such that invocations of property-setting methods will affect the current editing component,
- * and a call to {@link #then()} or {@link #then(String)} will append a new editing component to the end of the message,
- * optionally initializing it with text. Further property-setting method calls will affect that editing component.
- * </p>
- */
-public class FancyMessage
-    implements JsonRepresentedObject, Cloneable, Iterable<MessagePart>, ConfigurationSerializable {
-
-    private static Constructor<?> nmsPacketPlayOutChatConstructor;
-    // The ChatSerializer's instance of Gson
-    private static Object nmsChatSerializerGsonInstance;
-    private static Object chatMessageType;
-    private static Method fromJsonMethod;
-    private static JsonParser _stringParser = new JsonParser();
-
-    static {
-        ConfigurationSerialization.registerClass(FancyMessage.class);
-    }
-
-    private List<MessagePart> messageParts;
-    private String jsonString;
-    private boolean dirty;
-
-    /**
-     * Creates a JSON message with text.
-     *
-     * @param firstPartText The existing text in the message.
-     */
-    public FancyMessage(final String firstPartText) {
-        this(TextualComponent.rawText(firstPartText));
-    }
-
-    private FancyMessage(final TextualComponent firstPartText) {
-        messageParts = new ArrayList<>();
-        messageParts.add(new MessagePart(firstPartText));
-        jsonString = null;
-        dirty = false;
-        if (nmsPacketPlayOutChatConstructor == null) {
-            try {
-                Class<?> componentClass = Reflection.getNMSClass("IChatBaseComponent");
-                if (!Reflection.getVersion().startsWith("v1_16")) { // < 1.16 TODO needs to be fixed before 1.17 :P
-                    nmsPacketPlayOutChatConstructor = Reflection.getNMSClass("PacketPlayOutChat")
-                            .getDeclaredConstructor(componentClass);
-                } else {
-                    Class<Enum> chatMessageTypeClass = (Class<Enum>) Reflection.getNMSClass("ChatMessageType");
-                    nmsPacketPlayOutChatConstructor = Reflection.getNMSClass("PacketPlayOutChat")
-                            .getDeclaredConstructor(componentClass, chatMessageTypeClass, UUID.class);
-                    chatMessageType = Enum.valueOf(chatMessageTypeClass, "SYSTEM");
-                }
-                nmsPacketPlayOutChatConstructor.setAccessible(true);
-            } catch (NoSuchMethodException e) {
-                Bukkit.getLogger()
-                    .log(Level.SEVERE, "Could not find Minecraft method or constructor.", e);
-            } catch (SecurityException e) {
-                Bukkit.getLogger().log(Level.WARNING, "Could not access constructor.", e);
-            }
-        }
-    }
-
-    /**
-     * Creates a JSON message without text.
-     */
-    public FancyMessage() {
-        this((TextualComponent) null);
-    }
-
-    /**
-     * Deserializes a JSON-represented message from a mapping of key-value pairs.
-     * This is called by the Bukkit serialization API.
-     * It is not intended for direct public API consumption.
-     *
-     * @param serialized The key-value mapping which represents a fancy message.
-     */
-    @SuppressWarnings("unchecked") public static FancyMessage deserialize(
-        Map<String, Object> serialized) {
-        FancyMessage msg = new FancyMessage();
-        msg.messageParts = (List<MessagePart>) serialized.get("messageParts");
-        msg.jsonString = serialized.containsKey("JSON") ? serialized.get("JSON").toString() : null;
-        msg.dirty = !serialized.containsKey("JSON");
-        return msg;
-    }
-
-    /**
-     * Deserializes a fancy message from its JSON representation. This JSON representation is of the format of
-     * that returned by {@link #toJSONString()}, and is compatible with vanilla inputs.
-     *
-     * @param json The JSON string which represents a fancy message.
-     * @return A {@code FancyMessage} representing the parameterized JSON message.
-     */
-    public static FancyMessage deserialize(String json) {
-        JsonObject serialized = _stringParser.parse(json).getAsJsonObject();
-        JsonArray extra = serialized.getAsJsonArray("extra"); // Get the extra component
-        FancyMessage returnVal = new FancyMessage();
-        returnVal.messageParts.clear();
-        for (JsonElement mPrt : extra) {
-            MessagePart component = new MessagePart();
-            JsonObject messagePart = mPrt.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> entry : messagePart.entrySet()) {
-                // Deserialize text
-                if (TextualComponent.isTextKey(entry.getKey())) {
-                    // The map mimics the YAML serialization, which has a "key" field and one or more "value" fields
-                    Map<String, Object> serializedMapForm =
-                        new HashMap<>(); // Must be object due to Bukkit serializer API compliance
-                    serializedMapForm.put("key", entry.getKey());
-                    if (entry.getValue().isJsonPrimitive()) {
-                        // Assume string
-                        serializedMapForm.put("value", entry.getValue().getAsString());
-                    } else {
-                        // Composite object, but we assume each element is a string
-                        for (Map.Entry<String, JsonElement> compositeNestedElement : entry
-                            .getValue().getAsJsonObject().entrySet()) {
-                            serializedMapForm.put("value." + compositeNestedElement.getKey(),
-                                compositeNestedElement.getValue().getAsString());
-                        }
-                    }
-                    component.text = TextualComponent.deserialize(serializedMapForm);
-                } else if (MessagePart.stylesToNames.inverse().containsKey(entry.getKey())) {
-                    if (entry.getValue().getAsBoolean()) {
-                        component.styles
-                            .add(MessagePart.stylesToNames.inverse().get(entry.getKey()));
-                    }
-                } else if (entry.getKey().equals("color")) {
-                    component.color =
-                        ChatColor.valueOf(entry.getValue().getAsString().toUpperCase());
-                } else if (entry.getKey().equals("clickEvent")) {
-                    JsonObject object = entry.getValue().getAsJsonObject();
-                    component.clickActionName = object.get("action").getAsString();
-                    component.clickActionData = object.get("value").getAsString();
-                } else if (entry.getKey().equals("hoverEvent")) {
-                    JsonObject object = entry.getValue().getAsJsonObject();
-                    component.hoverActionName = object.get("action").getAsString();
-                    if (object.get("value").isJsonPrimitive()) {
-                        // Assume string
-                        component.hoverActionData =
-                            new JsonString(object.get("value").getAsString());
-                    } else {
-                        // Assume composite type
-                        // The only composite type we currently store is another FancyMessage
-                        // Therefore, recursion time!
-                        component.hoverActionData = deserialize(object.get("value")
-                            .toString() /* This should properly serialize the JSON object as a JSON string */);
-                    }
-                } else if (entry.getKey().equals("insertion")) {
-                    component.insertionData = entry.getValue().getAsString();
-                } else if (entry.getKey().equals("with")) {
-                    for (JsonElement object : entry.getValue().getAsJsonArray()) {
-                        if (object.isJsonPrimitive()) {
-                            component.translationReplacements
-                                .add(new JsonString(object.getAsString()));
-                        } else {
-                            // Only composite type stored in this array is - again - FancyMessages
-                            // Recurse within this function to parse this as a translation replacement
-                            component.translationReplacements.add(deserialize(object.toString()));
-                        }
-                    }
-                }
-            }
-            returnVal.messageParts.add(component);
-        }
-        return returnVal;
-    }
-
-    @Override public FancyMessage clone() throws CloneNotSupportedException {
-        FancyMessage instance = (FancyMessage) super.clone();
-        instance.messageParts = new ArrayList<>(messageParts.size());
-        for (int i = 0; i < messageParts.size(); i++) {
-            instance.messageParts.add(i, messageParts.get(i).clone());
-        }
-        instance.dirty = false;
-        instance.jsonString = null;
-        return instance;
-    }
-
-    /**
-     * Sets the text of the current editing component to a value.
-     *
-     * @param text The new text of the current editing component.
-     * @return This builder instance.
-     */
-    public FancyMessage text(String text) {
-        MessagePart latest = latest();
-        latest.text = TextualComponent.rawText(text);
-        dirty = true;
-        return this;
-    }
-
-    /**
-     * Sets the text of the current editing component to a value.
-     *
-     * @param text The new text of the current editing component.
-     * @return This builder instance.
-     */
-    public FancyMessage text(TextualComponent text) {
-        MessagePart latest = latest();
-        latest.text = text;
-        dirty = true;
-        return this;
-    }
-
-    /**
-     * Sets the color of the current editing component to a value.
-     *
-     * @param color The new color of the current editing component.
-     * @return This builder instance.
-     * @throws IllegalArgumentException If the specified {@code ChatColor} enumeration value is not a color (but a format value).
-     */
-    public FancyMessage color(final ChatColor color) {
-        if (!color.isColor()) {
-            throw new IllegalArgumentException(color.name() + " is not a color");
-        }
-        latest().color = color;
-        dirty = true;
-        return this;
-    }
-
-    /**
-     * Sets the stylization of the current editing component.
-     *
-     * @param styles The array of styles to apply to the editing component.
-     * @return This builder instance.
-     * @throws IllegalArgumentException If any of the enumeration values in the array do not represent formatters.
-     */
-    public FancyMessage style(ChatColor... styles) {
-        for (final ChatColor style : styles) {
-            if (!style.isFormat()) {
-                throw new IllegalArgumentException(style.name() + " is not a style");
-            }
-        }
-        latest().styles.addAll(Arrays.asList(styles));
-        dirty = true;
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to instruct the client to open a file on the client side filesystem when the currently edited part of the {@code FancyMessage} is clicked.
-     *
-     * @param path The path of the file on the client filesystem.
-     * @return This builder instance.
-     */
-    public FancyMessage file(final String path) {
-        onClick("open_file", path);
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to instruct the client to open a webpage in the client's web browser when the currently edited part of the {@code FancyMessage} is clicked.
-     *
-     * @param url The URL of the page to open when the link is clicked.
-     * @return This builder instance.
-     */
-    public FancyMessage link(final String url) {
-        onClick("open_url", url);
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to instruct the client to replace the chat input box content with the specified string when the currently edited part of the {@code FancyMessage} is clicked.
-     * The client will not immediately send the command to the server to be executed unless the client player submits the command/chat message, usually with the enter key.
-     *
-     * @param command The text to display in the chat bar of the client.
-     * @return This builder instance.
-     */
-    public FancyMessage suggest(final String command) {
-        onClick("suggest_command", command);
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to instruct the client to append the chat input box content with the specified string when the currently edited part of the {@code FancyMessage} is SHIFT-CLICKED.
-     * The client will not immediately send the command to the server to be executed unless the client player submits the command/chat message, usually with the enter key.
-     *
-     * @param command The text to append to the chat bar of the client.
-     * @return This builder instance.
-     */
-    public FancyMessage insert(final String command) {
-        latest().insertionData = command;
-        dirty = true;
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to instruct the client to send the specified string to the server as a chat message when the currently edited part of the {@code FancyMessage} is clicked.
-     * The client <b>will</b> immediately send the command to the server to be executed when the editing component is clicked.
-     *
-     * @param command The text to display in the chat bar of the client.
-     * @return This builder instance.
-     */
-    public FancyMessage command(final String command) {
-        onClick("run_command", command);
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param name The name of the achievement to display, excluding the "achievement." prefix.
-     * @return This builder instance.
-     */
-    public FancyMessage achievementTooltip(final String name) {
-        onHover("show_achievement", new JsonString("achievement." + name));
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to display information about a parameterless statistic when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param which The statistic to display.
-     * @return This builder instance.
-     * @throws IllegalArgumentException If the statistic requires a parameter which was not supplied.
-     */
-    public FancyMessage statisticTooltip(final Statistic which) {
-        Type type = which.getType();
-        if (type != Type.UNTYPED) {
-            throw new IllegalArgumentException(
-                "That statistic requires an additional " + type + " parameter!");
-        }
-        try {
-            Object statistic = Reflection
-                .getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSStatistic",
-                    Statistic.class).invoke(null, which);
-            return achievementTooltip(
-                (String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name")
-                    .get(statistic));
-        } catch (IllegalAccessException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-            return this;
-        } catch (IllegalArgumentException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-            return this;
-        } catch (InvocationTargetException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
-            return this;
-        }
-    }
-
-    /**
-     * Set the behavior of the current editing component to display information about a statistic parameter with a material when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param which The statistic to display.
-     * @param item  The sole material parameter to the statistic.
-     * @return This builder instance.
-     * @throws IllegalArgumentException If the statistic requires a parameter which was not supplied, or was supplied a parameter that was not required.
-     */
-    public FancyMessage statisticTooltip(final Statistic which, Material item) {
-        Type type = which.getType();
-        if (type == Type.UNTYPED) {
-            throw new IllegalArgumentException("That statistic needs no additional parameter!");
-        }
-        if ((type == Type.BLOCK && item.isBlock()) || type == Type.ENTITY) {
-            throw new IllegalArgumentException(
-                "Wrong parameter type for that statistic - needs " + type + "!");
-        }
-        try {
-            Object statistic = Reflection
-                .getMethod(Reflection.getOBCClass("CraftStatistic"), "getMaterialStatistic",
-                    Statistic.class, Material.class).invoke(null, which, item);
-            return achievementTooltip(
-                (String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name")
-                    .get(statistic));
-        } catch (IllegalAccessException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-            return this;
-        } catch (IllegalArgumentException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-            return this;
-        } catch (InvocationTargetException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
-            return this;
-        }
-    }
-
-    /**
-     * Set the behavior of the current editing component to display information about a statistic parameter with an entity type when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param which  The statistic to display.
-     * @param entity The sole entity type parameter to the statistic.
-     * @return This builder instance.
-     * @throws IllegalArgumentException If the statistic requires a parameter which was not supplied, or was supplied a parameter that was not required.
-     */
-    public FancyMessage statisticTooltip(final Statistic which, EntityType entity) {
-        Type type = which.getType();
-        if (type == Type.UNTYPED) {
-            throw new IllegalArgumentException("That statistic needs no additional parameter!");
-        }
-        if (type != Type.ENTITY) {
-            throw new IllegalArgumentException(
-                "Wrong parameter type for that statistic - needs " + type + "!");
-        }
-        try {
-            Object statistic = Reflection
-                .getMethod(Reflection.getOBCClass("CraftStatistic"), "getEntityStatistic",
-                    Statistic.class, EntityType.class).invoke(null, which, entity);
-            return achievementTooltip(
-                (String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name")
-                    .get(statistic));
-        } catch (IllegalAccessException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-            return this;
-        } catch (IllegalArgumentException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-            return this;
-        } catch (InvocationTargetException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
-            return this;
-        }
-    }
-
-    /**
-     * Set the behavior of the current editing component to display information about an item when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param itemJSON A string representing the JSON-serialized NBT data tag of an {@link ItemStack}.
-     * @return This builder instance.
-     */
-    public FancyMessage itemTooltip(final String itemJSON) {
-        onHover("show_item", new JsonString(
-            itemJSON)); // Seems a bit hacky, considering we have a JSON object as a parameter
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to display information about an item when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param itemStack The stack for which to display information.
-     * @return This builder instance.
-     */
-    public FancyMessage itemTooltip(final ItemStack itemStack) {
-        try {
-            Object nmsItem = Reflection
-                .getMethod(Reflection.getOBCClass("inventory.CraftItemStack"), "asNMSCopy",
-                    ItemStack.class).invoke(null, itemStack);
-            return itemTooltip(Reflection.getMethod(Reflection.getNMSClass("ItemStack"), "save",
-                Reflection.getNMSClass("NBTTagCompound"))
-                .invoke(nmsItem, Reflection.getNMSClass("NBTTagCompound").newInstance())
-                .toString());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return this;
-        }
-    }
-
-    /**
-     * Set the behavior of the current editing component to display raw text when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param text The text, which supports newlines, which will be displayed to the client upon hovering.
-     * @return This builder instance.
-     */
-    public FancyMessage tooltip(final String text) {
-        onHover("show_text", new JsonString(text));
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to display raw text when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param lines The lines of text which will be displayed to the client upon hovering. The iteration order of this object will be the order in which the lines of the tooltip are created.
-     * @return This builder instance.
-     */
-    public FancyMessage tooltip(final Iterable<String> lines) {
-        tooltip(ArrayWrapper.toArray(lines, String.class));
-        return this;
-    }
-    /*
-
-    /**
-     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-     * @param replacements The replacements, in order, that will be used in the language-specific message.
-     * @return This builder instance.
-     */   /* ------------
-    public FancyMessage translationReplacements(final Iterable<? extends CharSequence> replacements){
-        for(CharSequence str : replacements){
-            latest().translationReplacements.add(new JsonString(str));
-        }
-
-        return this;
-    }
-
-    */
-
-    /**
-     * Set the behavior of the current editing component to display raw text when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param lines The lines of text which will be displayed to the client upon hovering.
-     * @return This builder instance.
-     */
-    public FancyMessage tooltip(final String... lines) {
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < lines.length; i++) {
-            builder.append(lines[i]);
-            if (i != lines.length - 1) {
-                builder.append('\n');
-            }
-        }
-        tooltip(builder.toString());
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to display formatted text when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param text The formatted text which will be displayed to the client upon hovering.
-     * @return This builder instance.
-     */
-    public FancyMessage formattedTooltip(FancyMessage text) {
-        for (MessagePart component : text.messageParts) {
-            if (component.clickActionData != null && component.clickActionName != null) {
-                throw new IllegalArgumentException("The tooltip text cannot have click data.");
-            } else if (component.hoverActionData != null && component.hoverActionName != null) {
-                throw new IllegalArgumentException("The tooltip text cannot have a tooltip.");
-            }
-        }
-        onHover("show_text", text);
-        return this;
-    }
-
-    /**
-     * Set the behavior of the current editing component to display the specified lines of formatted text when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param lines The lines of formatted text which will be displayed to the client upon hovering.
-     * @return This builder instance.
-     */
-    public FancyMessage formattedTooltip(FancyMessage... lines) {
-        if (lines.length < 1) {
-            onHover(null, null); // Clear tooltip
-            return this;
-        }
-
-        FancyMessage result = new FancyMessage();
-        result.messageParts
-            .clear(); // Remove the one existing text component that exists by default, which destabilizes the object
-
-        for (int i = 0; i < lines.length; i++) {
-            try {
-                for (MessagePart component : lines[i]) {
-                    if (component.clickActionData != null && component.clickActionName != null) {
-                        throw new IllegalArgumentException(
-                            "The tooltip text cannot have click data.");
-                    } else if (component.hoverActionData != null
-                        && component.hoverActionName != null) {
-                        throw new IllegalArgumentException(
-                            "The tooltip text cannot have a tooltip.");
-                    }
-                    if (component.hasText()) {
-                        result.messageParts.add(component.clone());
-                    }
-                }
-                if (i != lines.length - 1) {
-                    result.messageParts.add(new MessagePart(TextualComponent.rawText("\n")));
-                }
-            } catch (CloneNotSupportedException e) {
-                Bukkit.getLogger().log(Level.WARNING, "Failed to clone object", e);
-                return this;
-            }
-        }
-        return formattedTooltip(
-            result.messageParts.isEmpty() ? null : result); // Throws NPE if size is 0, intended
-    }
-
-    /**
-     * Set the behavior of the current editing component to display the specified lines of formatted text when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param lines The lines of text which will be displayed to the client upon hovering. The iteration order of this object will be the order in which the lines of the tooltip are created.
-     * @return This builder instance.
-     */
-    public FancyMessage formattedTooltip(final Iterable<FancyMessage> lines) {
-        return formattedTooltip(ArrayWrapper.toArray(lines, FancyMessage.class));
-    }
-
-    /**
-     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-     *
-     * @param replacements The replacements, in order, that will be used in the language-specific message.
-     * @return This builder instance.
-     */
-    public FancyMessage translationReplacements(final String... replacements) {
-        for (String str : replacements) {
-            latest().translationReplacements.add(new JsonString(str));
-        }
-        dirty = true;
-
-        return this;
-    }
-
-    /**
-     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-     *
-     * @param replacements The replacements, in order, that will be used in the language-specific message.
-     * @return This builder instance.
-     */
-    public FancyMessage translationReplacements(final FancyMessage... replacements) {
-        Collections.addAll(latest().translationReplacements, replacements);
-
-        dirty = true;
-
-        return this;
-    }
-
-    /**
-     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-     *
-     * @param replacements The replacements, in order, that will be used in the language-specific message.
-     * @return This builder instance.
-     */
-    public FancyMessage translationReplacements(final Iterable<FancyMessage> replacements) {
-        return translationReplacements(ArrayWrapper.toArray(replacements, FancyMessage.class));
-    }
-
-    /**
-     * Terminate construction of the current editing component, and begin construction of a new message component.
-     * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
-     *
-     * @param text The text which will populate the new message component.
-     * @return This builder instance.
-     */
-    public FancyMessage then(final String text) {
-        return then(TextualComponent.rawText(text));
-    }
-
-    /**
-     * Terminate construction of the current editing component, and begin construction of a new message component.
-     * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
-     *
-     * @param text The text which will populate the new message component.
-     * @return This builder instance.
-     */
-    public FancyMessage then(final TextualComponent text) {
-        if (!latest().hasText()) {
-            throw new IllegalStateException("previous message part has no text");
-        }
-        messageParts.add(new MessagePart(text));
-        dirty = true;
-        return this;
-    }
-
-    /**
-     * Terminate construction of the current editing component, and begin construction of a new message component.
-     * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
-     *
-     * @return This builder instance.
-     */
-    public FancyMessage then() {
-        if (!latest().hasText()) {
-            throw new IllegalStateException("previous message part has no text");
-        }
-        messageParts.add(new MessagePart());
-        dirty = true;
-        return this;
-    }
-
-    @Override public void writeJson(JsonWriter writer) throws IOException {
-        if (messageParts.size() == 1) {
-            latest().writeJson(writer);
-        } else {
-            writer.beginObject().name("text").value("").name("extra").beginArray();
-            for (final MessagePart part : this) {
-                part.writeJson(writer);
-            }
-            writer.endArray().endObject();
-        }
-    }
-
-    /**
-     * Serialize this fancy message, converting it into syntactically-valid JSON using a {@link JsonWriter}.
-     * This JSON should be compatible with vanilla formatter commands such as {@code /tellraw}.
-     *
-     * @return The JSON string representing this object.
-     */
-    public String toJSONString() {
-        if (!dirty && jsonString != null) {
-            return jsonString;
-        }
-        StringWriter string = new StringWriter();
-        JsonWriter json = new JsonWriter(string);
-        try {
-            writeJson(json);
-            json.close();
-        } catch (IOException e) {
-            throw new RuntimeException("invalid message");
-        }
-        jsonString = string.toString();
-        dirty = false;
-        return jsonString;
-    }
-
-    /**
-     * Sends this message to a player. The player will receive the fully-fledged formatted display of this message.
-     *
-     * @param player The player who will receive the message.
-     */
-    public void send(Player player) {
-        send(player, toJSONString());
-    }
-
-    private void send(CommandSender sender, String jsonString) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage(toOldMessageFormat());
-            return;
-        }
-        Player player = (Player) sender;
-        try {
-            Object handle = Reflection.getHandle(player);
-            Object connection =
-                Reflection.getField(handle.getClass(), "playerConnection").get(handle);
-            Reflection
-                .getMethod(connection.getClass(), "sendPacket", Reflection.getNMSClass("Packet"))
-                .invoke(connection, createChatPacket(jsonString, ((Player) sender).getUniqueId()));
-        } catch (IllegalArgumentException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-        } catch (IllegalAccessException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-        } catch (InstantiationException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Underlying class is abstract.", e);
-        } catch (InvocationTargetException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
-        } catch (NoSuchMethodException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not find method.", e);
-        } catch (ClassNotFoundException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not find class.", e);
-        }
-    }
-
-    private Object createChatPacket(String json, UUID receiver)
-        throws IllegalArgumentException, IllegalAccessException, InstantiationException,
-        InvocationTargetException, NoSuchMethodException, ClassNotFoundException {
-        if (nmsChatSerializerGsonInstance == null) {
-            // Find the field and its value, completely bypassing obfuscation
-            Class<?> chatSerializerClazz;
-
-            // Get the three parts of the version string (major version is currently unused)
-            // vX_Y_RZ
-            //   X = major
-            //   Y = minor
-            //   Z = revision
-            final String version = Reflection.getVersion();
-            String[] split =
-                version.substring(1, version.length() - 1).split("_"); // Remove trailing dot
-            //int majorVersion = Integer.parseInt(split[0]);
-            int minorVersion = Integer.parseInt(split[1]);
-            int revisionVersion = Integer.parseInt(split[2].substring(1)); // Substring to ignore R
-
-            if (minorVersion < 8 || (minorVersion == 8 && revisionVersion == 1)) {
-                chatSerializerClazz = Reflection.getNMSClass("ChatSerializer");
-            } else {
-                chatSerializerClazz = Reflection.getNMSClass("IChatBaseComponent$ChatSerializer");
-            }
-
-            if (chatSerializerClazz == null) {
-                throw new ClassNotFoundException("Can't find the ChatSerializer class");
-            }
-
-            for (Field declaredField : chatSerializerClazz.getDeclaredFields()) {
-                if (Modifier.isFinal(declaredField.getModifiers()) && Modifier
-                    .isStatic(declaredField.getModifiers()) && declaredField.getType().getName()
-                    .endsWith("Gson")) {
-                    // We've found our field
-                    declaredField.setAccessible(true);
-                    nmsChatSerializerGsonInstance = declaredField.get(null);
-                    fromJsonMethod = nmsChatSerializerGsonInstance.getClass()
-                        .getMethod("fromJson", String.class, Class.class);
-                    break;
-                }
-            }
-        }
-
-        // Since the method is so simple, and all the obfuscated methods have the same name, it's easier to reimplement 'IChatBaseComponent a(String)' than to reflectively call it
-        // Of course, the implementation may change, but fuzzy matches might break with signature changes
-        Object serializedChatComponent = fromJsonMethod.invoke(nmsChatSerializerGsonInstance, json,
-            Reflection.getNMSClass("IChatBaseComponent"));
-
-        if (!Reflection.getVersion().startsWith("v1_16")) {
-            return nmsPacketPlayOutChatConstructor.newInstance(serializedChatComponent);
-        } else {
-            return nmsPacketPlayOutChatConstructor.newInstance(serializedChatComponent, chatMessageType, receiver);
-        }
-    }
-
-    /**
-     * Sends this message to a command sender.
-     * If the sender is a player, they will receive the fully-fledged formatted display of this message.
-     * Otherwise, they will receive a version of this message with less formatting.
-     *
-     * @param sender The command sender who will receive the message.
-     * @see #toOldMessageFormat()
-     */
-    public void send(CommandSender sender) {
-        send(sender, toJSONString());
-    }
-
-    /**
-     * Sends this message to multiple command senders.
-     *
-     * @param senders The command senders who will receive the message.
-     * @see #send(CommandSender)
-     */
-    public void send(final Iterable<? extends CommandSender> senders) {
-        String string = toJSONString();
-        for (final CommandSender sender : senders) {
-            send(sender, string);
-        }
-    }
-
-    /**
-     * Convert this message to a human-readable string with limited formatting.
-     * This method is used to send this message to clients without JSON formatting support.
-     * <p>
-     * Serialization of this message by using this message will include (in this order for each message part):
-     * <ol>
-     * <li>The color of each message part.</li>
-     * <li>The applicable stylizations for each message part.</li>
-     * <li>The core text of the message part.</li>
-     * </ol>
-     * The primary omissions are tooltips and clickable actions. Consequently, this method should be used only as a last resort.
-     * <p>
-     * Color and formatting can be removed from the returned string by using {@link ChatColor#stripColor(String)}.</p>
-     *
-     * @return A human-readable string representing limited formatting in addition to the core text of this message.
-     */
-    public String toOldMessageFormat() {
-        StringBuilder result = new StringBuilder();
-        for (MessagePart part : this) {
-            result.append(part.color == null ? "" : part.color);
-            for (ChatColor formatSpecifier : part.styles) {
-                result.append(formatSpecifier);
-            }
-            result.append(part.text);
-        }
-        return result.toString();
-    }
-
-    private MessagePart latest() {
-        return messageParts.get(messageParts.size() - 1);
-    }
-
-    private void onClick(final String name, final String data) {
-        final MessagePart latest = latest();
-        latest.clickActionName = name;
-        latest.clickActionData = data;
-        dirty = true;
-    }
-
-    private void onHover(final String name, final JsonRepresentedObject data) {
-        final MessagePart latest = latest();
-        latest.hoverActionName = name;
-        latest.hoverActionData = data;
-        dirty = true;
-    }
-
-    // Doc copied from interface
-    public Map<String, Object> serialize() {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("messageParts", messageParts);
-        //		map.put("JSON", toJSONString());
-        return map;
-    }
-
-    /**
-     * <b>Internally called method. Not for API consumption.</b>
-     */
-    public Iterator<MessagePart> iterator() {
-        return messageParts.iterator();
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java

@@ -1,45 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-/**
- * Represents an object that can be serialized to a JSON writer instance.
- */
-interface JsonRepresentedObject {
-
-    /**
-     * Writes the JSON representation of this object to the specified writer.
-     *
-     * @param writer The JSON writer which will receive the object.
-     * @throws IOException If an error occurs writing to the stream.
-     */
-    public void writeJson(JsonWriter writer) throws IOException;
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java

@@ -1,70 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import com.google.gson.stream.JsonWriter;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents a JSON string value.
- * Writes by this object will not write name values nor begin/end objects in the JSON stream.
- * All writes merely write the represented string value.
- */
-final class JsonString implements JsonRepresentedObject, ConfigurationSerializable {
-
-    private String _value;
-
-    public JsonString(CharSequence value) {
-        _value = value == null ? null : value.toString();
-    }
-
-    public static JsonString deserialize(Map<String, Object> map) {
-        return new JsonString(map.get("stringValue").toString());
-    }
-
-    @Override public void writeJson(JsonWriter writer) throws IOException {
-        writer.value(getValue());
-    }
-
-    public String getValue() {
-        return _value;
-    }
-
-    public Map<String, Object> serialize() {
-        HashMap<String, Object> theSingleValue = new HashMap<String, Object>();
-        theSingleValue.put("stringValue", _value);
-        return theSingleValue;
-    }
-
-    @Override public String toString() {
-        return _value;
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java

@@ -1,179 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableBiMap;
-import com.google.gson.stream.JsonWriter;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-
-/**
- * Internal class: Represents a component of a JSON-serializable {@link FancyMessage}.
- */
-final class MessagePart implements JsonRepresentedObject, ConfigurationSerializable, Cloneable {
-
-    static final BiMap<ChatColor, String> stylesToNames;
-
-    static {
-        ImmutableBiMap.Builder<ChatColor, String> builder = ImmutableBiMap.builder();
-        for (final ChatColor style : ChatColor.values()) {
-            if (!style.isFormat()) {
-                continue;
-            }
-
-            String styleName;
-            switch (style) {
-                case MAGIC:
-                    styleName = "obfuscated";
-                    break;
-                case UNDERLINE:
-                    styleName = "underlined";
-                    break;
-                default:
-                    styleName = style.name().toLowerCase();
-                    break;
-            }
-
-            builder.put(style, styleName);
-        }
-        stylesToNames = builder.build();
-    }
-
-    static {
-        ConfigurationSerialization.registerClass(MessagePart.class);
-    }
-
-    ChatColor color = ChatColor.WHITE;
-    ArrayList<ChatColor> styles = new ArrayList<>();
-    String clickActionName = null;
-    String clickActionData = null;
-    String hoverActionName = null;
-    JsonRepresentedObject hoverActionData = null;
-    TextualComponent text = null;
-    String insertionData = null;
-    ArrayList<JsonRepresentedObject> translationReplacements = new ArrayList<>();
-
-    MessagePart(final TextualComponent text) {
-        this.text = text;
-    }
-
-    MessagePart() {
-        this.text = null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static MessagePart deserialize(Map<String, Object> serialized) {
-        MessagePart part = new MessagePart((TextualComponent) serialized.get("text"));
-        part.styles = (ArrayList<ChatColor>) serialized.get("styles");
-        part.color = ChatColor.getByChar(serialized.get("color").toString());
-        part.hoverActionName = (String) serialized.get("hoverActionName");
-        part.hoverActionData = (JsonRepresentedObject) serialized.get("hoverActionData");
-        part.clickActionName = (String) serialized.get("clickActionName");
-        part.clickActionData = (String) serialized.get("clickActionData");
-        part.insertionData = (String) serialized.get("insertion");
-        part.translationReplacements =
-            (ArrayList<JsonRepresentedObject>) serialized.get("translationReplacements");
-        return part;
-    }
-
-    boolean hasText() {
-        return text != null;
-    }
-
-    @Override @SuppressWarnings("unchecked") public MessagePart clone()
-        throws CloneNotSupportedException {
-        MessagePart obj = (MessagePart) super.clone();
-        obj.styles = (ArrayList<ChatColor>) styles.clone();
-        if (hoverActionData instanceof JsonString) {
-            obj.hoverActionData = new JsonString(((JsonString) hoverActionData).getValue());
-        } else if (hoverActionData instanceof FancyMessage) {
-            obj.hoverActionData = ((FancyMessage) hoverActionData).clone();
-        }
-        obj.translationReplacements =
-            (ArrayList<JsonRepresentedObject>) translationReplacements.clone();
-        return obj;
-
-    }
-
-    public void writeJson(JsonWriter json) {
-        try {
-            json.beginObject();
-            text.writeJson(json);
-            json.name("color").value(color.name().toLowerCase());
-            for (final ChatColor style : styles) {
-                json.name(stylesToNames.get(style)).value(true);
-            }
-            if (clickActionName != null && clickActionData != null) {
-                json.name("clickEvent").beginObject().name("action").value(clickActionName)
-                    .name("value").value(clickActionData).endObject();
-            }
-            if (hoverActionName != null && hoverActionData != null) {
-                json.name("hoverEvent").beginObject().name("action").value(hoverActionName)
-                    .name("value");
-                hoverActionData.writeJson(json);
-                json.endObject();
-            }
-            if (insertionData != null) {
-                json.name("insertion").value(insertionData);
-            }
-            if (translationReplacements.size() > 0 && TextualComponent.isTranslatableText(text)) {
-                json.name("with").beginArray();
-                for (JsonRepresentedObject obj : translationReplacements) {
-                    obj.writeJson(json);
-                }
-                json.endArray();
-            }
-            json.endObject();
-        } catch (IOException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A problem occurred during writing of JSON string", e);
-        }
-    }
-
-    public Map<String, Object> serialize() {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("text", text);
-        map.put("styles", styles);
-        map.put("color", color.getChar());
-        map.put("hoverActionName", hoverActionName);
-        map.put("hoverActionData", hoverActionData);
-        map.put("clickActionName", clickActionName);
-        map.put("clickActionData", clickActionData);
-        map.put("insertion", insertionData);
-        map.put("translationReplacements", translationReplacements);
-        return map;
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java

@@ -1,227 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import org.bukkit.Bukkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A class containing static utility methods and caches which are intended as reflective conveniences.
- * Unless otherwise noted, upon failure methods will return {@code null}.
- */
-public final class Reflection {
-
-    /**
-     * Stores loaded classes from the {@code net.minecraft.server} package.
-     */
-    private static final Map<String, Class<?>> _loadedNMSClasses = new HashMap<>();
-    /**
-     * Stores loaded classes from the {@code org.bukkit.craftbukkit} package (and subpackages).
-     */
-    private static final Map<String, Class<?>> _loadedOBCClasses = new HashMap<>();
-    private static final Map<Class<?>, Map<String, Field>> _loadedFields = new HashMap<>();
-    /**
-     * Contains loaded methods in a cache.
-     * The map maps [types to maps of [method names to maps of [parameter types to method instances]]].
-     */
-    private static final Map<Class<?>, Map<String, Map<ArrayWrapper<Class<?>>, Method>>>
-        _loadedMethods = new HashMap<>();
-    private static String _versionString;
-
-    private Reflection() {
-    }
-
-    /**
-     * Gets the version string from the package name of the CraftBukkit server implementation.
-     * This is needed to bypass the JAR package name changing on each update.
-     *
-     * @return The version string of the OBC and NMS packages, <em>including the trailing dot</em>.
-     */
-    public synchronized static String getVersion() {
-        if (_versionString == null) {
-            String name = Bukkit.getServer().getClass().getPackage().getName();
-            _versionString = name.substring(name.lastIndexOf('.') + 1) + ".";
-        }
-
-        return _versionString;
-    }
-
-    /**
-     * Gets a {@link Class} object representing a type contained within the {@code net.minecraft.server} versioned package.
-     * The class instances returned by this method are cached, such that no lookup will be done twice (unless multiple threads are accessing this method simultaneously).
-     *
-     * @param className The name of the class, excluding the package, within NMS.
-     * @return The class instance representing the specified NMS class, or {@code null} if it could not be loaded.
-     */
-    public synchronized static Class<?> getNMSClass(String className) {
-        if (_loadedNMSClasses.containsKey(className)) {
-            return _loadedNMSClasses.get(className);
-        }
-
-        String fullName = "net.minecraft.server." + getVersion() + className;
-        Class<?> clazz;
-        try {
-            clazz = Class.forName(fullName);
-        } catch (ClassNotFoundException e) {
-            _loadedNMSClasses.put(className, null);
-            throw new RuntimeException(e);
-        }
-        _loadedNMSClasses.put(className, clazz);
-        return clazz;
-    }
-
-    /**
-     * Gets a {@link Class} object representing a type contained within the {@code org.bukkit.craftbukkit} versioned package.
-     * The class instances returned by this method are cached, such that no lookup will be done twice (unless multiple threads are accessing this method simultaneously).
-     *
-     * @param className The name of the class, excluding the package, within OBC. This name may contain a subpackage name, such as {@code inventory.CraftItemStack}.
-     * @return The class instance representing the specified OBC class, or {@code null} if it could not be loaded.
-     */
-    public synchronized static Class<?> getOBCClass(String className) {
-        if (_loadedOBCClasses.containsKey(className)) {
-            return _loadedOBCClasses.get(className);
-        }
-
-        String fullName = "org.bukkit.craftbukkit." + getVersion() + className;
-        Class<?> clazz;
-        try {
-            clazz = Class.forName(fullName);
-        } catch (ClassNotFoundException e) {
-            _loadedOBCClasses.put(className, null);
-            throw new RuntimeException(e);
-        }
-        _loadedOBCClasses.put(className, clazz);
-        return clazz;
-    }
-
-    /**
-     * Attempts to get the NMS handle of a CraftBukkit object.
-     * <p>
-     * The only match currently attempted by this method is a retrieval by using a parameterless {@code getHandle()} method implemented by the runtime type of the specified object.
-     * </p>
-     *
-     * @param obj The object for which to retrieve an NMS handle.
-     * @return The NMS handle of the specified object, or {@code null} if it could not be retrieved using {@code getHandle()}.
-     */
-    public synchronized static Object getHandle(Object obj)
-        throws InvocationTargetException, IllegalAccessException, IllegalArgumentException {
-        return getMethod(obj.getClass(), "getHandle").invoke(obj);
-    }
-
-    /**
-     * Retrieves a {@link Field} instance declared by the specified class with the specified name.
-     * Java access modifiers are ignored during this retrieval. No guarantee is made as to whether the field
-     * returned will be an instance or static field.
-     * <p>
-     * A global caching mechanism within this class is used to store fields. Combined with synchronization, this guarantees that
-     * no field will be reflectively looked up twice.
-     * </p>
-     * <p>
-     * If a field is deemed suitable for return, {@link Field#setAccessible(boolean) setAccessible} will be invoked with an argument of {@code true} before it is returned.
-     * This ensures that callers do not have to check or worry about Java access modifiers when dealing with the returned instance.
-     * </p>
-     *
-     * @param clazz The class which contains the field to retrieve.
-     * @param name  The declared name of the field in the class.
-     * @return A field object with the specified name declared by the specified class.
-     * @see Class#getDeclaredField(String)
-     */
-    public synchronized static Field getField(Class<?> clazz, String name) {
-        Map<String, Field> loaded;
-        if (!_loadedFields.containsKey(clazz)) {
-            loaded = new HashMap<>();
-            _loadedFields.put(clazz, loaded);
-        } else {
-            loaded = _loadedFields.get(clazz);
-        }
-        if (loaded.containsKey(name)) {
-            // If the field is loaded (or cached as not existing), return the relevant value, which might be null
-            return loaded.get(name);
-        }
-        try {
-            Field field = clazz.getDeclaredField(name);
-            field.setAccessible(true);
-            loaded.put(name, field);
-            return field;
-        } catch (NoSuchFieldException | SecurityException e) {
-            // Error loading
-            e.printStackTrace();
-            // Cache field as not existing
-            loaded.put(name, null);
-            return null;
-        }
-    }
-
-    /**
-     * Retrieves a {@link Method} instance declared by the specified class with the specified name and argument types.
-     * Java access modifiers are ignored during this retrieval. No guarantee is made as to whether the field
-     * returned will be an instance or static field.
-     * <p>
-     * A global caching mechanism within this class is used to store method. Combined with synchronization, this guarantees that
-     * no method will be reflectively looked up twice.
-     * <p>
-     * If a method is deemed suitable for return, {@link Method#setAccessible(boolean) setAccessible} will be invoked with an argument of {@code true} before it is returned.
-     * This ensures that callers do not have to check or worry about Java access modifiers when dealing with the returned instance.
-     * <p>
-     * This method does <em>not</em> search superclasses of the specified type for methods with the specified signature.
-     * Callers wishing this behavior should use {@link Class#getDeclaredMethod(String, Class...)}.
-     *
-     * @param clazz The class which contains the method to retrieve.
-     * @param name  The declared name of the method in the class.
-     * @param args  The formal argument types of the method.
-     * @return A method object with the specified name declared by the specified class.
-     */
-    public synchronized static Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-        _loadedMethods.computeIfAbsent(clazz, k -> new HashMap<>());
-
-        Map<String, Map<ArrayWrapper<Class<?>>, Method>> loadedMethodNames =
-            _loadedMethods.get(clazz);
-        loadedMethodNames.computeIfAbsent(name, k -> new HashMap<>());
-
-        Map<ArrayWrapper<Class<?>>, Method> loadedSignatures = loadedMethodNames.get(name);
-        ArrayWrapper<Class<?>> wrappedArg = new ArrayWrapper<>(args);
-        if (loadedSignatures.containsKey(wrappedArg)) {
-            return loadedSignatures.get(wrappedArg);
-        }
-
-        for (Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && Arrays.equals(args, m.getParameterTypes())) {
-                m.setAccessible(true);
-                loadedSignatures.put(wrappedArg, m);
-                return m;
-            }
-        }
-        loadedSignatures.put(wrappedArg, null);
-        return null;
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java

@@ -1,338 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.chat;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.gson.stream.JsonWriter;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-import org.bukkit.configuration.serialization.ConfigurationSerialization;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Represents a textual component of a message part.
- * This can be used to not only represent string literals in a JSON message,
- * but also to represent localized strings and other text values.
- * <p>Different instances of this class can be created with static constructor methods.</p>
- */
-public abstract class TextualComponent implements Cloneable {
-
-    static {
-        ConfigurationSerialization.registerClass(TextualComponent.ArbitraryTextTypeComponent.class);
-        ConfigurationSerialization.registerClass(TextualComponent.ComplexTextTypeComponent.class);
-    }
-
-    static TextualComponent deserialize(Map<String, Object> map) {
-        if (map.containsKey("key") && map.size() == 2 && map.containsKey("value")) {
-            // Arbitrary text component
-            return ArbitraryTextTypeComponent.deserialize(map);
-        } else if (map.size() >= 2 && map.containsKey("key") && !map
-            .containsKey("value") /* It contains keys that START WITH value */) {
-            // Complex JSON object
-            return ComplexTextTypeComponent.deserialize(map);
-        }
-
-        return null;
-    }
-
-    static boolean isTextKey(String key) {
-        return key.equals("translate") || key.equals("text") || key.equals("score") || key
-            .equals("selector");
-    }
-
-    static boolean isTranslatableText(TextualComponent component) {
-        return component instanceof ComplexTextTypeComponent && component.getKey()
-            .equals("translate");
-    }
-
-    /**
-     * Create a textual component representing a string literal.
-     *
-     * <p>This is the default type of textual component when a single string
-     * literal is given to a method.
-     *
-     * @param textValue The text which will be represented.
-     * @return The text component representing the specified literal text.
-     */
-    public static TextualComponent rawText(String textValue) {
-        return new ArbitraryTextTypeComponent("text", textValue);
-    }
-
-    /**
-     * Create a textual component representing a localized string.
-     * The client will see this text component as their localized version of the specified string <em>key</em>, which can be overridden by a
-     * resource pack.
-     * <p>
-     * If the specified translation key is not present on the client resource pack, the translation key will be displayed as a string literal to
-     * the client.
-     * </p>
-     *
-     * @param translateKey The string key which maps to localized text.
-     * @return The text component representing the specified localized text.
-     */
-    public static TextualComponent localizedText(String translateKey) {
-        return new ArbitraryTextTypeComponent("translate", translateKey);
-    }
-
-    private static void throwUnsupportedSnapshot() {
-        throw new UnsupportedOperationException(
-            "This feature is only supported in snapshot releases.");
-    }
-
-    /**
-     * Create a textual component representing a scoreboard value.
-     * The client will see their own score for the specified objective as the text represented by this component.
-     * <p>
-     * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
-     * </p>
-     *
-     * @param scoreboardObjective The name of the objective for which to display the score.
-     * @return The text component representing the specified scoreboard score (for the viewing player), or {@code null} if an error occurs during
-     * JSON serialization.
-     */
-    public static TextualComponent objectiveScore(String scoreboardObjective) {
-        return objectiveScore("*", scoreboardObjective);
-    }
-
-    /**
-     * Create a textual component representing a scoreboard value.
-     * The client will see the score of the specified player for the specified objective as the text represented by this component.
-     *
-     * <p><b>This method is currently guaranteed to throw an {@code UnsupportedOperationException}
-     * as it is only supported on snapshot clients.</b>
-     *
-     * @param playerName          The name of the player whos score will be shown. If
-     *                            this string represents the single-character sequence
-     *                            "*", the viewing player's score will be displayed.
-     *                            Standard minecraft selectors (@a, @p, etc)
-     *                            are <em>not</em> supported.
-     * @param scoreboardObjective The name of the objective for
-     *                            which to display the score.
-     * @return The text component representing the specified scoreboard score
-     * for the specified player, or {@code null} if an error occurs during JSON serialization.
-     */
-    public static TextualComponent objectiveScore(String playerName, String scoreboardObjective) {
-        throwUnsupportedSnapshot(); // Remove this line when the feature is released to non-snapshot versions, in addition to updating ALL THE
-        // OVERLOADS documentation accordingly
-
-        return new ComplexTextTypeComponent("score",
-            ImmutableMap.<String, String>builder().put("name", playerName)
-                .put("objective", scoreboardObjective).build());
-    }
-
-    /**
-     * Create a textual component representing a player name, retrievable by using a standard minecraft selector.
-     * The client will see the players or entities captured by the specified selector as the text represented by this component.
-     * <p>
-     * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
-     * </p>
-     *
-     * @param selector The minecraft player or entity selector which will capture the entities whose string representations will be displayed in
-     *                 the place of this text component.
-     * @return The text component representing the name of the entities captured by the selector.
-     */
-    public static TextualComponent selector(String selector) {
-        throwUnsupportedSnapshot(); // Remove this line when the feature is released to non-snapshot versions, in addition to updating ALL THE
-        // OVERLOADS documentation accordingly
-
-        return new ArbitraryTextTypeComponent("selector", selector);
-    }
-
-    @Override public String toString() {
-        return getReadableString();
-    }
-
-    /**
-     * @return The JSON key used to represent text components of this type.
-     */
-    public abstract String getKey();
-
-    /**
-     * @return A readable String
-     */
-    public abstract String getReadableString();
-
-    /**
-     * Clones a textual component instance.
-     * The returned object should not reference this textual component instance, but should maintain the same key and value.
-     */
-    @Override public abstract TextualComponent clone() throws CloneNotSupportedException;
-
-    /**
-     * Writes the text data represented by this textual component to the specified JSON writer object.
-     * A new object within the writer is not started.
-     *
-     * @param writer The object to which to write the JSON data.
-     * @throws IOException If an error occurs while writing to the stream.
-     */
-    public abstract void writeJson(JsonWriter writer) throws IOException;
-
-    /**
-     * Internal class used to represent all types of text components.
-     * Exception validating done is on keys and values.
-     */
-    private static final class ArbitraryTextTypeComponent extends TextualComponent
-        implements ConfigurationSerializable {
-
-        private String key;
-        private String value;
-
-        public ArbitraryTextTypeComponent(String key, String value) {
-            setKey(key);
-            setValue(value);
-        }
-
-        public static ArbitraryTextTypeComponent deserialize(Map<String, Object> map) {
-            return new ArbitraryTextTypeComponent(map.get("key").toString(),
-                map.get("value").toString());
-        }
-
-        @Override public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            Preconditions
-                .checkArgument(key != null && !key.isEmpty(), "The key must be specified.");
-            this.key = key;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            Preconditions.checkArgument(value != null, "The value must be specified.");
-            this.value = value;
-        }
-
-        @Override public TextualComponent clone() throws CloneNotSupportedException {
-            // Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone
-            return new ArbitraryTextTypeComponent(getKey(), getValue());
-        }
-
-        @Override public void writeJson(JsonWriter writer) throws IOException {
-            writer.name(getKey()).value(getValue());
-        }
-
-        @Override @SuppressWarnings("serial") public Map<String, Object> serialize() {
-            return new HashMap<String, Object>() {
-                {
-                    put("key", getKey());
-                    put("value", getValue());
-                }
-            };
-        }
-
-        @Override public String getReadableString() {
-            return getValue();
-        }
-    }
-
-
-    /**
-     * Internal class used to represent a text component with a nested JSON
-     * value.
-     *
-     * <p>Exception validating done is on keys and values.
-     */
-    private static final class ComplexTextTypeComponent extends TextualComponent
-        implements ConfigurationSerializable {
-
-        private String key;
-        private Map<String, String> value;
-
-        public ComplexTextTypeComponent(String key, Map<String, String> values) {
-            setKey(key);
-            setValue(values);
-        }
-
-        public static ComplexTextTypeComponent deserialize(Map<String, Object> map) {
-            String key = null;
-            Map<String, String> value = new HashMap<>();
-            for (Map.Entry<String, Object> valEntry : map.entrySet()) {
-                if (valEntry.getKey().equals("key")) {
-                    key = (String) valEntry.getValue();
-                } else if (valEntry.getKey().startsWith("value.")) {
-                    value.put(valEntry.getKey().substring(6) /* Strips out the value prefix */,
-                        valEntry.getValue().toString());
-                }
-            }
-            return new ComplexTextTypeComponent(key, value);
-        }
-
-        @Override public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            Preconditions
-                .checkArgument(key != null && !key.isEmpty(), "The key must be specified.");
-            this.key = key;
-        }
-
-        public Map<String, String> getValue() {
-            return value;
-        }
-
-        public void setValue(Map<String, String> value) {
-            Preconditions.checkArgument(value != null, "The value must be specified.");
-            this.value = value;
-        }
-
-        @Override public TextualComponent clone() {
-            // Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone
-            return new ComplexTextTypeComponent(getKey(), getValue());
-        }
-
-        @Override public void writeJson(JsonWriter writer) throws IOException {
-            writer.name(getKey());
-            writer.beginObject();
-            for (Map.Entry<String, String> jsonPair : value.entrySet()) {
-                writer.name(jsonPair.getKey()).value(jsonPair.getValue());
-            }
-            writer.endObject();
-        }
-
-        @Override @SuppressWarnings("serial") public Map<String, Object> serialize() {
-            return new java.util.HashMap<String, Object>() {
-                {
-                    put("key", getKey());
-                    for (Map.Entry<String, String> valEntry : getValue().entrySet()) {
-                        put("value." + valEntry.getKey(), valEntry.getValue());
-                    }
-                }
-            };
-        }
-
-        @Override public String getReadableString() {
-            return getKey();
-        }
-    }
-}

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
@@ -30,4 +23,5 @@ class AgeableStats {
     int age;
     boolean locked;
     boolean adult;
+
 }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
@@ -37,4 +30,5 @@ class ArmorStandStats {
     boolean noPlate;
     boolean invisible;
     boolean small;
+
 }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
@@ -34,4 +27,5 @@ class EntityBaseStats {
     double vZ;
     double vY;
     double vX;
+
 }

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

@@ -1,38 +1,29 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
-import lombok.Getter;
-import lombok.NonNull;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-@Getter
 public abstract class EntityWrapper {
 
     protected final float yaw;
@@ -43,7 +34,7 @@ public abstract class EntityWrapper {
     public double y;
     public double z;
 
-    EntityWrapper(@NonNull final Entity entity) {
+    EntityWrapper(final @NonNull Entity entity) {
         this.entity = entity;
         this.type = entity.getType();
 
@@ -55,7 +46,9 @@ public abstract class EntityWrapper {
         this.pitch = location.getPitch();
     }
 
-    @SuppressWarnings("deprecation") @Override public String toString() {
+    @SuppressWarnings("deprecation")
+    @Override
+    public String toString() {
         return String.format("[%s, x=%s, y=%s, z=%s]", type.getName(), x, y, z);
     }
 
@@ -63,4 +56,32 @@ public abstract class EntityWrapper {
 
     public abstract void saveEntity();
 
+    public float getYaw() {
+        return this.yaw;
+    }
+
+    public float getPitch() {
+        return this.pitch;
+    }
+
+    public Entity getEntity() {
+        return this.entity;
+    }
+
+    public EntityType getType() {
+        return this.type;
+    }
+
+    public double getX() {
+        return this.x;
+    }
+
+    public double getY() {
+        return this.y;
+    }
+
+    public double getZ() {
+        return this.z;
+    }
+
 }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
@@ -34,4 +27,5 @@ class HorseStats {
     Horse.Variant variant;
     Horse.Color color;
     Horse.Style style;
+
 }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
@@ -50,4 +43,5 @@ class LivingEntityStats {
     ItemStack chestplate;
     Collection<PotionEffect> potions;
     ItemStack offHand;
+
 }

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

@@ -1,31 +1,26 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
-import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.configuration.Settings;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Art;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
@@ -60,6 +55,8 @@ import java.util.List;
 
 public final class ReplicatingEntityWrapper extends EntityWrapper {
 
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ReplicatingEntityWrapper.class.getSimpleName());
+
     private final short depth;
     private final int hash;
     private final EntityBaseStats base = new EntityBaseStats();
@@ -104,61 +101,38 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             this.noGravity = true;
         }
         switch (entity.getType().toString()) {
-            case "BOAT":
+            case "BOAT" -> {
                 Boat boat = (Boat) entity;
                 this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                 return;
-            case "ARROW":
-            case "EGG":
-            case "ENDER_CRYSTAL":
-            case "ENDER_PEARL":
-            case "ENDER_SIGNAL":
-            case "EXPERIENCE_ORB":
-            case "FALLING_BLOCK":
-            case "FIREBALL":
-            case "FIREWORK":
-            case "FISHING_HOOK":
-            case "LEASH_HITCH":
-            case "LIGHTNING":
-            case "MINECART":
-            case "MINECART_COMMAND":
-            case "MINECART_MOB_SPAWNER":
-            case "MINECART_TNT":
-            case "PLAYER":
-            case "PRIMED_TNT":
-            case "SLIME":
-            case "SMALL_FIREBALL":
-            case "SNOWBALL":
-            case "MINECART_FURNACE":
-            case "SPLASH_POTION":
-            case "THROWN_EXP_BOTTLE":
-            case "WITHER_SKULL":
-            case "UNKNOWN":
-            case "SPECTRAL_ARROW":
-            case "SHULKER_BULLET":
-            case "DRAGON_FIREBALL":
-            case "AREA_EFFECT_CLOUD":
-            case "TRIDENT":
-            case "LLAMA_SPIT":
+            }
+            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "EXPERIENCE_ORB", "FALLING_BLOCK", "FIREBALL",
+                    "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND", "MINECART_MOB_SPAWNER",
+                    "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SLIME", "SMALL_FIREBALL", "SNOWBALL", "MINECART_FURNACE", "SPLASH_POTION",
+                    "THROWN_EXP_BOTTLE", "WITHER_SKULL", "UNKNOWN", "SPECTRAL_ARROW", "SHULKER_BULLET", "DRAGON_FIREBALL", "AREA_EFFECT_CLOUD",
+                    "TRIDENT", "LLAMA_SPIT" -> {
                 // Do this stuff later
                 return;
+            }
             // MISC //
-            case "DROPPED_ITEM":
+            case "DROPPED_ITEM" -> {
                 Item item = (Item) entity;
                 this.stack = item.getItemStack();
                 return;
-            case "ITEM_FRAME":
-                this.x = Math.floor(this.x);
-                this.y = Math.floor(this.y);
-                this.z = Math.floor(this.z);
+            }
+            case "ITEM_FRAME" -> {
+                this.x = Math.floor(this.getX());
+                this.y = Math.floor(this.getY());
+                this.z = Math.floor(this.getZ());
                 ItemFrame itemFrame = (ItemFrame) entity;
                 this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
                 this.stack = itemFrame.getItem().clone();
                 return;
-            case "PAINTING":
-                this.x = Math.floor(this.x);
-                this.y = Math.floor(this.y);
-                this.z = Math.floor(this.z);
+            }
+            case "PAINTING" -> {
+                this.x = Math.floor(this.getX());
+                this.y = Math.floor(this.getY());
+                this.z = Math.floor(this.getZ());
                 Painting painting = (Painting) entity;
                 Art art = painting.getArt();
                 this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
@@ -168,25 +142,21 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 this.dataString = art.name();
                 return;
+            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST":
-            case "MINECART_HOPPER":
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
                 storeInventory((InventoryHolder) entity);
                 return;
+            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE":
-            case "DONKEY":
-            case "LLAMA":
-            case "MULE":
-            case "SKELETON_HORSE":
+            case "HORSE", "DONKEY", "LLAMA", "MULE", "SKELETON_HORSE" -> {
                 AbstractHorse horse = (AbstractHorse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
-                if (horse instanceof ChestedHorse) {
-                    ChestedHorse horse1 = (ChestedHorse) horse;
+                if (horse instanceof ChestedHorse horse1) {
                     this.horse.chest = horse1.isCarryingChest();
                 }
                 //todo these horse features need fixing
@@ -198,16 +168,17 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeLiving(horse);
                 storeInventory(horse);
                 return;
+            }
             // END INVENTORY HOLDER //
-            case "WOLF":
-            case "OCELOT":
+            case "WOLF", "OCELOT" -> {
                 storeTameable((Tameable) entity);
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
+            }
             // END TAMEABLE //
             //todo fix sheep
-            case "SHEEP":
+            case "SHEEP" -> {
                 Sheep sheep = (Sheep) entity;
                 if (sheep.isSheared()) {
                     this.dataByte = (byte) 1;
@@ -218,61 +189,51 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeAgeable(sheep);
                 storeLiving(sheep);
                 return;
-            case "VILLAGER":
-            case "CHICKEN":
-            case "COW":
-            case "MUSHROOM_COW":
-            case "PIG":
-            case "TURTLE":
-            case "POLAR_BEAR":
+            }
+            case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
-            case "RABBIT":
+            }
+            case "RABBIT" -> {
                 this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
+            }
             // END AGEABLE //
-            case "ARMOR_STAND":
+            case "ARMOR_STAND" -> {
                 ArmorStand stand = (ArmorStand) entity;
                 this.inventory =
-                    new ItemStack[] {stand.getItemInHand().clone(), stand.getHelmet().clone(),
-                        stand.getChestplate().clone(), stand.getLeggings().clone(),
-                        stand.getBoots().clone()};
+                        new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
+                                stand.getChestplate().clone(), stand.getLeggings().clone(),
+                                stand.getBoots().clone()};
                 storeLiving(stand);
                 this.stand = new ArmorStandStats();
-
                 EulerAngle head = stand.getHeadPose();
                 this.stand.head[0] = (float) head.getX();
                 this.stand.head[1] = (float) head.getY();
                 this.stand.head[2] = (float) head.getZ();
-
                 EulerAngle body = stand.getBodyPose();
                 this.stand.body[0] = (float) body.getX();
                 this.stand.body[1] = (float) body.getY();
                 this.stand.body[2] = (float) body.getZ();
-
                 EulerAngle leftLeg = stand.getLeftLegPose();
                 this.stand.leftLeg[0] = (float) leftLeg.getX();
                 this.stand.leftLeg[1] = (float) leftLeg.getY();
                 this.stand.leftLeg[2] = (float) leftLeg.getZ();
-
                 EulerAngle rightLeg = stand.getRightLegPose();
                 this.stand.rightLeg[0] = (float) rightLeg.getX();
                 this.stand.rightLeg[1] = (float) rightLeg.getY();
                 this.stand.rightLeg[2] = (float) rightLeg.getZ();
-
                 EulerAngle leftArm = stand.getLeftArmPose();
                 this.stand.leftArm[0] = (float) leftArm.getX();
                 this.stand.leftArm[1] = (float) leftArm.getY();
                 this.stand.leftArm[2] = (float) leftArm.getZ();
-
                 EulerAngle rightArm = stand.getRightArmPose();
                 this.stand.rightArm[0] = (float) rightArm.getX();
                 this.stand.rightArm[1] = (float) rightArm.getY();
                 this.stand.rightArm[2] = (float) rightArm.getZ();
-
                 if (stand.hasArms()) {
                     this.stand.arms = true;
                 }
@@ -286,64 +247,48 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     this.stand.small = true;
                 }
                 return;
-            case "ENDERMITE":
+            }
+            case "ENDERMITE" -> {
                 return;
-            case "BAT":
+            }
+            case "BAT" -> {
                 if (((Bat) entity).isAwake()) {
                     this.dataByte = (byte) 1;
                 } else {
                     this.dataByte = (byte) 0;
                 }
                 return;
-            case "ENDER_DRAGON":
+            }
+            case "ENDER_DRAGON" -> {
                 EnderDragon entity1 = (EnderDragon) entity;
                 this.dataByte = (byte) entity1.getPhase().ordinal();
                 return;
-            case "SKELETON":
-            case "WITHER_SKELETON":
-            case "GUARDIAN":
-            case "ELDER_GUARDIAN":
-            case "GHAST":
-            case "MAGMA_CUBE":
-            case "SQUID":
-            case "PIG_ZOMBIE":
-            case "HOGLIN":
-            case "ZOMBIFIED_PIGLIN":
-            case "PIGLIN":
-            case "PIGLIN_BRUTE":
-            case "ZOMBIE":
-            case "WITHER":
-            case "WITCH":
-            case "SPIDER":
-            case "CAVE_SPIDER":
-            case "SILVERFISH":
-            case "GIANT":
-            case "ENDERMAN":
-            case "CREEPER":
-            case "BLAZE":
-            case "SHULKER":
-            case "SNOWMAN":
+            }
+            case "SKELETON", "WITHER_SKELETON", "GUARDIAN", "ELDER_GUARDIAN", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN",
+                    "ZOMBIFIED_PIGLIN", "PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH",
+                    "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SHULKER", "SNOWMAN" -> {
                 storeLiving((LivingEntity) entity);
                 return;
-            case "IRON_GOLEM":
+            }
+            case "IRON_GOLEM" -> {
                 if (((IronGolem) entity).isPlayerCreated()) {
                     this.dataByte = (byte) 1;
                 } else {
                     this.dataByte = (byte) 0;
                 }
                 storeLiving((LivingEntity) entity);
-                return;
+            }
             // END LIVING //
-            default:
-                PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
         }
     }
 
-    @Override public boolean equals(Object obj) {
+    @Override
+    public boolean equals(Object obj) {
         return this.hash == obj.hashCode();
     }
 
-    @Override public int hashCode() {
+    @Override
+    public int hashCode() {
         return this.hash;
     }
 
@@ -391,7 +336,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         try {
             entity.getInventory().setContents(this.inventory);
         } catch (IllegalArgumentException e) {
-            PlotSquared.debug("&c[WARN] Failed to restore inventory.\n Reason: " + e.getMessage());
+            LOGGER.error("Failed to restore inventory", e);
         }
     }
 
@@ -407,9 +352,9 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         this.lived.leashed = lived.isLeashed();
         if (this.lived.leashed) {
             Location location = lived.getLeashHolder().getLocation();
-            this.lived.leashX = (short) (this.x - location.getBlockX());
-            this.lived.leashY = (short) (this.y - location.getBlockY());
-            this.lived.leashZ = (short) (this.z - location.getBlockZ());
+            this.lived.leashX = (short) (this.getX() - location.getBlockX());
+            this.lived.leashY = (short) (this.getY() - location.getBlockY());
+            this.lived.leashZ = (short) (this.getZ() - location.getBlockZ());
         }
         EntityEquipment equipment = lived.getEquipment();
         this.lived.equipped = equipment != null;
@@ -459,8 +404,10 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         this.tamed.tamed = tamed.isTamed();
     }
 
-    @Override public Entity spawn(World world, int xOffset, int zOffset) {
-        Location location = new Location(world, this.x + xOffset, this.y, this.z + zOffset);
+    @SuppressWarnings("deprecation") // Paper deprecation
+    @Override
+    public Entity spawn(World world, int xOffset, int zOffset) {
+        Location location = new Location(world, this.getX() + xOffset, this.getY(), this.z + zOffset);
         location.setYaw(this.yaw);
         location.setPitch(this.pitch);
         if (!this.getType().isSpawnable()) {
@@ -468,20 +415,15 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
         Entity entity;
         switch (this.getType().toString()) {
-            case "DROPPED_ITEM":
+            case "DROPPED_ITEM" -> {
                 return world.dropItem(location, this.stack);
-            case "PLAYER":
-            case "LEASH_HITCH":
+            }
+            case "PLAYER", "LEASH_HITCH" -> {
                 return null;
-            case "ITEM_FRAME":
-                entity = world.spawn(location, ItemFrame.class);
-                break;
-            case "PAINTING":
-                entity = world.spawn(location, Painting.class);
-                break;
-            default:
-                entity = world.spawnEntity(location, this.getType());
-                break;
+            }
+            case "ITEM_FRAME" -> entity = world.spawn(location, ItemFrame.class);
+            case "PAINTING" -> entity = world.spawn(location, Painting.class);
+            default -> entity = world.spawnEntity(location, this.getType());
         }
         if (this.depth == 0) {
             return entity;
@@ -509,72 +451,46 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             entity.setGravity(false);
         }
         switch (entity.getType().toString()) {
-            case "BOAT":
+            case "BOAT" -> {
                 Boat boat = (Boat) entity;
                 boat.setWoodType(TreeSpecies.values()[dataByte]);
                 return entity;
-            case "SLIME":
+            }
+            case "SLIME" -> {
                 ((Slime) entity).setSize(this.dataByte);
                 return entity;
-            case "ARROW":
-            case "EGG":
-            case "ENDER_CRYSTAL":
-            case "ENDER_PEARL":
-            case "ENDER_SIGNAL":
-            case "DROPPED_ITEM":
-            case "EXPERIENCE_ORB":
-            case "FALLING_BLOCK":
-            case "FIREBALL":
-            case "FIREWORK":
-            case "FISHING_HOOK":
-            case "LEASH_HITCH":
-            case "LIGHTNING":
-            case "MINECART":
-            case "MINECART_COMMAND":
-            case "MINECART_MOB_SPAWNER":
-            case "MINECART_TNT":
-            case "PLAYER":
-            case "PRIMED_TNT":
-            case "SMALL_FIREBALL":
-            case "SNOWBALL":
-            case "SPLASH_POTION":
-            case "THROWN_EXP_BOTTLE":
-            case "SPECTRAL_ARROW":
-            case "SHULKER_BULLET":
-            case "AREA_EFFECT_CLOUD":
-            case "DRAGON_FIREBALL":
-            case "WITHER_SKULL":
-            case "MINECART_FURNACE":
-            case "LLAMA_SPIT":
-            case "TRIDENT":
-            case "UNKNOWN":
+            }
+            case "ARROW", "EGG", "ENDER_CRYSTAL", "ENDER_PEARL", "ENDER_SIGNAL", "DROPPED_ITEM", "EXPERIENCE_ORB", "FALLING_BLOCK",
+                    "FIREBALL", "FIREWORK", "FISHING_HOOK", "LEASH_HITCH", "LIGHTNING", "MINECART", "MINECART_COMMAND",
+                    "MINECART_MOB_SPAWNER", "MINECART_TNT", "PLAYER", "PRIMED_TNT", "SMALL_FIREBALL", "SNOWBALL",
+                    "SPLASH_POTION", "THROWN_EXP_BOTTLE", "SPECTRAL_ARROW", "SHULKER_BULLET", "AREA_EFFECT_CLOUD",
+                    "DRAGON_FIREBALL", "WITHER_SKULL", "MINECART_FURNACE", "LLAMA_SPIT", "TRIDENT", "UNKNOWN" -> {
                 // Do this stuff later
                 return entity;
+            }
             // MISC //
-            case "ITEM_FRAME":
+            case "ITEM_FRAME" -> {
                 ItemFrame itemframe = (ItemFrame) entity;
                 itemframe.setRotation(Rotation.values()[this.dataByte]);
                 itemframe.setItem(this.stack);
                 return entity;
-            case "PAINTING":
+            }
+            case "PAINTING" -> {
                 Painting painting = (Painting) entity;
                 painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
                 painting.setArt(Art.getByName(this.dataString), true);
                 return entity;
+            }
             // END MISC //
             // INVENTORY HOLDER //
-            case "MINECART_CHEST":
-            case "MINECART_HOPPER":
+            case "MINECART_CHEST", "MINECART_HOPPER" -> {
                 restoreInventory((InventoryHolder) entity);
                 return entity;
+            }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case "HORSE":
-            case "LLAMA":
-            case "SKELETON_HORSE":
-            case "DONKEY":
-            case "MULE":
+            case "HORSE", "LLAMA", "SKELETON_HORSE", "DONKEY", "MULE" -> {
                 AbstractHorse horse = (AbstractHorse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 if (horse instanceof ChestedHorse) {
@@ -589,15 +505,16 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreLiving(horse);
                 restoreInventory(horse);
                 return entity;
+            }
             // END INVENTORY HOLDER //
-            case "WOLF":
-            case "OCELOT":
+            case "WOLF", "OCELOT" -> {
                 restoreTameable((Tameable) entity);
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
+            }
             // END AGEABLE //
-            case "SHEEP":
+            case "SHEEP" -> {
                 Sheep sheep = (Sheep) entity;
                 if (this.dataByte == 1) {
                     sheep.setSheared(true);
@@ -608,25 +525,22 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreAgeable(sheep);
                 restoreLiving(sheep);
                 return sheep;
-            case "VILLAGER":
-            case "CHICKEN":
-            case "COW":
-            case "TURTLE":
-            case "POLAR_BEAR":
-            case "MUSHROOM_COW":
-            case "PIG":
+            }
+            case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
+            }
             // END AGEABLE //
-            case "RABBIT":
+            case "RABBIT" -> {
                 if (this.dataByte != 0) {
                     ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
                 }
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            case "ARMOR_STAND":
+            }
+            case "ARMOR_STAND" -> {
                 // CHECK positions
                 ArmorStand stand = (ArmorStand) entity;
                 if (this.inventory[0] != null) {
@@ -646,36 +560,40 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
                     EulerAngle pose =
-                        new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
+                            new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
                     stand.setHeadPose(pose);
                 }
                 if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
                     EulerAngle pose =
-                        new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
+                            new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
                     stand.setBodyPose(pose);
                 }
                 if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0
-                    || this.stand.leftLeg[2] != 0) {
+                        || this.stand.leftLeg[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1],
-                        this.stand.leftLeg[2]);
+                            this.stand.leftLeg[2]
+                    );
                     stand.setLeftLegPose(pose);
                 }
                 if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0
-                    || this.stand.rightLeg[2] != 0) {
+                        || this.stand.rightLeg[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1],
-                        this.stand.rightLeg[2]);
+                            this.stand.rightLeg[2]
+                    );
                     stand.setRightLegPose(pose);
                 }
                 if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0
-                    || this.stand.leftArm[2] != 0) {
+                        || this.stand.leftArm[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1],
-                        this.stand.leftArm[2]);
+                            this.stand.leftArm[2]
+                    );
                     stand.setLeftArmPose(pose);
                 }
                 if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0
-                    || this.stand.rightArm[2] != 0) {
+                        || this.stand.rightArm[2] != 0) {
                     EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1],
-                        this.stand.rightArm[2]);
+                            this.stand.rightArm[2]
+                    );
                     stand.setRightArmPose(pose);
                 }
                 if (this.stand.invisible) {
@@ -692,54 +610,38 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 }
                 restoreLiving(stand);
                 return stand;
-            case "BAT":
+            }
+            case "BAT" -> {
                 if (this.dataByte != 0) {
                     ((Bat) entity).setAwake(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            case "ENDER_DRAGON":
+            }
+            case "ENDER_DRAGON" -> {
                 if (this.dataByte != 0) {
                     ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            case "ENDERMITE":
-            case "GHAST":
-            case "MAGMA_CUBE":
-            case "SQUID":
-            case "PIG_ZOMBIE":
-            case "HOGLIN":
-            case "PIGLIN":
-            case "ZOMBIFIED_PIGLIN":
-            case "PIGLIN_BRUTE":
-            case "ZOMBIE":
-            case "WITHER":
-            case "WITCH":
-            case "SPIDER":
-            case "CAVE_SPIDER":
-            case "SILVERFISH":
-            case "GIANT":
-            case "ENDERMAN":
-            case "CREEPER":
-            case "BLAZE":
-            case "SNOWMAN":
-            case "SHULKER":
-            case "GUARDIAN":
-            case "ELDER_GUARDIAN":
-            case "SKELETON":
-            case "WITHER_SKELETON":
+            }
+            case "ENDERMITE", "GHAST", "MAGMA_CUBE", "SQUID", "PIG_ZOMBIE", "HOGLIN", "PIGLIN", "ZOMBIFIED_PIGLIN", "PIGLIN_BRUTE", "ZOMBIE", "WITHER", "WITCH", "SPIDER", "CAVE_SPIDER", "SILVERFISH", "GIANT", "ENDERMAN", "CREEPER", "BLAZE", "SNOWMAN", "SHULKER", "GUARDIAN", "ELDER_GUARDIAN", "SKELETON", "WITHER_SKELETON" -> {
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            case "IRON_GOLEM":
+            }
+            case "IRON_GOLEM" -> {
                 if (this.dataByte != 0) {
                     ((IronGolem) entity).setPlayerCreated(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            default:
-                PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
+            }
+            default -> {
+                if (Settings.DEBUG) {
+                    LOGGER.info("Could not identify entity: {}", entity.getType());
+                }
                 return entity;
+            }
             // END LIVING
         }
     }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
@@ -31,4 +24,5 @@ class TameableStats {
 
     AnimalTamer owner;
     boolean tamed;
+
 }

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

@@ -1,31 +1,24 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.entity;
 
-import com.plotsquared.bukkit.BukkitMain;
+import com.plotsquared.bukkit.BukkitPlatform;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -44,7 +37,8 @@ public class TeleportEntityWrapper extends EntityWrapper {
         super(entity);
     }
 
-    @Override public Entity spawn(final World world, final int xOffset, final int zOffset) {
+    @Override
+    public Entity spawn(final World world, final int xOffset, final int zOffset) {
         if (!getEntity().getLocation().getChunk().equals(oldLocation.getChunk())) {
             final Location oldLocation = this.oldLocation.clone();
             oldLocation.add(xOffset, 0, xOffset);
@@ -53,12 +47,13 @@ public class TeleportEntityWrapper extends EntityWrapper {
             getEntity().setInvulnerable(invulnerableOld);
             getEntity().setFireTicks(fireTicksOld);
             getEntity().setTicksLived(livingTicksOld);
-            getEntity().removeMetadata("ps-tmp-teleport", BukkitMain.getPlugin(BukkitMain.class));
+            getEntity().removeMetadata("ps-tmp-teleport", BukkitPlatform.getPlugin(BukkitPlatform.class));
         }
         return getEntity();
     }
 
-    @Override public void saveEntity() {
+    @Override
+    public void saveEntity() {
         if (getEntity().hasMetadata("ps-tmp-teleport")) {
             this.oldLocation = (Location) this.getEntity().getMetadata("ps-tmp-teleport").get(0);
         } else {
@@ -67,9 +62,9 @@ public class TeleportEntityWrapper extends EntityWrapper {
 
         // To account for offsets in the chunk manager
         this.oldLocation = oldLocation.clone();
-        this.oldLocation.setX(this.x);
-        this.oldLocation.setY(this.y);
-        this.oldLocation.setZ(this.z);
+        this.oldLocation.setX(this.getX());
+        this.oldLocation.setY(this.getY());
+        this.oldLocation.setZ(this.getZ());
 
         this.gravityOld = this.getEntity().hasGravity();
         this.getEntity().setGravity(false);
@@ -77,11 +72,13 @@ public class TeleportEntityWrapper extends EntityWrapper {
         this.getEntity().setInvulnerable(true);
         this.fireTicksOld = this.getEntity().getFireTicks();
         this.livingTicksOld = this.getEntity().getTicksLived();
-        this.getEntity().setMetadata("ps-tmp-teleport",
-            new FixedMetadataValue(BukkitMain.getPlugin(BukkitMain.class), oldLocation));
+        this.getEntity().setMetadata(
+                "ps-tmp-teleport",
+                new FixedMetadataValue(BukkitPlatform.getPlugin(BukkitPlatform.class), oldLocation)
+        );
         final Chunk newChunk = getNewChunk();
         this.getEntity().teleport(
-            new Location(newChunk.getWorld(), newChunk.getX() << 4, 5000, newChunk.getZ() << 4));
+                new Location(newChunk.getWorld(), newChunk.getX() << 4, 5000, newChunk.getZ() << 4));
     }
 
     private Chunk getNewChunk() {
@@ -115,4 +112,5 @@ public class TeleportEntityWrapper extends EntityWrapper {
     private Chunk getChunkRelative(final Chunk chunk, final int dx, final int dz) {
         return chunk.getWorld().getChunkAt(chunk.getX() + dx, chunk.getZ() + dz);
     }
+
 }

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

@@ -1,66 +1,75 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.generator;
 
-import com.plotsquared.core.PlotSquared;
+import com.plotsquared.bukkit.queue.LimitedRegionWrapperQueue;
+import com.plotsquared.core.generator.HybridPlotWorld;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
-import com.plotsquared.core.location.ChunkWrapper;
+import com.plotsquared.core.location.Location;
+import com.plotsquared.core.location.UncheckedWorldLocation;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.queue.GlobalBlockQueue;
-import com.plotsquared.core.queue.LocalBlockQueue;
-import com.plotsquared.core.queue.ScopedLocalBlockQueue;
-import org.bukkit.Chunk;
-import org.bukkit.World;
+import com.plotsquared.core.plot.world.SinglePlotArea;
+import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import org.bukkit.generator.BlockPopulator;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.generator.LimitedRegion;
+import org.bukkit.generator.WorldInfo;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Random;
 
 final class BlockStatePopulator extends BlockPopulator {
 
     private final IndependentPlotGenerator plotGenerator;
-    private LocalBlockQueue queue;
 
-    public BlockStatePopulator(IndependentPlotGenerator plotGenerator) {
+    /**
+     * @since 6.9.0
+     */
+    public BlockStatePopulator(
+            final @NonNull IndependentPlotGenerator plotGenerator
+    ) {
         this.plotGenerator = plotGenerator;
     }
 
     @Override
-    public void populate(@NotNull final World world, @NotNull final Random random,
-        @NotNull final Chunk source) {
-        if (this.queue == null) {
-            this.queue = GlobalBlockQueue.IMP.getNewQueue(world.getName(), false);
-        }
-        final PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null);
-        final ChunkWrapper wrap =
-            new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ());
-        final ScopedLocalBlockQueue chunk = this.queue.getForChunk(wrap.x, wrap.z);
-        if (this.plotGenerator.populateChunk(chunk, area)) {
-            this.queue.flush();
+    public void populate(
+            @NonNull final WorldInfo worldInfo,
+            @NonNull final Random random,
+            final int chunkX,
+            final int chunkZ,
+            @NonNull final LimitedRegion limitedRegion
+    ) {
+        PlotArea area = UncheckedWorldLocation.at(worldInfo.getName(), chunkX << 4, 0, chunkZ << 4).getPlotArea();
+        if (area == null || (area instanceof HybridPlotWorld hpw && !hpw.populationNeeded()) || area instanceof SinglePlotArea) {
+            return;
         }
+        LimitedRegionWrapperQueue wrapped = new LimitedRegionWrapperQueue(limitedRegion);
+        // It is possible for the region to be larger than the chunk, but there is no reason for P2 to need to populate
+        // outside of the actual chunk area.
+        Location min = UncheckedWorldLocation.at(worldInfo.getName(), chunkX << 4, worldInfo.getMinHeight(), chunkZ << 4);
+        Location max = UncheckedWorldLocation.at(
+                worldInfo.getName(),
+                (chunkX << 4) + 15,
+                worldInfo.getMaxHeight(),
+                (chunkZ << 4) + 15
+        );
+        ZeroedDelegateScopedQueueCoordinator offsetChunkQueue = new ZeroedDelegateScopedQueueCoordinator(wrapped, min, max);
+        this.plotGenerator.populateChunk(offsetChunkQueue, area);
     }
 
 }

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

@@ -1,35 +1,32 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.generator;
 
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.generator.AugmentedUtils;
+import com.plotsquared.core.queue.QueueCoordinator;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.util.SideEffectSet;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
-import org.jetbrains.annotations.NotNull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Random;
 
@@ -51,7 +48,15 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
     }
 
     @Override
-    public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk source) {
-        AugmentedUtils.generate(source, world.getName(), source.getX(), source.getZ(), null);
+    public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
+        QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(BukkitAdapter.adapt(world));
+        // The chunk is already loaded and we do not want to load the chunk in "fully" by using any PaperLib methods.
+        queue.setForceSync(true);
+        queue.setSideEffectSet(SideEffectSet.none());
+        queue.setBiomesEnabled(false);
+        queue.setChunkObject(source);
+        AugmentedUtils.generateChunk(world.getName(), source.getX(), source.getZ(), queue);
+        queue.enqueue();
     }
+
 }

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

@@ -1,33 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.generator;
-
-import com.plotsquared.core.generator.HybridUtils;
-
-public class BukkitHybridUtils extends HybridUtils {
-
-
-}

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

@@ -1,136 +1,147 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.generator;
 
 import com.plotsquared.bukkit.queue.GenChunk;
 import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.generator.ClassicPlotWorld;
 import com.plotsquared.core.generator.GeneratorWrapper;
 import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.generator.SingleWorldGenerator;
 import com.plotsquared.core.location.ChunkWrapper;
+import com.plotsquared.core.location.UncheckedWorldLocation;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.queue.ScopedLocalBlockQueue;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
-import com.plotsquared.core.util.MainUtil;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
-import lombok.Getter;
+import com.sk89q.worldedit.math.BlockVector3;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bukkit.HeightMap;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
+import org.bukkit.generator.BiomeProvider;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.generator.WorldInfo;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-public class BukkitPlotGenerator extends ChunkGenerator
-    implements GeneratorWrapper<ChunkGenerator> {
+import static java.util.function.Predicate.not;
 
-    @SuppressWarnings("unused") public final boolean PAPER_ASYNC_SAFE = true;
+public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper<ChunkGenerator> {
 
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());
+
+    @SuppressWarnings("unused")
+    public final boolean PAPER_ASYNC_SAFE = true;
+
+    private final PlotAreaManager plotAreaManager;
     private final IndependentPlotGenerator plotGenerator;
     private final ChunkGenerator platformGenerator;
     private final boolean full;
+    private final String levelName;
+    private final boolean useNewGenerationMethods;
+    private final BiomeProvider biomeProvider;
     private List<BlockPopulator> populators;
     private boolean loaded = false;
 
-    @Getter private final String levelName;
+    private PlotArea lastPlotArea;
+    private int lastChunkX = Integer.MIN_VALUE;
+    private int lastChunkZ = Integer.MIN_VALUE;
 
-    public BukkitPlotGenerator(String name, IndependentPlotGenerator generator) {
-        if (generator == null) {
-            throw new IllegalArgumentException("Generator may not be null!");
-        }
+    public BukkitPlotGenerator(
+            final @NonNull String name,
+            final @NonNull IndependentPlotGenerator generator,
+            final @NonNull PlotAreaManager plotAreaManager
+    ) {
+        this.plotAreaManager = plotAreaManager;
         this.levelName = name;
         this.plotGenerator = generator;
         this.platformGenerator = this;
         this.populators = new ArrayList<>();
-        this.populators.add(new BlockStatePopulator(this.plotGenerator));
+        int minecraftMinorVersion = PlotSquared.platform().serverVersion()[1];
+        if (minecraftMinorVersion >= 17) {
+            this.populators.add(new BlockStatePopulator(this.plotGenerator));
+        } else {
+            this.populators.add(new LegacyBlockStatePopulator(this.plotGenerator));
+        }
         this.full = true;
-        MainUtil.initCache();
+        this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
+        this.biomeProvider = new BukkitPlotBiomeProvider();
     }
 
-    public BukkitPlotGenerator(final String world, final ChunkGenerator cg) {
+    public BukkitPlotGenerator(final String world, final ChunkGenerator cg, final @NonNull PlotAreaManager plotAreaManager) {
         if (cg instanceof BukkitPlotGenerator) {
-            throw new IllegalArgumentException("ChunkGenerator: " + cg.getClass().getName()
-                + " is already a BukkitPlotGenerator!");
+            throw new IllegalArgumentException("ChunkGenerator: " + cg
+                    .getClass()
+                    .getName() + " is already a BukkitPlotGenerator!");
         }
+        this.plotAreaManager = plotAreaManager;
         this.levelName = world;
         this.full = false;
         this.platformGenerator = cg;
         this.plotGenerator = new DelegatePlotGenerator(cg, world);
-        MainUtil.initCache();
+        this.useNewGenerationMethods = PlotSquared.platform().serverVersion()[1] >= 19;
+        this.biomeProvider = null;
     }
 
-    @Override public void augment(PlotArea area) {
+    @Override
+    public void augment(PlotArea area) {
         BukkitAugmentedGenerator.get(BukkitUtil.getWorld(area.getWorldName()));
     }
 
-    @Override public boolean isFull() {
+    @Override
+    public boolean isFull() {
         return this.full;
     }
 
-    @Override public IndependentPlotGenerator getPlotGenerator() {
+    @Override
+    public IndependentPlotGenerator getPlotGenerator() {
         return this.plotGenerator;
     }
 
-    @Override public ChunkGenerator getPlatformGenerator() {
+    @Override
+    public ChunkGenerator getPlatformGenerator() {
         return this.platformGenerator;
     }
 
-    @Override @NotNull public List<BlockPopulator> getDefaultPopulators(@NotNull World world) {
+    @Override
+    public @NonNull List<BlockPopulator> getDefaultPopulators(@NonNull World world) {
         try {
-            if (!this.loaded) {
-                String name = world.getName();
-                PlotSquared.get().loadWorld(name, this);
-                Set<PlotArea> areas = PlotSquared.get().getPlotAreas(name);
-                if (!areas.isEmpty()) {
-                    PlotArea area = areas.iterator().next();
-                    if (!area.isMobSpawning()) {
-                        if (!area.isSpawnEggs()) {
-                            world.setSpawnFlags(false, false);
-                        }
-                        world.setAmbientSpawnLimit(0);
-                        world.setAnimalSpawnLimit(0);
-                        world.setMonsterSpawnLimit(0);
-                        world.setWaterAnimalSpawnLimit(0);
-                    } else {
-                        world.setSpawnFlags(true, true);
-                        world.setAmbientSpawnLimit(-1);
-                        world.setAnimalSpawnLimit(-1);
-                        world.setMonsterSpawnLimit(-1);
-                        world.setWaterAnimalSpawnLimit(-1);
-                    }
-                }
-                this.loaded = true;
-            }
+            checkLoaded(world);
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.error("Error attempting to load world into PlotSquared.", e);
         }
         ArrayList<BlockPopulator> toAdd = new ArrayList<>();
         List<BlockPopulator> existing = world.getPopulators();
@@ -147,18 +158,161 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return toAdd;
     }
 
-    @Override @NotNull
-    public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z,
-        @NotNull BiomeGrid biome) {
+    // Extracted to synchronized method for thread-safety, preventing multiple internal world load calls
+    private synchronized void checkLoaded(@NonNull World world) {
+        // Do not attempt to load configurations until WorldEdit has a platform ready.
+        if (!PlotSquared.get().isWeInitialised()) {
+            return;
+        }
+        if (!this.loaded) {
+            String name = world.getName();
+            PlotSquared.get().loadWorld(name, this);
+            final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(name);
+            if (!areas.isEmpty()) {
+                PlotArea area = areas.iterator().next();
+                if (!area.isMobSpawning()) {
+                    if (!area.isSpawnEggs()) {
+                        world.setSpawnFlags(false, false);
+                    }
+                    setSpawnLimits(world, 0);
+                } else {
+                    world.setSpawnFlags(true, true);
+                    setSpawnLimits(world, -1);
+                }
+            }
+            this.loaded = true;
+        }
+    }
 
-        GenChunk result = new GenChunk();
+    @SuppressWarnings("deprecation") // Kept for compatibility with <=1.17.1
+    private void setSpawnLimits(@NonNull World world, int limit) {
+        world.setAmbientSpawnLimit(limit);
+        world.setAnimalSpawnLimit(limit);
+        world.setMonsterSpawnLimit(limit);
+        world.setWaterAnimalSpawnLimit(limit);
+    }
+
+    @Override
+    public void generateNoise(
+            @NotNull final WorldInfo worldInfo,
+            @NotNull final Random random,
+            final int chunkX,
+            final int chunkZ,
+            @NotNull final ChunkData chunkData
+    ) {
+        if (this.platformGenerator != this) {
+            this.platformGenerator.generateNoise(worldInfo, random, chunkX, chunkZ, chunkData);
+            return;
+        }
+        int minY = chunkData.getMinHeight();
+        int maxY = chunkData.getMaxHeight();
+        GenChunk result = new GenChunk(minY, maxY);
+        // Set the chunk location
+        result.setChunk(new ChunkWrapper(worldInfo.getName(), chunkX, chunkZ));
+        // Set the result data
+        result.setChunkData(chunkData);
+        result.result = null;
+
+        // Catch any exceptions (as exceptions usually thrown)
+        try {
+            generate(BlockVector2.at(chunkX, chunkZ), worldInfo.getName(), result, false);
+        } catch (Throwable e) {
+            LOGGER.error("Error attempting to generate chunk.", e);
+        }
+    }
+
+    @Override
+    public void generateSurface(
+            @NotNull final WorldInfo worldInfo,
+            @NotNull final Random random,
+            final int chunkX,
+            final int chunkZ,
+            @NotNull final ChunkData chunkData
+    ) {
+        if (platformGenerator != this) {
+            platformGenerator.generateSurface(worldInfo, random, chunkX, chunkZ, chunkData);
+        }
+    }
+
+    @Override
+    public void generateBedrock(
+            @NotNull final WorldInfo worldInfo,
+            @NotNull final Random random,
+            final int chunkX,
+            final int chunkZ,
+            @NotNull final ChunkData chunkData
+    ) {
+        if (platformGenerator != this) {
+            platformGenerator.generateBedrock(worldInfo, random, chunkX, chunkZ, chunkData);
+        }
+    }
+
+    @Override
+    public void generateCaves(
+            @NotNull final WorldInfo worldInfo,
+            @NotNull final Random random,
+            final int chunkX,
+            final int chunkZ,
+            @NotNull final ChunkData chunkData
+    ) {
+        if (platformGenerator != this) {
+            platformGenerator.generateCaves(worldInfo, random, chunkX, chunkZ, chunkData);
+        }
+    }
+
+    @Override
+    public @Nullable BiomeProvider getDefaultBiomeProvider(@NotNull final WorldInfo worldInfo) {
+        if (platformGenerator != this) {
+            return platformGenerator.getDefaultBiomeProvider(worldInfo);
+        }
+        return biomeProvider;
+    }
+
+    @Override
+    public int getBaseHeight(
+            @NotNull final WorldInfo worldInfo,
+            @NotNull final Random random,
+            final int x,
+            final int z,
+            @NotNull final HeightMap heightMap
+    ) {
+        PlotArea area = getPlotArea(worldInfo.getName(), x, z);
+        if (area instanceof ClassicPlotWorld cpw) {
+            // Default to plot height being the heighest point before decoration (i.e. roads, walls etc.)
+            return cpw.PLOT_HEIGHT;
+        }
+        return super.getBaseHeight(worldInfo, random, x, z, heightMap);
+    }
+
+    /**
+     * The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
+     * The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
+     * release.
+     */
+    @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
+    @Override
+    @Deprecated(since = "7.0.0")
+    public @NonNull ChunkData generateChunkData(
+            @NonNull World world, @NonNull Random random, int x, int z, @NonNull BiomeGrid biome
+    ) {
+        if (useNewGenerationMethods) {
+            if (this.platformGenerator != this) {
+                return this.platformGenerator.generateChunkData(world, random, x, z, biome);
+            } else {
+                // Throw exception to be caught by the server that indicates the new generation API is being used.
+                throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
+            }
+        }
+
+        int minY = BukkitWorld.getMinWorldHeight(world);
+        int maxY = BukkitWorld.getMaxWorldHeight(world);
+        GenChunk result = new GenChunk(minY, maxY);
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getChunkData() != null) {
                 for (int chunkX = 0; chunkX < 16; chunkX++) {
                     for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
-                        for (int y = 0; y < world.getMaxHeight(); y++) {
+                        for (int y = minY; y < maxY; y++) {
                             biome.setBiome(chunkX, y, chunkZ, Biome.PLAINS);
-
                         }
                     }
                 }
@@ -178,42 +332,38 @@ public class BukkitPlotGenerator extends ChunkGenerator
             if (this.platformGenerator != this) {
                 return this.platformGenerator.generateChunkData(world, random, x, z, biome);
             } else {
-                generate(BlockVector2.at(x, z), world, result);
+                generate(BlockVector2.at(x, z), world.getName(), result, true);
             }
         } catch (Throwable e) {
-            e.printStackTrace();
+            LOGGER.error("Error attempting to load world into PlotSquared.", e);
         }
         // Return the result data
         return result.getChunkData();
     }
 
-    private void generate(BlockVector2 loc, World world, ScopedLocalBlockQueue result) {
+    private void generate(BlockVector2 loc, String world, ZeroedDelegateScopedQueueCoordinator result, boolean biomes) {
         // Load if improperly loaded
         if (!this.loaded) {
-            String name = world.getName();
-            PlotSquared.get().loadWorld(name, this);
-            this.loaded = true;
+            synchronized (this) {
+                PlotSquared.get().loadWorld(world, this);
+            }
         }
         // Process the chunk
         if (ChunkManager.preProcessChunk(loc, result)) {
             return;
         }
-        PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null);
-        if (area == null && (area = PlotSquared.get().getPlotArea(this.levelName, null)) == null) {
-            throw new IllegalStateException(
-                "Cannot regenerate chunk that does not belong to a plot area." + " Location: " + loc
-                    + ", world: " + world);
-        }
+        PlotArea area = getPlotArea(world, loc.getX(), loc.getZ());
         try {
-            this.plotGenerator.generateChunk(result, area);
+            this.plotGenerator.generateChunk(result, area, biomes);
         } catch (Throwable e) {
             // Recover from generator error
-            e.printStackTrace();
+            LOGGER.error("Error attempting to generate chunk.", e);
         }
         ChunkManager.postProcessChunk(loc, result);
     }
 
-    @Override public boolean canSpawn(@NotNull final World world, final int x, final int z) {
+    @Override
+    public boolean canSpawn(final @NonNull World world, final int x, final int z) {
         return true;
     }
 
@@ -237,7 +387,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return true;
     }
 
-    @Override public String toString() {
+    @Override
+    public String toString() {
         if (this.platformGenerator == this) {
             return this.plotGenerator.getName();
         }
@@ -248,11 +399,75 @@ public class BukkitPlotGenerator extends ChunkGenerator
         }
     }
 
-    @Override public boolean equals(final Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }
         return toString().equals(obj.toString()) || toString().equals(obj.getClass().getName());
     }
 
+    public String getLevelName() {
+        return this.levelName;
+    }
+
+    private synchronized PlotArea getPlotArea(String name, int chunkX, int chunkZ) {
+        // Load if improperly loaded
+        if (!this.loaded) {
+            PlotSquared.get().loadWorld(name, this);
+            // Do not set loaded to true as we want to ensure spawn limits are set when "loading" is actually able to be
+            // completed properly.
+        }
+        if (lastPlotArea != null && name.equals(this.levelName) && chunkX == lastChunkX && chunkZ == lastChunkZ) {
+            return lastPlotArea;
+        }
+        BlockVector3 loc = BlockVector3.at(chunkX << 4, 0, chunkZ << 4);
+        if (lastPlotArea != null && lastPlotArea.getRegion().contains(loc) && lastPlotArea.getRegion().contains(loc)) {
+            return lastPlotArea;
+        }
+        PlotArea area = UncheckedWorldLocation.at(name, loc).getPlotArea();
+        if (area == null) {
+            throw new IllegalStateException(String.format(
+                    "Cannot generate chunk that does not belong to a plot area. World: %s",
+                    name
+            ));
+        }
+        this.lastChunkX = chunkX;
+        this.lastChunkZ = chunkZ;
+        return this.lastPlotArea = area;
+    }
+
+    /**
+     * Biome provider should never need to be accessed outside of this class.
+     */
+    private final class BukkitPlotBiomeProvider extends BiomeProvider {
+
+        private static final List<Biome> BIOMES;
+
+        static {
+            Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
+            if (PlotSquared.platform().serverVersion()[1] <= 19) {
+                final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
+                if (cherryGrove != null) {
+                    disabledBiomes.add(cherryGrove);
+                }
+            }
+            BIOMES = Arrays.stream(Biome.values())
+                    .filter(not(disabledBiomes::contains))
+                    .toList();
+        }
+
+        @Override
+        public @NotNull Biome getBiome(@NotNull final WorldInfo worldInfo, final int x, final int y, final int z) {
+            PlotArea area = getPlotArea(worldInfo.getName(), x >> 4, z >> 4);
+            return BukkitAdapter.adapt(plotGenerator.getBiome(area, x, y, z));
+        }
+
+        @Override
+        public @NotNull List<Biome> getBiomes(@NotNull final WorldInfo worldInfo) {
+            return BIOMES; // Allow all biomes
+        }
+
+    }
+
 }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.generator;
 
@@ -31,15 +24,15 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotId;
-import com.plotsquared.core.queue.ScopedLocalBlockQueue;
+import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.MathMan;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Range;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Random;
 
@@ -53,18 +46,27 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
         this.world = world;
     }
 
-    @Override public void initialize(PlotArea area) {
+    @Override
+    public void initialize(PlotArea area) {
     }
 
-    @Override public String getName() {
+    @Override
+    public BiomeType getBiome(final PlotArea settings, final int x, final int y, final int z) {
+        return null;
+    }
+
+    @Override
+    public String getName() {
         return this.chunkGenerator.getClass().getName();
     }
 
-    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
-        return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotArea(world, id, min, max);
+    @Override
+    public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
+        return PlotSquared.platform().defaultGenerator().getNewPlotArea(world, id, min, max);
     }
 
-    @Override public void generateChunk(final ScopedLocalBlockQueue result, PlotArea settings) {
+    @Override
+    public void generateChunk(final ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes) {
         World world = BukkitUtil.getWorld(this.world);
         Location min = result.getMin();
         int chunkX = min.getX() >> 4;
@@ -73,22 +75,24 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
         try {
             ChunkGenerator.BiomeGrid grid = new ChunkGenerator.BiomeGrid() {
                 @Override
-                public void setBiome(@Range(from = 0, to = 15) int x,
-                    @Range(from = 0, to = 15) int z, @NotNull Biome biome) {
+                public void setBiome(int x, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
                 }
 
-                //do not annotate with Override until we discontinue support for 1.4.4
-                public void setBiome(int x, int y, int z, @NotNull Biome biome) {
+                //do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4)
+                @Override
+                public void setBiome(int x, int y, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
 
                 }
 
-                @Override @NotNull public Biome getBiome(int x, int z) {
+                @Override
+                public @NonNull Biome getBiome(int x, int z) {
                     return Biome.FOREST;
                 }
 
-                @Override public @NotNull Biome getBiome(int x, int y, int z) {
+                @Override
+                public @NonNull Biome getBiome(int x, int y, int z) {
                     return Biome.FOREST;
                 }
             };

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

@@ -0,0 +1,73 @@
+/*
+ * 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.generator;
+
+import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.generator.HybridPlotWorld;
+import com.plotsquared.core.generator.IndependentPlotGenerator;
+import com.plotsquared.core.location.Location;
+import com.plotsquared.core.location.UncheckedWorldLocation;
+import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.world.SinglePlotArea;
+import com.plotsquared.core.queue.QueueCoordinator;
+import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.util.SideEffectSet;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.generator.BlockPopulator;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.Random;
+
+final class LegacyBlockStatePopulator extends BlockPopulator {
+
+    private final IndependentPlotGenerator plotGenerator;
+
+    /**
+     * @since 6.9.0
+     */
+    public LegacyBlockStatePopulator(
+            final @NonNull IndependentPlotGenerator plotGenerator
+    ) {
+        this.plotGenerator = plotGenerator;
+    }
+
+    @Override
+    public void populate(@NonNull final World world, @NonNull final Random random, @NonNull final Chunk source) {
+        int chunkMinX = source.getX() << 4;
+        int chunkMinZ = source.getZ() << 4;
+        PlotArea area = Location.at(world.getName(), chunkMinX, 0, chunkMinZ).getPlotArea();
+        if (area == null || (area instanceof HybridPlotWorld hpw && !hpw.populationNeeded()) || area instanceof SinglePlotArea) {
+            return;
+        }
+
+        QueueCoordinator queue = PlotSquared.platform().globalBlockQueue().getNewQueue(new BukkitWorld(world));
+        queue.setForceSync(true);
+        queue.setSideEffectSet(SideEffectSet.none());
+        queue.setBiomesEnabled(false);
+        queue.setChunkObject(source);
+        Location min = UncheckedWorldLocation.at(world.getName(), chunkMinX, world.getMinHeight(), chunkMinZ);
+        Location max = UncheckedWorldLocation.at(world.getName(), chunkMinX + 15, world.getMaxHeight(), chunkMinZ + 15);
+        ZeroedDelegateScopedQueueCoordinator offsetChunkQueue = new ZeroedDelegateScopedQueueCoordinator(queue, min, max);
+        this.plotGenerator.populateChunk(offsetChunkQueue, area);
+        queue.enqueue();
+    }
+
+}

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

@@ -0,0 +1,49 @@
+/*
+ * 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.inject;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+import com.plotsquared.core.backup.BackupManager;
+import com.plotsquared.core.backup.BackupProfile;
+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 org.apache.logging.log4j.Logger;
+
+public class BackupModule extends AbstractModule {
+
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BackupModule.class.getSimpleName());
+
+    @Override
+    protected void configure() {
+        try {
+            install(new FactoryModuleBuilder()
+                    .implement(BackupProfile.class, PlayerBackupProfile.class).build(PlayerBackupProfileFactory.class));
+            bind(BackupManager.class).to(SimpleBackupManager.class);
+        } catch (final Exception e) {
+            LOGGER.error("Failed to initialize backup manager", e);
+            LOGGER.error("Backup features will be disabled");
+            bind(BackupManager.class).to(NullBackupManager.class);
+        }
+    }
+
+}

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

@@ -0,0 +1,148 @@
+/*
+ * 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.inject;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+import com.plotsquared.bukkit.BukkitPlatform;
+import com.plotsquared.bukkit.listener.SingleWorldListener;
+import com.plotsquared.bukkit.player.BukkitPlayerManager;
+import com.plotsquared.bukkit.queue.BukkitChunkCoordinator;
+import com.plotsquared.bukkit.queue.BukkitQueueCoordinator;
+import com.plotsquared.bukkit.schematic.BukkitSchematicHandler;
+import com.plotsquared.bukkit.util.BukkitChunkManager;
+import com.plotsquared.bukkit.util.BukkitEconHandler;
+import com.plotsquared.bukkit.util.BukkitInventoryUtil;
+import com.plotsquared.bukkit.util.BukkitRegionManager;
+import com.plotsquared.bukkit.util.BukkitSetupUtils;
+import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.bukkit.util.fawe.FaweRegionManager;
+import com.plotsquared.bukkit.util.fawe.FaweSchematicHandler;
+import com.plotsquared.core.PlotPlatform;
+import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.generator.HybridGen;
+import com.plotsquared.core.generator.IndependentPlotGenerator;
+import com.plotsquared.core.inject.annotations.ConsoleActor;
+import com.plotsquared.core.inject.annotations.DefaultGenerator;
+import com.plotsquared.core.inject.factory.ChunkCoordinatorBuilderFactory;
+import com.plotsquared.core.inject.factory.ChunkCoordinatorFactory;
+import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
+import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
+import com.plotsquared.core.plot.world.DefaultPlotAreaManager;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.plot.world.SinglePlotAreaManager;
+import com.plotsquared.core.queue.ChunkCoordinator;
+import com.plotsquared.core.queue.GlobalBlockQueue;
+import com.plotsquared.core.queue.QueueProvider;
+import com.plotsquared.core.queue.subscriber.DefaultProgressSubscriber;
+import com.plotsquared.core.queue.subscriber.ProgressSubscriber;
+import com.plotsquared.core.util.ChunkManager;
+import com.plotsquared.core.util.EconHandler;
+import com.plotsquared.core.util.InventoryUtil;
+import com.plotsquared.core.util.PlayerManager;
+import com.plotsquared.core.util.RegionManager;
+import com.plotsquared.core.util.SchematicHandler;
+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 org.apache.logging.log4j.Logger;
+import org.bukkit.Bukkit;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public class BukkitModule extends AbstractModule {
+
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitModule.class.getSimpleName());
+
+    private final BukkitPlatform bukkitPlatform;
+
+    public BukkitModule(final @NonNull BukkitPlatform bukkitPlatform) {
+        this.bukkitPlatform = bukkitPlatform;
+    }
+
+    @Override
+    protected void configure() {
+        bind(PlayerManager.class).to(BukkitPlayerManager.class);
+        bind(JavaPlugin.class).toInstance(bukkitPlatform);
+        bind(PlotPlatform.class).toInstance(bukkitPlatform);
+        bind(BukkitPlatform.class).toInstance(bukkitPlatform);
+        bind(IndependentPlotGenerator.class).annotatedWith(DefaultGenerator.class).to(HybridGen.class);
+        // Console actor
+        @NonNull ConsoleCommandSender console = Bukkit.getServer().getConsoleSender();
+        WorldEditPlugin wePlugin = ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
+        bind(Actor.class).annotatedWith(ConsoleActor.class).toInstance(wePlugin.wrapCommandSender(console));
+        bind(InventoryUtil.class).to(BukkitInventoryUtil.class);
+        bind(SetupUtils.class).to(BukkitSetupUtils.class);
+        bind(WorldUtil.class).to(BukkitUtil.class);
+        install(new FactoryModuleBuilder()
+                .implement(ProgressSubscriber.class, DefaultProgressSubscriber.class)
+                .build(ProgressSubscriberFactory.class));
+        bind(ChunkManager.class).to(BukkitChunkManager.class);
+        if (PlotSquared.platform().isFaweHooking()) {
+            bind(SchematicHandler.class).to(FaweSchematicHandler.class);
+            bind(RegionManager.class).to(FaweRegionManager.class);
+        } else {
+            bind(SchematicHandler.class).to(BukkitSchematicHandler.class);
+            bind(RegionManager.class).to(BukkitRegionManager.class);
+        }
+        bind(GlobalBlockQueue.class).toInstance(new GlobalBlockQueue(QueueProvider.of(BukkitQueueCoordinator.class)));
+        if (Settings.Enabled_Components.WORLDS) {
+            bind(PlotAreaManager.class).to(SinglePlotAreaManager.class);
+            try {
+                bind(SingleWorldListener.class).toInstance(new SingleWorldListener());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            bind(PlotAreaManager.class).to(DefaultPlotAreaManager.class);
+        }
+        install(new FactoryModuleBuilder().build(HybridPlotWorldFactory.class));
+        install(new FactoryModuleBuilder()
+                .implement(ChunkCoordinator.class, BukkitChunkCoordinator.class)
+                .build(ChunkCoordinatorFactory.class));
+        install(new FactoryModuleBuilder().build(ChunkCoordinatorBuilderFactory.class));
+    }
+
+    @Provides
+    @Singleton
+    @NonNull EconHandler provideEconHandler() {
+        if (!Settings.Enabled_Components.ECONOMY) {
+            return EconHandler.nullEconHandler();
+        }
+        if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+            try {
+                BukkitEconHandler econHandler = new BukkitEconHandler();
+                if (!econHandler.init()) {
+                    LOGGER.warn("Economy is enabled but no plugin is providing an economy service. Falling back...");
+                    return EconHandler.nullEconHandler();
+                }
+                return econHandler;
+            } catch (final Exception ignored) {
+            }
+        }
+        return EconHandler.nullEconHandler();
+    }
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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.inject;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.plotsquared.bukkit.permissions.BukkitPermissionHandler;
+import com.plotsquared.bukkit.permissions.VaultPermissionHandler;
+import com.plotsquared.core.permissions.PermissionHandler;
+import org.bukkit.Bukkit;
+
+public class PermissionModule extends AbstractModule {
+
+    @Provides
+    @Singleton
+    PermissionHandler providePermissionHandler() {
+        try {
+            if (Bukkit.getPluginManager().isPluginEnabled("Vault")) {
+                return new VaultPermissionHandler();
+            }
+        } catch (final Exception ignored) {
+        }
+        return new BukkitPermissionHandler();
+    }
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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.inject;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.plotsquared.bukkit.managers.BukkitWorldManager;
+import com.plotsquared.bukkit.managers.MultiverseWorldManager;
+import com.plotsquared.core.util.PlatformWorldManager;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+
+public class WorldManagerModule extends AbstractModule {
+
+    @SuppressWarnings("removal") // Internal use only
+    @Provides
+    @Singleton
+    PlatformWorldManager<World> provideWorldManager() {
+        if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) {
+            return new MultiverseWorldManager();
+        } else {
+            return new BukkitWorldManager();
+        }
+    }
+
+}

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

@@ -0,0 +1,195 @@
+/*
+ * 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.google.inject.Inject;
+import com.plotsquared.bukkit.player.BukkitPlayer;
+import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.core.location.Location;
+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.plot.flag.implementations.SculkSensorInteractFlag;
+import com.plotsquared.core.util.PlotFlagUtil;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFertilizeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockReceiveGameEvent;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+
+@SuppressWarnings("unused")
+public class BlockEventListener117 implements Listener {
+
+    private static final Set<Material> COPPER_OXIDIZING = Set.of(
+            Material.COPPER_BLOCK,
+            Material.EXPOSED_COPPER,
+            Material.WEATHERED_COPPER,
+            Material.OXIDIZED_COPPER,
+            Material.CUT_COPPER,
+            Material.EXPOSED_CUT_COPPER,
+            Material.WEATHERED_CUT_COPPER,
+            Material.OXIDIZED_CUT_COPPER,
+            Material.CUT_COPPER_STAIRS,
+            Material.EXPOSED_CUT_COPPER_STAIRS,
+            Material.WEATHERED_CUT_COPPER_STAIRS,
+            Material.OXIDIZED_CUT_COPPER_STAIRS,
+            Material.CUT_COPPER_SLAB,
+            Material.EXPOSED_CUT_COPPER_SLAB,
+            Material.WEATHERED_CUT_COPPER_SLAB,
+            Material.OXIDIZED_CUT_COPPER_SLAB
+    );
+
+    @Inject
+    public BlockEventListener117() {
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockReceiveGame(BlockReceiveGameEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.adapt(block.getLocation());
+        Entity entity = event.getEntity();
+
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            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) || !plot.getFlag(SculkSensorInteractFlag.class))) {
+            if (plotPlayer != null) {
+                if (plot != null) {
+                    if (!plot.isAdded(plotPlayer.getUUID())) {
+                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because both " +
+                                "sculk-sensor-interact and misc-interact = false");
+                        event.setCancelled(true);
+                    }
+                }
+                return;
+            }
+            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 both sculk-sensor-interact and " +
+                                        "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 both sculk-sensor-interact and " +
+                                    "misc-interact = false");
+                            event.setCancelled(true);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockFertilize(BlockFertilizeEvent event) {
+        Block block = event.getBlock();
+        List<org.bukkit.block.BlockState> blocks = event.getBlocks();
+        Location location = BukkitUtil.adapt(blocks.get(0).getLocation());
+
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            for (int i = blocks.size() - 1; i >= 0; i--) {
+                Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
+                if (blockLocation.isPlotArea()) {
+                    blocks.remove(i);
+                }
+            }
+        } else {
+            Plot origin = area.getOwnedPlot(location);
+            if (origin == null) {
+                event.setCancelled(true);
+                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())) {
+                    blocks.remove(i);
+                    continue;
+                }
+                Plot plot = area.getOwnedPlot(blockLocation);
+                if (!Objects.equals(plot, origin)) {
+                    event.getBlocks().remove(i);
+                    continue;
+                }
+                if (!area.buildRangeContainsY(location.getY())) {
+                    event.getBlocks().remove(i);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockForm(BlockFormEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.adapt(block.getLocation());
+        if (location.isPlotRoad()) {
+            event.setCancelled(true);
+            return;
+        }
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (plot == null) {
+            return;
+        }
+        if (COPPER_OXIDIZING.contains(event.getNewState().getType())) {
+            if (!plot.getFlag(CopperOxideFlag.class)) {
+                plot.debug("Copper could not oxide because copper-oxide = false");
+                event.setCancelled(true);
+            }
+        }
+    }
+
+}

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

@@ -1,38 +1,38 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.plot.world.SinglePlotArea;
+import com.plotsquared.core.util.ReflectionUtils;
 import com.plotsquared.core.util.ReflectionUtils.RefClass;
 import com.plotsquared.core.util.ReflectionUtils.RefField;
 import com.plotsquared.core.util.ReflectionUtils.RefMethod;
+import com.plotsquared.core.util.task.PlotSquaredTask;
 import com.plotsquared.core.util.task.TaskManager;
+import com.plotsquared.core.util.task.TaskTime;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -51,65 +51,107 @@ import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
+import java.util.Objects;
 
 import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 
 @SuppressWarnings("unused")
 public class ChunkListener implements Listener {
 
+    private final PlotAreaManager plotAreaManager;
+    private final int version;
+
+    private RefMethod methodSetUnsaved;
     private RefMethod methodGetHandleChunk;
-    private RefField mustSave;
+    private RefMethod methodGetHandleWorld;
+    private RefField mustNotSave;
+    private Object objChunkStatusFull = null;
+    /*
+    private RefMethod methodGetFullChunk;
+    private RefMethod methodGetBukkitChunk;
+    private RefMethod methodGetChunkProvider;
+    private RefMethod methodGetVisibleMap;
+    private RefField worldServer;
+    private RefField playerChunkMap;
+    private RefField updatingChunks;
+    private RefField visibleChunks;
+    */
     private Chunk lastChunk;
     private boolean ignoreUnload = false;
 
-    public ChunkListener() {
-        if (Settings.Chunk_Processor.AUTO_TRIM) {
-            try {
-                RefClass classChunk = getRefClass("{nms}.Chunk");
-                RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-                this.mustSave = classChunk.getField("mustSave");
-                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
-            } catch (Throwable ignored) {
-                PlotSquared.debug(PlotSquared.get().IMP.getPluginName()
-                    + "/Server not compatible for chunk processor trim/gc");
-
-                Settings.Chunk_Processor.AUTO_TRIM = false;
-            }
-        }
+    @Inject
+    public ChunkListener(final @NonNull PlotAreaManager plotAreaManager) {
+        this.plotAreaManager = plotAreaManager;
+        version = PlotSquared.platform().serverVersion()[1];
         if (!Settings.Chunk_Processor.AUTO_TRIM) {
             return;
         }
+        try {
+            RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
+            RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
+            ReflectionUtils.RefClass classChunkAccess = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
+            this.methodSetUnsaved = classChunkAccess.getMethod("a", boolean.class);
+            try {
+                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
+            } catch (NoSuchMethodException ignored) {
+                try {
+                    RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
+                    this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
+                    this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass());
+                } catch (NoSuchMethodException ex) {
+                    throw new RuntimeException(ex);
+                }
+            }
+            try {
+                if (version < 17) {
+                    RefClass classChunk = getRefClass("{nms}.Chunk");
+                    this.mustNotSave = classChunk.getField("mustNotSave");
+                } else {
+                    RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
+                    this.mustNotSave = classChunk.getField("mustNotSave");
+                }
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        } catch (Throwable ignored) {
+            Settings.Chunk_Processor.AUTO_TRIM = false;
+        }
         for (World world : Bukkit.getWorlds()) {
             world.setAutoSave(false);
         }
+        if (version > 13) {
+            return;
+        }
         TaskManager.runTaskRepeat(() -> {
             try {
                 HashSet<Chunk> toUnload = new HashSet<>();
                 for (World world : Bukkit.getWorlds()) {
                     String worldName = world.getName();
-                    if (!PlotSquared.get().hasPlotArea(worldName)) {
+                    if (!this.plotAreaManager.hasPlotArea(worldName)) {
                         continue;
                     }
-                    Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
-                    Object chunkMap = w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
-                    Method methodIsChunkInUse =
-                        chunkMap.getClass().getDeclaredMethod("isChunkInUse", int.class, int.class);
-                    Chunk[] chunks = world.getLoadedChunks();
-                    for (Chunk chunk : chunks) {
-                        if ((boolean) methodIsChunkInUse
-                            .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
-                            continue;
+                    Object craftWorld = methodGetHandleWorld.of(world).call();
+                    if (version == 13) {
+                        Object chunkMap = craftWorld.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(craftWorld);
+                        Method methodIsChunkInUse =
+                                chunkMap.getClass().getDeclaredMethod("isChunkInUse", int.class, int.class);
+                        Chunk[] chunks = world.getLoadedChunks();
+                        for (Chunk chunk : chunks) {
+                            if ((boolean) methodIsChunkInUse.invoke(chunkMap, chunk.getX(), chunk.getZ())) {
+                                continue;
+                            }
+                            int x = chunk.getX();
+                            int z = chunk.getZ();
+                            if (!shouldSave(worldName, x, z)) {
+                                unloadChunk(worldName, chunk, false);
+                                continue;
+                            }
+                            toUnload.add(chunk);
                         }
-                        int x = chunk.getX();
-                        int z = chunk.getZ();
-                        if (!shouldSave(worldName, x, z)) {
-                            unloadChunk(worldName, chunk, false);
-                            continue;
-                        }
-                        toUnload.add(chunk);
                     }
                 }
                 if (toUnload.isEmpty()) {
@@ -125,17 +167,20 @@ public class ChunkListener implements Listener {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-        }, 1);
+        }, TaskTime.ticks(1L));
     }
 
     public boolean unloadChunk(String world, Chunk chunk, boolean safe) {
         if (safe && shouldSave(world, chunk.getX(), chunk.getZ())) {
             return false;
         }
-        Object c = this.methodGetHandleChunk.of(chunk).call();
-        RefField.RefExecutor field = this.mustSave.of(c);
-        if ((Boolean) field.get()) {
-            field.set(false);
+        Object c = objChunkStatusFull != null
+                ? this.methodGetHandleChunk.of(chunk).call(objChunkStatusFull)
+                : this.methodGetHandleChunk.of(chunk).call();
+        RefField.RefExecutor field = this.mustNotSave.of(c);
+        methodSetUnsaved.of(c).call(false);
+        if (!((Boolean) field.get())) {
+            field.set(true);
             if (chunk.isLoaded()) {
                 ignoreUnload = true;
                 chunk.unload(false);
@@ -150,34 +195,57 @@ public class ChunkListener implements Listener {
         int z = chunkZ << 4;
         int x2 = x + 15;
         int z2 = z + 15;
-        Plot plot = new Location(world, x, 1, z).getOwnedPlotAbs();
-        if (plot != null && plot.hasOwner()) {
-            return true;
+        Location loc = Location.at(world, x, 1, z);
+        PlotArea plotArea = plotAreaManager.getPlotArea(loc);
+        if (plotArea != null) {
+            Plot plot = plotArea.getPlot(loc);
+            if (plot != null && plot.hasOwner()) {
+                return true;
+            }
         }
-        plot = new Location(world, x2, 1, z2).getOwnedPlotAbs();
-        if (plot != null && plot.hasOwner()) {
-            return true;
+        loc = Location.at(world, x2, 1, z2);
+        plotArea = plotAreaManager.getPlotArea(loc);
+        if (plotArea != null) {
+            Plot plot = plotArea.getPlot(loc);
+            if (plot != null && plot.hasOwner()) {
+                return true;
+            }
         }
-        plot = new Location(world, x2, 1, z).getOwnedPlotAbs();
-        if (plot != null && plot.hasOwner()) {
-            return true;
+        loc = Location.at(world, x2, 1, z);
+        plotArea = plotAreaManager.getPlotArea(loc);
+        if (plotArea != null) {
+            Plot plot = plotArea.getPlot(loc);
+            if (plot != null && plot.hasOwner()) {
+                return true;
+            }
         }
-        plot = new Location(world, x, 1, z2).getOwnedPlotAbs();
-        if (plot != null && plot.hasOwner()) {
-            return true;
+        loc = Location.at(world, x, 1, z2);
+        plotArea = plotAreaManager.getPlotArea(loc);
+        if (plotArea != null) {
+            Plot plot = plotArea.getPlot(loc);
+            if (plot != null && plot.hasOwner()) {
+                return true;
+            }
         }
-        plot = new Location(world, x + 7, 1, z + 7).getOwnedPlotAbs();
+        loc = Location.at(world, x + 7, 1, z + 7);
+        plotArea = plotAreaManager.getPlotArea(loc);
+        if (plotArea == null) {
+            return false;
+        }
+        Plot plot = plotArea.getPlot(loc);
         return plot != null && plot.hasOwner();
     }
 
-    @EventHandler public void onChunkUnload(ChunkUnloadEvent event) {
+    @EventHandler
+    public void onChunkUnload(ChunkUnloadEvent event) {
         if (ignoreUnload) {
             return;
         }
         Chunk chunk = event.getChunk();
         if (Settings.Chunk_Processor.AUTO_TRIM) {
             String world = chunk.getWorld().getName();
-            if (PlotSquared.get().hasPlotArea(world)) {
+            if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(
+                    world)) {
                 if (unloadChunk(world, chunk, true)) {
                     return;
                 }
@@ -188,11 +256,13 @@ public class ChunkListener implements Listener {
         }
     }
 
-    @EventHandler public void onChunkLoad(ChunkLoadEvent event) {
+    @EventHandler
+    public void onChunkLoad(ChunkLoadEvent event) {
         processChunk(event.getChunk(), false);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST) public void onItemSpawn(ItemSpawnEvent event) {
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onItemSpawn(ItemSpawnEvent event) {
         Item entity = event.getEntity();
         PaperLib.getChunkAtAsync(event.getLocation()).thenAccept(chunk -> {
             if (chunk == this.lastChunk) {
@@ -200,7 +270,7 @@ public class ChunkListener implements Listener {
                 event.setCancelled(true);
                 return;
             }
-            if (!PlotSquared.get().hasPlotArea(chunk.getWorld().getName())) {
+            if (!this.plotAreaManager.hasPlotArea(chunk.getWorld().getName())) {
                 return;
             }
             Entity[] entities = chunk.getEntities();
@@ -230,7 +300,7 @@ public class ChunkListener implements Listener {
                 event.setCancelled(true);
                 return;
             }
-            if (!PlotSquared.get().hasPlotArea(chunk.getWorld().getName())) {
+            if (!this.plotAreaManager.hasPlotArea(chunk.getWorld().getName())) {
                 return;
             }
             Entity[] entities = chunk.getEntities();
@@ -245,21 +315,16 @@ public class ChunkListener implements Listener {
     }
 
     private void cleanChunk(final Chunk chunk) {
-        TaskManager.index.incrementAndGet();
-        final Integer currentIndex = TaskManager.index.get();
-        Integer task = TaskManager.runTaskRepeat(() -> {
+        final int currentIndex = TaskManager.index.incrementAndGet();
+        PlotSquaredTask task = TaskManager.runTaskRepeat(() -> {
             if (!chunk.isLoaded()) {
-                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                TaskManager.tasks.remove(currentIndex);
-                PlotSquared.debug("Successfully processed and unloaded chunk!");
+                Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();
                 chunk.unload(true);
                 return;
             }
             BlockState[] tiles = chunk.getTileEntities();
             if (tiles.length == 0) {
-                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                TaskManager.tasks.remove(currentIndex);
-                PlotSquared.debug("Successfully processed and unloaded chunk!");
+                Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();
                 chunk.unload(true);
                 return;
             }
@@ -267,21 +332,19 @@ public class ChunkListener implements Listener {
             int i = 0;
             while (System.currentTimeMillis() - start < 250) {
                 if (i >= tiles.length - Settings.Chunk_Processor.MAX_TILES) {
-                    Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                    TaskManager.tasks.remove(currentIndex);
-                    PlotSquared.debug("Successfully processed and unloaded chunk!");
+                    Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();
                     chunk.unload(true);
                     return;
                 }
                 tiles[i].getBlock().setType(Material.AIR, false);
                 i++;
             }
-        }, 5);
-        TaskManager.tasks.put(currentIndex, task);
+        }, TaskTime.ticks(5L));
+        TaskManager.addTask(task, currentIndex);
     }
 
     public boolean processChunk(Chunk chunk, boolean unload) {
-        if (!PlotSquared.get().hasPlotArea(chunk.getWorld().getName())) {
+        if (!this.plotAreaManager.hasPlotArea(chunk.getWorld().getName())) {
             return false;
         }
         Entity[] entities = chunk.getEntities();
@@ -296,24 +359,18 @@ public class ChunkListener implements Listener {
                     toRemove--;
                 }
             }
-
-            PlotSquared.debug(
-                "PlotSquared detected unsafe chunk and processed: " + (chunk.getX() << 4) + "," + (
-                    chunk.getX() << 4));
         }
         if (tiles.length > Settings.Chunk_Processor.MAX_TILES) {
             if (unload) {
-                PlotSquared.debug(
-                    "PlotSquared detected unsafe chunk: " + (chunk.getX() << 4) + "," + (
-                        chunk.getX() << 4));
                 cleanChunk(chunk);
                 return true;
             }
 
-            for (int i = 0 ; i < (tiles.length - Settings.Chunk_Processor.MAX_TILES); i++) {
+            for (int i = 0; i < (tiles.length - Settings.Chunk_Processor.MAX_TILES); i++) {
                 tiles[i].getBlock().setType(Material.AIR, false);
             }
         }
         return false;
     }
+
 }

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

@@ -1,48 +1,56 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.google.inject.Inject;
+import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.util.BukkitEntityUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.listener.PlayerBlockEventType;
 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.PlotArea;
+import com.plotsquared.core.plot.PlotHandler;
 import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
+import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
-import com.plotsquared.core.plot.flag.implementations.MobPlaceFlag;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.util.EventDispatcher;
+import com.plotsquared.core.util.PlotFlagUtil;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.world.block.BlockType;
 import org.bukkit.Material;
+import org.bukkit.Particle;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Boat;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.event.EventHandler;
@@ -59,6 +67,9 @@ import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.projectiles.BlockProjectileSource;
+import org.bukkit.projectiles.ProjectileSource;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Iterator;
 import java.util.List;
@@ -66,13 +77,28 @@ import java.util.List;
 @SuppressWarnings("unused")
 public class EntityEventListener implements Listener {
 
+    private final PlotAreaManager plotAreaManager;
+    private final EventDispatcher eventDispatcher;
     private float lastRadius;
 
+    @Inject
+    public EntityEventListener(
+            final @NonNull PlotAreaManager plotAreaManager,
+            final @NonNull EventDispatcher eventDispatcher
+    ) {
+        this.plotAreaManager = plotAreaManager;
+        this.eventDispatcher = eventDispatcher;
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
         EntityDamageByEntityEvent eventChange =
-            new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
-                EntityDamageEvent.DamageCause.FIRE_TICK, event.getDuration());
+                new EntityDamageByEntityEvent(
+                        event.getCombuster(),
+                        event.getEntity(),
+                        EntityDamageEvent.DamageCause.FIRE_TICK,
+                        event.getDuration()
+                );
         onEntityDamageByEntityEvent(eventChange);
         if (eventChange.isCancelled()) {
             event.setCancelled(true);
@@ -82,8 +108,8 @@ public class EntityEventListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
         Entity damager = event.getDamager();
-        Location location = BukkitUtil.getLocation(damager);
-        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        Location location = BukkitUtil.adapt(damager.getLocation());
+        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
             return;
         }
         Entity victim = event.getEntity();
@@ -98,8 +124,7 @@ public class EntityEventListener implements Listener {
 */
         if (!BukkitEntityUtil.entityDamage(damager, victim, event.getCause())) {
             if (event.isCancelled()) {
-                if (victim instanceof Ageable) {
-                    Ageable ageable = (Ageable) victim;
+                if (victim instanceof Ageable ageable) {
                     if (ageable.getAge() == -24000) {
                         ageable.setAge(0);
                         ageable.setAdult();
@@ -113,61 +138,44 @@ public class EntityEventListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void creatureSpawnEvent(CreatureSpawnEvent event) {
         Entity entity = event.getEntity();
-        Location location = BukkitUtil.getLocation(entity.getLocation());
+        Location location = BukkitUtil.adapt(entity.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
         }
         CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG":
-            case "EGG":
-            case "OCELOT_BABY":
-            case "SPAWNER_EGG":
+            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
                 if (!area.isSpawnEggs()) {
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "REINFORCEMENTS":
-            case "NATURAL":
-            case "MOUNT":
-            case "PATROL":
-            case "RAID":
-            case "SHEARED":
-            case "SHOULDER_ENTITY":
-            case "SILVERFISH_BLOCK":
-            case "TRAP":
-            case "VILLAGE_DEFENSE":
-            case "VILLAGE_INVASION":
-            case "BEEHIVE":
-            case "CHUNK_GEN":
+            }
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
+                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "BREEDING":
+            }
+            case "BREEDING" -> {
                 if (!area.isSpawnBreeding()) {
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "BUILD_IRONGOLEM":
-            case "BUILD_SNOWMAN":
-            case "BUILD_WITHER":
-            case "CUSTOM":
+            }
+            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
                 if (!area.isSpawnCustom() && entity.getType() != EntityType.ARMOR_STAND) {
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "SPAWNER":
+            }
+            case "SPAWNER" -> {
                 if (!area.isMobSpawnerSpawning()) {
                     event.setCancelled(true);
                     return;
                 }
-                break;
+            }
         }
         Plot plot = area.getOwnedPlotAbs(location);
         if (plot == null) {
@@ -176,7 +184,7 @@ public class EntityEventListener implements Listener {
             }
             return;
         }
-        if (BukkitEntityUtil.checkEntity(entity, plot)) {
+        if (BukkitEntityUtil.checkEntity(entity, plot.getBasePlot(false))) {
             event.setCancelled(true);
         }
     }
@@ -189,10 +197,10 @@ public class EntityEventListener implements Listener {
         Block block = event.getBlock();
         World world = block.getWorld();
         String worldName = world.getName();
-        if (!PlotSquared.get().hasPlotArea(worldName)) {
+        if (!this.plotAreaManager.hasPlotArea(worldName)) {
             return;
         }
-        Location location = BukkitUtil.getLocation(block.getLocation());
+        Location location = BukkitUtil.adapt(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -220,41 +228,40 @@ public class EntityEventListener implements Listener {
                 entity.remove();
             }
         } else if (event.getTo() == Material.AIR) {
-            event.getEntity()
-                .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+            event.getEntity().setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH) public void onDamage(EntityDamageEvent event) {
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onDamage(EntityDamageEvent event) {
         if (event.getEntityType() != EntityType.PLAYER) {
             return;
         }
-        Location location = BukkitUtil.getLocation(event.getEntity());
+        Location location = BukkitUtil.adapt(event.getEntity().getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (area.isRoadFlags() && area.getRoadFlag(InvincibleFlag.class)) {
+            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, InvincibleFlag.class, true)) {
                 event.setCancelled(true);
             }
             return;
         }
         if (plot.getFlag(InvincibleFlag.class)) {
-            plot.debug(
-                event.getEntity().getName() + " could not take damage because invincible = true");
+            plot.debug(event.getEntity().getName() + " could not take damage because invincible = true");
             event.setCancelled(true);
         }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBigBoom(EntityExplodeEvent event) {
-        Location location = BukkitUtil.getLocation(event.getLocation());
+        Location location = BukkitUtil.adapt(event.getLocation());
         PlotArea area = location.getPlotArea();
         boolean plotArea = location.isPlotArea();
         if (!plotArea) {
-            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+            if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
                 return;
             }
             return;
@@ -270,14 +277,11 @@ public class EntityEventListener implements Listener {
                     origin = (Plot) meta.get(0).value();
                 }
                 if (this.lastRadius != 0) {
-                    List<Entity> nearby = event.getEntity()
-                        .getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
+                    List<Entity> nearby = event.getEntity().getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
                     for (Entity near : nearby) {
-                        if (near instanceof TNTPrimed || near.getType()
-                            .equals(EntityType.MINECART_TNT)) {
+                        if (near instanceof TNTPrimed || near.getType().equals(EntityType.MINECART_TNT)) {
                             if (!near.hasMetadata("plot")) {
-                                near.setMetadata("plot",
-                                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+                                near.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
                             }
                         }
                     }
@@ -286,9 +290,8 @@ public class EntityEventListener implements Listener {
                 Iterator<Block> iterator = event.blockList().iterator();
                 while (iterator.hasNext()) {
                     Block block = iterator.next();
-                    location = BukkitUtil.getLocation(block.getLocation());
-                    if (!area.contains(location.getX(), location.getZ()) || (origin != null
-                        && !origin.equals(area.getOwnedPlot(location)))) {
+                    location = BukkitUtil.adapt(block.getLocation());
+                    if (!area.contains(location.getX(), location.getZ()) || !origin.equals(area.getOwnedPlot(location))) {
                         iterator.remove();
                     }
                 }
@@ -298,35 +301,110 @@ public class EntityEventListener implements Listener {
             }
         }
         event.setCancelled(true);
+        //Spawn Explosion Particles when enabled in settings
+        if (Settings.General.ALWAYS_SHOW_EXPLOSIONS) {
+            event.getLocation().getWorld().spawnParticle(Particle.EXPLOSION_HUGE, event.getLocation(), 0);
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPeskyMobsChangeTheWorldLikeWTFEvent(EntityChangeBlockEvent event) {
         Entity e = event.getEntity();
-        if (!(e instanceof FallingBlock)) {
-            Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-            PlotArea area = location.getPlotArea();
-            if (area != null) {
-                Plot plot = area.getOwnedPlot(location);
-                if (plot != null && plot.getFlag(MobPlaceFlag.class)) {
+        Material type = event.getBlock().getType();
+        Location location = BukkitUtil.adapt(event.getBlock().getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        if (e instanceof FallingBlock) {
+            // allow falling blocks converting to blocks and vice versa
+            return;
+        } else if (e instanceof Boat) {
+            // allow boats destroying lily pads
+            if (type == Material.LILY_PAD) {
+                return;
+            }
+        } else if (e instanceof Player player) {
+            BukkitPlayer pp = BukkitUtil.adapt(player);
+            if (type.toString().equals("POWDER_SNOW")) {
+                // Burning player evaporating powder snow. Use same checks as
+                // trampling farmland
+                BlockType blockType = BukkitAdapter.asBlockType(type);
+                if (!this.eventDispatcher.checkPlayerBlockEvent(pp,
+                        PlayerBlockEventType.TRIGGER_PHYSICAL, location, blockType, true
+                )) {
+                    event.setCancelled(true);
+                }
+                return;
+            } else {
+                // already handled by other flags (mainly the 'use' flag):
+                // - player tilting big dripleaf by standing on it
+                // - player picking glow berries from cave vine
+                // - player trampling farmland
+                // - player standing on or clicking redstone ore
+                return;
+            }
+        } else if (e instanceof Projectile entity) {
+            // Exact same as the ProjectileHitEvent listener, except that we let
+            // the entity-change-block determine what to do with shooters that
+            // aren't players and aren't blocks
+            Plot plot = area.getPlot(location);
+            ProjectileSource shooter = entity.getShooter();
+            if (shooter instanceof Player) {
+                PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
+                if (plot == null) {
+                    if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
+                        entity.remove();
+                        event.setCancelled(true);
+                    }
                     return;
                 }
-                if (plot != null) {
-                    plot.debug(e.getType() + " could not change block because mob-place = false");
+                if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
+                    return;
                 }
+                entity.remove();
                 event.setCancelled(true);
+                return;
             }
+            if (!(shooter instanceof Entity) && shooter != null) {
+                if (plot == null) {
+                    entity.remove();
+                    event.setCancelled(true);
+                    return;
+                }
+                Location sLoc =
+                        BukkitUtil.adapt(((BlockProjectileSource) shooter).getBlock().getLocation());
+                if (!area.contains(sLoc.getX(), sLoc.getZ())) {
+                    entity.remove();
+                    event.setCancelled(true);
+                    return;
+                }
+                Plot sPlot = area.getOwnedPlotAbs(sLoc);
+                if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
+                    entity.remove();
+                    event.setCancelled(true);
+                }
+                return;
+            }
+            // fall back to entity-change-block flag
+        }
+
+        Plot plot = area.getOwnedPlot(location);
+        if (plot != null && !plot.getFlag(EntityChangeBlockFlag.class)) {
+            plot.debug(e.getType() + " could not change block because entity-change-block = false");
+            event.setCancelled(true);
         }
     }
 
-    @EventHandler public void onPrime(ExplosionPrimeEvent event) {
+    @EventHandler
+    public void onPrime(ExplosionPrimeEvent event) {
         this.lastRadius = event.getRadius() + 1;
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onVehicleCreate(VehicleCreateEvent event) {
         Vehicle entity = event.getVehicle();
-        Location location = BukkitUtil.getLocation(entity);
+        Location location = BukkitUtil.adapt(entity.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -337,8 +415,8 @@ public class EntityEventListener implements Listener {
             return;
         }
         if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-            entity
-                .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+            entity.setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot));
         }
     }
+
 }

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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;
 
@@ -36,6 +29,7 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -54,40 +48,43 @@ import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.List;
 
-@SuppressWarnings("unused")
 public class EntitySpawnListener implements Listener {
 
-    private final static String KEY = "P2";
+    private static final String KEY = "P2";
     private static boolean ignoreTP = false;
+    private static boolean hasPlotArea = false;
+    private static String areaName = null;
 
     public static void testNether(final Entity entity) {
-        @NotNull World world = entity.getWorld();
-        if (world.getEnvironment() != World.Environment.NETHER
-            && world.getEnvironment() != World.Environment.THE_END) {
+        @NonNull World world = entity.getWorld();
+        if (world.getEnvironment() != World.Environment.NETHER && world.getEnvironment() != World.Environment.THE_END) {
             return;
         }
         test(entity);
     }
 
     public static void testCreate(final Entity entity) {
-        @NotNull World world = entity.getWorld();
-        if (!PlotSquared.get().hasPlotArea(entity.getWorld().getName())) {
+        @NonNull World world = entity.getWorld();
+        if (!world.getName().equals(areaName)) {
+            areaName = world.getName();
+            hasPlotArea = PlotSquared.get().getPlotAreaManager().hasPlotArea(areaName);
+        }
+        if (!hasPlotArea) {
             return;
         }
         test(entity);
     }
 
     public static void test(Entity entity) {
-        @NotNull World world = entity.getWorld();
+        @NonNull World world = entity.getWorld();
         List<MetadataValue> meta = entity.getMetadata(KEY);
         if (meta.isEmpty()) {
-            if (PlotSquared.get().hasPlotArea(world.getName())) {
-                entity.setMetadata(KEY,
-                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, entity.getLocation()));
+            if (PlotSquared.get().getPlotAreaManager().hasPlotArea(world.getName())) {
+                entity.setMetadata(KEY, new FixedMetadataValue((Plugin) PlotSquared.platform(), entity.getLocation()));
             }
         } else {
             org.bukkit.Location origin = (org.bukkit.Location) meta.get(0).value();
@@ -121,23 +118,23 @@ public class EntitySpawnListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void creatureSpawnEvent(EntitySpawnEvent event) {
         Entity entity = event.getEntity();
-        Location location = BukkitUtil.getLocation(entity.getLocation());
+        Location location = BukkitUtil.adapt(entity.getLocation());
         PlotArea area = location.getPlotArea();
         if (!location.isPlotArea()) {
             return;
         }
         Plot plot = location.getOwnedPlotAbs();
+        EntityType type = entity.getType();
         if (plot == null) {
-            EntityType type = entity.getType();
+            if (type == EntityType.DROPPED_ITEM) {
+                if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                    event.setCancelled(true);
+                }
+                return;
+            }
             if (!area.isMobSpawning()) {
-                switch (type) {
-                    case DROPPED_ITEM:
-                        if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    case PLAYER:
-                        return;
+                if (type == EntityType.PLAYER) {
+                    return;
                 }
                 if (type.isAlive()) {
                     event.setCancelled(true);
@@ -151,41 +148,70 @@ public class EntitySpawnListener implements Listener {
         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
             event.setCancelled(true);
         }
-        switch (entity.getType()) {
-            case ENDER_CRYSTAL:
-                if (BukkitEntityUtil.checkEntity(entity, plot)) {
-                    event.setCancelled(true);
-                }
-            case SHULKER:
-                if (!entity.hasMetadata("shulkerPlot")) {
-                    entity.setMetadata("shulkerPlot",
-                        new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot.getId()));
-                }
+        if (type == EntityType.ENDER_CRYSTAL) {
+            if (BukkitEntityUtil.checkEntity(entity, plot)) {
+                event.setCancelled(true);
+            }
+            return;
+        }
+        if (type == EntityType.SHULKER) {
+            if (!entity.hasMetadata("shulkerPlot")) {
+                entity.setMetadata("shulkerPlot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot.getId()));
+            }
         }
     }
 
-    @EventHandler public void onChunkLoad(ChunkLoadEvent event) {
-        @NotNull Chunk chunk = event.getChunk();
+    @EventHandler
+    public void onChunkLoad(ChunkLoadEvent event) {
+        @NonNull Chunk chunk = event.getChunk();
         for (final Entity entity : chunk.getEntities()) {
             testCreate(entity);
         }
     }
 
-    @EventHandler public void onVehicle(VehicleUpdateEvent event) {
+    @EventHandler
+    public void onVehicle(VehicleUpdateEvent event) {
         testNether(event.getVehicle());
     }
 
-    @EventHandler public void onVehicle(VehicleCreateEvent event) {
+    @EventHandler
+    public void onVehicle(VehicleCreateEvent event) {
         testCreate(event.getVehicle());
     }
 
-    @EventHandler public void onVehicle(VehicleBlockCollisionEvent event) {
+    @EventHandler
+    public void onVehicle(VehicleBlockCollisionEvent event) {
         testNether(event.getVehicle());
     }
 
-    @EventHandler public void onTeleport(EntityTeleportEvent event) {
-        Entity ent = event.getEntity();
-        if (ent instanceof Vehicle || ent instanceof ArmorStand) {
+    @EventHandler
+    public void onTeleport(EntityTeleportEvent event) {
+        Entity entity = event.getEntity();
+        Entity fromLocation = event.getEntity();
+        Block toLocation = event.getTo().getBlock();
+        final Location fromLocLocation = BukkitUtil.adapt(fromLocation.getLocation());
+        final PlotArea fromArea = fromLocLocation.getPlotArea();
+        Location toLocLocation = BukkitUtil.adapt(toLocation.getLocation());
+        PlotArea toArea = toLocLocation.getPlotArea();
+
+        if (toArea == null) {
+            if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
+                event.setCancelled(true);
+            }
+            return;
+        }
+        Plot toPlot = toArea.getOwnedPlot(toLocLocation);
+        if (fromLocation.getType() == EntityType.SHULKER && fromArea != null) {
+            final Plot fromPlot = fromArea.getOwnedPlot(fromLocLocation);
+
+            if (fromPlot != null || toPlot != null) {
+                if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+        if (entity instanceof Vehicle || entity instanceof ArmorStand) {
             testNether(event.getEntity());
         }
     }
@@ -195,9 +221,11 @@ public class EntitySpawnListener implements Listener {
         testNether(event.getVehicle());
     }
 
-    @EventHandler public void spawn(CreatureSpawnEvent event) {
+    @EventHandler
+    public void spawn(CreatureSpawnEvent event) {
         if (event.getEntityType() == EntityType.ARMOR_STAND) {
             testCreate(event.getEntity());
         }
     }
+
 }

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

@@ -1,39 +1,30 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.google.common.collect.Iterables;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.configuration.Captions;
 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.flag.implementations.ForcefieldFlag;
-import com.plotsquared.core.util.Permissions;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
@@ -44,13 +35,16 @@ import java.util.UUID;
 @SuppressWarnings("unused")
 public class ForceFieldListener {
 
-    private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) {
-        Set<PlotPlayer> players = new HashSet<>();
-        for (Player nearPlayer : Iterables
-            .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
-            PlotPlayer plotPlayer;
-            if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
-                .equals(plotPlayer.getCurrentPlot())) {
+    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()
+        ) {
+            PlotPlayer<?> plotPlayer;
+            if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot
+                    .equals(plotPlayer.getCurrentPlot())) {
                 continue;
             }
             if (!plot.isAdded(plotPlayer.getUUID())) {
@@ -60,12 +54,15 @@ public class ForceFieldListener {
         return players;
     }
 
-    private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) {
-        for (Player nearPlayer : Iterables
-            .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
-            PlotPlayer plotPlayer;
-            if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
-                .equals(plotPlayer.getCurrentPlot())) {
+    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()
+        ) {
+            PlotPlayer<?> plotPlayer;
+            if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot
+                    .equals(plotPlayer.getCurrentPlot())) {
                 continue;
             }
             if (plot.isAdded(plotPlayer.getUUID())) {
@@ -75,7 +72,7 @@ public class ForceFieldListener {
         return null;
     }
 
-    private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) {
+    private static Vector calculateVelocity(PlotPlayer<?> player, PlotPlayer<?> e) {
         Location playerLocation = player.getLocationFull();
         Location oPlayerLocation = e.getLocation();
         double playerX = playerLocation.getX();
@@ -105,28 +102,27 @@ public class ForceFieldListener {
         return new Vector(x, y, z);
     }
 
-    public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) {
+    public static void handleForcefield(Player player, PlotPlayer<?> plotPlayer, Plot plot) {
         if (plot.getFlag(ForcefieldFlag.class)) {
             UUID uuid = plotPlayer.getUUID();
             if (plot.isAdded(uuid)) {
-                Set<PlotPlayer> players = getNearbyPlayers(player, plot);
-                for (PlotPlayer oPlayer : players) {
-                    if (!Permissions
-                        .hasPermission(oPlayer, Captions.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+                Set<PlotPlayer<?>> players = getNearbyPlayers(player, plot);
+                for (PlotPlayer<?> oPlayer : players) {
+                    if (!oPlayer.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
                         ((BukkitPlayer) oPlayer).player
-                            .setVelocity(calculateVelocity(plotPlayer, oPlayer));
+                                .setVelocity(calculateVelocity(plotPlayer, oPlayer));
                     }
                 }
             } else {
-                PlotPlayer oPlayer = hasNearbyPermitted(player, plot);
+                PlotPlayer<?> oPlayer = hasNearbyPermitted(player, plot);
                 if (oPlayer == null) {
                     return;
                 }
-                if (!Permissions
-                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
                     player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
                 }
             }
         }
     }
+
 }

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

@@ -1,30 +1,24 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.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;
@@ -32,17 +26,27 @@ import com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent;
 import com.destroystokyo.paper.event.entity.SlimePathfindEvent;
 import com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent;
 import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
+import com.google.inject.Inject;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Command;
 import com.plotsquared.core.command.MainCommand;
-import com.plotsquared.core.configuration.Captions;
 import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
 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.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.PlotFlagUtil;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.Chunk;
 import org.bukkit.block.Block;
 import org.bukkit.block.TileState;
@@ -51,13 +55,13 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
-import org.bukkit.entity.ThrownPotion;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.projectiles.ProjectileSource;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -71,14 +75,21 @@ import java.util.regex.Pattern;
 @SuppressWarnings("unused")
 public class PaperListener implements Listener {
 
+    private final PlotAreaManager plotAreaManager;
     private Chunk lastChunk;
 
-    @EventHandler public void onEntityPathfind(EntityPathfindEvent event) {
+    @Inject
+    public PaperListener(final @NonNull PlotAreaManager plotAreaManager) {
+        this.plotAreaManager = plotAreaManager;
+    }
+
+    @EventHandler
+    public void onEntityPathfind(EntityPathfindEvent event) {
         if (!Settings.Paper_Components.ENTITY_PATHING) {
             return;
         }
-        Location toLoc = BukkitUtil.getLocation(event.getLoc());
-        Location fromLoc = BukkitUtil.getLocation(event.getEntity().getLocation());
+        Location toLoc = BukkitUtil.adapt(event.getLoc());
+        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
         PlotArea tarea = toLoc.getPlotArea();
         if (tarea == null) {
             return;
@@ -106,7 +117,8 @@ public class PaperListener implements Listener {
         event.setCancelled(true);
     }
 
-    @EventHandler public void onEntityPathfind(SlimePathfindEvent event) {
+    @EventHandler
+    public void onEntityPathfind(SlimePathfindEvent event) {
         if (!Settings.Paper_Components.ENTITY_PATHING) {
             return;
         }
@@ -117,8 +129,8 @@ public class PaperListener implements Listener {
             return;
         }
 
-        Location toLoc = BukkitUtil.getLocation(b.getLocation());
-        Location fromLoc = BukkitUtil.getLocation(event.getEntity().getLocation());
+        Location toLoc = BukkitUtil.adapt(b.getLocation());
+        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
         PlotArea tarea = toLoc.getPlotArea();
         if (tarea == null) {
             return;
@@ -147,11 +159,12 @@ public class PaperListener implements Listener {
         event.setCancelled(true);
     }
 
-    @EventHandler public void onPreCreatureSpawnEvent(PreCreatureSpawnEvent event) {
+    @EventHandler
+    public void onPreCreatureSpawnEvent(PreCreatureSpawnEvent event) {
         if (!Settings.Paper_Components.CREATURE_SPAWN) {
             return;
         }
-        Location location = BukkitUtil.getLocation(event.getSpawnLocation());
+        Location location = BukkitUtil.adapt(event.getSpawnLocation());
         PlotArea area = location.getPlotArea();
         if (!location.isPlotArea()) {
             return;
@@ -165,73 +178,55 @@ public class PaperListener implements Listener {
         }
         CreatureSpawnEvent.SpawnReason reason = event.getReason();
         switch (reason.toString()) {
-            case "DISPENSE_EGG":
-            case "EGG":
-            case "OCELOT_BABY":
-            case "SPAWNER_EGG":
+            case "DISPENSE_EGG", "EGG", "OCELOT_BABY", "SPAWNER_EGG" -> {
                 if (!area.isSpawnEggs()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "REINFORCEMENTS":
-            case "NATURAL":
-            case "MOUNT":
-            case "PATROL":
-            case "RAID":
-            case "SHEARED":
-            case "SHOULDER_ENTITY":
-            case "SILVERFISH_BLOCK":
-            case "TRAP":
-            case "VILLAGE_DEFENSE":
-            case "VILLAGE_INVASION":
-            case "BEEHIVE":
-            case "CHUNK_GEN":
+            }
+            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
                 if (!area.isMobSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "BREEDING":
+            }
+            case "BREEDING" -> {
                 if (!area.isSpawnBreeding()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "BUILD_IRONGOLEM":
-            case "BUILD_SNOWMAN":
-            case "BUILD_WITHER":
-            case "CUSTOM":
+            }
+            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
                 if (!area.isSpawnCustom() && event.getType() != EntityType.ARMOR_STAND) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-                break;
-            case "SPAWNER":
+            }
+            case "SPAWNER" -> {
                 if (!area.isMobSpawnerSpawning()) {
                     event.setShouldAbortSpawn(true);
                     event.setCancelled(true);
                     return;
                 }
-                break;
+            }
         }
         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()) {
-                switch (type) {
-                    case DROPPED_ITEM:
-                        if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
-                            event.setShouldAbortSpawn(true);
-                            event.setCancelled(true);
-                            return;
-                        }
-                    case PLAYER:
-                        return;
+                if (type == EntityType.PLAYER) {
+                    return;
                 }
                 if (type.isAlive()) {
                     event.setShouldAbortSpawn(true);
@@ -253,7 +248,7 @@ public class PaperListener implements Listener {
     @EventHandler
     public void onPlayerNaturallySpawnCreaturesEvent(PlayerNaturallySpawnCreaturesEvent event) {
         if (Settings.Paper_Components.CANCEL_CHUNK_SPAWN) {
-            Location location = BukkitUtil.getLocation(event.getPlayer().getLocation());
+            Location location = BukkitUtil.adapt(event.getPlayer().getLocation());
             PlotArea area = location.getPlotArea();
             if (area != null && !area.isMobSpawning()) {
                 event.setCancelled(true);
@@ -261,9 +256,10 @@ public class PaperListener implements Listener {
         }
     }
 
-    @EventHandler public void onPreSpawnerSpawnEvent(PreSpawnerSpawnEvent event) {
+    @EventHandler
+    public void onPreSpawnerSpawnEvent(PreSpawnerSpawnEvent event) {
         if (Settings.Paper_Components.SPAWNER_SPAWN) {
-            Location location = BukkitUtil.getLocation(event.getSpawnerLocation());
+            Location location = BukkitUtil.adapt(event.getSpawnerLocation());
             PlotArea area = location.getPlotArea();
             if (area != null && !area.isMobSpawnerSpawning()) {
                 event.setCancelled(true);
@@ -272,22 +268,26 @@ public class PaperListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST) public void onBlockPlace(BlockPlaceEvent event) {
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onBlockPlace(BlockPlaceEvent event) {
         if (!Settings.Paper_Components.TILE_ENTITY_CHECK || !Settings.Enabled_Components.CHUNK_PROCESSOR) {
             return;
         }
         if (!(event.getBlock().getState(false) instanceof TileState)) {
             return;
         }
-        final Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+        final Location location = BukkitUtil.adapt(event.getBlock().getLocation());
         final PlotArea plotArea = location.getPlotArea();
         if (plotArea == null) {
             return;
         }
         final int tileEntityCount = event.getBlock().getChunk().getTileEntities(false).length;
         if (tileEntityCount >= Settings.Chunk_Processor.MAX_TILES) {
-            final PlotPlayer<?> plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
-            Captions.TILE_ENTITY_CAP_REACHED.send(plotPlayer, Settings.Chunk_Processor.MAX_TILES);
+            final PlotPlayer<?> plotPlayer = BukkitUtil.adapt(event.getPlayer());
+            plotPlayer.sendMessage(
+                    TranslatableCaption.of("errors.tile_entity_cap_reached"),
+                    TagResolver.resolver("amount", Tag.inserting(Component.text(Settings.Chunk_Processor.MAX_TILES)))
+            );
             event.setCancelled(true);
             event.setBuild(false);
         }
@@ -299,31 +299,69 @@ public class PaperListener implements Listener {
      *
      * @param event Paper's PlayerLaunchProjectileEvent
      */
-    @EventHandler public void onProjectileLaunch(PlayerLaunchProjectileEvent event) {
+    @EventHandler
+    public void onProjectileLaunch(PlayerLaunchProjectileEvent event) {
         if (!Settings.Paper_Components.PLAYER_PROJECTILE) {
             return;
         }
         Projectile entity = event.getProjectile();
-        if (!(entity instanceof ThrownPotion)) {
-            return;
-        }
         ProjectileSource shooter = entity.getShooter();
         if (!(shooter instanceof Player)) {
             return;
         }
-        Location location = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        Location location = BukkitUtil.adapt(entity.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
             return;
         }
-        PlotPlayer<?> pp = BukkitUtil.getPlayer((Player) shooter);
+        PlotPlayer<Player> pp = BukkitUtil.adapt((Player) shooter);
         Plot plot = location.getOwnedPlot();
-        if (plot != null && !plot.isAdded(pp.getUUID())) {
-            entity.remove();
-            event.setCancelled(true);
+
+        if (plot == null) {
+            if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !pp.hasPermission(
+                    Permission.PERMISSION_ADMIN_PROJECTILE_ROAD
+            )) {
+                pp.sendMessage(
+                        TranslatableCaption.of("permission.no_permission_event"),
+                        TagResolver.resolver(
+                                "node",
+                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
+                        )
+                );
+                entity.remove();
+                event.setCancelled(true);
+            }
+        } else if (!plot.hasOwner()) {
+            if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
+                pp.sendMessage(
+                        TranslatableCaption.of("permission.no_permission_event"),
+                        TagResolver.resolver(
+                                "node",
+                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
+                        )
+                );
+                entity.remove();
+                event.setCancelled(true);
+            }
+        } else if (!plot.isAdded(pp.getUUID())) {
+            if (!plot.getFlag(ProjectilesFlag.class)) {
+                if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
+                    pp.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
+                            )
+                    );
+                    entity.remove();
+                    event.setCancelled(true);
+                }
+            }
         }
     }
 
-    @EventHandler public void onAsyncTabCompletion(final AsyncTabCompleteEvent event) {
+    @EventHandler
+    public void onAsyncTabCompletion(final AsyncTabCompleteEvent event) {
         if (!Settings.Paper_Components.ASYNC_TAB_COMPLETION) {
             return;
         }
@@ -341,13 +379,13 @@ public class PaperListener implements Listener {
         if (unprocessedArgs.length == 1) {
             return; // We don't do anything in this case
         } else if (!Settings.Enabled_Components.TAB_COMPLETED_ALIASES
-            .contains(unprocessedArgs[0].toLowerCase(Locale.ENGLISH))) {
+                .contains(unprocessedArgs[0].toLowerCase(Locale.ENGLISH))) {
             return;
         }
         final String[] args = new String[unprocessedArgs.length - 1];
         System.arraycopy(unprocessedArgs, 1, args, 0, args.length);
         try {
-            final PlotPlayer<?> player = BukkitUtil.getPlayer((Player) event.getSender());
+            final PlotPlayer<?> player = BukkitUtil.adapt((Player) event.getSender());
             final Collection<Command> objects = MainCommand.getInstance().tab(player, args, buffer.endsWith(" "));
             if (objects == null) {
                 return;
@@ -358,7 +396,56 @@ public class PaperListener implements Listener {
             }
             event.setCompletions(result);
             event.setHandled(true);
-        } catch (final Exception ignored) {}
+        } catch (final Exception ignored) {
+        }
+    }
+
+    @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

@@ -1,83 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.listener;
-
-import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.configuration.Captions;
-import com.plotsquared.core.configuration.Settings;
-import com.plotsquared.core.location.Location;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.PlotArea;
-import org.bukkit.block.Banner;
-import org.bukkit.block.Beacon;
-import org.bukkit.block.Bed;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.CommandBlock;
-import org.bukkit.block.Comparator;
-import org.bukkit.block.Conduit;
-import org.bukkit.block.Container;
-import org.bukkit.block.CreatureSpawner;
-import org.bukkit.block.DaylightDetector;
-import org.bukkit.block.EnchantingTable;
-import org.bukkit.block.EndGateway;
-import org.bukkit.block.EnderChest;
-import org.bukkit.block.Jukebox;
-import org.bukkit.block.Sign;
-import org.bukkit.block.Skull;
-import org.bukkit.block.Structure;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.BlockPlaceEvent;
-
-public class PaperListener113 extends PaperListener {
-
-    @EventHandler
-    public void onBlockPlace(BlockPlaceEvent event) {
-        if (!Settings.Paper_Components.TILE_ENTITY_CHECK || !Settings.Enabled_Components.CHUNK_PROCESSOR) {
-            return;
-        }
-        BlockState state = event.getBlock().getState(false);
-        if (!(state instanceof Banner || state instanceof Beacon || state instanceof Bed
-                || state instanceof CommandBlock || state instanceof Comparator || state instanceof Conduit
-                || state instanceof Container || state instanceof CreatureSpawner || state instanceof DaylightDetector
-                || state instanceof EnchantingTable || state instanceof EnderChest || state instanceof EndGateway
-                || state instanceof Jukebox || state instanceof Sign || state instanceof Skull
-                || state instanceof Structure)) {
-            return;
-        }
-        final Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-        final PlotArea plotArea = location.getPlotArea();
-        if (plotArea == null) {
-            return;
-        }
-        final int tileEntityCount = event.getBlock().getChunk().getTileEntities(false).length;
-        if (tileEntityCount >= Settings.Chunk_Processor.MAX_TILES) {
-            final PlotPlayer<?> plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
-            Captions.TILE_ENTITY_CAP_REACHED.send(plotPlayer, Settings.Chunk_Processor.MAX_TILES);
-            event.setCancelled(true);
-            event.setBuild(false);
-        }
-    }
-}

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

@@ -1,40 +1,38 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.google.inject.Inject;
 import com.plotsquared.bukkit.util.BukkitEntityUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Captions;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
 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.PlotArea;
 import com.plotsquared.core.plot.PlotHandler;
-import com.plotsquared.core.util.Permissions;
+import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.util.PlotFlagUtil;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -49,27 +47,30 @@ import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @SuppressWarnings("unused")
 public class ProjectileEventListener implements Listener {
 
+    private final PlotAreaManager plotAreaManager;
+
+    @Inject
+    public ProjectileEventListener(final @NonNull PlotAreaManager plotAreaManager) {
+        this.plotAreaManager = plotAreaManager;
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPotionSplash(LingeringPotionSplashEvent event) {
-        Projectile entity = event.getEntity();
-        Location location = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-            return;
-        }
-        if (!this.onProjectileHit(event)) {
-            event.setCancelled(true);
-        }
+    public void onLingeringPotionSplash(LingeringPotionSplashEvent event) {
+        // Cancelling projectile hit events still results in area effect clouds.
+        // We need to cancel the splash events to get rid of those.
+        onProjectileHit(event);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPotionSplash(PotionSplashEvent event) {
         ThrownPotion damager = event.getPotion();
-        Location location = BukkitUtil.getLocation(damager);
-        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        Location location = BukkitUtil.adapt(damager.getLocation());
+        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
             return;
         }
         int count = 0;
@@ -79,78 +80,139 @@ public class ProjectileEventListener implements Listener {
                 count++;
             }
         }
-        if ((count > 0 && count == event.getAffectedEntities().size()) || !onProjectileHit(event)) {
+        if (count > 0 && count == event.getAffectedEntities().size()) {
             event.setCancelled(true);
+        } else {
+            // Cancelling projectile hit events still results in potions
+            // splashing in the world. We need to cancel the splash events to
+            // avoid that.
+            onProjectileHit(event);
         }
     }
 
-    @EventHandler public void onProjectileLaunch(ProjectileLaunchEvent event) {
+    @EventHandler(ignoreCancelled = true)
+    public void onProjectileLaunch(ProjectileLaunchEvent event) {
         Projectile entity = event.getEntity();
-        if (!(entity instanceof ThrownPotion)) {
-            return;
-        }
         ProjectileSource shooter = entity.getShooter();
         if (!(shooter instanceof Player)) {
             return;
         }
-        Location location = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        Location location = BukkitUtil.adapt(entity.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
             return;
         }
-        PlotPlayer<Player> pp = BukkitUtil.getPlayer((Player) shooter);
+        PlotPlayer<Player> pp = BukkitUtil.adapt((Player) shooter);
         Plot plot = location.getOwnedPlot();
-        if (plot != null && !plot.isAdded(pp.getUUID())) {
-            entity.remove();
-            event.setCancelled(true);
+
+        if (plot == null) {
+            if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !pp.hasPermission(
+                    Permission.PERMISSION_ADMIN_PROJECTILE_ROAD
+            )) {
+                pp.sendMessage(
+                        TranslatableCaption.of("permission.no_permission_event"),
+                        TagResolver.resolver(
+                                "node",
+                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_ROAD)
+                        )
+                );
+                entity.remove();
+                event.setCancelled(true);
+            }
+        } else if (!plot.hasOwner()) {
+            if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
+                pp.sendMessage(
+                        TranslatableCaption.of("permission.no_permission_event"),
+                        TagResolver.resolver(
+                                "node",
+                                Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)
+                        )
+                );
+                entity.remove();
+                event.setCancelled(true);
+            }
+        } else if (!plot.isAdded(pp.getUUID())) {
+            if (!plot.getFlag(ProjectilesFlag.class)) {
+                if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
+                    pp.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)
+                            )
+                    );
+                    entity.remove();
+                    event.setCancelled(true);
+                }
+            }
         }
     }
 
-    @SuppressWarnings({"BooleanMethodIsAlwaysInverted", "cos it's not... dum IntelliJ"}) @EventHandler
-    public boolean onProjectileHit(ProjectileHitEvent event) {
+    @EventHandler
+    public void onProjectileHit(ProjectileHitEvent event) {
         Projectile entity = event.getEntity();
-        Location location = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-            return true;
+        Location location = BukkitUtil.adapt(entity.getLocation());
+        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
+            return;
         }
         PlotArea area = location.getPlotArea();
         if (area == null) {
-            return true;
+            return;
         }
         Plot plot = area.getPlot(location);
         ProjectileSource shooter = entity.getShooter();
         if (shooter instanceof Player) {
-            PlotPlayer<?> pp = BukkitUtil.getPlayer((Player) shooter);
-            if (plot == null) {
-                if (!Permissions.hasPermission(pp, Captions.PERMISSION_PROJECTILE_UNOWNED)) {
-                    entity.remove();
-                    return false;
+            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;
                 }
-                return true;
+
+                entity.remove();
+                event.setCancelled(true);
+                return;
             }
-            if (plot.isAdded(pp.getUUID()) || Permissions
-                .hasPermission(pp, Captions.PERMISSION_PROJECTILE_OTHER)) {
-                return true;
+
+            PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
+            if (plot == null) {
+                if (!PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, ProjectilesFlag.class, true) && !pp.hasPermission(
+                        Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED
+                )) {
+                    entity.remove();
+                    event.setCancelled(true);
+                }
+                return;
+            }
+            if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
+                    ProjectilesFlag.class)) {
+                return;
             }
             entity.remove();
-            return false;
+            event.setCancelled(true);
+            return;
         }
         if (!(shooter instanceof Entity) && shooter != null) {
             if (plot == null) {
                 entity.remove();
-                return false;
+                event.setCancelled(true);
+                return;
             }
             Location sLoc =
-                BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+                    BukkitUtil.adapt(((BlockProjectileSource) shooter).getBlock().getLocation());
             if (!area.contains(sLoc.getX(), sLoc.getZ())) {
                 entity.remove();
-                return false;
+                event.setCancelled(true);
+                return;
             }
             Plot sPlot = area.getOwnedPlotAbs(sLoc);
             if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
                 entity.remove();
-                return false;
+                event.setCancelled(true);
             }
         }
-        return true;
     }
+
 }

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

@@ -1,52 +1,50 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.BukkitMain;
+import com.google.inject.Inject;
+import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.placeholder.MVdWPlaceholders;
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Captions;
 import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.player.ConsolePlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerLoadEvent;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class ServerListener implements Listener {
 
-    private final BukkitMain plugin;
+    private final BukkitPlatform plugin;
 
-    public ServerListener(BukkitMain plugin) {
+    @Inject
+    public ServerListener(final @NonNull BukkitPlatform plugin) {
         this.plugin = plugin;
     }
 
-    @EventHandler public void onServerLoad(ServerLoadEvent event) {
+    @EventHandler
+    public void onServerLoad(ServerLoadEvent event) {
         if (Bukkit.getPluginManager().getPlugin("MVdWPlaceholderAPI") != null && Settings.Enabled_Components.USE_MVDWAPI) {
-            new MVdWPlaceholders(this.plugin, PlotSquared.get().getPlaceholderRegistry());
-            PlotSquared.log(Captions.PREFIX + "&6PlotSquared hooked into MVdWPlaceholderAPI");
+            new MVdWPlaceholders(this.plugin, this.plugin.placeholderRegistry());
+            ConsolePlayer.getConsole().sendMessage(TranslatableCaption.of("placeholder.hooked"));
         }
     }
+
 }

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

@@ -1,35 +1,28 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.core.PlotSquared;
 import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.plot.world.SinglePlotArea;
 import com.plotsquared.core.plot.world.SinglePlotAreaManager;
 import com.plotsquared.core.util.ReflectionUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.event.EventHandler;
@@ -37,43 +30,40 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.plugin.Plugin;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 
-@SuppressWarnings("unused")
 public class SingleWorldListener implements Listener {
 
+    private final Method methodSetUnsaved;
     private Method methodGetHandleChunk;
-    private Field mustSave;
-    private boolean isTrueForNotSave = true;
+    private Object objChunkStatusFull = null;
 
-    public SingleWorldListener(Plugin plugin) throws Exception {
-        ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk");
+    public SingleWorldListener() throws Exception {
         ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-        this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
+        ReflectionUtils.RefClass classChunkAccess = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
+        this.methodSetUnsaved = classChunkAccess.getMethod("a", boolean.class).getRealMethod();
         try {
-            if (PlotSquared.get().IMP.getServerVersion()[1] == 13) {
-                this.mustSave = classChunk.getField("mustSave").getRealField();
-                this.isTrueForNotSave = false;
-            } else {
-                this.mustSave = classChunk.getField("mustNotSave").getRealField();
+            this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
+        } catch (NoSuchMethodException ignored) {
+            try {
+                ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
+                this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
+                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod();
+            } catch (NoSuchMethodException ex) {
+                throw new RuntimeException(ex);
             }
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
         }
-        Bukkit.getPluginManager().registerEvents(this, plugin);
     }
 
     public void markChunkAsClean(Chunk chunk) {
         try {
-            Object nmsChunk = methodGetHandleChunk.invoke(chunk);
-            if (mustSave != null) {
-                this.mustSave.set(nmsChunk, false);
-            }
+            Object nmsChunk = objChunkStatusFull != null
+                    ? this.methodGetHandleChunk.invoke(chunk, objChunkStatusFull)
+                    : this.methodGetHandleChunk.invoke(chunk);
+            methodSetUnsaved.invoke(nmsChunk, false);
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -86,10 +76,15 @@ public class SingleWorldListener implements Listener {
         if (!(man instanceof SinglePlotAreaManager)) {
             return;
         }
-        if (!isPlotId(name)) {
+        if (!SinglePlotArea.isSinglePlotWorld(name)) {
+            return;
+        }
+        int x = event.getChunk().getX();
+        int z = event.getChunk().getZ();
+        if (x < 16 && x > -16 && z < 16 && z > -16) {
+            // Allow spawn to generate
             return;
         }
-
         markChunkAsClean(event.getChunk());
     }
 
@@ -98,35 +93,9 @@ public class SingleWorldListener implements Listener {
     //        handle(event);
     //    }
 
-    @EventHandler(priority = EventPriority.LOWEST) public void onChunkLoad(ChunkLoadEvent event) {
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onChunkLoad(ChunkLoadEvent event) {
         handle(event);
     }
 
-    private boolean isPlotId(String worldName) {
-        int len = worldName.length();
-        int separator = 0;
-        for (int i = 0; i < len; i++) {
-            switch (worldName.charAt(i)) {
-                case ',':
-                case ';':
-                    separator++;
-                    break;
-                case '-':
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                    break;
-                default:
-                    return false;
-            }
-        }
-        return separator == 1;
-    }
 }

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

@@ -0,0 +1,57 @@
+/*
+ * 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/listener/WorldEvents.java

@@ -1,30 +1,24 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.google.inject.Inject;
 import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.generator.GeneratorWrapper;
@@ -36,17 +30,23 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 import org.bukkit.generator.ChunkGenerator;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @SuppressWarnings("unused")
 public class WorldEvents implements Listener {
 
+    private final PlotAreaManager plotAreaManager;
+
+    @Inject
+    public WorldEvents(final @NonNull PlotAreaManager plotAreaManager) {
+        this.plotAreaManager = plotAreaManager;
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onWorldInit(WorldInitEvent event) {
         World world = event.getWorld();
         String name = world.getName();
-        PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
-        if (manager instanceof SinglePlotAreaManager) {
-            SinglePlotAreaManager single = (SinglePlotAreaManager) manager;
+        if (this.plotAreaManager instanceof final SinglePlotAreaManager single) {
             if (single.isWorld(name)) {
                 world.setKeepSpawnInMemory(false);
                 return;
@@ -56,7 +56,8 @@ public class WorldEvents implements Listener {
         if (gen instanceof GeneratorWrapper) {
             PlotSquared.get().loadWorld(name, (GeneratorWrapper<?>) gen);
         } else {
-            PlotSquared.get().loadWorld(name, new BukkitPlotGenerator(name, gen));
+            PlotSquared.get().loadWorld(name, new BukkitPlotGenerator(name, gen, this.plotAreaManager));
         }
     }
+
 }

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

@@ -1,38 +1,32 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.managers;
 
+import com.google.inject.Singleton;
 import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.util.PlatformWorldManager;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
 import org.bukkit.WorldType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,13 +38,15 @@ import java.util.List;
  * Default Bukkit world manager. It will handle world creation by
  * registering the generator in bukkit.yml
  */
+@Singleton
 public class BukkitWorldManager implements PlatformWorldManager<World> {
 
-    @Override public void initialize() {
+    @Override
+    public void initialize() {
     }
 
-    @Override @Nullable
-    public World handleWorldCreation(@NotNull String worldName, @Nullable String generator) {
+    @Override
+    public @Nullable World handleWorldCreation(@NonNull String worldName, @Nullable String generator) {
         this.setGenerator(worldName, generator);
         final WorldCreator wc = new WorldCreator(worldName);
         wc.environment(World.Environment.NORMAL);
@@ -61,8 +57,8 @@ public class BukkitWorldManager implements PlatformWorldManager<World> {
         return Bukkit.createWorld(wc);
     }
 
-    protected void setGenerator(@Nullable final String worldName, @Nullable final String generator) {
-        if (generator == null || worldName != null && worldName.contains(".")) {
+    protected void setGenerator(final @Nullable String worldName, final @Nullable String generator) {
+        if (generator == null) {
             return;
         }
         File file = new File("bukkit.yml").getAbsoluteFile();
@@ -75,11 +71,13 @@ public class BukkitWorldManager implements PlatformWorldManager<World> {
         }
     }
 
-    @Override public String getName() {
+    @Override
+    public String getName() {
         return "bukkit";
     }
 
-    @Override public Collection<String> getWorlds() {
+    @Override
+    public Collection<String> getWorlds() {
         final List<World> worlds = Bukkit.getWorlds();
         final List<String> worldNames = new ArrayList<>();
         for (final World world : worlds) {

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

@@ -1,66 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.managers;
-
-import org.bukkit.World;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import se.hyperver.hyperverse.Hyperverse;
-import se.hyperver.hyperverse.world.WorldConfiguration;
-import se.hyperver.hyperverse.world.WorldConfigurationBuilder;
-import se.hyperver.hyperverse.world.WorldFeatures;
-import se.hyperver.hyperverse.world.WorldType;
-
-/**
- * Hyperverse specific manager that creates worlds
- * using Hyperverse's API
- */
-public class HyperverseWorldManager extends BukkitWorldManager {
-
-    @Override @Nullable
-    public World handleWorldCreation(@NotNull String worldName, @Nullable String generator) {
-        // First let Bukkit register the world
-        this.setGenerator(worldName, generator);
-        // Create the world
-        final WorldConfigurationBuilder worldConfigurationBuilder = WorldConfiguration.builder()
-            .setName(worldName).setType(WorldType.OVER_WORLD);
-        if (generator != null) {
-            worldConfigurationBuilder.setGenerator(generator).setWorldFeatures(WorldFeatures.FLATLAND);
-        }
-        try {
-            return Hyperverse.getApi().createWorld(worldConfigurationBuilder.createWorldConfiguration())
-                .getBukkitWorld();
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Override public String getName() {
-        return "bukkit-hyperverse";
-    }
-
-}

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

@@ -1,48 +1,48 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.managers;
 
+import com.google.inject.Singleton;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Multiverse specific manager that informs Multiverse of
  * world creation by executing a console command
+ *
+ * @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
+@Singleton
 public class MultiverseWorldManager extends BukkitWorldManager {
 
-    @Override @Nullable
-    public World handleWorldCreation(@NotNull final String worldName, @Nullable final String generator) {
+    @Override
+    public @Nullable World handleWorldCreation(final @NonNull String worldName, final @Nullable String generator) {
         // First let Bukkit register the world
         this.setGenerator(worldName, generator);
         // Then we send the console command
         final StringBuilder commandBuilder = new StringBuilder("mv create ")
-            .append(worldName).append(" normal");
+                .append(worldName).append(" normal");
         if (generator != null) {
             commandBuilder.append(" -g ").append(generator);
         }
@@ -50,7 +50,8 @@ public class MultiverseWorldManager extends BukkitWorldManager {
         return Bukkit.getWorld(worldName);
     }
 
-    @Override public String getName() {
+    @Override
+    public String getName() {
         return "bukkit-multiverse";
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/BukkitPermissionHandler.java

@@ -0,0 +1,100 @@
+/*
+ * 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.permissions;
+
+import com.plotsquared.bukkit.player.BukkitPlayer;
+import com.plotsquared.core.permissions.ConsolePermissionProfile;
+import com.plotsquared.core.permissions.PermissionHandler;
+import com.plotsquared.core.permissions.PermissionProfile;
+import com.plotsquared.core.player.ConsolePlayer;
+import com.plotsquared.core.player.OfflinePlotPlayer;
+import com.plotsquared.core.player.PlotPlayer;
+import org.bukkit.entity.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.lang.ref.WeakReference;
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+public class BukkitPermissionHandler implements PermissionHandler {
+
+    @Override
+    public void initialize() {
+    }
+
+    @NonNull
+    @Override
+    public Optional<PermissionProfile> getPermissionProfile(
+            @NonNull PlotPlayer<?> playerPlotPlayer
+    ) {
+        if (playerPlotPlayer instanceof final BukkitPlayer bukkitPlayer) {
+            return Optional.of(new BukkitPermissionProfile(bukkitPlayer.getPlatformPlayer()));
+        } else if (playerPlotPlayer instanceof ConsolePlayer) {
+            return Optional.of(ConsolePermissionProfile.INSTANCE);
+        }
+        return Optional.empty();
+    }
+
+    @NonNull
+    @Override
+    public Optional<PermissionProfile> getPermissionProfile(
+            @NonNull OfflinePlotPlayer offlinePlotPlayer
+    ) {
+        return Optional.empty();
+    }
+
+    @NonNull
+    @Override
+    public Set<PermissionHandlerCapability> getCapabilities() {
+        return EnumSet.of(PermissionHandlerCapability.ONLINE_PERMISSIONS);
+    }
+
+
+    private static final class BukkitPermissionProfile implements PermissionProfile {
+
+        private final WeakReference<Player> playerReference;
+
+        private BukkitPermissionProfile(final @NonNull Player player) {
+            this.playerReference = new WeakReference<>(player);
+        }
+
+        @Override
+        public boolean hasPermission(
+                final @Nullable String world,
+                final @NonNull String permission
+        ) {
+            final Player player = this.playerReference.get();
+            return player != null && player.hasPermission(permission);
+        }
+
+        @Override
+        public boolean hasKeyedPermission(
+                final @Nullable String world,
+                final @NonNull String stub,
+                final @NonNull String key
+        ) {
+            final Player player = this.playerReference.get();
+            return player != null && (player.hasPermission(stub + "." + key) || player.hasPermission(stub + ".*"));
+        }
+
+    }
+
+}

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/VaultPermissionHandler.java

@@ -0,0 +1,135 @@
+/*
+ * 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.permissions;
+
+import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
+import com.plotsquared.bukkit.player.BukkitPlayer;
+import com.plotsquared.core.permissions.ConsolePermissionProfile;
+import com.plotsquared.core.permissions.PermissionHandler;
+import com.plotsquared.core.permissions.PermissionProfile;
+import com.plotsquared.core.player.ConsolePlayer;
+import com.plotsquared.core.player.OfflinePlotPlayer;
+import com.plotsquared.core.player.PlotPlayer;
+import net.milkbowl.vault.permission.Permission;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+public class VaultPermissionHandler implements PermissionHandler {
+
+    private Permission permissions;
+
+    @Override
+    public void initialize() {
+        if (Bukkit.getServer().getPluginManager().getPlugin("Vault") == null) {
+            throw new IllegalStateException("Vault is not present on the server");
+        }
+        RegisteredServiceProvider<Permission> permissionProvider =
+                Bukkit.getServer().getServicesManager().getRegistration(Permission.class);
+        if (permissionProvider != null) {
+            this.permissions = permissionProvider.getProvider();
+        }
+    }
+
+    @NonNull
+    @Override
+    public Optional<PermissionProfile> getPermissionProfile(
+            @NonNull PlotPlayer<?> playerPlotPlayer
+    ) {
+        if (playerPlotPlayer instanceof final BukkitPlayer bukkitPlayer) {
+            return Optional.of(new VaultPermissionProfile(bukkitPlayer.getPlatformPlayer()));
+        } else if (playerPlotPlayer instanceof ConsolePlayer) {
+            return Optional.of(ConsolePermissionProfile.INSTANCE);
+        }
+        return Optional.empty();
+    }
+
+    @NonNull
+    @Override
+    public Optional<PermissionProfile> getPermissionProfile(
+            @NonNull OfflinePlotPlayer offlinePlotPlayer
+    ) {
+        if (offlinePlotPlayer instanceof BukkitOfflinePlayer) {
+            return Optional.of(new VaultPermissionProfile(((BukkitOfflinePlayer) offlinePlotPlayer).player));
+        }
+        return Optional.empty();
+    }
+
+    @NonNull
+    @Override
+    public Set<PermissionHandlerCapability> getCapabilities() {
+        return EnumSet.of(
+                PermissionHandlerCapability.PER_WORLD_PERMISSIONS,
+                PermissionHandlerCapability.ONLINE_PERMISSIONS,
+                PermissionHandlerCapability.OFFLINE_PERMISSIONS
+        );
+    }
+
+
+    private final class VaultPermissionProfile implements PermissionProfile {
+
+        private final OfflinePlayer offlinePlayer;
+
+        private VaultPermissionProfile(final @NonNull OfflinePlayer offlinePlayer) {
+            this.offlinePlayer = offlinePlayer;
+        }
+
+        @Override
+        public boolean hasPermission(
+                final @Nullable String world,
+                final @NonNull String permission
+        ) {
+            if (permissions == null) {
+                return false;
+            }
+            if (world == null && offlinePlayer instanceof BukkitPlayer) {
+                return permissions.playerHas(((BukkitPlayer) offlinePlayer).getPlatformPlayer(), permission);
+            }
+            return permissions.playerHas(world, offlinePlayer, permission);
+        }
+
+        @Override
+        public boolean hasKeyedPermission(
+                final @Nullable String world,
+                final @NonNull String stub,
+                final @NonNull String key
+        ) {
+            if (permissions == null) {
+                return false;
+            }
+            if (world == null && offlinePlayer instanceof BukkitPlayer) {
+                return permissions.playerHas(
+                        ((BukkitPlayer) offlinePlayer).getPlatformPlayer(),
+                        stub + ".*"
+                ) || permissions.playerHas(((BukkitPlayer) offlinePlayer).getPlatformPlayer(), stub + "." + key);
+            }
+            return permissions.playerHas(world, offlinePlayer, stub + ".*") || permissions.playerHas(world, offlinePlayer,
+                    stub + "." + key
+            );
+        }
+
+    }
+
+}

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.placeholder;
 
@@ -34,7 +27,7 @@ import com.plotsquared.core.util.placeholders.Placeholder;
 import com.plotsquared.core.util.placeholders.PlaceholderRegistry;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Placeholder support for MVdWPlaceholderAPI
@@ -45,8 +38,10 @@ public class MVdWPlaceholders {
     private final Plugin plugin;
     private final PlaceholderRegistry registry;
 
-    public MVdWPlaceholders(@NotNull final Plugin plugin,
-                            @NotNull final PlaceholderRegistry registry) {
+    public MVdWPlaceholders(
+            final @NonNull Plugin plugin,
+            final @NonNull PlaceholderRegistry registry
+    ) {
         this.plugin = plugin;
         this.registry = registry;
         for (final Placeholder placeholder : registry.getPlaceholders()) {
@@ -55,24 +50,24 @@ public class MVdWPlaceholders {
         PlotSquared.get().getEventDispatcher().registerListener(this);
     }
 
-    @Subscribe public void onNewPlaceholder(@NotNull final
-        PlaceholderRegistry.PlaceholderAddedEvent event) {
-        this.addPlaceholder(event.getPlaceholder());
+    @Subscribe
+    public void onNewPlaceholder(final PlaceholderRegistry.@NonNull PlaceholderAddedEvent event) {
+        this.addPlaceholder(event.placeholder());
     }
 
-    private void addPlaceholder(@NotNull final Placeholder placeholder) {
-        PlaceholderAPI.registerPlaceholder(plugin, PREFIX + String.format("%s", placeholder.getKey()),
-            placeholderReplaceEvent -> {
-                if (!placeholderReplaceEvent.isOnline() || placeholderReplaceEvent.getPlayer() == null) {
-                    return "";
+    private void addPlaceholder(final @NonNull Placeholder placeholder) {
+        PlaceholderAPI.registerPlaceholder(
+                plugin,
+                PREFIX + String.format("%s", placeholder.getKey()),
+                placeholderReplaceEvent -> {
+                    if (!placeholderReplaceEvent.isOnline() || placeholderReplaceEvent.getPlayer() == null) {
+                        return "";
+                    }
+                    final PlotPlayer<Player> player = BukkitUtil.adapt(placeholderReplaceEvent.getPlayer());
+                    String key = placeholderReplaceEvent.getPlaceholder().substring(PREFIX.length());
+                    return registry.getPlaceholderValue(key, player);
                 }
-                final PlotPlayer<Player> player = BukkitUtil.getPlayer(placeholderReplaceEvent.getPlayer());
-                if (player == null) {
-                    return "";
-                }
-                String key = placeholderReplaceEvent.getPlaceholder().substring(PREFIX.length());
-                return registry.getPlaceholderValue(key, player);
-            });
+        );
     }
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.placeholder;
 
@@ -36,28 +29,34 @@ public class PAPIPlaceholders extends PlaceholderExpansion {
     public PAPIPlaceholders() {
     }
 
-    @Override public boolean persist() {
+    @Override
+    public boolean persist() {
         return true;
     }
 
-    @Override public boolean canRegister() {
+    @Override
+    public boolean canRegister() {
         return true;
     }
 
-    @Override public String getAuthor() {
+    @Override
+    public String getAuthor() {
         return "IntellectualSites";
     }
 
-    @Override public String getIdentifier() {
+    @Override
+    public String getIdentifier() {
         return "plotsquared";
     }
 
-    @Override public String getVersion() {
+    @Override
+    public String getVersion() {
         return "3";
     }
 
-    @Override public String onPlaceholderRequest(Player p, String identifier) {
-        final PlotPlayer<?> pl = PlotSquared.imp().getPlayerManager().getPlayerIfExists(p.getUniqueId());
+    @Override
+    public String onPlaceholderRequest(Player p, String identifier) {
+        final PlotPlayer<?> pl = PlotSquared.platform().playerManager().getPlayerIfExists(p.getUniqueId());
 
         if (pl == null) {
             return "";
@@ -66,24 +65,26 @@ public class PAPIPlaceholders extends PlaceholderExpansion {
         // PAPI specific ones that don't translate well over into other placeholder APIs
         if (identifier.startsWith("has_plot_")) {
             identifier = identifier.substring("has_plot_".length());
-            if (identifier.isEmpty())
+            if (identifier.isEmpty()) {
                 return "";
+            }
 
             return pl.getPlotCount(identifier) > 0 ?
-                PlaceholderAPIPlugin.booleanTrue() :
-                PlaceholderAPIPlugin.booleanFalse();
+                    PlaceholderAPIPlugin.booleanTrue() :
+                    PlaceholderAPIPlugin.booleanFalse();
         }
 
         if (identifier.startsWith("plot_count_")) {
             identifier = identifier.substring("plot_count_".length());
-            if (identifier.isEmpty())
+            if (identifier.isEmpty()) {
                 return "";
+            }
 
             return String.valueOf(pl.getPlotCount(identifier));
         }
 
         // PlotSquared placeholders
-        return PlotSquared.get().getPlaceholderRegistry().getPlaceholderValue(identifier, pl);
+        return PlotSquared.platform().placeholderRegistry().getPlaceholderValue(identifier, pl);
     }
 
 }

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java

@@ -1,40 +1,35 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.placeholder;
 
 import com.plotsquared.bukkit.player.BukkitPlayer;
-import com.plotsquared.core.configuration.ChatFormatter;
+import com.plotsquared.core.configuration.caption.ChatFormatter;
 import com.plotsquared.core.player.PlotPlayer;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.entity.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class PlaceholderFormatter implements ChatFormatter {
 
-    @Override public void format(final ChatContext context) {
-        final PlotPlayer recipient = context.getRecipient();
+    @Override
+    public void format(final @NonNull ChatContext context) {
+        final PlotPlayer<?> recipient = context.getRecipient();
         if (recipient instanceof BukkitPlayer) {
             if (context.isRawOutput()) {
                 context.setMessage(context.getMessage().replace('%', '\u2010'));

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

@@ -1,63 +1,95 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.player;
 
+import com.plotsquared.core.permissions.NullPermissionProfile;
+import com.plotsquared.core.permissions.PermissionHandler;
+import com.plotsquared.core.permissions.PermissionProfile;
 import com.plotsquared.core.player.OfflinePlotPlayer;
 import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.UUID;
 
 public class BukkitOfflinePlayer implements OfflinePlotPlayer {
 
     public final OfflinePlayer player;
+    private final PermissionProfile permissionProfile;
 
     /**
      * Please do not use this method. Instead use BukkitUtil.getPlayer(Player),
      * as it caches player objects.
      *
-     * @param player
+     * @param player            Bukkit OfflinePlayer player to convert
+     * @param permissionHandler Permission Profile to be used
      */
-    public BukkitOfflinePlayer(OfflinePlayer player) {
+    public BukkitOfflinePlayer(
+            final @NonNull OfflinePlayer player, final @NonNull
+    PermissionHandler permissionHandler
+    ) {
         this.player = player;
+        this.permissionProfile = permissionHandler.getPermissionProfile(this)
+                .orElse(NullPermissionProfile.INSTANCE);
     }
 
-    @NotNull @Override public UUID getUUID() {
+    @NonNull
+    @Override
+    public UUID getUUID() {
         return this.player.getUniqueId();
     }
 
-    @Override public long getLastPlayed() {
-        return this.player.getLastPlayed();
+    @Override
+    @NonNegative
+    public long getLastPlayed() {
+        return this.player.getLastSeen();
     }
 
-    @Override public boolean isOnline() {
-        return this.player.isOnline();
-    }
-
-    @Override public String getName() {
+    @Override
+    public String getName() {
         return this.player.getName();
     }
+
+    @Override
+    public boolean hasPermission(
+            final @Nullable String world,
+            final @NonNull String permission
+    ) {
+        return this.permissionProfile.hasPermission(world, permission);
+    }
+
+    @Override
+    public boolean hasKeyedPermission(
+            final @Nullable String world,
+            final @NonNull String stub,
+            final @NonNull String key
+    ) {
+        return this.permissionProfile.hasPermission(world, stub + "." + key) || this.permissionProfile.hasPermission(
+                world,
+                stub + ".*"
+        );
+    }
+
+    @Override
+    public boolean hasPermission(@NonNull final String permission, final boolean notify) {
+        return hasPermission(permission);
+    }
+
 }

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

@@ -1,48 +1,43 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.player;
 
 import com.google.common.base.Charsets;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Captions;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.location.Location;
+import com.plotsquared.core.permissions.Permission;
+import com.plotsquared.core.permissions.PermissionHandler;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.PlotWeather;
-import com.plotsquared.core.util.EconHandler;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.MathMan;
-import com.plotsquared.core.util.StringMan;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import io.papermc.lib.PaperLib;
+import net.kyori.adventure.audience.Audience;
 import org.bukkit.GameMode;
 import org.bukkit.Sound;
 import org.bukkit.WeatherType;
@@ -52,12 +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.jetbrains.annotations.NotNull;
+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;
@@ -68,63 +64,63 @@ public class BukkitPlayer extends PlotPlayer<Player> {
 
     private static boolean CHECK_EFFECTIVE = true;
     public final Player player;
-    private boolean offline;
     private String name;
 
     /**
-     * <p>Please do not use this method. Instead use
-     * BukkitUtil.getPlayer(Player), as it caches player objects.</p>
-     *
-     * @param player Bukkit player instance
+     * @param plotAreaManager   PlotAreaManager instance
+     * @param eventDispatcher   EventDispatcher instance
+     * @param player            Bukkit player instance
+     * @param permissionHandler PermissionHandler instance
      */
-    public BukkitPlayer(@NotNull final Player player) {
-        this(player, false);
-    }
-
-    public BukkitPlayer(@NotNull final Player player, final boolean offline) {
-        this(player, offline, true);
-    }
-
-    public BukkitPlayer(@NotNull final Player player, final boolean offline, final boolean realPlayer) {
+    BukkitPlayer(
+            final @NonNull PlotAreaManager plotAreaManager,
+            final @NonNull EventDispatcher eventDispatcher,
+            final @NonNull Player player,
+            final boolean realPlayer,
+            final @NonNull PermissionHandler permissionHandler
+    ) {
+        super(plotAreaManager, eventDispatcher, permissionHandler);
         this.player = player;
-        this.offline = offline;
+        this.setupPermissionProfile();
         if (realPlayer) {
             super.populatePersistentMetaMap();
         }
     }
 
-    @Override public Actor toActor() {
+    @Override
+    public Actor toActor() {
         return BukkitAdapter.adapt(player);
     }
 
-    @Override public Player getPlatformPlayer() {
+    @Override
+    public Player getPlatformPlayer() {
         return this.player;
     }
 
-    @NotNull @Override public Location getLocation() {
-        final Location location = super.getLocation();
-        return location == null ? BukkitUtil.getLocation(this.player) : location;
-    }
-
-    @NotNull @Override public UUID getUUID() {
+    @NonNull
+    @Override
+    public UUID getUUID() {
         if (Settings.UUID.OFFLINE) {
             if (Settings.UUID.FORCE_LOWERCASE) {
                 return UUID.nameUUIDFromBytes(("OfflinePlayer:" +
-                    getName().toLowerCase()).getBytes(Charsets.UTF_8));
+                        getName().toLowerCase()).getBytes(Charsets.UTF_8));
             } else {
                 return UUID.nameUUIDFromBytes(("OfflinePlayer:" +
-                    getName()).getBytes(Charsets.UTF_8));
+                        getName()).getBytes(Charsets.UTF_8));
             }
         }
         return player.getUniqueId();
     }
 
-    @Override public long getLastPlayed() {
-        return this.player.getLastPlayed();
+    @Override
+    @NonNegative
+    public long getLastPlayed() {
+        return this.player.getLastSeen();
     }
 
-    @Override public boolean canTeleport(@NotNull final Location location) {
-        final org.bukkit.Location to = BukkitUtil.getLocation(location);
+    @Override
+    public boolean canTeleport(final @NonNull Location location) {
+        final org.bukkit.Location to = BukkitUtil.adapt(location);
         final org.bukkit.Location from = player.getLocation();
         PlayerTeleportEvent event = new PlayerTeleportEvent(player, from, to);
         callEvent(event);
@@ -136,15 +132,10 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         return true;
     }
 
-    @Override
-    public void sendTitle(String title, String subtitle, int fadeIn, int stay, int fadeOut) {
-        player.sendTitle(title, subtitle, fadeIn, stay, fadeOut);
-    }
-
-    private void callEvent(@NotNull final Event event) {
+    private void callEvent(final @NonNull Event event) {
         final RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
         for (final RegisteredListener listener : listeners) {
-            if (listener.getPlugin().getName().equals(PlotSquared.imp().getPluginName())) {
+            if (listener.getPlugin().getName().equals(PlotSquared.platform().pluginName())) {
                 continue;
             }
             try {
@@ -155,23 +146,22 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
     }
 
-    @Override public boolean hasPermission(final String permission) {
-        if (this.offline && EconHandler.getEconHandler() != null) {
-            return EconHandler.getEconHandler().hasPermission(getName(), permission);
-        }
-        return this.player.hasPermission(permission);
-    }
-
-    @Override public int hasPermissionRange(final String stub, final int range) {
-        if (hasPermission(Captions.PERMISSION_ADMIN.getTranslated())) {
+    @SuppressWarnings("StringSplitter")
+    @Override
+    @NonNegative
+    public int hasPermissionRange(
+            final @NonNull String stub,
+            @NonNegative final int range
+    ) {
+        if (hasPermission(Permission.PERMISSION_ADMIN.toString())) {
             return Integer.MAX_VALUE;
         }
         final String[] nodes = stub.split("\\.");
         final StringBuilder n = new StringBuilder();
         for (int i = 0; i < (nodes.length - 1); i++) {
             n.append(nodes[i]).append(".");
-            if (!stub.equals(n + Captions.PERMISSION_STAR.getTranslated())) {
-                if (hasPermission(n + Captions.PERMISSION_STAR.getTranslated())) {
+            if (!stub.equals(n + Permission.PERMISSION_STAR.toString())) {
+                if (hasPermission(n + Permission.PERMISSION_STAR.toString())) {
                     return Integer.MAX_VALUE;
                 }
             }
@@ -186,6 +176,10 @@ public class BukkitPlayer extends PlotPlayer<Player> {
             final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
             if (!effective.isEmpty()) {
                 for (PermissionAttachmentInfo attach : effective) {
+                    // Ignore all "false" permissions
+                    if (!attach.getValue()) {
+                        continue;
+                    }
                     String permStr = attach.getPermission();
                     if (permStr.startsWith(stubPlus)) {
                         hasAny = true;
@@ -222,85 +216,63 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         return max;
     }
 
-    @Override public boolean isPermissionSet(final String permission) {
-        return this.player.isPermissionSet(permission);
-    }
-
-    @Override public void sendMessage(String message) {
-        message = message.replace('\u2010', '%').replace('\u2021', '&').replace('\u2030', '&');
-        if (!StringMan.isEqual(this.getMeta("lastMessage"), message) || (
-            System.currentTimeMillis() - this.<Long>getMeta("lastMessageTime") > 5000)) {
-            setMeta("lastMessage", message);
-            setMeta("lastMessageTime", System.currentTimeMillis());
-            this.player.sendMessage(message);
-        }
-    }
-
     @Override
-    public void teleport(@NotNull final Location location, @NotNull final TeleportCause cause) {
+    public void teleport(final @NonNull Location location, final @NonNull TeleportCause cause) {
         if (Math.abs(location.getX()) >= 30000000 || Math.abs(location.getZ()) >= 30000000) {
             return;
         }
         final org.bukkit.Location bukkitLocation =
-            new org.bukkit.Location(BukkitUtil.getWorld(location.getWorld()), location.getX() + 0.5,
-                location.getY(), location.getZ() + 0.5, location.getYaw(), location.getPitch());
+                new org.bukkit.Location(BukkitUtil.getWorld(location.getWorldName()), location.getX() + 0.5,
+                        location.getY(), location.getZ() + 0.5, location.getYaw(), location.getPitch()
+                );
         PaperLib.teleportAsync(player, bukkitLocation, getTeleportCause(cause));
     }
 
-    @Override public String getName() {
+    @Override
+    public String getName() {
         if (this.name == null) {
             this.name = this.player.getName();
         }
         return this.name;
     }
 
-    @Override public boolean isOnline() {
-        return !this.offline && this.player.isOnline();
-    }
-
-    @Override public void setCompassTarget(Location location) {
+    @Override
+    public void setCompassTarget(Location location) {
         this.player.setCompassTarget(
-            new org.bukkit.Location(BukkitUtil.getWorld(location.getWorld()), location.getX(),
-                location.getY(), location.getZ()));
+                new org.bukkit.Location(BukkitUtil.getWorld(location.getWorldName()), location.getX(),
+                        location.getY(), location.getZ()
+                ));
     }
 
-    @Override public Location getLocationFull() {
-        return BukkitUtil.getLocationFull(this.player);
+    @Override
+    public Location getLocationFull() {
+        return BukkitUtil.adaptComplete(this.player.getLocation());
     }
 
-    @Override public void setWeather(@NotNull final PlotWeather weather) {
+    @Override
+    public void setWeather(final @NonNull PlotWeather weather) {
         switch (weather) {
-            case CLEAR:
-                this.player.setPlayerWeather(WeatherType.CLEAR);
-                break;
-            case RAIN:
-                this.player.setPlayerWeather(WeatherType.DOWNFALL);
-                break;
-            case WORLD:
-                this.player.resetPlayerWeather();
-                break;
-            default:
+            case CLEAR -> this.player.setPlayerWeather(WeatherType.CLEAR);
+            case RAIN -> this.player.setPlayerWeather(WeatherType.DOWNFALL);
+            case WORLD -> this.player.resetPlayerWeather();
+            default -> {
                 //do nothing as this is PlotWeather.OFF
-                break;
-        }
-    }
-
-    @NotNull @Override public com.sk89q.worldedit.world.gamemode.GameMode getGameMode() {
-        switch (this.player.getGameMode()) {
-            case ADVENTURE:
-                return ADVENTURE;
-            case CREATIVE:
-                return CREATIVE;
-            case SPECTATOR:
-                return SPECTATOR;
-            case SURVIVAL:
-            default:
-                return SURVIVAL;
+            }
         }
     }
 
     @Override
-    public void setGameMode(@NotNull final com.sk89q.worldedit.world.gamemode.GameMode gameMode) {
+    public com.sk89q.worldedit.world.gamemode.GameMode getGameMode() {
+        return switch (this.player.getGameMode()) {
+            case ADVENTURE -> ADVENTURE;
+            case CREATIVE -> CREATIVE;
+            case SPECTATOR -> SPECTATOR;
+            default -> SURVIVAL;
+        };
+    }
+
+    @Override
+    public void setGameMode(final com.sk89q.worldedit.world.gamemode.GameMode gameMode) {
         if (ADVENTURE.equals(gameMode)) {
             this.player.setGameMode(GameMode.ADVENTURE);
         } else if (CREATIVE.equals(gameMode)) {
@@ -312,7 +284,8 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
     }
 
-    @Override public void setTime(final long time) {
+    @Override
+    public void setTime(final long time) {
         if (time != Long.MAX_VALUE) {
             this.player.setPlayerTime(time, false);
         } else {
@@ -320,44 +293,66 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
     }
 
-    @Override public boolean getFlight() {
+    @Override
+    public boolean getFlight() {
         return player.getAllowFlight();
     }
 
-    @Override public void setFlight(boolean fly) {
+    @Override
+    public void setFlight(boolean fly) {
         this.player.setAllowFlight(fly);
     }
 
-    @Override public void playMusic(@NotNull final Location location, @NotNull final ItemType id) {
+    @Override
+    public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
         if (id == ItemTypes.AIR) {
             // Let's just stop all the discs because why not?
             for (final Sound sound : Arrays.stream(Sound.values())
-                .filter(sound -> sound.name().contains("DISC")).collect(Collectors.toList())) {
+                    .filter(sound -> sound.name().contains("DISC")).toList()) {
                 player.stopSound(sound);
             }
             // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
         } else {
             // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
-            this.player.playSound(BukkitUtil.getLocation(location),
-                Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f);
+            this.player.playSound(BukkitUtil.adapt(location),
+                    Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f
+            );
         }
     }
 
-    @Override public void kick(final String message) {
+    @SuppressWarnings("deprecation") // Needed for Spigot compatibility
+    @Override
+    public void kick(final String message) {
         this.player.kickPlayer(message);
     }
 
-    @Override public void stopSpectating() {
+    @Override
+    public void stopSpectating() {
         if (getGameMode() == SPECTATOR) {
             this.player.setSpectatorTarget(null);
         }
     }
 
-    @Override public boolean isBanned() {
+    @Override
+    public boolean isBanned() {
         return this.player.isBanned();
     }
 
-    @Override public boolean canSee(final PlotPlayer<?> other) {
+    @Override
+    public @NonNull Audience getAudience() {
+        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) {
             return true;
         } else {
@@ -365,14 +360,19 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
     }
 
-    public PlayerTeleportEvent.TeleportCause getTeleportCause(@NotNull final TeleportCause cause) {
-        switch (cause) {
-            case COMMAND:
-                return PlayerTeleportEvent.TeleportCause.COMMAND;
-            case PLUGIN:
-                return PlayerTeleportEvent.TeleportCause.PLUGIN;
-            default:
-                return PlayerTeleportEvent.TeleportCause.UNKNOWN;
+    /**
+     * Convert from PlotSquared's {@link TeleportCause} to Bukkit's {@link PlayerTeleportEvent.TeleportCause}
+     *
+     * @param cause PlotSquared teleport cause to convert
+     * @return Bukkit's equivalent teleport cause
+     */
+    public PlayerTeleportEvent.TeleportCause getTeleportCause(final @NonNull TeleportCause cause) {
+        if (TeleportCause.CauseSets.COMMAND.contains(cause)) {
+            return PlayerTeleportEvent.TeleportCause.COMMAND;
+        } else if (cause == TeleportCause.UNKNOWN) {
+            return PlayerTeleportEvent.TeleportCause.UNKNOWN;
         }
+        return PlayerTeleportEvent.TeleportCause.PLUGIN;
     }
+
 }

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

@@ -1,68 +1,91 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.player;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.plotsquared.core.permissions.PermissionHandler;
+import com.plotsquared.core.plot.world.PlotAreaManager;
+import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlayerManager;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.UUID;
 
 /**
  * Player manager providing {@link BukkitPlayer Bukkit players}
  */
+@Singleton
 public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
 
-    @NotNull @Override public BukkitPlayer getPlayer(@NotNull final Player object) {
-        try {
-            return getPlayer(object.getUniqueId());
-        } catch (final NoSuchPlayerException exception) {
-            return new BukkitPlayer(object, object.isOnline(), false);
-        }
+    private final PlotAreaManager plotAreaManager;
+    private final EventDispatcher eventDispatcher;
+    private final PermissionHandler permissionHandler;
+
+    @Inject
+    public BukkitPlayerManager(
+            final @NonNull PlotAreaManager plotAreaManager,
+            final @NonNull EventDispatcher eventDispatcher,
+            final @NonNull PermissionHandler permissionHandler
+    ) {
+        this.plotAreaManager = plotAreaManager;
+        this.eventDispatcher = eventDispatcher;
+        this.permissionHandler = permissionHandler;
     }
 
-    @Override @NotNull public BukkitPlayer createPlayer(@NotNull final UUID uuid) {
+    @NonNull
+    @Override
+    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);
+        }
+        if (!object.isOnline()) {
+            throw new NoSuchPlayerException(object.getUniqueId());
+        }
+        return getPlayer(object.getUniqueId());
+    }
+
+    @Override
+    public @NonNull BukkitPlayer createPlayer(final @NonNull UUID uuid) {
         final Player player = Bukkit.getPlayer(uuid);
         if (player == null || !player.isOnline()) {
             throw new NoSuchPlayerException(uuid);
         }
-        return new BukkitPlayer(player);
+        return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, player, false, this.permissionHandler);
     }
 
-    @Nullable @Override public BukkitOfflinePlayer getOfflinePlayer(@Nullable final UUID uuid) {
+    @Nullable
+    @Override
+    public BukkitOfflinePlayer getOfflinePlayer(final @Nullable UUID uuid) {
         if (uuid == null) {
             return null;
         }
-        return new BukkitOfflinePlayer(Bukkit.getOfflinePlayer(uuid));
+        return new BukkitOfflinePlayer(Bukkit.getOfflinePlayer(uuid), this.permissionHandler);
     }
 
-    @NotNull @Override public BukkitOfflinePlayer getOfflinePlayer(@NotNull final String username) {
-        return new BukkitOfflinePlayer(Bukkit.getOfflinePlayer(username));
+    @NonNull
+    @Override
+    public BukkitOfflinePlayer getOfflinePlayer(final @NonNull String username) {
+        return new BukkitOfflinePlayer(Bukkit.getOfflinePlayer(username), this.permissionHandler);
     }
 
 }

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

@@ -0,0 +1,283 @@
+/*
+ * 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.queue;
+
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+import com.plotsquared.bukkit.BukkitPlatform;
+import com.plotsquared.core.PlotSquared;
+import com.plotsquared.core.queue.ChunkCoordinator;
+import com.plotsquared.core.queue.subscriber.ProgressSubscriber;
+import com.plotsquared.core.util.task.PlotSquaredTask;
+import com.plotsquared.core.util.task.TaskManager;
+import com.plotsquared.core.util.task.TaskTime;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.world.World;
+import io.papermc.lib.PaperLib;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+/**
+ * Utility that allows for the loading and coordination of chunk actions
+ * <p>
+ * The coordinator takes in collection of chunk coordinates, loads them
+ * and allows the caller to specify a sink for the loaded chunks. The
+ * coordinator will prevent the chunks from being unloaded until the sink
+ * has fully consumed the chunk
+ * </p>
+ **/
+public final class BukkitChunkCoordinator extends ChunkCoordinator {
+
+    private final List<ProgressSubscriber> progressSubscribers = new LinkedList<>();
+
+    private final Queue<BlockVector2> requestedChunks;
+    private final Queue<Chunk> availableChunks;
+    private final long maxIterationTime;
+    private final Plugin plugin;
+    private final Consumer<BlockVector2> chunkConsumer;
+    private final org.bukkit.World bukkitWorld;
+    private final Runnable whenDone;
+    private final Consumer<Throwable> throwableConsumer;
+    private final boolean unloadAfter;
+    private final int totalSize;
+    private final AtomicInteger expectedSize;
+    private final AtomicInteger loadingChunks = new AtomicInteger();
+    private final boolean forceSync;
+
+    private int batchSize;
+    private PlotSquaredTask task;
+    private volatile boolean shouldCancel;
+    private boolean finished;
+
+    @Inject
+    private BukkitChunkCoordinator(
+            @Assisted final long maxIterationTime,
+            @Assisted final int initialBatchSize,
+            @Assisted final @NonNull Consumer<BlockVector2> chunkConsumer,
+            @Assisted final @NonNull World world,
+            @Assisted final @NonNull Collection<BlockVector2> requestedChunks,
+            @Assisted final @NonNull Runnable whenDone,
+            @Assisted final @NonNull Consumer<Throwable> throwableConsumer,
+            @Assisted("unloadAfter") final boolean unloadAfter,
+            @Assisted final @NonNull Collection<ProgressSubscriber> progressSubscribers,
+            @Assisted("forceSync") final boolean forceSync
+    ) {
+        this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
+        this.availableChunks = new LinkedBlockingQueue<>();
+        this.totalSize = requestedChunks.size();
+        this.expectedSize = new AtomicInteger(this.totalSize);
+        this.batchSize = initialBatchSize;
+        this.chunkConsumer = chunkConsumer;
+        this.maxIterationTime = maxIterationTime;
+        this.whenDone = whenDone;
+        this.throwableConsumer = throwableConsumer;
+        this.unloadAfter = unloadAfter;
+        this.plugin = JavaPlugin.getPlugin(BukkitPlatform.class);
+        this.bukkitWorld = Bukkit.getWorld(world.getName());
+        this.progressSubscribers.addAll(progressSubscribers);
+        this.forceSync = forceSync;
+    }
+
+    @Override
+    public void start() {
+        if (!forceSync) {
+            // Request initial batch
+            this.requestBatch();
+            // Wait until next tick to give the chunks a chance to be loaded
+            TaskManager.runTaskLater(() -> task = TaskManager.runTaskRepeat(this, TaskTime.ticks(1)), TaskTime.ticks(1));
+        } else {
+            try {
+                while (!shouldCancel && !requestedChunks.isEmpty()) {
+                    chunkConsumer.accept(requestedChunks.poll());
+                }
+            } catch (Throwable t) {
+                throwableConsumer.accept(t);
+            } finally {
+                finish();
+            }
+        }
+    }
+
+    @Override
+    public void cancel() {
+        shouldCancel = true;
+    }
+
+    private void finish() {
+        try {
+            this.whenDone.run();
+        } catch (final Throwable throwable) {
+            this.throwableConsumer.accept(throwable);
+        } finally {
+            for (final ProgressSubscriber subscriber : this.progressSubscribers) {
+                subscriber.notifyEnd();
+            }
+            if (task != null) {
+                task.cancel();
+            }
+            finished = true;
+        }
+    }
+
+    @Override
+    public void run() {
+        if (shouldCancel) {
+            if (unloadAfter) {
+                Chunk chunk;
+                while ((chunk = availableChunks.poll()) != null) {
+                    freeChunk(chunk);
+                }
+            }
+            finish();
+            return;
+        }
+
+        Chunk chunk = this.availableChunks.poll();
+        if (chunk == null) {
+            if (this.availableChunks.isEmpty()) {
+                if (this.requestedChunks.isEmpty() && loadingChunks.get() == 0) {
+                    finish();
+                } else {
+                    requestBatch();
+                }
+            }
+            return;
+        }
+        long[] iterationTime = new long[2];
+        int processedChunks = 0;
+        do {
+            final long start = System.currentTimeMillis();
+            try {
+                this.chunkConsumer.accept(BlockVector2.at(chunk.getX(), chunk.getZ()));
+            } catch (final Throwable throwable) {
+                this.throwableConsumer.accept(throwable);
+            }
+            if (unloadAfter) {
+                this.freeChunk(chunk);
+            }
+            processedChunks++;
+            final long end = System.currentTimeMillis();
+            // Update iteration time
+            iterationTime[0] = iterationTime[1];
+            iterationTime[1] = end - start;
+        } while (iterationTime[0] + iterationTime[1] < this.maxIterationTime * 2 && (chunk = availableChunks.poll()) != null);
+        if (processedChunks < this.batchSize) {
+            // Adjust batch size based on the amount of processed chunks per tick
+            this.batchSize = processedChunks;
+        }
+
+        final int expected = this.expectedSize.addAndGet(-processedChunks);
+
+        if (expected <= 0) {
+            finish();
+        } else {
+            if (this.availableChunks.size() < processedChunks) {
+                final double progress = ((double) totalSize - (double) expected) / (double) totalSize;
+                for (final ProgressSubscriber subscriber : this.progressSubscribers) {
+                    subscriber.notifyProgress(this, progress);
+                }
+                this.requestBatch();
+            }
+        }
+    }
+
+    /**
+     * Requests a batch of chunks to be loaded
+     */
+    private void requestBatch() {
+        BlockVector2 chunk;
+        for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
+            // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
+            loadingChunks.incrementAndGet();
+            PaperLib
+                    .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), true, true)
+                    .whenComplete((chunkObject, throwable) -> {
+                        loadingChunks.decrementAndGet();
+                        if (throwable != null) {
+                            throwable.printStackTrace();
+                            // We want one less because this couldn't be processed
+                            this.expectedSize.decrementAndGet();
+                        } else if (PlotSquared.get().isMainThread(Thread.currentThread())) {
+                            this.processChunk(chunkObject);
+                        } else {
+                            TaskManager.runTask(() -> this.processChunk(chunkObject));
+                        }
+                    });
+        }
+    }
+
+    /**
+     * Once a chunk has been loaded, process it (add a plugin ticket and add to
+     * available chunks list). It is important that this gets executed on the
+     * server's main thread.
+     */
+    private void processChunk(final @NonNull Chunk chunk) {
+        /* Chunk#isLoaded does not necessarily return true shortly after PaperLib#getChunkAtAsync completes, but the chunk is
+        still loaded.
+        if (!chunk.isLoaded()) {
+            throw new IllegalArgumentException(String.format("Chunk %d;%d is is not loaded", chunk.getX(), chunk.getZ());
+        }*/
+        if (finished) {
+            return;
+        }
+        chunk.addPluginChunkTicket(this.plugin);
+        this.availableChunks.add(chunk);
+    }
+
+    /**
+     * Once a chunk has been used, free it up for unload by removing the plugin ticket
+     */
+    private void freeChunk(final @NonNull Chunk chunk) {
+        if (!chunk.isLoaded()) {
+            throw new IllegalArgumentException(String.format("Chunk %d;%d is is not loaded", chunk.getX(), chunk.getZ()));
+        }
+        chunk.removePluginChunkTicket(this.plugin);
+    }
+
+    @Override
+    public int getRemainingChunks() {
+        return this.expectedSize.get();
+    }
+
+    @Override
+    public int getTotalChunks() {
+        return this.totalSize;
+    }
+
+    /**
+     * Subscribe to coordinator progress updates
+     *
+     * @param subscriber Subscriber
+     */
+    public void subscribeToProgress(final @NonNull ProgressSubscriber subscriber) {
+        this.progressSubscribers.add(subscriber);
+    }
+
+}

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

@@ -1,245 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.queue;
-
-import com.plotsquared.bukkit.schematic.StateWrapper;
-import com.plotsquared.bukkit.util.BukkitBlockUtil;
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.queue.BasicLocalBlockQueue;
-import com.plotsquared.core.util.BlockUtil;
-import com.plotsquared.core.util.MainUtil;
-import com.plotsquared.core.util.task.TaskManager;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.world.biome.BiomeType;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import io.papermc.lib.PaperLib;
-import lombok.NonNull;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-import org.bukkit.block.Block;
-import org.bukkit.block.Container;
-import org.bukkit.block.data.BlockData;
-
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-
-public class BukkitLocalQueue extends BasicLocalBlockQueue {
-
-    public BukkitLocalQueue(String world) {
-        super(world);
-    }
-
-    @Override public LocalChunk getLocalChunk(int x, int z) {
-        return new BasicLocalChunk(this, x, z) {
-            // Custom stuff?
-        };
-    }
-
-    @Override public void optimize() {
-
-    }
-
-    @Override public BlockState getBlock(int x, int y, int z) {
-        World worldObj = Bukkit.getWorld(getWorld());
-        if (worldObj != null) {
-            Block block = worldObj.getBlockAt(x, y, z);
-            return BukkitBlockUtil.get(block);
-        } else {
-            return BlockUtil.get(0, 0);
-        }
-    }
-
-    @Override public void refreshChunk(int x, int z) {
-        World worldObj = Bukkit.getWorld(getWorld());
-        if (worldObj != null) {
-            worldObj.refreshChunk(x, z);
-        } else {
-            PlotSquared.debug("Error Refreshing Chunk");
-        }
-    }
-
-    @Override public void fixChunkLighting(int x, int z) {
-        // Do nothing
-    }
-
-    @Override public final void regenChunk(int x, int z) {
-        World worldObj = Bukkit.getWorld(getWorld());
-        if (worldObj != null) {
-            try {
-                worldObj.regenerateChunk(x, z);
-            } catch (UnsupportedOperationException e) {
-                com.sk89q.worldedit.world.World world = BukkitAdapter.adapt(worldObj);
-                try (EditSession editSession = WorldEdit.getInstance().getEditSessionFactory()
-                    .getEditSession(world, -1);) {
-                    CuboidRegion region =
-                        new CuboidRegion(world, BlockVector3.at((x << 4), 0, (z << 4)),
-                            BlockVector3.at((x << 4) + 15, 255, (z << 4) + 15));
-                    world.regenerate(region, editSession);
-                }
-            }
-        } else {
-            PlotSquared.debug("Error Regenerating Chunk");
-        }
-    }
-
-    @Override public final void setComponents(LocalChunk lc)
-        throws ExecutionException, InterruptedException {
-        setBaseBlocks(lc);
-    }
-
-    public void setBaseBlocks(LocalChunk localChunk) {
-        World worldObj = Bukkit.getWorld(getWorld());
-        if (worldObj == null) {
-            throw new NullPointerException("World cannot be null.");
-        }
-        final Consumer<Chunk> chunkConsumer = chunk -> {
-            for (int layer = 0; layer < localChunk.baseblocks.length; layer++) {
-                BaseBlock[] blocksLayer = localChunk.baseblocks[layer];
-                if (blocksLayer != null) {
-                    for (int j = 0; j < blocksLayer.length; j++) {
-                        if (blocksLayer[j] != null) {
-                            BaseBlock block = blocksLayer[j];
-                            int x = MainUtil.x_loc[layer][j];
-                            int y = MainUtil.y_loc[layer][j];
-                            int z = MainUtil.z_loc[layer][j];
-
-                            BlockData blockData = BukkitAdapter.adapt(block);
-
-                            Block existing = chunk.getBlock(x, y, z);
-                            final BlockState existingBaseBlock =
-                                BukkitAdapter.adapt(existing.getBlockData());
-                            if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing
-                                .getBlockData().matches(blockData)) {
-                                continue;
-                            }
-
-                            if (existing.getState() instanceof Container) {
-                                ((Container) existing.getState()).getInventory().clear();
-                            }
-
-                            existing.setType(BukkitAdapter.adapt(block.getBlockType()), false);
-                            existing.setBlockData(blockData, false);
-                            if (block.hasNbtData()) {
-                                CompoundTag tag = block.getNbtData();
-                                StateWrapper sw = new StateWrapper(tag);
-
-                                sw.restoreTag(worldObj.getName(), existing.getX(), existing.getY(),
-                                    existing.getZ());
-                            }
-                        }
-                    }
-                }
-            }
-            if (setBiome() && localChunk.biomes != null) {
-                for (int x = 0; x < localChunk.biomes.length; x++) {
-                    BiomeType[] biomeZ = localChunk.biomes[x];
-                    if (biomeZ != null) {
-                        for (int z = 0; z < biomeZ.length; z++) {
-                            if (biomeZ[z] != null) {
-                                BiomeType biomeType = biomeZ[z];
-
-                                Biome biome = BukkitAdapter.adapt(biomeType);
-                                worldObj.setBiome((chunk.getX() << 4) + x, (chunk.getZ() << 4) + z,
-                                    biome);
-                            }
-                        }
-                    }
-                }
-            }
-        };
-        if (isForceSync()) {
-            chunkConsumer.accept(getChunk(worldObj, localChunk));
-        } else {
-            PaperLib.getChunkAtAsync(worldObj, localChunk.getX(), localChunk.getZ(), true)
-                .thenAccept(chunkConsumer);
-        }
-    }
-
-    private Chunk getChunk(final World world, final LocalChunk localChunk) {
-        Chunk chunk = null;
-        if (this.getChunkObject() != null && this.getChunkObject() instanceof Chunk) {
-            chunk = (Chunk) this.getChunkObject();
-        }
-        if (chunk == null) {
-            chunk = world.getChunkAt(localChunk.getX(), localChunk.getZ());
-        }
-        if (!chunk.isLoaded()) {
-            chunk.load(true);
-        }
-        return chunk;
-    }
-
-    private void setMaterial(@NonNull final BlockState plotBlock, @NonNull final Block block) {
-        Material material = BukkitAdapter.adapt(plotBlock.getBlockType());
-        block.setType(material, false);
-    }
-
-    private boolean equals(@NonNull final BlockState plotBlock, @NonNull final Block block) {
-        return plotBlock.equals(BukkitBlockUtil.get(block));
-    }
-
-    public void setBiomes(LocalChunk lc) {
-        World worldObj = Bukkit.getWorld(getWorld());
-        if (worldObj == null) {
-            throw new NullPointerException("World cannot be null.");
-        }
-        if (lc.biomes == null) {
-            throw new NullPointerException("Biomes cannot be null.");
-        }
-        final Consumer<Chunk> chunkConsumer = chunk -> {
-            for (int x = 0; x < lc.biomes.length; x++) {
-                BiomeType[] biomeZ = lc.biomes[x];
-                if (biomeZ != null) {
-                    for (int z = 0; z < biomeZ.length; z++) {
-                        if (biomeZ[z] != null) {
-                            BiomeType biomeType = biomeZ[z];
-
-                            Biome biome = BukkitAdapter.adapt(biomeType);
-                            worldObj
-                                .setBiome((chunk.getX() << 4) + x, (chunk.getZ() << 4) + z, biome);
-                        }
-                    }
-                }
-            }
-        };
-        if (this.isForceSync()) {
-            chunkConsumer.accept(getChunk(worldObj, lc));
-        } else {
-            PaperLib.getChunkAtAsync(worldObj, lc.getX(), lc.getZ(), true)
-                .thenAccept(chunkConsumer);
-        }
-    }
-
-}

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

@@ -0,0 +1,402 @@
+/*
+ * 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.queue;
+
+import com.google.inject.Inject;
+import com.plotsquared.bukkit.schematic.StateWrapper;
+import com.plotsquared.bukkit.util.BukkitBlockUtil;
+import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.inject.factory.ChunkCoordinatorBuilderFactory;
+import com.plotsquared.core.inject.factory.ChunkCoordinatorFactory;
+import com.plotsquared.core.queue.BasicQueueCoordinator;
+import com.plotsquared.core.queue.ChunkCoordinator;
+import com.plotsquared.core.queue.LocalChunk;
+import com.plotsquared.core.util.ChunkUtil;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.util.SideEffect;
+import com.sk89q.worldedit.util.SideEffectSet;
+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.BlockState;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.block.Block;
+import org.bukkit.block.Container;
+import org.bukkit.block.data.BlockData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Consumer;
+
+public class BukkitQueueCoordinator extends BasicQueueCoordinator {
+
+    private static final SideEffectSet NO_SIDE_EFFECT_SET;
+    private static final SideEffectSet EDGE_SIDE_EFFECT_SET;
+    private static final SideEffectSet LIGHTING_SIDE_EFFECT_SET;
+    private static final SideEffectSet EDGE_LIGHTING_SIDE_EFFECT_SET;
+
+    static {
+        NO_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.LIGHTING, SideEffect.State.OFF).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.OFF
+        );
+        EDGE_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.ON
+        );
+        LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.NEIGHBORS, SideEffect.State.OFF);
+        EDGE_LIGHTING_SIDE_EFFECT_SET = SideEffectSet.none().with(SideEffect.UPDATE, SideEffect.State.ON).with(
+                SideEffect.NEIGHBORS,
+                SideEffect.State.ON
+        );
+    }
+
+    private org.bukkit.World bukkitWorld;
+    @Inject
+    private ChunkCoordinatorBuilderFactory chunkCoordinatorBuilderFactory;
+    @Inject
+    private ChunkCoordinatorFactory chunkCoordinatorFactory;
+    private ChunkCoordinator chunkCoordinator;
+
+    @Inject
+    public BukkitQueueCoordinator(@NonNull World world) {
+        super(world);
+    }
+
+    @Override
+    public BlockState getBlock(int x, int y, int z) {
+        Block block = getBukkitWorld().getBlockAt(x, y, z);
+        return BukkitBlockUtil.get(block);
+    }
+
+    @Override
+    public void start() {
+        chunkCoordinator.start();
+    }
+
+    @Override
+    public void cancel() {
+        chunkCoordinator.cancel();
+    }
+
+    @Override
+    public boolean enqueue() {
+        final Clipboard regenClipboard;
+        if (isRegen()) {
+            BlockVector3 start = BlockVector3.at(getRegenStart()[0] << 4, getMinY(), getRegenStart()[1] << 4);
+            BlockVector3 end = BlockVector3.at((getRegenEnd()[0] << 4) + 15, getMaxY(), (getRegenEnd()[1] << 4) + 15);
+            Region region = new CuboidRegion(start, end);
+            regenClipboard = new BlockArrayClipboard(region);
+            regenClipboard.setOrigin(start);
+            getWorld().regenerate(region, regenClipboard);
+        } else if (getRegenRegion() != null) {
+            regenClipboard = new BlockArrayClipboard(getRegenRegion());
+            regenClipboard.setOrigin(getRegenRegion().getMinimumPoint());
+            getWorld().regenerate(getRegenRegion(), regenClipboard);
+        } else {
+            regenClipboard = null;
+        }
+        Consumer<BlockVector2> consumer = getChunkConsumer();
+        if (consumer == null) {
+            consumer = blockVector2 -> {
+                LocalChunk localChunk = getBlockChunks().get(blockVector2);
+                boolean isRegenChunk =
+                        regenClipboard != null && blockVector2.getBlockX() > getRegenStart()[0] && blockVector2.getBlockZ() > getRegenStart()[1]
+                                && blockVector2.getBlockX() < getRegenEnd()[0] && blockVector2.getBlockZ() < getRegenEnd()[1];
+                int sx = blockVector2.getX() << 4;
+                int sz = blockVector2.getZ() << 4;
+                if (isRegenChunk) {
+                    for (int layer = getMinLayer(); layer <= getMaxLayer(); layer++) {
+                        for (int y = 0; y < 16; y++) {
+                            for (int x = 0; x < 16; x++) {
+                                for (int z = 0; z < 16; z++) {
+                                    x += sx;
+                                    y += layer << 4;
+                                    z += sz;
+                                    BaseBlock block = regenClipboard.getFullBlock(BlockVector3.at(x, y, z));
+                                    if (block != null) {
+                                        boolean edge = Settings.QUEUE.UPDATE_EDGES && isEdgeRegen(x & 15, z & 15, blockVector2);
+                                        setWorldBlock(x, y, z, block, blockVector2, edge);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // Allow regen and then blocks to be placed (plot schematic etc)
+                if (localChunk == null) {
+                    return;
+                }
+                for (int layer = 0; layer < localChunk.getBaseblocks().length; layer++) {
+                    BaseBlock[] blocksLayer = localChunk.getBaseblocks()[layer];
+                    if (blocksLayer == null) {
+                        continue;
+                    }
+                    for (int j = 0; j < blocksLayer.length; j++) {
+                        if (blocksLayer[j] == null) {
+                            continue;
+                        }
+                        BaseBlock block = blocksLayer[j];
+
+                        if (block != null) {
+                            int lx = ChunkUtil.getX(j);
+                            int lz = ChunkUtil.getZ(j);
+                            int x = sx + lx;
+                            int y = ChunkUtil.getY(layer + localChunk.getMinSection(), j);
+                            int z = sz + lz;
+                            boolean edge = Settings.QUEUE.UPDATE_EDGES && isEdge(y >> 4, lx, y & 15, lz, blockVector2,
+                                    localChunk
+                            );
+                            setWorldBlock(x, y, z, block, blockVector2, edge);
+                        }
+                    }
+                }
+                for (int layer = 0; layer < localChunk.getBiomes().length; layer++) {
+                    BiomeType[] biomesLayer = localChunk.getBiomes()[layer];
+                    if (biomesLayer == null) {
+                        continue;
+                    }
+                    for (int j = 0; j < biomesLayer.length; j++) {
+                        if (biomesLayer[j] == null) {
+                            continue;
+                        }
+                        BiomeType biome = biomesLayer[j];
+                        if (biome != null) {
+                            int x = sx + ChunkUtil.getX(j);
+                            int y = ChunkUtil.getY(layer, j);
+                            int z = sz + ChunkUtil.getZ(j);
+                            getWorld().setBiome(BlockVector3.at(x, y, z), biome);
+                        }
+                    }
+                }
+                if (localChunk.getTiles().size() > 0) {
+                    localChunk.getTiles().forEach((blockVector3, tag) -> {
+                        try {
+                            BaseBlock block = getWorld().getBlock(blockVector3).toBaseBlock(tag);
+                            getWorld().setBlock(blockVector3, block, getSideEffectSet(SideEffectState.NONE));
+                        } catch (WorldEditException ignored) {
+                            StateWrapper sw = new StateWrapper(tag);
+                            sw.restoreTag(getWorld().getName(), blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
+                        }
+                    });
+                }
+                if (localChunk.getEntities().size() > 0) {
+                    localChunk.getEntities().forEach((location, entity) -> getWorld().createEntity(location, entity));
+                }
+            };
+        }
+        Collection<BlockVector2> read = new ArrayList<>();
+        if (getReadChunks().size() > 0) {
+            read.addAll(getReadChunks());
+        }
+        chunkCoordinator =
+                chunkCoordinatorBuilderFactory
+                        .create(chunkCoordinatorFactory)
+                        .inWorld(getWorld())
+                        .withChunks(getBlockChunks().keySet())
+                        .withChunks(read)
+                        .withInitialBatchSize(3)
+                        .withMaxIterationTime(40)
+                        .withThrowableConsumer(Throwable::printStackTrace)
+                        .withFinalAction(getCompleteTask())
+                        .withConsumer(consumer)
+                        .unloadAfter(isUnloadAfter())
+                        .withProgressSubscribers(getProgressSubscribers())
+                        .forceSync(isForceSync())
+                        .build();
+        return super.enqueue();
+    }
+
+    /**
+     * Set a block to the world. First tries WNA but defaults to normal block setting methods if that fails
+     */
+    @SuppressWarnings("unused")
+    private void setWorldBlock(int x, int y, int z, @NonNull BaseBlock block, @NonNull BlockVector2 blockVector2, boolean edge) {
+        try {
+            BlockVector3 loc = BlockVector3.at(x, y, z);
+            boolean lighting = false;
+            switch (getLightingMode()) {
+                case NONE:
+                    break;
+                case PLACEMENT:
+                    lighting = block.getBlockType().getMaterial().getLightValue() > 0;
+                    break;
+                case REPLACEMENT:
+                    lighting = block.getBlockType().getMaterial().getLightValue() > 0
+                            || getWorld().getBlock(loc).getBlockType().getMaterial().getLightValue() > 0;
+                    break;
+                default:
+                    // Can only be "all"
+                    lighting = true;
+            }
+            SideEffectSet sideEffectSet;
+            if (lighting) {
+                sideEffectSet = getSideEffectSet(edge ? SideEffectState.EDGE_LIGHTING : SideEffectState.LIGHTING);
+            } else {
+                sideEffectSet = getSideEffectSet(edge ? SideEffectState.EDGE : SideEffectState.NONE);
+            }
+            getWorld().setBlock(loc, block, sideEffectSet);
+        } catch (WorldEditException ignored) {
+            // Fallback to not so nice method
+            BlockData blockData = BukkitAdapter.adapt(block);
+            Block existing;
+            // Assume a chunk object has been given only when it should have been.
+            if (getChunkObject() instanceof Chunk chunkObject) {
+                existing = chunkObject.getBlock(x & 15, y, z & 15);
+            } else {
+                existing = getBukkitWorld().getBlockAt(x, y, z);
+            }
+            final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData());
+            if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) {
+                return;
+            }
+
+            if (existing.getState() instanceof Container) {
+                ((Container) existing.getState()).getInventory().clear();
+            }
+
+            existing.setType(BukkitAdapter.adapt(block.getBlockType()), false);
+            existing.setBlockData(blockData, false);
+            if (block.hasNbtData()) {
+                CompoundTag tag = block.getNbtData();
+                StateWrapper sw = new StateWrapper(tag);
+
+                sw.restoreTag(existing);
+            }
+        }
+    }
+
+    private org.bukkit.World getBukkitWorld() {
+        if (bukkitWorld == null) {
+            bukkitWorld = Bukkit.getWorld(getWorld().getName());
+        }
+        return bukkitWorld;
+    }
+
+    private boolean isEdge(int layer, int x, int y, int z, BlockVector2 blockVector2, LocalChunk localChunk) {
+        int layerIndex = (layer - localChunk.getMinSection());
+        if (layer == localChunk.getMinSection() || layerIndex == localChunk.getBaseblocks().length - 1) {
+            return false;
+        }
+        if (x == 0) {
+            LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() - 1));
+            if (localChunkX == null || localChunkX.getBaseblocks()[layerIndex] == null ||
+                    localChunkX.getBaseblocks()[layerIndex][ChunkUtil.getJ(15, y, z)] != null) {
+                return true;
+            }
+        } else if (x == 15) {
+            LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() + 1));
+            if (localChunkX == null || localChunkX.getBaseblocks()[layerIndex] == null ||
+                    localChunkX.getBaseblocks()[layerIndex][ChunkUtil.getJ(0, y, z)] != null) {
+                return true;
+            }
+        }
+        if (z == 0) {
+            LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() - 1));
+            if (localChunkZ == null || localChunkZ.getBaseblocks()[layerIndex] == null ||
+                    localChunkZ.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, y, 15)] != null) {
+                return true;
+            }
+        } else if (z == 15) {
+            LocalChunk localChunkZ = getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() + 1));
+            if (localChunkZ == null || localChunkZ.getBaseblocks()[layerIndex] == null ||
+                    localChunkZ.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, y, 0)] != null) {
+                return true;
+            }
+        }
+        if (y == 0) {
+            if (localChunk.getBaseblocks()[layerIndex - 1] == null ||
+                    localChunk.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, 15, z)] != null) {
+                return true;
+            }
+        } else if (y == 15) {
+            if (localChunk.getBaseblocks()[layerIndex + 1] == null ||
+                    localChunk.getBaseblocks()[layerIndex][ChunkUtil.getJ(x, 0, z)] != null) {
+                return true;
+            }
+        }
+        BaseBlock[] baseBlocks = localChunk.getBaseblocks()[layerIndex];
+        if (x > 0 && baseBlocks[ChunkUtil.getJ(x - 1, y, z)] == null) {
+            return true;
+        }
+        if (x < 15 && baseBlocks[ChunkUtil.getJ(x + 1, y, z)] == null) {
+            return true;
+        }
+        if (y > 0 && baseBlocks[ChunkUtil.getJ(x, y - 1, z)] == null) {
+            return true;
+        }
+        if (y < 15 && baseBlocks[ChunkUtil.getJ(x, y + 1, z)] == null) {
+            return true;
+        }
+        if (z > 0 && baseBlocks[ChunkUtil.getJ(x, y, z - 1)] == null) {
+            return true;
+        }
+        return z < 15 && baseBlocks[ChunkUtil.getJ(x, y, z + 1)] == null;
+    }
+
+    private boolean isEdgeRegen(int x, int z, BlockVector2 blockVector2) {
+        if (x == 0) {
+            LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() - 1));
+            if (localChunkX == null) {
+                return true;
+            }
+        } else if (x == 15) {
+            LocalChunk localChunkX = getBlockChunks().get(blockVector2.withX(blockVector2.getX() + 1));
+            if (localChunkX == null) {
+                return true;
+            }
+        }
+        if (z == 0) {
+            return getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() - 1)) == null;
+        } else if (z == 15) {
+            return getBlockChunks().get(blockVector2.withZ(blockVector2.getZ() + 1)) == null;
+        }
+        return false;
+    }
+
+    private SideEffectSet getSideEffectSet(SideEffectState state) {
+        if (getSideEffectSet() != null) {
+            return getSideEffectSet();
+        }
+        return switch (state) {
+            case NONE -> NO_SIDE_EFFECT_SET;
+            case EDGE -> EDGE_SIDE_EFFECT_SET;
+            case LIGHTING -> LIGHTING_SIDE_EFFECT_SET;
+            case EDGE_LIGHTING -> EDGE_LIGHTING_SIDE_EFFECT_SET;
+        };
+    }
+
+    private enum SideEffectState {
+        NONE,
+        EDGE,
+        LIGHTING,
+        EDGE_LIGHTING
+    }
+
+}

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

@@ -1,326 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.queue;
-
-import com.google.common.base.Preconditions;
-import com.plotsquared.bukkit.BukkitMain;
-import com.sk89q.worldedit.math.BlockVector2;
-import io.papermc.lib.PaperLib;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-
-/**
- * Utility that allows for the loading and coordination of chunk actions
- * <p>
- * The coordinator takes in collection of chunk coordinates, loads them
- * and allows the caller to specify a sink for the loaded chunks. The
- * coordinator will prevent the chunks from being unloaded until the sink
- * has fully consumed the chunk
- * <p>
- * Usage:
- * <pre>{@code
- * final ChunkCoordinator chunkCoordinator = ChunkCoordinator.builder()
- *     .inWorld(Objects.requireNonNull(Bukkit.getWorld("world"))).withChunk(BlockVector2.at(0, 0))
- *     .withConsumer(chunk -> System.out.printf("Got chunk %d;%d", chunk.getX(), chunk.getZ()))
- *     .withFinalAction(() -> System.out.println("All chunks have been loaded"))
- *     .withThrowableConsumer(throwable -> System.err.println("Something went wrong... =("))
- *     .withMaxIterationTime(25L)
- *     .build();
- * chunkCoordinator.subscribeToProgress((coordinator, progress) ->
- *     System.out.printf("Progress: %.1f", progress * 100.0f));
- * chunkCoordinator.start();
- * }</pre>
- *
- * @author Alexander Söderberg
- * @see #builder() To create a new coordinator instance
- */
-public final class ChunkCoordinator extends BukkitRunnable {
-
-    private final List<ProgressSubscriber> progressSubscribers = new LinkedList<>();
-
-    private final Queue<BlockVector2> requestedChunks;
-    private final Queue<Chunk> availableChunks;
-    private final long maxIterationTime;
-    private final Plugin plugin;
-    private final Consumer<Chunk> chunkConsumer;
-    private final World world;
-    private final Runnable whenDone;
-    private final Consumer<Throwable> throwableConsumer;
-    private final int totalSize;
-
-    private AtomicInteger expectedSize;
-    private int batchSize;
-
-    private ChunkCoordinator(final long maxIterationTime, final int initialBatchSize,
-        @NotNull final Consumer<Chunk> chunkConsumer, @NotNull final World world,
-        @NotNull final Collection<BlockVector2> requestedChunks, @NotNull final Runnable whenDone,
-        @NotNull final Consumer<Throwable> throwableConsumer) {
-        this.requestedChunks = new LinkedBlockingQueue<>(requestedChunks);
-        this.availableChunks = new LinkedBlockingQueue<>();
-        this.totalSize = requestedChunks.size();
-        this.expectedSize = new AtomicInteger(this.totalSize);
-        this.world = world;
-        this.batchSize = initialBatchSize;
-        this.chunkConsumer = chunkConsumer;
-        this.maxIterationTime = maxIterationTime;
-        this.whenDone = whenDone;
-        this.throwableConsumer = throwableConsumer;
-        this.plugin = JavaPlugin.getPlugin(BukkitMain.class);
-    }
-
-    /**
-     * Create a new {@link ChunkCoordinator} instance
-     *
-     * @return Coordinator builder instance
-     */
-    @NotNull public static ChunkCoordinatorBuilder builder() {
-        return new ChunkCoordinatorBuilder();
-    }
-
-    /**
-     * Start the coordinator instance
-     */
-    public void start() {
-        // Request initial batch
-        this.requestBatch();
-        // Wait until next tick to give the chunks a chance to be loaded
-        this.runTaskTimer(this.plugin, 1L, 1L);
-    }
-
-    @Override public void run() {
-        Chunk chunk = this.availableChunks.poll();
-        if (chunk == null) {
-            return;
-        }
-        long iterationTime;
-        int processedChunks = 0;
-        do {
-            final long start = System.currentTimeMillis();
-            try {
-                this.chunkConsumer.accept(chunk);
-            } catch (final Throwable throwable) {
-                this.throwableConsumer.accept(throwable);
-            }
-            this.freeChunk(chunk);
-            processedChunks++;
-            final long end = System.currentTimeMillis();
-            // Update iteration time
-            iterationTime = end - start;
-        } while (2 * iterationTime /* last chunk + next chunk */ < this.maxIterationTime
-            && (chunk = availableChunks.poll()) != null);
-        if (processedChunks < this.batchSize) {
-            // Adjust batch size based on the amount of processed chunks per tick
-            this.batchSize = processedChunks;
-        }
-
-        final int expected = this.expectedSize.addAndGet(-processedChunks);
-
-        final float progress = ((float) totalSize - (float) expected) / (float) totalSize;
-        for (final ProgressSubscriber subscriber : this.progressSubscribers) {
-            subscriber.notifyProgress(this, progress);
-        }
-
-        if (expected <= 0) {
-            try {
-                this.whenDone.run();
-            } catch (final Throwable throwable) {
-                this.throwableConsumer.accept(throwable);
-            }
-            this.cancel();
-        } else {
-            if (this.availableChunks.size() < processedChunks) {
-                this.requestBatch();
-            }
-        }
-    }
-
-    private void requestBatch() {
-        BlockVector2 chunk;
-        for (int i = 0; i < this.batchSize && (chunk = this.requestedChunks.poll()) != null; i++) {
-            // This required PaperLib to be bumped to version 1.0.4 to mark the request as urgent
-            PaperLib.getChunkAtAsync(this.world, chunk.getX(), chunk.getZ(), true, true)
-                .whenComplete((chunkObject, throwable) -> {
-                    if (throwable != null) {
-                        throwable.printStackTrace();
-                        // We want one less because this couldn't be processed
-                        this.expectedSize.decrementAndGet();
-                    } else {
-                        this.processChunk(chunkObject);
-                    }
-                });
-        }
-    }
-
-    private void processChunk(@NotNull final Chunk chunk) {
-        if (!chunk.isLoaded()) {
-            throw new IllegalArgumentException(
-                String.format("Chunk %d;%d is is not loaded", chunk.getX(), chunk.getZ()));
-        }
-        chunk.addPluginChunkTicket(this.plugin);
-        this.availableChunks.add(chunk);
-    }
-
-    private void freeChunk(@NotNull final Chunk chunk) {
-        if (!chunk.isLoaded()) {
-            throw new IllegalArgumentException(
-                String.format("Chunk %d;%d is is not loaded", chunk.getX(), chunk.getZ()));
-        }
-        chunk.removePluginChunkTicket(this.plugin);
-    }
-
-    /**
-     * Get the amount of remaining chunks (at the time of the method call)
-     *
-     * @return Snapshot view of remaining chunk count
-     */
-    public int getRemainingChunks() {
-        return this.expectedSize.get();
-    }
-
-    /**
-     * Get the amount of requested chunks
-     *
-     * @return Requested chunk count
-     */
-    public int getTotalChunks() {
-        return this.totalSize;
-    }
-
-    /**
-     * Subscribe to coordinator progress updates
-     *
-     * @param subscriber Subscriber
-     */
-    public void subscribeToProgress(@NotNull final ChunkCoordinator.ProgressSubscriber subscriber) {
-        this.progressSubscribers.add(subscriber);
-    }
-
-
-    @FunctionalInterface
-    public interface ProgressSubscriber {
-
-        /**
-         * Notify about a progress update in the coordinator
-         *
-         * @param coordinator Coordinator instance that triggered the notification
-         * @param progress    Progress in the range [0, 1]
-         */
-        void notifyProgress(@NotNull final ChunkCoordinator coordinator, final float progress);
-
-    }
-
-
-    public static final class ChunkCoordinatorBuilder {
-
-        private final List<BlockVector2> requestedChunks = new LinkedList<>();
-        private Consumer<Throwable> throwableConsumer = Throwable::printStackTrace;
-        private World world;
-        private Consumer<Chunk> chunkConsumer;
-        private Runnable whenDone = () -> {
-        };
-        private long maxIterationTime = 60; // A little over 1 tick;
-        private int initialBatchSize = 4;
-
-        private ChunkCoordinatorBuilder() {
-        }
-
-        @NotNull public ChunkCoordinatorBuilder inWorld(@NotNull final World world) {
-            this.world = Preconditions.checkNotNull(world, "World may not be null");
-            return this;
-        }
-
-        @NotNull
-        public ChunkCoordinatorBuilder withChunk(@NotNull final BlockVector2 chunkLocation) {
-            this.requestedChunks
-                .add(Preconditions.checkNotNull(chunkLocation, "Chunk location may not be null"));
-            return this;
-        }
-
-        @NotNull public ChunkCoordinatorBuilder withChunks(
-            @NotNull final Collection<BlockVector2> chunkLocations) {
-            chunkLocations.forEach(this::withChunk);
-            return this;
-        }
-
-        @NotNull
-        public ChunkCoordinatorBuilder withConsumer(@NotNull final Consumer<Chunk> chunkConsumer) {
-            this.chunkConsumer =
-                Preconditions.checkNotNull(chunkConsumer, "Chunk consumer may not be null");
-            return this;
-        }
-
-        @NotNull public ChunkCoordinatorBuilder withFinalAction(@NotNull final Runnable whenDone) {
-            this.whenDone = Preconditions.checkNotNull(whenDone, "Final action may not be null");
-            return this;
-        }
-
-        @NotNull public ChunkCoordinatorBuilder withMaxIterationTime(final long maxIterationTime) {
-            Preconditions
-                .checkArgument(maxIterationTime > 0, "Max iteration time must be positive");
-            this.maxIterationTime = maxIterationTime;
-            return this;
-        }
-
-        @NotNull public ChunkCoordinatorBuilder withInitialBatchSize(final int initialBatchSize) {
-            Preconditions
-                .checkArgument(initialBatchSize > 0, "Initial batch size must be positive");
-            this.initialBatchSize = initialBatchSize;
-            return this;
-        }
-
-        @NotNull public ChunkCoordinatorBuilder withThrowableConsumer(
-            @NotNull final Consumer<Throwable> throwableConsumer) {
-            this.throwableConsumer =
-                Preconditions.checkNotNull(throwableConsumer, "Throwable consumer may not be null");
-            return this;
-        }
-
-        @NotNull public ChunkCoordinator build() {
-            Preconditions.checkNotNull(this.world, "No world was supplied");
-            Preconditions.checkNotNull(this.chunkConsumer, "No chunk consumer was supplied");
-            Preconditions.checkNotNull(this.whenDone, "No final action was supplied");
-            Preconditions
-                .checkNotNull(this.throwableConsumer, "No throwable consumer was supplied");
-            return new ChunkCoordinator(this.maxIterationTime, this.initialBatchSize,
-                this.chunkConsumer, this.world, this.requestedChunks, this.whenDone,
-                this.throwableConsumer);
-        }
-
-    }
-
-}

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

@@ -1,37 +1,31 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.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.ScopedLocalBlockQueue;
-import com.plotsquared.core.util.MainUtil;
+import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
+import com.plotsquared.core.util.ChunkUtil;
 import com.plotsquared.core.util.PatternUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.function.pattern.Pattern;
@@ -39,18 +33,22 @@ import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import lombok.Getter;
-import lombok.Setter;
+import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 import org.bukkit.generator.ChunkGenerator.ChunkData;
-import org.jetbrains.annotations.NotNull;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Arrays;
 
-public class GenChunk extends ScopedLocalBlockQueue {
+/**
+ * Internal use only. Subject to changes at any time.
+ */
+@DoNotUse
+public class GenChunk extends ZeroedDelegateScopedQueueCoordinator {
 
     public final Biome[] biomes;
     public BlockState[][] result;
@@ -59,14 +57,32 @@ public class GenChunk extends ScopedLocalBlockQueue {
     public String world;
     public int chunkX;
     public int chunkZ;
-    @Getter @Setter private ChunkData chunkData = null;
+    private ChunkData chunkData = null;
 
-    public GenChunk() {
-        super(null, new Location(null, 0, 0, 0), new Location(null, 15, 255, 15));
+    /**
+     * @param minY minimum world Y, inclusive
+     * @param maxY maximum world Y, inclusive
+     * @since 6.6.0
+     */
+    public GenChunk(int minY, int maxY) {
+        super(null, Location.at("", 0, minY, 0), Location.at("", 15, maxY, 15));
         this.biomes = Biome.values();
     }
 
-    public Chunk getChunk() {
+    public @Nullable ChunkData getChunkData() {
+        return this.chunkData;
+    }
+
+    /**
+     * Set the internal Bukkit chunk data
+     *
+     * @param chunkData Bukkit ChunkData
+     */
+    public void setChunkData(@NonNull ChunkData chunkData) {
+        this.chunkData = chunkData;
+    }
+
+    public @NonNull Chunk getChunk() {
         if (chunk == null) {
             World worldObj = BukkitUtil.getWorld(world);
             if (worldObj != null) {
@@ -76,34 +92,48 @@ public class GenChunk extends ScopedLocalBlockQueue {
         return chunk;
     }
 
-    public void setChunk(Chunk chunk) {
+    /**
+     * Set the chunk being represented
+     *
+     * @param chunk Bukkit Chunk
+     */
+    public void setChunk(@NonNull Chunk chunk) {
         this.chunk = chunk;
     }
 
-    public void setChunk(ChunkWrapper wrap) {
+
+    /**
+     * Set the world and XZ of the chunk being represented via {@link ChunkWrapper}
+     *
+     * @param wrap PlotSquared ChunkWrapper
+     */
+    public void setChunk(@NonNull ChunkWrapper wrap) {
         chunk = null;
-        world = wrap.world;
-        chunkX = wrap.x;
-        chunkZ = wrap.z;
+        world = wrap.world();
+        chunkX = wrap.x();
+        chunkZ = wrap.z();
     }
 
-    @Override public void fillBiome(BiomeType biomeType) {
+    @Override
+    public void fillBiome(@NonNull BiomeType biomeType) {
         if (biomeGrid == null) {
             return;
         }
         Biome biome = BukkitAdapter.adapt(biomeType);
-        for (int x = 0; x < 16; x++) {
-            for (int z = 0; z < 16; z++) {
-                this.biomeGrid.setBiome(x, z, biome);
+        for (int y = getMin().getY(); y <= getMax().getY(); y++) {
+            for (int x = 0; x < 16; x++) {
+                for (int z = 0; z < 16; z++) {
+                    this.biomeGrid.setBiome(x, y, z, biome);
+                }
             }
         }
     }
 
-    @Override public void setCuboid(Location pos1, Location pos2, BlockState block) {
-        if (result != null && pos1.getX() == 0 && pos1.getZ() == 0 && pos2.getX() == 15
-            && pos2.getZ() == 15) {
+    @Override
+    public void setCuboid(@NonNull Location pos1, @NonNull Location pos2, @NonNull BlockState block) {
+        if (result != null && pos1.getX() == 0 && pos1.getZ() == 0 && pos2.getX() == 15 && pos2.getZ() == 15) {
             for (int y = pos1.getY(); y <= pos2.getY(); y++) {
-                int layer = y >> 4;
+                int layer = getLayerIndex(y);
                 BlockState[] data = result[layer];
                 if (data == null) {
                     result[layer] = data = new BlockState[4096];
@@ -119,28 +149,51 @@ public class GenChunk extends ScopedLocalBlockQueue {
         int maxX = Math.max(pos1.getX(), pos2.getX());
         int maxY = Math.max(pos1.getY(), pos2.getY());
         int maxZ = Math.max(pos1.getZ(), pos2.getZ());
-        chunkData
-            .setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, BukkitAdapter.adapt(block));
+        chunkData.setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, BukkitAdapter.adapt(block));
     }
 
-    @Override public boolean setBiome(int x, int z, BiomeType biomeType) {
+    @Override
+    public boolean setBiome(int x, int z, @NonNull BiomeType biomeType) {
         return setBiome(x, z, BukkitAdapter.adapt(biomeType));
     }
 
-    public boolean setBiome(int x, int z, Biome biome) {
+    /**
+     * Set the in the whole column of XZ
+     *
+     * @param x     Relative x location within the chunk (0 - 15)
+     * @param z     Relative z location within the chunk (0 - 15)
+     * @param biome Bukkit biome to set
+     * @return if successful
+     */
+    public boolean setBiome(int x, int z, @NonNull Biome biome) {
         if (this.biomeGrid != null) {
-            this.biomeGrid.setBiome(x, z, biome);
+            for (int y = getMin().getY(); y <= getMax().getY(); y++) {
+                this.setBiome(x, y, z, biome);
+            }
             return true;
         }
         return false;
     }
 
-    @Override public boolean setBlock(int x, int y, int z, @NotNull Pattern pattern) {
-        return setBlock(x, y, z, PatternUtil
-            .apply(Preconditions.checkNotNull(pattern, "Pattern may not be null"), x, y, z));
+    public boolean setBiome(int x, int y, int z, @NonNull Biome biome) {
+        if (this.biomeGrid != null) {
+            this.biomeGrid.setBiome(x, y, z, biome);
+            return true;
+        }
+        return false;
     }
 
-    @Override public boolean setBlock(int x, int y, int z, BlockState id) {
+    @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);
+    }
+
+    @Override
+    public boolean setBlock(int x, int y, int z, @NonNull BlockState id) {
         if (this.result == null) {
             this.chunkData.setBlock(x, y, z, BukkitAdapter.adapt(id));
             return true;
@@ -150,17 +203,18 @@ public class GenChunk extends ScopedLocalBlockQueue {
         return true;
     }
 
-    private void storeCache(final int x, final int y, final int z, final BlockState id) {
-        int i = MainUtil.CACHE_I[y][x][z];
+    private void storeCache(final int x, final int y, final int z, final @NonNull BlockState id) {
+        int i = getLayerIndex(y);
         BlockState[] v = this.result[i];
         if (v == null) {
             this.result[i] = v = new BlockState[4096];
         }
-        int j = MainUtil.CACHE_J[y][x][z];
+        int j = ChunkUtil.getJ(x, y, z);
         v[j] = id;
     }
 
-    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
+    @Override
+    public boolean setBlock(int x, int y, int z, @NonNull BaseBlock id) {
         if (this.result == null) {
             this.chunkData.setBlock(x, y, z, BukkitAdapter.adapt(id));
             return true;
@@ -170,8 +224,9 @@ public class GenChunk extends ScopedLocalBlockQueue {
         return true;
     }
 
-    @Override public BlockState getBlock(int x, int y, int z) {
-        int i = MainUtil.CACHE_I[y][x][z];
+    @Override
+    public @Nullable BlockState getBlock(int x, int y, int z) {
+        int i = getLayerIndex(y);
         if (result == null) {
             return BukkitBlockUtil.get(chunkData.getType(x, y, z));
         }
@@ -179,7 +234,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
         if (array == null) {
             return BlockTypes.AIR.getDefaultState();
         }
-        int j = MainUtil.CACHE_J[y][x][z];
+        int j = ChunkUtil.getJ(x, y, z);
         return array[j];
     }
 
@@ -191,20 +246,23 @@ public class GenChunk extends ScopedLocalBlockQueue {
         return chunk == null ? chunkZ : chunk.getZ();
     }
 
-    @Override public String getWorld() {
-        return chunk == null ? world : chunk.getWorld().getName();
+    @Override
+    public com.sk89q.worldedit.world.@NonNull World getWorld() {
+        return chunk == null ? BukkitAdapter.adapt(Bukkit.getWorld(world)) : BukkitAdapter.adapt(chunk.getWorld());
     }
 
-    @Override public Location getMax() {
-        return new Location(getWorld(), 15 + (getX() << 4), 255, 15 + (getZ() << 4));
+    @Override
+    public @NonNull Location getMax() {
+        return Location.at(getWorld().getName(), 15 + (getX() << 4), super.getMax().getY(), 15 + (getZ() << 4));
     }
 
-    @Override public Location getMin() {
-        return new Location(getWorld(), getX() << 4, 0, getZ() << 4);
+    @Override
+    public @NonNull Location getMin() {
+        return Location.at(getWorld().getName(), getX() << 4, super.getMin().getY(), getZ() << 4);
     }
 
-    public GenChunk clone() {
-        GenChunk toReturn = new GenChunk();
+    public @NonNull GenChunk clone() {
+        GenChunk toReturn = new GenChunk(getMin().getY(), getMax().getY());
         if (this.result != null) {
             for (int i = 0; i < this.result.length; i++) {
                 BlockState[] matrix = this.result[i];
@@ -217,4 +275,9 @@ public class GenChunk extends ScopedLocalBlockQueue {
         toReturn.chunkData = this.chunkData;
         return toReturn;
     }
+
+    private int getLayerIndex(int y) {
+        return (y - getMin().getY()) >> 4;
+    }
+
 }

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

@@ -0,0 +1,130 @@
+/*
+ * 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.queue;
+
+import com.plotsquared.bukkit.schematic.StateWrapper;
+import com.plotsquared.core.queue.DelegateQueueCoordinator;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.entity.Entity;
+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 org.apache.logging.log4j.Logger;
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.generator.LimitedRegion;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+/**
+ * Wraps a {@link LimitedRegion} inside a {@link com.plotsquared.core.queue.QueueCoordinator} so it can be written to.
+ *
+ * @since 6.9.0
+ */
+public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
+
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
+
+    private final LimitedRegion limitedRegion;
+    private boolean useOtherRestoreTagMethod = false;
+
+    /**
+     * @since 6.9.0
+     */
+    public LimitedRegionWrapperQueue(LimitedRegion limitedRegion) {
+        super(null);
+        this.limitedRegion = limitedRegion;
+    }
+
+    @Override
+    public boolean setBlock(final int x, final int y, final int z, @NonNull final Pattern pattern) {
+        return setBlock(x, y, z, pattern.applyBlock(BlockVector3.at(x, y, z)));
+    }
+
+    @Override
+    public boolean setBlock(final int x, final int y, final int z, @NonNull final BaseBlock id) {
+        boolean result = setBlock(x, y, z, id.toImmutableState());
+        if (result && id.hasNbtData()) {
+            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());
+                }
+            } 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;
+    }
+
+    @Override
+    public boolean setBlock(final int x, final int y, final int z, @NonNull final BlockState id) {
+        try {
+            limitedRegion.setType(x, y, z, BukkitAdapter.adapt(id.getBlockType()));
+            limitedRegion.setBlockData(x, y, z, BukkitAdapter.adapt(id));
+        } catch (IllegalArgumentException e) {
+            LOGGER.error("Error attempting to populate block into the world at location {},{},{}", x, y, z, e);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean setEntity(@NonNull final Entity entity) {
+        EntityType type = BukkitAdapter.adapt(entity.getState().getType());
+        double x = entity.getLocation().getX();
+        double y = entity.getLocation().getY();
+        double z = entity.getLocation().getZ();
+        Location location = new Location(limitedRegion.getWorld(), x, y, z);
+        try {
+            limitedRegion.spawnEntity(location, type);
+        } catch (IllegalArgumentException e) {
+            LOGGER.error("Error attempting to populate entity into the world at location {},{},{}", (int) x, (int) y, (int) z, e);
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean setTile(final int x, final int y, final int z, @NonNull final CompoundTag tag) {
+        StateWrapper sw = new StateWrapper(tag);
+        try {
+            return 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;
+        }
+    }
+
+    @Override
+    public boolean isSettingTiles() {
+        return true;
+    }
+
+}

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java

@@ -1,41 +1,46 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.schematic;
 
-import com.plotsquared.core.queue.LocalBlockQueue;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
+import com.plotsquared.core.queue.QueueCoordinator;
 import com.plotsquared.core.util.SchematicHandler;
+import com.plotsquared.core.util.WorldUtil;
 import com.sk89q.jnbt.CompoundTag;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Schematic Handler.
  */
+@Singleton
 public class BukkitSchematicHandler extends SchematicHandler {
 
-    @Override
-    public boolean restoreTile(LocalBlockQueue queue, CompoundTag ct, int x, int y, int z) {
-        return new StateWrapper(ct).restoreTag(queue.getWorld(), x, y, z);
+    @Inject
+    public BukkitSchematicHandler(final @NonNull WorldUtil worldUtil, @NonNull ProgressSubscriberFactory subscriberFactory) {
+        super(worldUtil, subscriberFactory);
     }
+
+    @Override
+    public boolean restoreTile(QueueCoordinator queue, CompoundTag ct, int x, int y, int z) {
+        return new StateWrapper(ct).restoreTag(queue.getWorld().getName(), x, y, z);
+    }
+
 }

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java

@@ -1,32 +1,26 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.schematic;
 
+import com.destroystokyo.paper.profile.PlayerProfile;
+import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.configuration.Captions;
 import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.ListTag;
@@ -36,29 +30,39 @@ import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.item.ItemType;
+import io.papermc.lib.PaperLib;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
 import org.bukkit.World;
+import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
+import org.bukkit.block.Skull;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.banner.PatternType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.UUID;
 
 public class StateWrapper {
 
-    public org.bukkit.block.BlockState state = null;
-    public CompoundTag tag = null;
+    public CompoundTag tag;
 
-    public StateWrapper(org.bukkit.block.BlockState state) {
-        this.state = state;
-    }
+    private boolean paperErrorTextureSent = false;
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
 
     public StateWrapper(CompoundTag tag) {
         this.tag = tag;
@@ -66,132 +70,141 @@ public class StateWrapper {
 
     public static String jsonToColourCode(String str) {
         str = str.replace("{\"extra\":", "").replace("],\"text\":\"\"}", "]")
-            .replace("[{\"color\":\"black\",\"text\":\"", "&0")
-            .replace("[{\"color\":\"dark_blue\",\"text\":\"", "&1")
-            .replace("[{\"color\":\"dark_green\",\"text\":\"", "&2")
-            .replace("[{\"color\":\"dark_aqua\",\"text\":\"", "&3")
-            .replace("[{\"color\":\"dark_red\",\"text\":\"", "&4")
-            .replace("[{\"color\":\"dark_purple\",\"text\":\"", "&5")
-            .replace("[{\"color\":\"gold\",\"text\":\"", "&6")
-            .replace("[{\"color\":\"gray\",\"text\":\"", "&7")
-            .replace("[{\"color\":\"dark_gray\",\"text\":\"", "&8")
-            .replace("[{\"color\":\"blue\",\"text\":\"", "&9")
-            .replace("[{\"color\":\"green\",\"text\":\"", "&a")
-            .replace("[{\"color\":\"aqua\",\"text\":\"", "&b")
-            .replace("[{\"color\":\"red\",\"text\":\"", "&c")
-            .replace("[{\"color\":\"light_purple\",\"text\":\"", "&d")
-            .replace("[{\"color\":\"yellow\",\"text\":\"", "&e")
-            .replace("[{\"color\":\"white\",\"text\":\"", "&f")
-            .replace("[{\"obfuscated\":true,\"text\":\"", "&k")
-            .replace("[{\"bold\":true,\"text\":\"", "&l")
-            .replace("[{\"strikethrough\":true,\"text\":\"", "&m")
-            .replace("[{\"underlined\":true,\"text\":\"", "&n")
-            .replace("[{\"italic\":true,\"text\":\"", "&o").replace("[{\"color\":\"black\",", "&0")
-            .replace("[{\"color\":\"dark_blue\",", "&1")
-            .replace("[{\"color\":\"dark_green\",", "&2")
-            .replace("[{\"color\":\"dark_aqua\",", "&3").replace("[{\"color\":\"dark_red\",", "&4")
-            .replace("[{\"color\":\"dark_purple\",", "&5").replace("[{\"color\":\"gold\",", "&6")
-            .replace("[{\"color\":\"gray\",", "&7").replace("[{\"color\":\"dark_gray\",", "&8")
-            .replace("[{\"color\":\"blue\",", "&9").replace("[{\"color\":\"green\",", "&a")
-            .replace("[{\"color\":\"aqua\",", "&b").replace("[{\"color\":\"red\",", "&c")
-            .replace("[{\"color\":\"light_purple\",", "&d").replace("[{\"color\":\"yellow\",", "&e")
-            .replace("[{\"color\":\"white\",", "&f").replace("[{\"obfuscated\":true,", "&k")
-            .replace("[{\"bold\":true,", "&l").replace("[{\"strikethrough\":true,", "&m")
-            .replace("[{\"underlined\":true,", "&n").replace("[{\"italic\":true,", "&o")
-            .replace("{\"color\":\"black\",\"text\":\"", "&0")
-            .replace("{\"color\":\"dark_blue\",\"text\":\"", "&1")
-            .replace("{\"color\":\"dark_green\",\"text\":\"", "&2")
-            .replace("{\"color\":\"dark_aqua\",\"text\":\"", "&3")
-            .replace("{\"color\":\"dark_red\",\"text\":\"", "&4")
-            .replace("{\"color\":\"dark_purple\",\"text\":\"", "&5")
-            .replace("{\"color\":\"gold\",\"text\":\"", "&6")
-            .replace("{\"color\":\"gray\",\"text\":\"", "&7")
-            .replace("{\"color\":\"dark_gray\",\"text\":\"", "&8")
-            .replace("{\"color\":\"blue\",\"text\":\"", "&9")
-            .replace("{\"color\":\"green\",\"text\":\"", "&a")
-            .replace("{\"color\":\"aqua\",\"text\":\"", "&b")
-            .replace("{\"color\":\"red\",\"text\":\"", "&c")
-            .replace("{\"color\":\"light_purple\",\"text\":\"", "&d")
-            .replace("{\"color\":\"yellow\",\"text\":\"", "&e")
-            .replace("{\"color\":\"white\",\"text\":\"", "&f")
-            .replace("{\"obfuscated\":true,\"text\":\"", "&k")
-            .replace("{\"bold\":true,\"text\":\"", "&l")
-            .replace("{\"strikethrough\":true,\"text\":\"", "&m")
-            .replace("{\"underlined\":true,\"text\":\"", "&n")
-            .replace("{\"italic\":true,\"text\":\"", "&o").replace("{\"color\":\"black\",", "&0")
-            .replace("{\"color\":\"dark_blue\",", "&1").replace("{\"color\":\"dark_green\",", "&2")
-            .replace("{\"color\":\"dark_aqua\",", "&3").replace("{\"color\":\"dark_red\",", "&4")
-            .replace("{\"color\":\"dark_purple\",", "&5").replace("{\"color\":\"gold\",", "&6")
-            .replace("{\"color\":\"gray\",", "&7").replace("{\"color\":\"dark_gray\",", "&8")
-            .replace("{\"color\":\"blue\",", "&9").replace("{\"color\":\"green\",", "&a")
-            .replace("{\"color\":\"aqua\",", "&b").replace("{\"color\":\"red\",", "&c")
-            .replace("{\"color\":\"light_purple\",", "&d").replace("{\"color\":\"yellow\",", "&e")
-            .replace("{\"color\":\"white\",", "&f").replace("{\"obfuscated\":true,", "&k")
-            .replace("{\"bold\":true,", "&l").replace("{\"strikethrough\":true,", "&m")
-            .replace("{\"underlined\":true,", "&n").replace("{\"italic\":true,", "&o")
-            .replace("\"color\":\"black\",\"text\":\"", "&0")
-            .replace("\"color\":\"dark_blue\",\"text\":\"", "&1")
-            .replace("\"color\":\"dark_green\",\"text\":\"", "&2")
-            .replace("\"color\":\"dark_aqua\",\"text\":\"", "&3")
-            .replace("\"color\":\"dark_red\",\"text\":\"", "&4")
-            .replace("\"color\":\"dark_purple\",\"text\":\"", "&5")
-            .replace("\"color\":\"gold\",\"text\":\"", "&6")
-            .replace("\"color\":\"gray\",\"text\":\"", "&7")
-            .replace("\"color\":\"dark_gray\",\"text\":\"", "&8")
-            .replace("\"color\":\"blue\",\"text\":\"", "&9")
-            .replace("\"color\":\"green\",\"text\":\"", "&a")
-            .replace("\"color\":\"aqua\",\"text\":\"", "&b")
-            .replace("\"color\":\"red\",\"text\":\"", "&c")
-            .replace("\"color\":\"light_purple\",\"text\":\"", "&d")
-            .replace("\"color\":\"yellow\",\"text\":\"", "&e")
-            .replace("\"color\":\"white\",\"text\":\"", "&f")
-            .replace("\"obfuscated\":true,\"text\":\"", "&k")
-            .replace("\"bold\":true,\"text\":\"", "&l")
-            .replace("\"strikethrough\":true,\"text\":\"", "&m")
-            .replace("\"underlined\":true,\"text\":\"", "&n")
-            .replace("\"italic\":true,\"text\":\"", "&o").replace("\"color\":\"black\",", "&0")
-            .replace("\"color\":\"dark_blue\",", "&1").replace("\"color\":\"dark_green\",", "&2")
-            .replace("\"color\":\"dark_aqua\",", "&3").replace("\"color\":\"dark_red\",", "&4")
-            .replace("\"color\":\"dark_purple\",", "&5").replace("\"color\":\"gold\",", "&6")
-            .replace("\"color\":\"gray\",", "&7").replace("\"color\":\"dark_gray\",", "&8")
-            .replace("\"color\":\"blue\",", "&9").replace("\"color\":\"green\",", "&a")
-            .replace("\"color\":\"aqua\",", "&b").replace("\"color\":\"red\",", "&c")
-            .replace("\"color\":\"light_purple\",", "&d").replace("\"color\":\"yellow\",", "&e")
-            .replace("\"color\":\"white\",", "&f").replace("\"obfuscated\":true,", "&k")
-            .replace("\"bold\":true,", "&l").replace("\"strikethrough\":true,", "&m")
-            .replace("\"underlined\":true,", "&n").replace("\"italic\":true,", "&o")
-            .replace("[{\"text\":\"", "&0").replace("{\"text\":\"", "&0").replace("\"},", "")
-            .replace("\"}]", "").replace("\"}", "");
-        for (Entry<String, String> entry : Captions.replacements.entrySet()) {
-            str = str.replace(entry.getKey(), entry.getValue());
-        }
+                .replace("[{\"color\":\"black\",\"text\":\"", "&0")
+                .replace("[{\"color\":\"dark_blue\",\"text\":\"", "&1")
+                .replace("[{\"color\":\"dark_green\",\"text\":\"", "&2")
+                .replace("[{\"color\":\"dark_aqua\",\"text\":\"", "&3")
+                .replace("[{\"color\":\"dark_red\",\"text\":\"", "&4")
+                .replace("[{\"color\":\"dark_purple\",\"text\":\"", "&5")
+                .replace("[{\"color\":\"gold\",\"text\":\"", "&6")
+                .replace("[{\"color\":\"gray\",\"text\":\"", "&7")
+                .replace("[{\"color\":\"dark_gray\",\"text\":\"", "&8")
+                .replace("[{\"color\":\"blue\",\"text\":\"", "&9")
+                .replace("[{\"color\":\"green\",\"text\":\"", "&a")
+                .replace("[{\"color\":\"aqua\",\"text\":\"", "&b")
+                .replace("[{\"color\":\"red\",\"text\":\"", "&c")
+                .replace("[{\"color\":\"light_purple\",\"text\":\"", "&d")
+                .replace("[{\"color\":\"yellow\",\"text\":\"", "&e")
+                .replace("[{\"color\":\"white\",\"text\":\"", "&f")
+                .replace("[{\"obfuscated\":true,\"text\":\"", "&k")
+                .replace("[{\"bold\":true,\"text\":\"", "&l")
+                .replace("[{\"strikethrough\":true,\"text\":\"", "&m")
+                .replace("[{\"underlined\":true,\"text\":\"", "&n")
+                .replace("[{\"italic\":true,\"text\":\"", "&o").replace("[{\"color\":\"black\",", "&0")
+                .replace("[{\"color\":\"dark_blue\",", "&1")
+                .replace("[{\"color\":\"dark_green\",", "&2")
+                .replace("[{\"color\":\"dark_aqua\",", "&3").replace("[{\"color\":\"dark_red\",", "&4")
+                .replace("[{\"color\":\"dark_purple\",", "&5").replace("[{\"color\":\"gold\",", "&6")
+                .replace("[{\"color\":\"gray\",", "&7").replace("[{\"color\":\"dark_gray\",", "&8")
+                .replace("[{\"color\":\"blue\",", "&9").replace("[{\"color\":\"green\",", "&a")
+                .replace("[{\"color\":\"aqua\",", "&b").replace("[{\"color\":\"red\",", "&c")
+                .replace("[{\"color\":\"light_purple\",", "&d").replace("[{\"color\":\"yellow\",", "&e")
+                .replace("[{\"color\":\"white\",", "&f").replace("[{\"obfuscated\":true,", "&k")
+                .replace("[{\"bold\":true,", "&l").replace("[{\"strikethrough\":true,", "&m")
+                .replace("[{\"underlined\":true,", "&n").replace("[{\"italic\":true,", "&o")
+                .replace("{\"color\":\"black\",\"text\":\"", "&0")
+                .replace("{\"color\":\"dark_blue\",\"text\":\"", "&1")
+                .replace("{\"color\":\"dark_green\",\"text\":\"", "&2")
+                .replace("{\"color\":\"dark_aqua\",\"text\":\"", "&3")
+                .replace("{\"color\":\"dark_red\",\"text\":\"", "&4")
+                .replace("{\"color\":\"dark_purple\",\"text\":\"", "&5")
+                .replace("{\"color\":\"gold\",\"text\":\"", "&6")
+                .replace("{\"color\":\"gray\",\"text\":\"", "&7")
+                .replace("{\"color\":\"dark_gray\",\"text\":\"", "&8")
+                .replace("{\"color\":\"blue\",\"text\":\"", "&9")
+                .replace("{\"color\":\"green\",\"text\":\"", "&a")
+                .replace("{\"color\":\"aqua\",\"text\":\"", "&b")
+                .replace("{\"color\":\"red\",\"text\":\"", "&c")
+                .replace("{\"color\":\"light_purple\",\"text\":\"", "&d")
+                .replace("{\"color\":\"yellow\",\"text\":\"", "&e")
+                .replace("{\"color\":\"white\",\"text\":\"", "&f")
+                .replace("{\"obfuscated\":true,\"text\":\"", "&k")
+                .replace("{\"bold\":true,\"text\":\"", "&l")
+                .replace("{\"strikethrough\":true,\"text\":\"", "&m")
+                .replace("{\"underlined\":true,\"text\":\"", "&n")
+                .replace("{\"italic\":true,\"text\":\"", "&o").replace("{\"color\":\"black\",", "&0")
+                .replace("{\"color\":\"dark_blue\",", "&1").replace("{\"color\":\"dark_green\",", "&2")
+                .replace("{\"color\":\"dark_aqua\",", "&3").replace("{\"color\":\"dark_red\",", "&4")
+                .replace("{\"color\":\"dark_purple\",", "&5").replace("{\"color\":\"gold\",", "&6")
+                .replace("{\"color\":\"gray\",", "&7").replace("{\"color\":\"dark_gray\",", "&8")
+                .replace("{\"color\":\"blue\",", "&9").replace("{\"color\":\"green\",", "&a")
+                .replace("{\"color\":\"aqua\",", "&b").replace("{\"color\":\"red\",", "&c")
+                .replace("{\"color\":\"light_purple\",", "&d").replace("{\"color\":\"yellow\",", "&e")
+                .replace("{\"color\":\"white\",", "&f").replace("{\"obfuscated\":true,", "&k")
+                .replace("{\"bold\":true,", "&l").replace("{\"strikethrough\":true,", "&m")
+                .replace("{\"underlined\":true,", "&n").replace("{\"italic\":true,", "&o")
+                .replace("\"color\":\"black\",\"text\":\"", "&0")
+                .replace("\"color\":\"dark_blue\",\"text\":\"", "&1")
+                .replace("\"color\":\"dark_green\",\"text\":\"", "&2")
+                .replace("\"color\":\"dark_aqua\",\"text\":\"", "&3")
+                .replace("\"color\":\"dark_red\",\"text\":\"", "&4")
+                .replace("\"color\":\"dark_purple\",\"text\":\"", "&5")
+                .replace("\"color\":\"gold\",\"text\":\"", "&6")
+                .replace("\"color\":\"gray\",\"text\":\"", "&7")
+                .replace("\"color\":\"dark_gray\",\"text\":\"", "&8")
+                .replace("\"color\":\"blue\",\"text\":\"", "&9")
+                .replace("\"color\":\"green\",\"text\":\"", "&a")
+                .replace("\"color\":\"aqua\",\"text\":\"", "&b")
+                .replace("\"color\":\"red\",\"text\":\"", "&c")
+                .replace("\"color\":\"light_purple\",\"text\":\"", "&d")
+                .replace("\"color\":\"yellow\",\"text\":\"", "&e")
+                .replace("\"color\":\"white\",\"text\":\"", "&f")
+                .replace("\"obfuscated\":true,\"text\":\"", "&k")
+                .replace("\"bold\":true,\"text\":\"", "&l")
+                .replace("\"strikethrough\":true,\"text\":\"", "&m")
+                .replace("\"underlined\":true,\"text\":\"", "&n")
+                .replace("\"italic\":true,\"text\":\"", "&o").replace("\"color\":\"black\",", "&0")
+                .replace("\"color\":\"dark_blue\",", "&1").replace("\"color\":\"dark_green\",", "&2")
+                .replace("\"color\":\"dark_aqua\",", "&3").replace("\"color\":\"dark_red\",", "&4")
+                .replace("\"color\":\"dark_purple\",", "&5").replace("\"color\":\"gold\",", "&6")
+                .replace("\"color\":\"gray\",", "&7").replace("\"color\":\"dark_gray\",", "&8")
+                .replace("\"color\":\"blue\",", "&9").replace("\"color\":\"green\",", "&a")
+                .replace("\"color\":\"aqua\",", "&b").replace("\"color\":\"red\",", "&c")
+                .replace("\"color\":\"light_purple\",", "&d").replace("\"color\":\"yellow\",", "&e")
+                .replace("\"color\":\"white\",", "&f").replace("\"obfuscated\":true,", "&k")
+                .replace("\"bold\":true,", "&l").replace("\"strikethrough\":true,", "&m")
+                .replace("\"underlined\":true,", "&n").replace("\"italic\":true,", "&o")
+                .replace("[{\"text\":\"", "&0").replace("{\"text\":\"", "&0").replace("\"},", "")
+                .replace("\"}]", "").replace("\"}", "");
+        str = ChatColor.translateAlternateColorCodes('&', str);
         return str;
     }
 
+    /**
+     * Restore the TileEntity data to the given world at the given coordinates.
+     *
+     * @param worldName World name
+     * @param x         x position
+     * @param y         y position
+     * @param z         z position
+     * @return true if successful
+     */
     public boolean restoreTag(String worldName, int x, int y, int z) {
-        if (this.tag == null) {
+        World world = BukkitUtil.getWorld(worldName);
+        if (world == null) {
             return false;
         }
-        World world = BukkitUtil.getWorld(worldName);
-        Block block = world.getBlockAt(x, y, z);
-        if (block == null) {
+        return restoreTag(world.getBlockAt(x, y, z));
+    }
+
+    /**
+     * Restore the TileEntity data to the given block
+     *
+     * @param block Block to restore to
+     * @return true if successful
+     */
+    @SuppressWarnings("deprecation") // #setLine is needed for Spigot compatibility
+    public boolean restoreTag(@NonNull Block block) {
+        if (this.tag == null) {
             return false;
         }
         org.bukkit.block.BlockState state = block.getState();
         switch (getId()) {
-            case "chest":
-            case "beacon":
-            case "brewingstand":
-            case "dispenser":
-            case "dropper":
-            case "furnace":
-            case "hopper":
-            case "shulkerbox":
-                if (!(state instanceof Container)) {
+            case "chest", "beacon", "brewingstand", "dispenser", "dropper", "furnace", "hopper", "shulkerbox" -> {
+                if (!(state instanceof Container container)) {
                     return false;
                 }
                 List<Tag> itemsTag = this.tag.getListTag("Items").getValue();
-                Container container = (Container) state;
                 Inventory inv = container.getSnapshotInventory();
                 for (Tag itemTag : itemsTag) {
                     CompoundTag itemComp = (CompoundTag) itemTag;
@@ -208,9 +221,9 @@ public class StateWrapper {
                 }
                 container.update(true, false);
                 return true;
-            case "sign":
-                if (state instanceof Sign) {
-                    Sign sign = (Sign) state;
+            }
+            case "sign" -> {
+                if (state instanceof Sign sign) {
                     sign.setLine(0, jsonToColourCode(tag.getString("Text1")));
                     sign.setLine(1, jsonToColourCode(tag.getString("Text2")));
                     sign.setLine(2, jsonToColourCode(tag.getString("Text3")));
@@ -219,24 +232,80 @@ public class StateWrapper {
                     return true;
                 }
                 return false;
+            }
+            case "skull" -> {
+                if (state instanceof Skull skull) {
+                    CompoundTag skullOwner = ((CompoundTag) this.tag.getValue().get("SkullOwner"));
+                    if (skullOwner == null) {
+                        return true;
+                    }
+                    String player = skullOwner.getString("Name");
+
+                    if (player != null && !player.isEmpty()) {
+                        try {
+                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
+                            skull.update(true);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        return true;
+                    }
+
+                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
+                    if (properties == null) {
+                        return false;
+                    }
+                    final ListTag textures = properties.getListTag("textures");
+                    if (textures.getValue().isEmpty()) {
+                        return false;
+                    }
+                    final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
+                    if (textureCompound == null) {
+                        return false;
+                    }
+                    String textureValue = textureCompound.getString("Value");
+                    if (textureValue == null) {
+                        return false;
+                    }
+                    if (!PaperLib.isPaper()) {
+                        if (!paperErrorTextureSent) {
+                            paperErrorTextureSent = true;
+                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
+                        }
+                        return false;
+                    }
+                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
+                    profile.setProperty(new ProfileProperty("textures", textureValue));
+                    skull.setPlayerProfile(profile);
+                    skull.update(true);
+                    return true;
+
+                }
+                return false;
+            }
+            case "banner" -> {
+                if (state instanceof Banner banner) {
+                    List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
+                    if (patterns == null || patterns.isEmpty()) {
+                        return false;
+                    }
+                    banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
+                        DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
+                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
+                        if (color == null || patternType == null) {
+                            return null;
+                        }
+                        return new Pattern(color, patternType);
+                    }).filter(Objects::nonNull).toList());
+                    banner.update(true);
+                    return true;
+                }
+                return false;
+            }
         }
         return false;
     }
 
-    public CompoundTag getTag() {
-        if (this.tag != null) {
-            return this.tag;
-        }
-        if (this.state instanceof InventoryHolder) {
-            InventoryHolder inv = (InventoryHolder) this.state;
-            ItemStack[] contents = inv.getInventory().getContents();
-            Map<String, Tag> values = new HashMap<>();
-            values.put("Items", new ListTag(CompoundTag.class, serializeInventory(contents)));
-            return new CompoundTag(values);
-        }
-        return null;
-    }
-
     public String getId() {
         String tileid = this.tag.getString("id").toLowerCase();
         if (tileid.startsWith("minecraft:")) {

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

@@ -1,50 +1,29 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.item.ItemType;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 
-import java.util.function.Supplier;
-
 public class BukkitBlockUtil {
-    public static Supplier<ItemType> supplyItem(Block block) {
-        return new Supplier<ItemType>() {
-            @Override public ItemType get() {
-                return BukkitAdapter.asItemType(block.getType());
-            }
-        };
-    }
-
-    public static Supplier<ItemType> supplyItem(Material type) {
-        return () -> BukkitAdapter.asItemType(type);
-    }
 
     public static BlockState get(Block block) {
         return get(block.getType());
@@ -53,4 +32,5 @@ public class BukkitBlockUtil {
     public static BlockState get(Material material) {
         return BukkitAdapter.asBlockType(material).getDefaultState();
     }
+
 }

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

@@ -1,78 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.util;
-
-import com.plotsquared.bukkit.chat.FancyMessage;
-import com.plotsquared.bukkit.player.BukkitPlayer;
-import com.plotsquared.core.configuration.Captions;
-import com.plotsquared.core.configuration.Settings;
-import com.plotsquared.core.player.ConsolePlayer;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.message.PlotMessage;
-import com.plotsquared.core.util.ChatManager;
-import org.bukkit.ChatColor;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class BukkitChatManager extends ChatManager<FancyMessage> {
-
-    @Override public FancyMessage builder() {
-        return new FancyMessage("");
-    }
-
-    @Override public void color(PlotMessage message, String color) {
-        message.$(this).color(ChatColor.getByChar(Captions.color(color).substring(1)));
-    }
-
-    @Override public void tooltip(PlotMessage message, PlotMessage... tooltips) {
-        List<FancyMessage> lines =
-            Arrays.stream(tooltips).map(tooltip -> tooltip.$(this)).collect(Collectors.toList());
-        message.$(this).formattedTooltip(lines);
-    }
-
-    @Override public void command(PlotMessage message, String command) {
-        message.$(this).command(command);
-    }
-
-    @Override public void text(PlotMessage message, String text) {
-        message.$(this).then(ChatColor.stripColor(text));
-    }
-
-    @Override public void send(PlotMessage plotMessage, PlotPlayer player) {
-        if (player instanceof ConsolePlayer || !Settings.Chat.INTERACTIVE) {
-            player.sendMessage(plotMessage.$(this).toOldMessageFormat());
-        } else {
-            plotMessage.$(this).send(((BukkitPlayer) player).player);
-        }
-    }
-
-    @Override public void suggest(PlotMessage plotMessage, String command) {
-        plotMessage.$(this).suggest(command);
-    }
-
-}

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

@@ -1,165 +1,44 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
-import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.listener.WEExtent;
-import com.plotsquared.core.queue.GlobalBlockQueue;
-import com.plotsquared.core.queue.LocalBlockQueue;
+import com.google.inject.Singleton;
 import com.plotsquared.core.util.ChunkManager;
-import com.plotsquared.core.util.entity.EntityCategories;
-import com.plotsquared.core.util.task.TaskManager;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.world.block.BaseBlock;
 import io.papermc.lib.PaperLib;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.Entity;
 
 import java.util.concurrent.CompletableFuture;
 
-import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
-import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
-import static com.plotsquared.core.util.entity.EntityCategories.CAP_MISC;
-import static com.plotsquared.core.util.entity.EntityCategories.CAP_MOB;
-import static com.plotsquared.core.util.entity.EntityCategories.CAP_MONSTER;
-import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
-
+@Singleton
 public class BukkitChunkManager extends ChunkManager {
 
     public static boolean isIn(CuboidRegion region, int x, int z) {
-        return x >= region.getMinimumPoint().getX() && x <= region.getMaximumPoint().getX()
-            && z >= region.getMinimumPoint().getZ() && z <= region.getMaximumPoint().getZ();
-    }
-
-    public static ContentMap swapChunk(World world1, World world2, Chunk pos1, Chunk pos2,
-        CuboidRegion r1, CuboidRegion r2) {
-        ContentMap map = new ContentMap();
-        int relX = r2.getMinimumPoint().getX() - r1.getMinimumPoint().getX();
-        int relZ = r2.getMinimumPoint().getZ() - r1.getMinimumPoint().getZ();
-
-        map.saveEntitiesIn(pos1, r1, relX, relZ, true);
-        map.saveEntitiesIn(pos2, r2, -relX, -relZ, true);
-
-        int sx = pos1.getX() << 4;
-        int sz = pos1.getZ() << 4;
-
-        String worldName1 = world1.getName();
-        String worldName2 = world2.getName();
-
-        BukkitWorld bukkitWorld1 = new BukkitWorld(world1);
-        BukkitWorld bukkitWorld2 = new BukkitWorld(world2);
-
-        LocalBlockQueue queue1 = GlobalBlockQueue.IMP.getNewQueue(worldName1, false);
-        LocalBlockQueue queue2 = GlobalBlockQueue.IMP.getNewQueue(worldName2, false);
-
-        for (int x = Math.max(r1.getMinimumPoint().getX(), sx);
-             x <= Math.min(r1.getMaximumPoint().getX(), sx + 15); x++) {
-            for (int z = Math.max(r1.getMinimumPoint().getZ(), sz);
-                 z <= Math.min(r1.getMaximumPoint().getZ(), sz + 15); z++) {
-                for (int y = 0; y < 256; y++) {
-                    Block block1 = world1.getBlockAt(x, y, z);
-                    BaseBlock baseBlock1 = bukkitWorld1.getFullBlock(BlockVector3.at(x, y, z));
-                    BlockData data1 = block1.getBlockData();
-
-                    int xx = x + relX;
-                    int zz = z + relZ;
-
-                    Block block2 = world2.getBlockAt(xx, y, zz);
-                    BaseBlock baseBlock2 = bukkitWorld2.getFullBlock(BlockVector3.at(xx, y, zz));
-                    BlockData data2 = block2.getBlockData();
-
-                    if (block1.isEmpty()) {
-                        if (!block2.isEmpty()) {
-                            queue1.setBlock(x, y, z, baseBlock2);
-                            queue2.setBlock(xx, y, zz, WEExtent.AIRBASE);
-                        }
-                    } else if (block2.isEmpty()) {
-                        queue1.setBlock(x, y, z, WEExtent.AIRBASE);
-                        queue2.setBlock(xx, y, zz, baseBlock1);
-                    } else if (block1.equals(block2)) {
-                        if (!data1.matches(data2)) {
-                            block1.setBlockData(data2);
-                            block2.setBlockData(data1);
-                        }
-                    } else {
-                        queue1.setBlock(x, y, z, baseBlock2);
-                        queue2.setBlock(xx, y, zz, baseBlock1);
-                    }
-                }
-            }
-        }
-        queue1.enqueue();
-        queue2.enqueue();
-        return map;
+        return x >= region.getMinimumPoint().getX() && x <= region.getMaximumPoint().getX() && z >= region
+                .getMinimumPoint()
+                .getZ() && z <= region
+                .getMaximumPoint().getZ();
     }
 
     @Override
     public CompletableFuture<?> loadChunk(String world, BlockVector2 chunkLoc, boolean force) {
-        return PaperLib
-            .getChunkAtAsync(BukkitUtil.getWorld(world), chunkLoc.getX(), chunkLoc.getZ(), force);
+        return PaperLib.getChunkAtAsync(BukkitUtil.getWorld(world), chunkLoc.getX(), chunkLoc.getZ(), force);
     }
 
-    @Override
-    public void unloadChunk(final String world, final BlockVector2 chunkLoc, final boolean save) {
-        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-            TaskManager.runTask(() -> BukkitUtil.getWorld(world)
-                .unloadChunk(chunkLoc.getX(), chunkLoc.getZ(), save));
-        } else {
-            BukkitUtil.getWorld(world).unloadChunk(chunkLoc.getX(), chunkLoc.getZ(), save);
-        }
-    }
-
-    private void count(int[] count, Entity entity) {
-        final com.sk89q.worldedit.world.entity.EntityType entityType =
-            BukkitAdapter.adapt(entity.getType());
-
-        if (EntityCategories.PLAYER.contains(entityType)) {
-            return;
-        } else if (EntityCategories.PROJECTILE.contains(entityType) || EntityCategories.OTHER
-            .contains(entityType) || EntityCategories.HANGING.contains(entityType)) {
-            count[CAP_MISC]++;
-        } else if (EntityCategories.ANIMAL.contains(entityType) || EntityCategories.VILLAGER
-            .contains(entityType) || EntityCategories.TAMEABLE.contains(entityType)) {
-            count[CAP_MOB]++;
-            count[CAP_ANIMAL]++;
-        } else if (EntityCategories.VEHICLE.contains(entityType)) {
-            count[CAP_VEHICLE]++;
-        } else if (EntityCategories.HOSTILE.contains(entityType)) {
-            count[CAP_MOB]++;
-            count[CAP_MONSTER]++;
-        }
-        count[CAP_ENTITY]++;
-    }
-
-
 }

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

@@ -1,45 +1,45 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
+import com.google.inject.Singleton;
 import com.plotsquared.bukkit.player.BukkitOfflinePlayer;
 import com.plotsquared.bukkit.player.BukkitPlayer;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.player.OfflinePlotPlayer;
 import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.util.EconHandler;
-import com.plotsquared.core.util.PermHandler;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.RegisteredServiceProvider;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
+@Singleton
 public class BukkitEconHandler extends EconHandler {
 
     private Economy econ;
 
+    private static OfflinePlayer getBukkitOfflinePlayer(PlotPlayer<?> plotPlayer) {
+        return ((BukkitPlayer) plotPlayer).player;
+    }
+
     @Override
     public boolean init() {
         if (this.econ == null) {
@@ -53,45 +53,54 @@ public class BukkitEconHandler extends EconHandler {
             return;
         }
         RegisteredServiceProvider<Economy> economyProvider =
-            Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
+                Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
         if (economyProvider != null) {
             this.econ = economyProvider.getProvider();
         }
     }
 
-    @Override public double getMoney(PlotPlayer<?> player) {
+    @Override
+    public double getMoney(PlotPlayer<?> player) {
         double bal = super.getMoney(player);
         if (Double.isNaN(bal)) {
-            return this.econ.getBalance(((BukkitPlayer) player).player);
+            return this.econ.getBalance(getBukkitOfflinePlayer(player));
         }
         return bal;
     }
 
-    @Override public void withdrawMoney(PlotPlayer<?> player, double amount) {
-        this.econ.withdrawPlayer(((BukkitPlayer) player).player, amount);
+    @Override
+    public void withdrawMoney(PlotPlayer<?> player, double amount) {
+        this.econ.withdrawPlayer(getBukkitOfflinePlayer(player), amount);
     }
 
-    @Override public void depositMoney(PlotPlayer<?> player, double amount) {
-        this.econ.depositPlayer(((BukkitPlayer) player).player, amount);
+    @Override
+    public void depositMoney(PlotPlayer<?> player, double amount) {
+        this.econ.depositPlayer(getBukkitOfflinePlayer(player), amount);
     }
 
-    @Override public void depositMoney(OfflinePlotPlayer player, double amount) {
+    @Override
+    public void depositMoney(OfflinePlotPlayer player, double amount) {
         this.econ.depositPlayer(((BukkitOfflinePlayer) player).player, amount);
     }
 
-    /**
-     * @deprecated Use {@link PermHandler#hasPermission(String, String, String)} instead
-     */
-    @Deprecated @Override public boolean hasPermission(String world, String player, String perm) {
-        if (PlotSquared.imp().getPermissionHandler() != null) {
-            return PlotSquared.imp().getPermissionHandler().hasPermission(world, player, perm);
-        } else {
-            return false;
-        }
+    @Override
+    public boolean isEnabled(PlotArea plotArea) {
+        return plotArea.useEconomy();
     }
 
-    @Override public double getBalance(PlotPlayer<?> player) {
-        return this.econ.getBalance(player.getName());
+    @Override
+    public @NonNull String format(double balance) {
+        return this.econ.format(balance);
+    }
+
+    @Override
+    public boolean isSupported() {
+        return true;
+    }
+
+    @Override
+    public double getBalance(PlotPlayer<?> player) {
+        return this.econ.getBalance(getBukkitOfflinePlayer(player));
     }
 
 }

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

@@ -1,34 +1,28 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
 import com.plotsquared.bukkit.player.BukkitPlayer;
-import com.plotsquared.core.configuration.Captions;
 import com.plotsquared.core.configuration.Settings;
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.location.Location;
+import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag;
@@ -46,10 +40,11 @@ import com.plotsquared.core.plot.flag.implementations.PvpFlag;
 import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag;
 import com.plotsquared.core.plot.flag.implementations.VehicleCapFlag;
 import com.plotsquared.core.util.EntityUtil;
-import com.plotsquared.core.util.MainUtil;
-import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
@@ -65,16 +60,15 @@ import java.util.Objects;
 public class BukkitEntityUtil {
 
     public static final com.sk89q.worldedit.world.entity.EntityType FAKE_ENTITY_TYPE =
-        new com.sk89q.worldedit.world.entity.EntityType("plotsquared:fake");
+            new com.sk89q.worldedit.world.entity.EntityType("plotsquared:fake");
 
     public static boolean entityDamage(Entity damager, Entity victim) {
         return entityDamage(damager, victim, null);
     }
 
-    public static boolean entityDamage(Entity damager, Entity victim,
-        EntityDamageEvent.DamageCause cause) {
-        Location dloc = BukkitUtil.getLocation(damager);
-        Location vloc = BukkitUtil.getLocation(victim);
+    public static boolean entityDamage(Entity damager, Entity victim, EntityDamageEvent.DamageCause cause) {
+        Location dloc = BukkitUtil.adapt(damager.getLocation());
+        Location vloc = BukkitUtil.adapt(victim.getLocation());
         PlotArea dArea = dloc.getPlotArea();
         PlotArea vArea;
         if (dArea != null && dArea.contains(vloc.getX(), vloc.getZ())) {
@@ -144,15 +138,14 @@ public class BukkitEntityUtil {
         Player player;
         if (damager instanceof Player) { // attacker is player
             player = (Player) damager;
-        } else if (damager instanceof Projectile) {
-            Projectile projectile = (Projectile) damager;
+        } else if (damager instanceof Projectile projectile) {
             ProjectileSource shooter = projectile.getShooter();
             if (shooter instanceof Player) { // shooter is player
                 player = (Player) shooter;
             } else { // shooter is not player
                 if (shooter instanceof BlockProjectileSource) {
                     Location sLoc = BukkitUtil
-                        .getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+                            .adapt(((BlockProjectileSource) shooter).getBlock().getLocation());
                     dplot = dArea.getPlot(sLoc);
                 }
                 player = null;
@@ -161,7 +154,7 @@ public class BukkitEntityUtil {
             player = null;
         }
         if (player != null) {
-            BukkitPlayer plotPlayer = BukkitUtil.getPlayer(player);
+            BukkitPlayer plotPlayer = BukkitUtil.adapt(player);
 
             final com.sk89q.worldedit.world.entity.EntityType entityType;
 
@@ -174,82 +167,106 @@ public class BukkitEntityUtil {
 
             if (EntityCategories.HANGING.contains(entityType)) { // hanging
                 if (plot != null && (plot.getFlag(HangingBreakFlag.class) || plot
-                    .isAdded(plotPlayer.getUUID()))) {
+                        .isAdded(plotPlayer.getUUID()))) {
                     if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) {
-                        if (!Permissions
-                            .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
-                            MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                                Captions.PERMISSION_ADMIN_BUILD_OTHER);
+                        if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_BUILD_OTHER)) {
+                            plotPlayer.sendMessage(
+                                    TranslatableCaption.of("done.building_restricted")
+                            );
                             return false;
                         }
                     }
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.destroy." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
+                            )
+                    );
                     return false;
                 }
             } else if (victim.getType() == EntityType.ARMOR_STAND) {
                 if (plot != null && (plot.getFlag(MiscBreakFlag.class) || plot
-                    .isAdded(plotPlayer.getUUID()))) {
+                        .isAdded(plotPlayer.getUUID()))) {
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.destroy." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_DESTROY + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_DESTROY + "." + stub))
+                            )
+                    );
                     if (plot != null) {
                         plot.debug(player.getName()
-                            + " could not break armor stand because misc-break = false");
+                                + " could not break armor stand because misc-break = false");
                     }
                     return false;
                 }
             } else if (EntityCategories.HOSTILE.contains(entityType)) {
                 if (isPlot) {
                     if (plot.getFlag(HostileAttackFlag.class) || plot.getFlag(PveFlag.class) || plot
-                        .isAdded(plotPlayer.getUUID())) {
+                            .isAdded(plotPlayer.getUUID())) {
                         return true;
                     }
                 } else if (roadFlags && (area.getRoadFlag(HostileAttackFlag.class) || area
-                    .getFlag(PveFlag.class))) {
+                        .getFlag(PveFlag.class))) {
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.pve." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
+                            )
+                    );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType
-                            + " because pve = false OR hostile-attack = false");
+                                + " because pve = false OR hostile-attack = false");
                     }
                     return false;
                 }
             } else if (EntityCategories.TAMEABLE.contains(entityType)) { // victim is tameable
                 if (isPlot) {
                     if (plot.getFlag(TamedAttackFlag.class) || plot.getFlag(PveFlag.class) || plot
-                        .isAdded(plotPlayer.getUUID())) {
+                            .isAdded(plotPlayer.getUUID())) {
                         return true;
                     }
                 } else if (roadFlags && (area.getRoadFlag(TamedAttackFlag.class) || area
-                    .getFlag(PveFlag.class))) {
+                        .getFlag(PveFlag.class))) {
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.pve." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
+                            )
+                    );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType
-                            + " because pve = false OR tamned-attack = false");
+                                + " because pve = false OR tamed-attack = false");
                     }
                     return false;
                 }
             } else if (EntityCategories.PLAYER.contains(entityType)) {
                 if (isPlot) {
-                    if (!plot.getFlag(PvpFlag.class) && !Permissions
-                        .hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-                        MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                            "plots.admin.pvp." + stub);
+                    if (!plot.getFlag(PvpFlag.class) && !plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
+                        plotPlayer.sendMessage(
+                                TranslatableCaption.of("permission.no_permission_event"),
+                                TagResolver.resolver(
+                                        "node",
+                                        Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
+                                )
+                        );
                         plot.debug(player.getName() + " could not attack " + entityType
-                            + " because pve = false");
+                                + " because pve = false");
                         return false;
                     } else {
                         return true;
@@ -257,30 +274,42 @@ public class BukkitEntityUtil {
                 } else if (roadFlags && area.getRoadFlag(PvpFlag.class)) {
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.pvp." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVP + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVP + "." + stub))
+                            )
+                    );
                     return false;
                 }
             } else if (EntityCategories.ANIMAL.contains(entityType)) { // victim is animal
                 if (isPlot) {
                     if (plot.getFlag(AnimalAttackFlag.class) || plot.getFlag(PveFlag.class) || plot
-                        .isAdded(plotPlayer.getUUID())) {
-                        plot.debug(player.getName() + " could not attack " + entityType
-                            + " because pve = false OR animal-attack = false");
+                            .isAdded(plotPlayer.getUUID())) {
                         return true;
                     }
                 } else if (roadFlags && (area.getRoadFlag(AnimalAttackFlag.class) || area
-                    .getFlag(PveFlag.class))) {
+                        .getFlag(PveFlag.class))) {
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.pve." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
+                            )
+                    );
+                    if (plot != null) {
+                        plot.debug(player.getName() + " could not attack " + entityType
+                                + " because pve = false OR animal-attack = false");
+                    }
                     return false;
                 }
             } else if (EntityCategories.VEHICLE
-                .contains(entityType)) { // Vehicles are managed in vehicle destroy event
+                    .contains(entityType)) { // Vehicles are managed in vehicle destroy event
                 return true;
             } else { // victim is something else
                 if (isPlot) {
@@ -290,25 +319,30 @@ public class BukkitEntityUtil {
                 } else if (roadFlags && area.getRoadFlag(PveFlag.class)) {
                     return true;
                 }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
-                        "plots.admin.pve." + stub);
+                if (!plotPlayer.hasPermission(Permission.PERMISSION_ADMIN_PVE + "." + stub)) {
+                    plotPlayer.sendMessage(
+                            TranslatableCaption.of("permission.no_permission_event"),
+                            TagResolver.resolver(
+                                    "node",
+                                    Tag.inserting(Component.text(Permission.PERMISSION_ADMIN_PVE + "." + stub))
+                            )
+                    );
                     if (plot != null) {
                         plot.debug(player.getName() + " could not attack " + entityType
-                            + " because pve = false");
+                                + " because pve = false");
                     }
                     return false;
                 }
             }
             return true;
         } else if (dplot != null && (!dplot.equals(vplot) || Objects
-            .equals(dplot.getOwnerAbs(), vplot.getOwnerAbs()))) {
+                .equals(dplot.getOwnerAbs(), vplot.getOwnerAbs()))) {
             return vplot != null && vplot.getFlag(PveFlag.class);
         }
         //disable the firework damage. too much of a headache to support at the moment.
         if (vplot != null) {
             if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
-                && damager.getType() == EntityType.FIREWORK) {
+                    && damager.getType() == EntityType.FIREWORK) {
                 return false;
             }
         }
@@ -316,46 +350,50 @@ public class BukkitEntityUtil {
             return true;
         }
         return ((vplot != null && vplot.getFlag(PveFlag.class)) || !(damager instanceof Arrow
-            && !(victim instanceof Creature)));
+                && !(victim instanceof Creature)));
     }
 
     public static boolean checkEntity(Entity entity, Plot plot) {
         if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot.getArea()
-            .getFlagContainer().getFlagMap().isEmpty()) {
+                .getFlagContainer().getFlagMap().isEmpty()) {
             return false;
         }
 
         final com.sk89q.worldedit.world.entity.EntityType entityType =
-            BukkitAdapter.adapt(entity.getType());
+                BukkitAdapter.adapt(entity.getType());
 
         if (EntityCategories.PLAYER.contains(entityType)) {
             return false;
         }
 
         if (EntityCategories.PROJECTILE.contains(entityType) || EntityCategories.OTHER
-            .contains(entityType) || EntityCategories.HANGING.contains(entityType)) {
+                .contains(entityType) || EntityCategories.HANGING.contains(entityType)) {
             return EntityUtil.checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED,
-                MiscCapFlag.MISC_CAP_UNLIMITED);
+                    MiscCapFlag.MISC_CAP_UNLIMITED
+            );
         }
 
         // Has to go go before vehicle as horses are both
         // animals and vehicles
         if (EntityCategories.ANIMAL.contains(entityType) || EntityCategories.VILLAGER
-            .contains(entityType) || EntityCategories.TAMEABLE.contains(entityType)) {
+                .contains(entityType) || EntityCategories.TAMEABLE.contains(entityType)) {
             return EntityUtil
-                .checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MobCapFlag.MOB_CAP_UNLIMITED,
-                    AnimalCapFlag.ANIMAL_CAP_UNLIMITED);
+                    .checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MobCapFlag.MOB_CAP_UNLIMITED,
+                            AnimalCapFlag.ANIMAL_CAP_UNLIMITED
+                    );
         }
 
         if (EntityCategories.HOSTILE.contains(entityType)) {
             return EntityUtil
-                .checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MobCapFlag.MOB_CAP_UNLIMITED,
-                    HostileCapFlag.HOSTILE_CAP_UNLIMITED);
+                    .checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MobCapFlag.MOB_CAP_UNLIMITED,
+                            HostileCapFlag.HOSTILE_CAP_UNLIMITED
+                    );
         }
 
         if (EntityCategories.VEHICLE.contains(entityType)) {
             return EntityUtil.checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED,
-                VehicleCapFlag.VEHICLE_CAP_UNLIMITED);
+                    VehicleCapFlag.VEHICLE_CAP_UNLIMITED
+            );
         }
 
         return EntityUtil.checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED);

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

@@ -1,36 +1,31 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
+import com.google.inject.Singleton;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.PlotInventory;
 import com.plotsquared.core.plot.PlotItemStack;
 import com.plotsquared.core.util.InventoryUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -40,62 +35,37 @@ import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.IntStream;
 
+@Singleton
 public class BukkitInventoryUtil extends InventoryUtil {
 
-    @Override public void open(PlotInventory inv) {
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        Inventory inventory = Bukkit.createInventory(null, inv.size * 9,
-            ChatColor.translateAlternateColorCodes('&', inv.getTitle()));
-        PlotItemStack[] items = inv.getItems();
-        for (int i = 0; i < inv.size * 9; i++) {
-            PlotItemStack item = items[i];
-            if (item != null) {
-                inventory.setItem(i, getItem(item));
-            }
-        }
-        bp.player.openInventory(inventory);
-    }
-
-    @Override public void close(PlotInventory inv) {
-        if (!inv.isOpen()) {
-            return;
-        }
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        bp.player.closeInventory();
-    }
-
-    @Override public void setItem(PlotInventory inv, int index, PlotItemStack item) {
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        InventoryView opened = bp.player.getOpenInventory();
-        if (!inv.isOpen()) {
-            return;
-        }
-        opened.setItem(index, getItem(item));
-        bp.player.updateInventory();
-    }
-
-    private static ItemStack getItem(PlotItemStack item) {
+    private static @Nullable ItemStack getItem(PlotItemStack item) {
         if (item == null) {
             return null;
         }
-        ItemStack stack = new ItemStack(BukkitAdapter.adapt(item.getType()), item.amount);
-        ItemMeta meta = null;
-        if (item.name != null) {
-            meta = stack.getItemMeta();
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', item.name));
+        Material material = BukkitAdapter.adapt(item.getType());
+        if (material == null) {
+            return null;
         }
-        if (item.lore != null) {
+        ItemStack stack = new ItemStack(material, item.getAmount());
+        ItemMeta meta = null;
+        if (item.getName() != null) {
+            meta = stack.getItemMeta();
+            Component nameComponent = BukkitUtil.MINI_MESSAGE.deserialize(item.getName());
+            meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
+        }
+        if (item.getLore() != null) {
             if (meta == null) {
                 meta = stack.getItemMeta();
             }
             List<String> lore = new ArrayList<>();
-            for (String entry : item.lore) {
-                lore.add(ChatColor.translateAlternateColorCodes('&', entry));
+            for (String entry : item.getLore()) {
+                lore.add(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(BukkitUtil.MINI_MESSAGE.deserialize(entry)));
             }
             meta.setLore(lore);
         }
@@ -105,6 +75,49 @@ public class BukkitInventoryUtil extends InventoryUtil {
         return stack;
     }
 
+    @SuppressWarnings("deprecation") // Paper deprecation
+    @Override
+    public void open(PlotInventory inv) {
+        BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
+        Inventory inventory = Bukkit.createInventory(null, inv.getLines() * 9,
+                ChatColor.translateAlternateColorCodes('&', inv.getTitle())
+        );
+        PlotItemStack[] items = inv.getItems();
+        for (int i = 0; i < inv.getLines() * 9; i++) {
+            PlotItemStack item = items[i];
+            if (item != null) {
+                inventory.setItem(i, getItem(item));
+            }
+        }
+        bp.player.openInventory(inventory);
+    }
+
+    @Override
+    public void close(PlotInventory inv) {
+        if (!inv.isOpen()) {
+            return;
+        }
+        BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
+        bp.player.closeInventory();
+    }
+
+    @Override
+    public boolean setItemChecked(PlotInventory inv, int index, PlotItemStack item) {
+        BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
+        InventoryView opened = bp.player.getOpenInventory();
+        ItemStack stack = getItem(item);
+        if (stack == null) {
+            return false;
+        }
+        if (!inv.isOpen()) {
+            return true;
+        }
+        opened.setItem(index, stack);
+        bp.player.updateInventory();
+        return true;
+    }
+
+    @SuppressWarnings("deprecation") // Paper deprecation
     public PlotItemStack getItem(ItemStack item) {
         if (item == null) {
             return null;
@@ -129,18 +142,21 @@ public class BukkitInventoryUtil extends InventoryUtil {
         return new PlotItemStack(id.name(), amount, name, lore);
     }
 
-    @Override public PlotItemStack[] getItems(PlotPlayer player) {
+    @Override
+    public PlotItemStack[] getItems(PlotPlayer<?> player) {
         BukkitPlayer bp = (BukkitPlayer) player;
         PlayerInventory inv = bp.player.getInventory();
         return IntStream.range(0, 36).mapToObj(i -> getItem(inv.getItem(i)))
-            .toArray(PlotItemStack[]::new);
+                .toArray(PlotItemStack[]::new);
     }
 
-    @Override public boolean isOpen(PlotInventory plotInventory) {
+    @SuppressWarnings("deprecation") // #getTitle is needed for Spigot compatibility
+    @Override
+    public boolean isOpen(PlotInventory plotInventory) {
         if (!plotInventory.isOpen()) {
             return false;
         }
-        BukkitPlayer bp = (BukkitPlayer) plotInventory.player;
+        BukkitPlayer bp = (BukkitPlayer) plotInventory.getPlayer();
         InventoryView opened = bp.player.getOpenInventory();
         if (plotInventory.isOpen()) {
             if (opened.getType() == InventoryType.CRAFTING) {
@@ -149,4 +165,5 @@ public class BukkitInventoryUtil extends InventoryUtil {
         }
         return false;
     }
+
 }

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

@@ -1,59 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.util;
-
-import com.plotsquared.core.util.PermHandler;
-import net.milkbowl.vault.permission.Permission;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-public class BukkitPermHandler extends PermHandler {
-
-    private Permission perms;
-
-    @Override
-    public boolean init() {
-        if (this.perms == null) {
-            setupPermissions();
-        }
-        return this.perms != null;
-    }
-
-    private void setupPermissions() {
-        if (Bukkit.getServer().getPluginManager().getPlugin("Vault") == null) {
-            return;
-        }
-        RegisteredServiceProvider<Permission> permissionProvider =
-            Bukkit.getServer().getServicesManager().getRegistration(Permission.class);
-        if (permissionProvider != null) {
-            this.perms = permissionProvider.getProvider();
-        }
-    }
-
-    @Override public boolean hasPermission(String world, String player, String perm) {
-        return this.perms.playerHas(world, Bukkit.getOfflinePlayer(player), perm);
-    }
-}

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

@@ -1,53 +1,44 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
-import com.plotsquared.bukkit.BukkitMain;
-import com.plotsquared.core.PlotSquared;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import com.plotsquared.core.generator.AugmentedUtils;
+import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.location.PlotLoc;
+import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotManager;
 import com.plotsquared.core.queue.GlobalBlockQueue;
-import com.plotsquared.core.queue.LocalBlockQueue;
-import com.plotsquared.core.queue.ScopedLocalBlockQueue;
+import com.plotsquared.core.queue.QueueCoordinator;
+import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
-import com.plotsquared.core.util.MainUtil;
 import com.plotsquared.core.util.RegionManager;
-import com.plotsquared.core.util.RegionUtil;
+import com.plotsquared.core.util.WorldUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.RunnableVal;
-import com.plotsquared.core.util.task.TaskManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
-import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import io.papermc.lib.PaperLib;
@@ -56,17 +47,14 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.Semaphore;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL;
 import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY;
 import static com.plotsquared.core.util.entity.EntityCategories.CAP_MISC;
@@ -74,55 +62,38 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_MOB;
 import static com.plotsquared.core.util.entity.EntityCategories.CAP_MONSTER;
 import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE;
 
+@Singleton
 public class BukkitRegionManager extends RegionManager {
 
-    public static boolean isIn(CuboidRegion region, int x, int z) {
-        return x >= region.getMinimumPoint().getX() && x <= region.getMaximumPoint().getX()
-            && z >= region.getMinimumPoint().getZ() && z <= region.getMaximumPoint().getZ();
+    private final GlobalBlockQueue blockQueue;
+
+    @Inject
+    public BukkitRegionManager(
+            @NonNull WorldUtil worldUtil, @NonNull GlobalBlockQueue blockQueue, @NonNull
+    ProgressSubscriberFactory subscriberFactory
+    ) {
+        super(worldUtil, blockQueue, subscriberFactory);
+        this.blockQueue = blockQueue;
     }
 
-    @Override public Set<BlockVector2> getChunkChunks(String world) {
-        Set<BlockVector2> chunks = super.getChunkChunks(world);
-        if (Bukkit.isPrimaryThread()) {
-            for (Chunk chunk : Objects.requireNonNull(Bukkit.getWorld(world)).getLoadedChunks()) {
-                BlockVector2 loc = BlockVector2.at(chunk.getX() >> 5, chunk.getZ() >> 5);
-                chunks.add(loc);
-            }
-        } else {
-            final Semaphore semaphore = new Semaphore(1);
-            try {
-                PlotSquared.debug("Attempting to make an asynchronous call to getLoadedChunks."
-                    + " Will halt the calling thread until completed.");
-                semaphore.acquire();
-                Bukkit.getScheduler().runTask(BukkitMain.getPlugin(BukkitMain.class), () -> {
-                    for (Chunk chunk : Objects.requireNonNull(Bukkit.getWorld(world))
-                        .getLoadedChunks()) {
-                        BlockVector2 loc = BlockVector2.at(chunk.getX() >> 5, chunk.getZ() >> 5);
-                        chunks.add(loc);
-                    }
-                    semaphore.release();
-                });
-                semaphore.acquireUninterruptibly();
-            } catch (final Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return chunks;
-    }
-
-    @Override public boolean handleClear(Plot plot, Runnable whenDone, PlotManager manager) {
+    @Override
+    public boolean handleClear(
+            @NonNull Plot plot,
+            @Nullable Runnable whenDone,
+            @NonNull PlotManager manager,
+            @Nullable PlotPlayer<?> player
+    ) {
         return false;
     }
 
-    @Override public int[] countEntities(Plot plot) {
+    @Override
+    public int[] countEntities(@NonNull Plot plot) {
         int[] existing = (int[]) plot.getMeta("EntityCount");
-        if (existing != null && (System.currentTimeMillis() - (long) plot.getMeta("EntityCountTime")
-            < 1000)) {
+        if (existing != null && (System.currentTimeMillis() - (long) plot.getMeta("EntityCountTime") < 1000)) {
             return existing;
         }
         PlotArea area = plot.getArea();
         World world = BukkitUtil.getWorld(area.getWorldName());
-
         Location bot = plot.getBottomAbs();
         Location top = plot.getTopAbs();
         int bx = bot.getX() >> 4;
@@ -162,7 +133,7 @@ public class BukkitRegionManager extends RegionManager {
                         if (X > bx && X < tx && Z > bz && Z < tz) {
                             count(count, entity);
                         } else {
-                            Plot other = area.getPlot(BukkitUtil.getLocation(location));
+                            Plot other = area.getPlot(BukkitUtil.adapt(location));
                             if (plot.equals(other)) {
                                 count(count, entity);
                             }
@@ -177,7 +148,7 @@ public class BukkitRegionManager extends RegionManager {
                 Entity[] entities1 = chunk.getEntities();
                 for (Entity entity : entities1) {
                     if (X == bx || X == tx || Z == bz || Z == tz) {
-                        Plot other = area.getPlot(BukkitUtil.getLocation(entity));
+                        Plot other = area.getPlot(BukkitUtil.adapt(entity.getLocation()));
                         if (plot.equals(other)) {
                             count(count, entity);
                         }
@@ -191,64 +162,13 @@ public class BukkitRegionManager extends RegionManager {
     }
 
     @Override
-    public boolean copyRegion(Location pos1, Location pos2, Location newPos,
-        final Runnable whenDone) {
-        final int relX = newPos.getX() - pos1.getX();
-        final int relZ = newPos.getZ() - pos1.getZ();
-
-        final CuboidRegion region =
-            RegionUtil.createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
-        final World oldWorld = Bukkit.getWorld(pos1.getWorld());
-        final BukkitWorld oldBukkitWorld = new BukkitWorld(oldWorld);
-        final World newWorld = Bukkit.getWorld(newPos.getWorld());
-        assert newWorld != null;
-        assert oldWorld != null;
-        final String newWorldName = newWorld.getName();
-        final ContentMap map = new ContentMap();
-        final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(newWorldName, false);
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-            @Override public void run(int[] value) {
-                int bx = value[2];
-                int bz = value[3];
-                int tx = value[4];
-                int tz = value[5];
-                BlockVector2 loc = BlockVector2.at(value[0], value[1]);
-                int cxx = loc.getX() << 4;
-                int czz = loc.getZ() << 4;
-                PaperLib.getChunkAtAsync(oldWorld, loc.getX(), loc.getZ())
-                    .thenAccept(chunk1 -> map.saveEntitiesIn(chunk1, region)).thenRun(() -> {
-                    for (int x = bx & 15; x <= (tx & 15); x++) {
-                        for (int z = bz & 15; z <= (tz & 15); z++) {
-                            map.saveBlocks(oldBukkitWorld, 256, cxx + x, czz + z, relX, relZ);
-                        }
-                    }
-                });
-            }
-        }, () -> {
-            for (Entry<PlotLoc, BaseBlock[]> entry : map.allBlocks.entrySet()) {
-                PlotLoc loc = entry.getKey();
-                BaseBlock[] blocks = entry.getValue();
-                for (int y = 0; y < blocks.length; y++) {
-                    if (blocks[y] != null) {
-                        BaseBlock block = blocks[y];
-                        queue.setBlock(loc.getX(), y, loc.getZ(), block);
-                    }
-                }
-            }
-            queue.enqueue();
-            GlobalBlockQueue.IMP.addEmptyTask(() -> {
-                //map.restoreBlocks(newWorld, 0, 0);
-                map.restoreEntities(newWorld, relX, relZ);
-                TaskManager.runTask(whenDone);
-            });
-        }, 5);
-        return true;
-    }
-
-    @Override
-    public boolean regenerateRegion(final Location pos1, final Location pos2,
-        final boolean ignoreAugment, final Runnable whenDone) {
-        final String world = pos1.getWorld();
+    public boolean regenerateRegion(
+            final @NonNull Location pos1,
+            final @NonNull Location pos2,
+            final boolean ignoreAugment,
+            final @Nullable Runnable whenDone
+    ) {
+        final BukkitWorld world = (BukkitWorld) worldUtil.getWeWorld(pos1.getWorldName());
 
         final int p1x = pos1.getX();
         final int p1z = pos1.getZ();
@@ -259,150 +179,132 @@ public class BukkitRegionManager extends RegionManager {
         final int tcx = p2x >> 4;
         final int tcz = p2z >> 4;
 
-        final List<BlockVector2> chunks = new ArrayList<>();
+        final QueueCoordinator queue = blockQueue.getNewQueue(world);
+        final QueueCoordinator regenQueue = blockQueue.getNewQueue(world);
+        queue.addReadChunks(new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3()).getChunks());
+        queue.setChunkConsumer(chunk -> {
 
-        for (int x = bcx; x <= tcx; x++) {
-            for (int z = bcz; z <= tcz; z++) {
-                chunks.add(BlockVector2.at(x, z));
+            int x = chunk.getX();
+            int z = chunk.getZ();
+            int xxb = x << 4;
+            int zzb = z << 4;
+            int xxt = xxb + 15;
+            int zzt = zzb + 15;
+            if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) {
+                AugmentedUtils.bypass(ignoreAugment, () -> regenQueue.regenChunk(chunk.getX(), chunk.getZ()));
+                return;
             }
-        }
-        final World worldObj = Bukkit.getWorld(world);
-        checkNotNull(worldObj, "Critical error during regeneration.");
-        final BukkitWorld bukkitWorldObj = new BukkitWorld(worldObj);
-        TaskManager.runTask(new Runnable() {
-            @Override public void run() {
-                long start = System.currentTimeMillis();
-                while (!chunks.isEmpty() && System.currentTimeMillis() - start < 5) {
-                    final BlockVector2 chunk = chunks.remove(0);
-                    int x = chunk.getX();
-                    int z = chunk.getZ();
-                    int xxb = x << 4;
-                    int zzb = z << 4;
-                    int xxt = xxb + 15;
-                    int zzt = zzb + 15;
-                    PaperLib.getChunkAtAsync(worldObj, x, z, false).thenAccept(chunkObj -> {
-                        if (chunkObj == null) {
-                            return;
-                        }
-                        final LocalBlockQueue queue =
-                            GlobalBlockQueue.IMP.getNewQueue(world, false);
-                        if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) {
-                            AugmentedUtils.bypass(ignoreAugment,
-                                () -> queue.regenChunkSafe(chunk.getX(), chunk.getZ()));
-                            return;
-                        }
-                        boolean checkX1 = false;
+            boolean checkX1 = false;
 
-                        int xxb2;
+            int xxb2;
 
-                        if (x == bcx) {
-                            xxb2 = p1x - 1;
-                            checkX1 = true;
-                        } else {
-                            xxb2 = xxb;
-                        }
-                        boolean checkX2 = false;
-                        int xxt2;
-                        if (x == tcx) {
-                            xxt2 = p2x + 1;
-                            checkX2 = true;
-                        } else {
-                            xxt2 = xxt;
-                        }
-                        boolean checkZ1 = false;
-                        int zzb2;
-                        if (z == bcz) {
-                            zzb2 = p1z - 1;
-                            checkZ1 = true;
-                        } else {
-                            zzb2 = zzb;
-                        }
-                        boolean checkZ2 = false;
-                        int zzt2;
-                        if (z == tcz) {
-                            zzt2 = p2z + 1;
-                            checkZ2 = true;
-                        } else {
-                            zzt2 = zzt;
-                        }
-                        final ContentMap map = new ContentMap();
-                        if (checkX1) {
-                            map.saveRegion(bukkitWorldObj, xxb, xxb2, zzb2, zzt2); //
-                        }
-                        if (checkX2) {
-                            map.saveRegion(bukkitWorldObj, xxt2, xxt, zzb2, zzt2); //
-                        }
-                        if (checkZ1) {
-                            map.saveRegion(bukkitWorldObj, xxb2, xxt2, zzb, zzb2); //
-                        }
-                        if (checkZ2) {
-                            map.saveRegion(bukkitWorldObj, xxb2, xxt2, zzt2, zzt); //
-                        }
-                        if (checkX1 && checkZ1) {
-                            map.saveRegion(bukkitWorldObj, xxb, xxb2, zzb, zzb2); //
-                        }
-                        if (checkX2 && checkZ1) {
-                            map.saveRegion(bukkitWorldObj, xxt2, xxt, zzb, zzb2); // ?
-                        }
-                        if (checkX1 && checkZ2) {
-                            map.saveRegion(bukkitWorldObj, xxb, xxb2, zzt2, zzt); // ?
-                        }
-                        if (checkX2 && checkZ2) {
-                            map.saveRegion(bukkitWorldObj, xxt2, xxt, zzt2, zzt); //
-                        }
-                        CuboidRegion currentPlotClear = RegionUtil
-                            .createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
-                        map.saveEntitiesOut(chunkObj, currentPlotClear);
-                        AugmentedUtils.bypass(ignoreAugment, () -> ChunkManager
-                            .setChunkInPlotArea(null, new RunnableVal<ScopedLocalBlockQueue>() {
-                                @Override public void run(ScopedLocalBlockQueue value) {
-                                    Location min = value.getMin();
-                                    int bx = min.getX();
-                                    int bz = min.getZ();
-                                    for (int x1 = 0; x1 < 16; x1++) {
-                                        for (int z1 = 0; z1 < 16; z1++) {
-                                            PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1);
-                                            BaseBlock[] ids = map.allBlocks.get(plotLoc);
-                                            if (ids != null) {
-                                                for (int y = 0;
-                                                     y < Math.min(128, ids.length); y++) {
-                                                    BaseBlock id = ids[y];
-                                                    if (id != null) {
-                                                        value.setBlock(x1, y, z1, id);
-                                                    } else {
-                                                        value.setBlock(x1, y, z1,
-                                                            BlockTypes.AIR.getDefaultState());
-                                                    }
-                                                }
-                                                for (int y = Math.min(128, ids.length);
-                                                     y < ids.length; y++) {
-                                                    BaseBlock id = ids[y];
-                                                    if (id != null) {
-                                                        value.setBlock(x1, y, z1, id);
-                                                    }
-                                                }
+            if (x == bcx) {
+                xxb2 = p1x - 1;
+                checkX1 = true;
+            } else {
+                xxb2 = xxb;
+            }
+            boolean checkX2 = false;
+            int xxt2;
+            if (x == tcx) {
+                xxt2 = p2x + 1;
+                checkX2 = true;
+            } else {
+                xxt2 = xxt;
+            }
+            boolean checkZ1 = false;
+            int zzb2;
+            if (z == bcz) {
+                zzb2 = p1z - 1;
+                checkZ1 = true;
+            } else {
+                zzb2 = zzb;
+            }
+            boolean checkZ2 = false;
+            int zzt2;
+            if (z == tcz) {
+                zzt2 = p2z + 1;
+                checkZ2 = true;
+            } else {
+                zzt2 = zzt;
+            }
+            final ContentMap map = new ContentMap();
+            if (checkX1) {
+                map.saveRegion(world, xxb, xxb2, zzb2, zzt2); //
+            }
+            if (checkX2) {
+                map.saveRegion(world, xxt2, xxt, zzb2, zzt2); //
+            }
+            if (checkZ1) {
+                map.saveRegion(world, xxb2, xxt2, zzb, zzb2); //
+            }
+            if (checkZ2) {
+                map.saveRegion(world, xxb2, xxt2, zzt2, zzt); //
+            }
+            if (checkX1 && checkZ1) {
+                map.saveRegion(world, xxb, xxb2, zzb, zzb2); //
+            }
+            if (checkX2 && checkZ1) {
+                map.saveRegion(world, xxt2, xxt, zzb, zzb2); // ?
+            }
+            if (checkX1 && checkZ2) {
+                map.saveRegion(world, xxb, xxb2, zzt2, zzt); // ?
+            }
+            if (checkX2 && checkZ2) {
+                map.saveRegion(world, xxt2, xxt, zzt2, zzt); //
+            }
+            CuboidRegion currentPlotClear = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
+            map.saveEntitiesOut(Bukkit.getWorld(world.getName()).getChunkAt(x, z), currentPlotClear);
+            AugmentedUtils.bypass(
+                    ignoreAugment,
+                    () -> ChunkManager.setChunkInPlotArea(null, new RunnableVal<ZeroedDelegateScopedQueueCoordinator>() {
+                        @Override
+                        public void run(ZeroedDelegateScopedQueueCoordinator value) {
+                            Location min = value.getMin();
+                            int bx = min.getX();
+                            int bz = min.getZ();
+                            for (int x1 = 0; x1 < 16; x1++) {
+                                for (int z1 = 0; z1 < 16; z1++) {
+                                    PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1);
+                                    BaseBlock[] ids = map.allBlocks.get(plotLoc);
+                                    if (ids != null) {
+                                        int minY = value.getMin().getY();
+                                        for (int yIndex = 0; yIndex < ids.length; yIndex++) {
+                                            int y = yIndex + minY;
+                                            BaseBlock id = ids[yIndex];
+                                            if (id != null) {
+                                                value.setBlock(x1, y, z1, id);
+                                            } else {
+                                                value.setBlock(x1, y, z1, BlockTypes.AIR.getDefaultState());
                                             }
                                         }
                                     }
                                 }
-                            }, world, chunk));
-                        //map.restoreBlocks(worldObj, 0, 0);
-                        map.restoreEntities(worldObj, 0, 0);
-                    });
-                }
-                if (!chunks.isEmpty()) {
-                    TaskManager.runTaskLater(this, 1);
-                } else {
-                    TaskManager.runTaskLater(whenDone, 1);
-                }
-            }
+                            }
+                        }
+                    }, world.getName(), chunk)
+            );
+            //map.restoreBlocks(worldObj, 0, 0);
+            map.restoreEntities(Bukkit.getWorld(world.getName()));
         });
+        regenQueue.setCompleteTask(whenDone);
+        queue.setCompleteTask(regenQueue::enqueue);
+        queue.enqueue();
         return true;
     }
 
-    @Override public void clearAllEntities(Location pos1, Location pos2) {
-        String world = pos1.getWorld();
-        List<Entity> entities = BukkitUtil.getEntities(world);
+    @Override
+    public void clearAllEntities(@NonNull Location pos1, @NonNull Location pos2) {
+        String world = pos1.getWorldName();
+
+        final World bukkitWorld = BukkitUtil.getWorld(world);
+        final List<Entity> entities;
+        if (bukkitWorld != null) {
+            entities = new ArrayList<>(bukkitWorld.getEntities());
+        } else {
+            entities = new ArrayList<>();
+        }
+
         int bx = pos1.getX();
         int bz = pos1.getZ();
         int tx = pos2.getX();
@@ -410,8 +312,7 @@ public class BukkitRegionManager extends RegionManager {
         for (Entity entity : entities) {
             if (!(entity instanceof Player)) {
                 org.bukkit.Location location = entity.getLocation();
-                if (location.getX() >= bx && location.getX() <= tx && location.getZ() >= bz
-                    && location.getZ() <= tz) {
+                if (location.getX() >= bx && location.getX() <= tx && location.getZ() >= bz && location.getZ() <= tz) {
                     if (entity.hasMetadata("ps-tmp-teleport")) {
                         continue;
                     }
@@ -421,69 +322,16 @@ public class BukkitRegionManager extends RegionManager {
         }
     }
 
-    @Override
-    public void swap(Location bot1, Location top1, Location bot2, Location top2,
-        final Runnable whenDone) {
-        CuboidRegion region1 =
-            RegionUtil.createRegion(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ());
-        CuboidRegion region2 =
-            RegionUtil.createRegion(bot2.getX(), top2.getX(), bot2.getZ(), top2.getZ());
-        final World world1 = Bukkit.getWorld(bot1.getWorld());
-        final World world2 = Bukkit.getWorld(bot2.getWorld());
-        checkNotNull(world1, "Critical error during swap.");
-        checkNotNull(world2, "Critical error during swap.");
-        int relX = bot2.getX() - bot1.getX();
-        int relZ = bot2.getZ() - bot1.getZ();
-
-        final ArrayDeque<ContentMap> maps = new ArrayDeque<>();
-
-        for (int x = bot1.getX() >> 4; x <= top1.getX() >> 4; x++) {
-            for (int z = bot1.getZ() >> 4; z <= top1.getZ() >> 4; z++) {
-                Chunk chunk1 = world1.getChunkAt(x, z);
-                Chunk chunk2 = world2.getChunkAt(x + (relX >> 4), z + (relZ >> 4));
-                maps.add(
-                    BukkitChunkManager.swapChunk(world1, world2, chunk1, chunk2, region1, region2));
-            }
-        }
-        GlobalBlockQueue.IMP.addEmptyTask(() -> {
-            for (ContentMap map : maps) {
-                map.restoreEntities(world1, 0, 0);
-                TaskManager.runTaskLater(whenDone, 1);
-            }
-        });
-    }
-
-    @Override
-    public void setBiome(final CuboidRegion region, final int extendBiome, final BiomeType biome,
-        final String world, final Runnable whenDone) {
-        Location pos1 = new Location(world, region.getMinimumPoint().getX() - extendBiome,
-            region.getMinimumPoint().getY(), region.getMinimumPoint().getZ() - extendBiome);
-        Location pos2 = new Location(world, region.getMaximumPoint().getX() + extendBiome,
-            region.getMaximumPoint().getY(), region.getMaximumPoint().getZ() + extendBiome);
-        final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
-
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-            @Override public void run(int[] value) {
-                BlockVector2 loc = BlockVector2.at(value[0], value[1]);
-                ChunkManager.manager.loadChunk(world, loc, false).thenRun(() -> {
-                    MainUtil.setBiome(world, value[2], value[3], value[4], value[5], biome);
-                    queue.refreshChunk(value[0], value[1]);
-                });
-            }
-        }, whenDone, 5);
-    }
-
-    private void count(int[] count, Entity entity) {
-        final com.sk89q.worldedit.world.entity.EntityType entityType =
-            BukkitAdapter.adapt(entity.getType());
+    private void count(int[] count, @NonNull Entity entity) {
+        final com.sk89q.worldedit.world.entity.EntityType entityType = BukkitAdapter.adapt(entity.getType());
 
         if (EntityCategories.PLAYER.contains(entityType)) {
             return;
-        } else if (EntityCategories.PROJECTILE.contains(entityType) || EntityCategories.OTHER
-            .contains(entityType) || EntityCategories.HANGING.contains(entityType)) {
+        } else if (EntityCategories.PROJECTILE.contains(entityType) || EntityCategories.OTHER.contains(entityType) || EntityCategories.HANGING
+                .contains(entityType)) {
             count[CAP_MISC]++;
-        } else if (EntityCategories.ANIMAL.contains(entityType) || EntityCategories.VILLAGER
-            .contains(entityType) || EntityCategories.TAMEABLE.contains(entityType)) {
+        } else if (EntityCategories.ANIMAL.contains(entityType) || EntityCategories.VILLAGER.contains(entityType) || EntityCategories.TAMEABLE
+                .contains(entityType)) {
             count[CAP_MOB]++;
             count[CAP_ANIMAL]++;
         } else if (EntityCategories.VEHICLE.contains(entityType)) {
@@ -494,4 +342,5 @@ public class BukkitRegionManager extends RegionManager {
         }
         count[CAP_ENTITY]++;
     }
+
 }

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

@@ -1,57 +1,75 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.ConfigurationNode;
 import com.plotsquared.core.configuration.ConfigurationSection;
+import com.plotsquared.core.configuration.file.YamlConfiguration;
 import com.plotsquared.core.generator.GeneratorWrapper;
+import com.plotsquared.core.inject.annotations.WorldConfig;
+import com.plotsquared.core.inject.annotations.WorldFile;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotAreaType;
-import com.plotsquared.core.plot.SetupObject;
+import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.setup.PlotAreaBuilder;
 import com.plotsquared.core.util.SetupUtils;
-import io.papermc.lib.PaperLib;
+import com.plotsquared.core.util.task.TaskManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
+import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Objects;
 
+@Singleton
 public class BukkitSetupUtils extends SetupUtils {
 
-    @Override public void updateGenerators() {
-        if (!SetupUtils.generators.isEmpty()) {
+    private final PlotAreaManager plotAreaManager;
+    private final YamlConfiguration worldConfiguration;
+    private final File worldFile;
+
+    @Inject
+    public BukkitSetupUtils(
+            final @NonNull PlotAreaManager plotAreaManager,
+            @WorldConfig final @NonNull YamlConfiguration worldConfiguration,
+            @WorldFile final @NonNull File worldFile
+    ) {
+        this.plotAreaManager = plotAreaManager;
+        this.worldConfiguration = worldConfiguration;
+        this.worldFile = worldFile;
+    }
+
+    @Override
+    public void updateGenerators(final boolean force) {
+        if (loaded && !SetupUtils.generators.isEmpty() && !force) {
             return;
         }
         String testWorld = "CheckingPlotSquaredGenerator";
@@ -66,7 +84,7 @@ public class BukkitSetupUtils extends SetupUtils {
                         if (generator instanceof GeneratorWrapper<?>) {
                             wrapped = (GeneratorWrapper<?>) generator;
                         } else {
-                            wrapped = new BukkitPlotGenerator(testWorld, generator);
+                            wrapped = new BukkitPlotGenerator(testWorld, generator, this.plotAreaManager);
                         }
                         SetupUtils.generators.put(name, wrapped);
                     }
@@ -75,156 +93,49 @@ public class BukkitSetupUtils extends SetupUtils {
                 e.printStackTrace();
             }
         }
+        loaded = true;
     }
 
-    @Override public void unload(String worldName, boolean save) {
-        World world = Bukkit.getWorld(worldName);
-        if (world == null) {
-            return;
-        }
-        World dw = Bukkit.getWorlds().get(0);
-        for (Player player : world.getPlayers()) {
-            PaperLib.teleportAsync(player, dw.getSpawnLocation());
-        }
-        if (save) {
-            for (Chunk chunk : world.getLoadedChunks()) {
-                chunk.unload(true);
+    @Override
+    public void unload(String worldName, boolean save) {
+        TaskManager.runTask(() -> {
+            World world = Bukkit.getWorld(worldName);
+            if (world == null) {
+                return;
             }
-        } else {
-            for (Chunk chunk : world.getLoadedChunks()) {
-                chunk.unload(false);
+            Location location = Bukkit.getWorlds().get(0).getSpawnLocation();
+            for (Player player : world.getPlayers()) {
+                player.teleport(location);
             }
-        }
-        Bukkit.unloadWorld(world, false);
+            if (save) {
+                for (Chunk chunk : world.getLoadedChunks()) {
+                    chunk.unload(true);
+                }
+            } else {
+                for (Chunk chunk : world.getLoadedChunks()) {
+                    chunk.unload(false);
+                }
+            }
+            Bukkit.unloadWorld(world, false);
+        });
     }
 
-    @Deprecated @Override public String setupWorld(SetupObject object) {
-        SetupUtils.manager.updateGenerators();
-        ConfigurationNode[] steps = object.step == null ? new ConfigurationNode[0] : object.step;
-        String world = object.world;
-        PlotAreaType type = object.type;
-        String worldPath = "worlds." + object.world;
-        switch (type) {
-            case PARTIAL: {
-                if (object.id != null) {
-                    if (!PlotSquared.get().worlds.contains(worldPath)) {
-                        PlotSquared.get().worlds.createSection(worldPath);
-                    }
-                    ConfigurationSection worldSection =
-                        PlotSquared.get().worlds.getConfigurationSection(worldPath);
-                    String areaName = object.id + "-" + object.min + "-" + object.max;
-                    String areaPath = "areas." + areaName;
-                    if (!worldSection.contains(areaPath)) {
-                        worldSection.createSection(areaPath);
-                    }
-                    ConfigurationSection areaSection =
-                        worldSection.getConfigurationSection(areaPath);
-                    HashMap<String, Object> options = new HashMap<>();
-                    for (ConfigurationNode step : steps) {
-                        options.put(step.getConstant(), step.getValue());
-                    }
-                    options.put("generator.type", object.type.toString());
-                    options.put("generator.terrain", object.terrain.toString());
-                    options.put("generator.plugin", object.plotManager);
-                    if (object.setupGenerator != null && !object.setupGenerator
-                        .equals(object.plotManager)) {
-                        options.put("generator.init", object.setupGenerator);
-                    }
-                    for (Entry<String, Object> entry : options.entrySet()) {
-                        String key = entry.getKey();
-                        Object value = entry.getValue();
-                        if (worldSection.contains(key)) {
-                            Object current = worldSection.get(key);
-                            if (!Objects.equals(value, current)) {
-                                areaSection.set(key, value);
-                            }
-                        } else {
-                            worldSection.set(key, value);
-                        }
-                    }
-                }
-                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
-                if (gen != null && gen.isFull()) {
-                    object.setupGenerator = null;
-                }
-                break;
-            }
-            case AUGMENTED: {
-                if (!object.plotManager.endsWith(":single")) {
-                    if (!PlotSquared.get().worlds.contains(worldPath)) {
-                        PlotSquared.get().worlds.createSection(worldPath);
-                    }
-                    if (steps.length != 0) {
-                        ConfigurationSection worldSection =
-                            PlotSquared.get().worlds.getConfigurationSection(worldPath);
-                        for (ConfigurationNode step : steps) {
-                            worldSection.set(step.getConstant(), step.getValue());
-                        }
-                    }
-                    PlotSquared.get().worlds
-                        .set("worlds." + world + ".generator.type", object.type.toString());
-                    PlotSquared.get().worlds
-                        .set("worlds." + world + ".generator.terrain", object.terrain.toString());
-                    PlotSquared.get().worlds
-                        .set("worlds." + world + ".generator.plugin", object.plotManager);
-                    if (object.setupGenerator != null && !object.setupGenerator
-                        .equals(object.plotManager)) {
-                        PlotSquared.get().worlds
-                            .set("worlds." + world + ".generator.init", object.setupGenerator);
-                    }
-                }
-                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
-                if (gen != null && gen.isFull()) {
-                    object.setupGenerator = null;
-                }
-                break;
-            }
-            case NORMAL: {
-                if (steps.length != 0) {
-                    if (!PlotSquared.get().worlds.contains(worldPath)) {
-                        PlotSquared.get().worlds.createSection(worldPath);
-                    }
-                    ConfigurationSection worldSection =
-                        PlotSquared.get().worlds.getConfigurationSection(worldPath);
-                    for (ConfigurationNode step : steps) {
-                        worldSection.set(step.getConstant(), step.getValue());
-                    }
-                }
-                break;
-            }
-        }
-
-        try {
-            PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        Objects.requireNonNull(PlotSquared.imp()).getWorldManager()
-            .handleWorldCreation(object.world, object.setupGenerator);
-
-        if (Bukkit.getWorld(world) != null) {
-            return world;
-        }
-
-        return object.world;
-    }
-
-    @Override public String setupWorld(PlotAreaBuilder builder) {
-        SetupUtils.manager.updateGenerators();
+    @Override
+    public String setupWorld(PlotAreaBuilder builder) {
+        this.updateGenerators(false);
         ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
-                new ConfigurationNode[0] : builder.settingsNodesWrapper().getSettingsNodes();
+                new ConfigurationNode[0] : builder.settingsNodesWrapper().settingsNodes();
         String world = builder.worldName();
         PlotAreaType type = builder.plotAreaType();
         String worldPath = "worlds." + builder.worldName();
         switch (type) {
-            case PARTIAL: {
+            case PARTIAL -> {
                 if (builder.areaName() != null) {
-                    if (!PlotSquared.get().worlds.contains(worldPath)) {
-                        PlotSquared.get().worlds.createSection(worldPath);
+                    if (!this.worldConfiguration.contains(worldPath)) {
+                        this.worldConfiguration.createSection(worldPath);
                     }
                     ConfigurationSection worldSection =
-                            PlotSquared.get().worlds.getConfigurationSection(worldPath);
+                            this.worldConfiguration.getConfigurationSection(worldPath);
                     String areaName = builder.areaName() + "-" + builder.minimumId() + "-" + builder.maximumId();
                     String areaPath = "areas." + areaName;
                     if (!worldSection.contains(areaPath)) {
@@ -260,29 +171,28 @@ public class BukkitSetupUtils extends SetupUtils {
                 if (gen != null && gen.isFull()) {
                     builder.generatorName(null);
                 }
-                break;
             }
-            case AUGMENTED: {
+            case AUGMENTED -> {
                 if (!builder.plotManager().endsWith(":single")) {
-                    if (!PlotSquared.get().worlds.contains(worldPath)) {
-                        PlotSquared.get().worlds.createSection(worldPath);
+                    if (!this.worldConfiguration.contains(worldPath)) {
+                        this.worldConfiguration.createSection(worldPath);
                     }
                     if (steps.length != 0) {
                         ConfigurationSection worldSection =
-                                PlotSquared.get().worlds.getConfigurationSection(worldPath);
+                                this.worldConfiguration.getConfigurationSection(worldPath);
                         for (ConfigurationNode step : steps) {
                             worldSection.set(step.getConstant(), step.getValue());
                         }
                     }
-                    PlotSquared.get().worlds
+                    this.worldConfiguration
                             .set("worlds." + world + ".generator.type", builder.plotAreaType().toString());
-                    PlotSquared.get().worlds
+                    this.worldConfiguration
                             .set("worlds." + world + ".generator.terrain", builder.terrainType().toString());
-                    PlotSquared.get().worlds
+                    this.worldConfiguration
                             .set("worlds." + world + ".generator.plugin", builder.plotManager());
                     if (builder.generatorName() != null && !builder.generatorName()
                             .equals(builder.plotManager())) {
-                        PlotSquared.get().worlds
+                        this.worldConfiguration
                                 .set("worlds." + world + ".generator.init", builder.generatorName());
                     }
                 }
@@ -290,30 +200,28 @@ public class BukkitSetupUtils extends SetupUtils {
                 if (gen != null && gen.isFull()) {
                     builder.generatorName(null);
                 }
-                break;
             }
-            case NORMAL: {
+            case NORMAL -> {
                 if (steps.length != 0) {
-                    if (!PlotSquared.get().worlds.contains(worldPath)) {
-                        PlotSquared.get().worlds.createSection(worldPath);
+                    if (!this.worldConfiguration.contains(worldPath)) {
+                        this.worldConfiguration.createSection(worldPath);
                     }
                     ConfigurationSection worldSection =
-                            PlotSquared.get().worlds.getConfigurationSection(worldPath);
+                            this.worldConfiguration.getConfigurationSection(worldPath);
                     for (ConfigurationNode step : steps) {
                         worldSection.set(step.getConstant(), step.getValue());
                     }
                 }
-                break;
             }
         }
 
         try {
-            PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+            this.worldConfiguration.save(this.worldFile);
         } catch (IOException e) {
             e.printStackTrace();
         }
 
-        Objects.requireNonNull(PlotSquared.imp()).getWorldManager()
+        Objects.requireNonNull(PlotSquared.platform()).worldManager()
                 .handleWorldCreation(builder.worldName(), builder.generatorName());
 
         if (Bukkit.getWorld(world) != null) {
@@ -323,9 +231,10 @@ public class BukkitSetupUtils extends SetupUtils {
         return builder.worldName();
     }
 
-    @Override public String getGenerator(PlotArea plotArea) {
+    @Override
+    public String getGenerator(PlotArea plotArea) {
         if (SetupUtils.generators.isEmpty()) {
-            updateGenerators();
+            updateGenerators(false);
         }
         World world = Bukkit.getWorld(plotArea.getWorldName());
         if (world == null) {
@@ -343,4 +252,5 @@ public class BukkitSetupUtils extends SetupUtils {
         }
         return null;
     }
+
 }

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

@@ -1,79 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.util;
-
-import com.plotsquared.bukkit.BukkitMain;
-import com.plotsquared.core.util.task.TaskManager;
-import org.bukkit.Bukkit;
-
-public class BukkitTaskManager extends TaskManager {
-
-    private final BukkitMain bukkitMain;
-
-    public BukkitTaskManager(BukkitMain bukkitMain) {
-        this.bukkitMain = bukkitMain;
-    }
-
-    @Override public int taskRepeat(Runnable runnable, int interval) {
-        return this.bukkitMain.getServer().getScheduler()
-            .scheduleSyncRepeatingTask(this.bukkitMain, runnable, interval, interval);
-    }
-
-    @SuppressWarnings("deprecation") @Override
-    public int taskRepeatAsync(Runnable runnable, int interval) {
-        return this.bukkitMain.getServer().getScheduler()
-            .scheduleAsyncRepeatingTask(this.bukkitMain, runnable, interval, interval);
-    }
-
-    @Override public void taskAsync(Runnable runnable) {
-        if (this.bukkitMain.isEnabled()) {
-            this.bukkitMain.getServer().getScheduler()
-                .runTaskAsynchronously(this.bukkitMain, runnable);
-        } else {
-            runnable.run();
-        }
-    }
-
-    @Override public void task(Runnable runnable) {
-        this.bukkitMain.getServer().getScheduler().runTask(this.bukkitMain, runnable).getTaskId();
-    }
-
-    @Override public void taskLater(Runnable runnable, int delay) {
-        this.bukkitMain.getServer().getScheduler().runTaskLater(this.bukkitMain, runnable, delay)
-            .getTaskId();
-    }
-
-    @Override public void taskLaterAsync(Runnable runnable, int delay) {
-        this.bukkitMain.getServer().getScheduler()
-            .runTaskLaterAsynchronously(this.bukkitMain, runnable, delay);
-    }
-
-    @Override public void cancelTask(int task) {
-        if (task != -1) {
-            Bukkit.getScheduler().cancelTask(task);
-        }
-    }
-}

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

@@ -1,68 +1,64 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
-import com.plotsquared.bukkit.BukkitMain;
+import com.google.inject.Singleton;
+import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.player.BukkitPlayerManager;
 import com.plotsquared.core.PlotSquared;
-import com.plotsquared.core.configuration.Captions;
+import com.plotsquared.core.configuration.caption.Caption;
+import com.plotsquared.core.configuration.caption.LocaleHolder;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.util.BlockUtil;
-import com.plotsquared.core.util.MainUtil;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.StringComparison;
 import com.plotsquared.core.util.WorldUtil;
-import com.plotsquared.core.util.task.RunnableVal;
 import com.plotsquared.core.util.task.TaskManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockCategories;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import io.papermc.lib.PaperLib;
-import lombok.NonNull;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
-import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 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;
@@ -93,268 +89,158 @@ import org.bukkit.entity.Snowman;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.entity.WaterMob;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.UUID;
+import java.util.concurrent.Semaphore;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
 import java.util.stream.Stream;
 
 @SuppressWarnings({"unused", "WeakerAccess"})
+@Singleton
 public class BukkitUtil extends WorldUtil {
 
-    private static String lastString = null;
-    private static World lastWorld = null;
-
-    private static Player lastPlayer = null;
-    private static BukkitPlayer lastPlotPlayer = null;
-
-    public static void removePlayer(UUID uuid) {
-        lastPlayer = null;
-        lastPlotPlayer = null;
-        // Make sure that it's removed internally
-        PlotSquared.imp().getPlayerManager().removePlayer(uuid);
-    }
-
-    public static PlotPlayer<Player> getPlayer(@NonNull final OfflinePlayer op) {
-        if (op.isOnline()) {
-            return getPlayer(op.getPlayer());
-        }
-        final Player player = OfflinePlayerUtil.loadPlayer(op);
-        player.loadData();
-        return new BukkitPlayer(player, true);
-    }
+    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 final Collection<BlockType> tileEntityTypes = new HashSet<>();
 
     /**
-     * Get a plot based on the location.
+     * Turn a Bukkit {@link Player} into a PlotSquared {@link PlotPlayer}
      *
-     * @param location the location to check
-     * @return plot if found, otherwise it creates a temporary plot
-     * @see Plot
+     * @param player Bukkit player
+     * @return PlotSquared player
      */
-    public static Plot getPlot(org.bukkit.Location location) {
-        if (location == null) {
-            return null;
-        }
-        return getLocation(location).getPlot();
-    }
-
-    /**
-     * Get a plot based on the player location.
-     *
-     * @param player the player to check
-     * @return plot if found, otherwise it creates a temporary plot
-     * @see #getPlot(org.bukkit.Location)
-     * @see Plot
-     */
-    public static Plot getPlot(Player player) {
-        return getPlot(player.getLocation());
-    }
-
-    /**
-     * Get the PlotPlayer for an offline player.
-     *
-     * <p>Note that this will work if the player is offline, however not all
-     * functionality will work.
-     *
-     * @param player the player to wrap
-     * @return a {@code PlotPlayer}
-     * @see PlotPlayer#wrap(Object)
-     */
-    public static PlotPlayer<?> wrapPlayer(OfflinePlayer player) {
-        return PlotPlayer.wrap(player);
-    }
-
-    /**
-     * Gets the PlotPlayer for a player. The PlotPlayer is usually cached and
-     * will provide useful functions relating to players.
-     *
-     * @param player the player to wrap
-     * @return a {@code PlotPlayer}
-     * @see PlotPlayer#wrap(Object)
-     */
-    public static PlotPlayer<?> wrapPlayer(Player player) {
-        return PlotPlayer.wrap(player);
-    }
-
-    /**
-     * Gets the PlotPlayer for a UUID. The PlotPlayer is usually cached and
-     * will provide useful functions relating to players.
-     *
-     * @param uuid the uuid to wrap
-     * @return a {@code PlotPlayer}
-     * @see PlotPlayer#wrap(Object)
-     */
-    @Override public PlotPlayer<?> wrapPlayer(UUID uuid) {
-        return PlotPlayer.wrap(Bukkit.getOfflinePlayer(uuid));
-    }
-
-    /**
-     * Gets the number of plots, which the player is able to build in.
-     *
-     * @param player player, for whom we're getting the plots
-     * @return the number of allowed plots
-     */
-    public static int getAllowedPlots(Player player) {
-        PlotPlayer<?> plotPlayer = PlotPlayer.wrap(player);
-        return plotPlayer.getAllowedPlots();
-    }
-
-    /**
-     * Check whether or not a player is in a plot.
-     *
-     * @param player who we're checking for
-     * @return true if the player is in a plot, false if not-
-     */
-    public static boolean isInPlot(Player player) {
-        return getPlot(player) != null;
-    }
-
-    /**
-     * Gets a collection containing the players plots.
-     *
-     * @param world  Specify the world we want to select the plots from
-     * @param player Player, for whom we're getting the plots
-     * @return a set containing the players plots
-     * @see Plot
-     */
-    public static Set<Plot> getPlayerPlots(String world, Player player) {
-        if (world == null) {
-            return new HashSet<>();
-        }
-        return BukkitPlayer.wrap(player).getPlots(world);
-    }
-
-    /**
-     * Send a message to a player. The message supports color codes.
-     *
-     * @param player the recipient of the message
-     * @param string the message
-     * @see MainUtil#sendMessage(PlotPlayer, String)
-     */
-    public static void sendMessage(Player player, String string) {
-        MainUtil.sendMessage(BukkitUtil.getPlayer(player), string);
-    }
-
-    /**
-     * Gets the player plot count.
-     *
-     * @param world  Specify the world we want to select the plots from
-     * @param player Player, for whom we're getting the plot count
-     * @return the number of plots the player has
-     */
-    public static int getPlayerPlotCount(String world, Player player) {
-        if (world == null) {
-            return 0;
-        }
-        return BukkitUtil.getPlayer(player).getPlotCount(world);
-    }
-
-    /**
-     * Send a message to a player.
-     *
-     * @param player  the recipient of the message
-     * @param caption the message
-     */
-    public static void sendMessage(Player player, Captions caption) {
-        MainUtil.sendMessage(BukkitUtil.getPlayer(player), caption);
-    }
-
-    public static BukkitPlayer getPlayer(@NonNull final Player player) {
-        if (player == lastPlayer) {
-            return lastPlotPlayer;
-        }
-        final PlayerManager<?, ?> playerManager = PlotSquared.imp().getPlayerManager();
+    public static @NonNull BukkitPlayer adapt(final @NonNull Player player) {
+        final PlayerManager<?, ?> playerManager = PlotSquared.platform().playerManager();
         return ((BukkitPlayerManager) playerManager).getPlayer(player);
     }
 
-    public static Location getLocation(@NonNull final org.bukkit.Location location) {
-        return new Location(location.getWorld().getName(), MathMan.roundInt(location.getX()),
-            MathMan.roundInt(location.getY()), MathMan.roundInt(location.getZ()));
+    /**
+     * Turn a Bukkit {@link org.bukkit.Location} into a PlotSquared {@link Location}.
+     * This only copies the 4-tuple (world,x,y,z) and does not include the yaw and the pitch
+     *
+     * @param location Bukkit location
+     * @return PlotSquared location
+     */
+    public static @NonNull Location adapt(final org.bukkit.@NonNull Location location) {
+        return Location
+                .at(
+                        com.plotsquared.bukkit.util.BukkitWorld.of(location.getWorld()),
+                        MathMan.roundInt(location.getX()),
+                        MathMan.roundInt(location.getY()),
+                        MathMan.roundInt(location.getZ())
+                );
     }
 
-    public static Location getLocationFull(@NonNull final org.bukkit.Location location) {
-        return new Location(location.getWorld().getName(), MathMan.roundInt(location.getX()),
-            MathMan.roundInt(location.getY()), MathMan.roundInt(location.getZ()), location.getYaw(),
-            location.getPitch());
+    /**
+     * Turn a Bukkit {@link org.bukkit.Location} into a PlotSquared {@link Location}.
+     * This copies the entire 6-tuple (world,x,y,z,yaw,pitch).
+     *
+     * @param location Bukkit location
+     * @return PlotSquared location
+     */
+    public static @NonNull Location adaptComplete(final org.bukkit.@NonNull Location location) {
+        return Location
+                .at(
+                        com.plotsquared.bukkit.util.BukkitWorld.of(location.getWorld()),
+                        MathMan.roundInt(location.getX()),
+                        MathMan.roundInt(location.getY()),
+                        MathMan.roundInt(location.getZ()),
+                        location.getYaw(),
+                        location.getPitch()
+                );
     }
 
-    public static org.bukkit.Location getLocation(@NonNull final Location location) {
-        return new org.bukkit.Location(getWorld(location.getWorld()), location.getX(),
-            location.getY(), location.getZ());
+    /**
+     * Turn a PlotSquared {@link Location} into a Bukkit {@link org.bukkit.Location}.
+     * This only copies the 4-tuple (world,x,y,z) and does not include the yaw and the pitch
+     *
+     * @param location PlotSquared location
+     * @return Bukkit location
+     */
+    public static org.bukkit.@NonNull Location adapt(final @NonNull Location location) {
+        return new org.bukkit.Location(
+                (World) location.getWorld().getPlatformWorld(),
+                location.getX(),
+                location.getY(),
+                location.getZ()
+        );
     }
 
-    public static World getWorld(@NonNull final String string) {
+    /**
+     * Get a Bukkit {@link World} from its name
+     *
+     * @param string World name
+     * @return World if it exists, or {@code null}
+     */
+    public static @Nullable World getWorld(final @NonNull String string) {
         return Bukkit.getWorld(string);
     }
 
-    public static String getWorld(@NonNull final Entity entity) {
-        return entity.getWorld().getName();
+    private static void ensureLoaded(
+            final @NonNull String world,
+            final int x,
+            final int z,
+            final @NonNull Consumer<Chunk> chunkConsumer
+    ) {
+        PaperLib.getChunkAtAsync(Objects.requireNonNull(getWorld(world)), x >> 4, z >> 4, true)
+                .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk));
     }
 
-    public static List<Entity> getEntities(@NonNull final String worldName) {
-        World world = getWorld(worldName);
-        if (world != null) {
-            return world.getEntities();
+    private static void ensureLoaded(final @NonNull Location location, final @NonNull Consumer<Chunk> chunkConsumer) {
+        PaperLib.getChunkAtAsync(adapt(location), true).thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk));
+    }
+
+    private static <T> void ensureMainThread(final @NonNull Consumer<T> consumer, final @NonNull T value) {
+        if (Bukkit.isPrimaryThread()) {
+            consumer.accept(value);
         } else {
-            return new ArrayList<>();
+            Bukkit.getScheduler().runTask(BukkitPlatform.getPlugin(BukkitPlatform.class), () -> consumer.accept(value));
         }
     }
 
-    public static Location getLocation(@NonNull final Entity entity) {
-        final org.bukkit.Location location = entity.getLocation();
-        String world = location.getWorld().getName();
-        return new Location(world, location.getBlockX(), location.getBlockY(),
-            location.getBlockZ());
-    }
-
-    @NotNull public static Location getLocationFull(@NonNull final Entity entity) {
-        final org.bukkit.Location location = entity.getLocation();
-        return new Location(location.getWorld().getName(), MathMan.roundInt(location.getX()),
-            MathMan.roundInt(location.getY()), MathMan.roundInt(location.getZ()), location.getYaw(),
-            location.getPitch());
-    }
-
-    public static Material getMaterial(@NonNull final BlockState plotBlock) {
-        return BukkitAdapter.adapt(plotBlock.getBlockType());
-    }
-
-    @Override public boolean isBlockSame(BlockState block1, BlockState block2) {
-        if (block1.equals(block2)) {
-            return true;
-        }
-        Material mat1 = getMaterial(block1), mat2 = getMaterial(block2);
-        return mat1 == mat2;
-    }
-
-    @Override public boolean isWorld(@NonNull final String worldName) {
-        return getWorld(worldName) != null;
-    }
-
-    @Override public void getBiome(String world, int x, int z, final Consumer<BiomeType> result) {
-        ensureLoaded(world, x, z,
-            chunk -> result.accept(BukkitAdapter.adapt(getWorld(world).getBiome(x, z))));
-    }
-
-    @Override public BiomeType getBiomeSynchronous(String world, int x, int z) {
-        return BukkitAdapter.adapt(getWorld(world).getBiome(x, z));
-    }
-
     @Override
-    public void getHighestBlock(@NonNull final String world, final int x, final int z,
-        final IntConsumer result) {
+    public boolean isBlockSame(final @NonNull BlockState block1, final @NonNull BlockState block2) {
+        if (block1.equals(block2)) {
+            return true;
+        }
+        final Material mat1 = BukkitAdapter.adapt(block1.getBlockType());
+        final Material mat2 = BukkitAdapter.adapt(block2.getBlockType());
+        return mat1 == mat2;
+    }
+
+    @Override
+    public boolean isWorld(final @NonNull String worldName) {
+        return getWorld(worldName) != null;
+    }
+
+    @Override
+    public void getBiome(final @NonNull String world, final int x, final int z, final @NonNull Consumer<BiomeType> result) {
+        ensureLoaded(world, x, z, chunk -> result.accept(BukkitAdapter.adapt(getWorld(world).getBiome(x, z))));
+    }
+
+    @Override
+    public @NonNull BiomeType getBiomeSynchronous(final @NonNull String world, final int x, final int z) {
+        return BukkitAdapter.adapt(Objects.requireNonNull(getWorld(world)).getBiome(x, z));
+    }
+
+    @Override
+    public void getHighestBlock(final @NonNull String world, final int x, final int z, final @NonNull IntConsumer result) {
         ensureLoaded(world, x, z, chunk -> {
-            final World bukkitWorld = getWorld(world);
+            final World bukkitWorld = Objects.requireNonNull(getWorld(world));
             // Skip top and bottom block
             int air = 1;
-            for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
+            int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
+            int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
+            for (int y = maxY - 1; y >= minY; y--) {
                 Block block = bukkitWorld.getBlockAt(x, y, z);
                 Material type = block.getType();
                 if (type.isSolid()) {
@@ -375,11 +261,15 @@ public class BukkitUtil extends WorldUtil {
         });
     }
 
-    @Override public int getHighestBlockSynchronous(String world, int x, int z) {
-        final World bukkitWorld = getWorld(world);
+    @Override
+    @NonNegative
+    public int getHighestBlockSynchronous(final @NonNull String world, final int x, final int z) {
+        final World bukkitWorld = Objects.requireNonNull(getWorld(world));
         // Skip top and bottom block
         int air = 1;
-        for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
+        int maxY = com.plotsquared.bukkit.util.BukkitWorld.getMaxWorldHeight(bukkitWorld);
+        int minY = com.plotsquared.bukkit.util.BukkitWorld.getMinWorldHeight(bukkitWorld);
+        for (int y = maxY - 1; y >= minY; y--) {
             Block block = bukkitWorld.getBlockAt(x, y, z);
             Material type = block.getType();
             if (type.isSolid()) {
@@ -398,73 +288,75 @@ public class BukkitUtil extends WorldUtil {
     }
 
     @Override
-    public void getSign(@NonNull final Location location, final Consumer<String[]> result) {
-        ensureLoaded(location, chunk -> {
-            final Block block = chunk.getWorld().getBlockAt(getLocation(location));
-            if (block.getState() instanceof Sign) {
-                Sign sign = (Sign) block.getState();
-                result.accept(sign.getLines());
-            }
-        });
-    }
-
-    @Override @Nullable public String[] getSignSynchronous(@NonNull final Location location) {
-        Block block = getWorld(location.getWorld())
-            .getBlockAt(location.getX(), location.getY(), location.getZ());
-        return TaskManager.IMP.sync(new RunnableVal<String[]>() {
-            @Override public void run(String[] value) {
-                if (block.getState() instanceof Sign) {
-                    Sign sign = (Sign) block.getState();
-                    this.value = sign.getLines();
+    public @NonNull String[] getSignSynchronous(final @NonNull Location location) {
+        Block block = Objects.requireNonNull(getWorld(location.getWorldName())).getBlockAt(
+                location.getX(),
+                location.getY(),
+                location.getZ()
+        );
+        try {
+            return TaskManager.getPlatformImplementation().sync(() -> {
+                if (block.getState() instanceof Sign sign) {
+                    return sign.getLines();
                 }
-            }
-        });
+                return new String[0];
+            });
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+        return new String[0];
     }
 
-    @Override public Location getSpawn(@NonNull final String world) {
+    @Override
+    public @NonNull Location getSpawn(final @NonNull String world) {
         final org.bukkit.Location temp = getWorld(world).getSpawnLocation();
-        return new Location(world, temp.getBlockX(), temp.getBlockY(), temp.getBlockZ(),
-            temp.getYaw(), temp.getPitch());
+        return Location.at(world, temp.getBlockX(), temp.getBlockY(), temp.getBlockZ(), temp.getYaw(), temp.getPitch());
     }
 
-    @Override public void setSpawn(@NonNull final Location location) {
-        final World world = getWorld(location.getWorld());
+    @Override
+    public void setSpawn(final @NonNull Location location) {
+        final World world = getWorld(location.getWorldName());
         if (world != null) {
             world.setSpawnLocation(location.getX(), location.getY(), location.getZ());
         }
     }
 
-    @Override public void saveWorld(@NonNull final String worldName) {
+    @Override
+    public void saveWorld(final @NonNull String worldName) {
         final World world = getWorld(worldName);
         if (world != null) {
             world.save();
         }
     }
 
-    @Override @SuppressWarnings("deprecation")
-    public void setSign(@NonNull final String worldName, final int x, final int y, final int z,
-        @NonNull final String[] lines) {
-        ensureLoaded(worldName, x, z, chunk -> {
-            final World world = getWorld(worldName);
-            final Block block = world.getBlockAt(x, y, z);
-            //        block.setType(Material.AIR);
+    @Override
+    @SuppressWarnings("deprecation")
+    public void setSign(
+            final @NonNull Location location, final @NonNull Caption[] lines,
+            final @NonNull TagResolver... replacements
+    ) {
+        ensureLoaded(location.getWorldName(), location.getX(), location.getZ(), chunk -> {
+            PlotArea area = location.getPlotArea();
+            final World world = getWorld(location.getWorldName());
+            final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
             final Material type = block.getType();
             if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
-                BlockFace facing = BlockFace.EAST;
-                if (world.getBlockAt(x, y, z + 1).getType().isSolid()) {
-                    facing = BlockFace.NORTH;
-                } else if (world.getBlockAt(x + 1, y, z).getType().isSolid()) {
-                    facing = BlockFace.WEST;
-                } else if (world.getBlockAt(x, y, z - 1).getType().isSolid()) {
-                    facing = BlockFace.SOUTH;
+                BlockFace facing = BlockFace.NORTH;
+                if (!world.getBlockAt(location.getX(), location.getY(), location.getZ() + 1).getType().isSolid()) {
+                    if (world.getBlockAt(location.getX() - 1, location.getY(), location.getZ()).getType().isSolid()) {
+                        facing = BlockFace.EAST;
+                    } else if (world.getBlockAt(location.getX() + 1, location.getY(), location.getZ()).getType().isSolid()) {
+                        facing = BlockFace.WEST;
+                    } else if (world.getBlockAt(location.getX(), location.getY(), location.getZ() - 1).getType().isSolid()) {
+                        facing = BlockFace.SOUTH;
+                    }
                 }
-                if (PlotSquared.get().IMP.getServerVersion()[1] == 13) {
-                    block.setType(Material.valueOf("WALL_SIGN"), false);
+                if (PlotSquared.platform().serverVersion()[1] == 13) {
+                    block.setType(Material.valueOf(area.legacySignMaterial()), false);
                 } else {
-                    block.setType(Material.valueOf("OAK_WALL_SIGN"), false);
+                    block.setType(Material.valueOf(area.signMaterial()), false);
                 }
                 if (!(block.getBlockData() instanceof WallSign)) {
-                    PlotSquared.debug(block.getBlockData().getAsString());
                     throw new RuntimeException("Something went wrong generating a sign");
                 }
                 final Directional sign = (Directional) block.getBlockData();
@@ -472,114 +364,88 @@ public class BukkitUtil extends WorldUtil {
                 block.setBlockData(sign, false);
             }
             final org.bukkit.block.BlockState blockstate = block.getState();
-            if (blockstate instanceof Sign) {
-                final Sign sign = (Sign) blockstate;
+            if (blockstate instanceof final Sign sign) {
                 for (int i = 0; i < lines.length; i++) {
-                    sign.setLine(i, lines[i]);
+                    sign.setLine(i, LEGACY_COMPONENT_SERIALIZER.serialize(
+                            MINI_MESSAGE.deserialize(lines[i].getComponent(LocaleHolder.console()), replacements)
+                    ));
                 }
-                sign.update(true);
+                sign.update(true, false);
             }
         });
     }
 
-    @Override public boolean isBlockSolid(@NonNull final BlockState block) {
-        return block.getBlockType().getMaterial().isSolid();
-    }
-
-    @Override public String getClosestMatchingName(@NonNull final BlockState block) {
-        try {
-            return getMaterial(block).name();
-        } catch (Exception ignored) {
-            return null;
-        }
-    }
-
-    @Override @Nullable
-    public StringComparison<BlockState>.ComparisonResult getClosestBlock(String name) {
+    @Override
+    public @NonNull StringComparison<BlockState>.ComparisonResult getClosestBlock(@NonNull String name) {
         BlockState state = BlockUtil.get(name);
         return new StringComparison<BlockState>().new ComparisonResult(1, state);
     }
 
     @Override
-    public void setBiomes(@NonNull final String worldName, @NonNull final CuboidRegion region,
-        @NonNull final BiomeType biomeType) {
-        final World world = getWorld(worldName);
-        if (world == null) {
-            PlotSquared.log("An error occurred setting the biome because the world was null.");
-            return;
-        }
-        final Biome biome = BukkitAdapter.adapt(biomeType);
-        for (int x = region.getMinimumPoint().getX(); x <= region.getMaximumPoint().getX(); x++) {
-            for (int z = region.getMinimumPoint().getZ();
-                 z <= region.getMaximumPoint().getZ(); z++) {
-                if (world.getBiome(x, z) != biome) {
-                    world.setBiome(x, z, biome);
-                }
-            }
-        }
-    }
-
-    public com.sk89q.worldedit.world.World getWeWorld(String world) {
+    public com.sk89q.worldedit.world.@NonNull World getWeWorld(final @NonNull String world) {
         return new BukkitWorld(Bukkit.getWorld(world));
     }
 
     @Override
-    public void getBlock(@NonNull final Location location, final Consumer<BlockState> result) {
+    public void refreshChunk(int x, int z, String world) {
+        Bukkit.getWorld(world).refreshChunk(x, z);
+    }
+
+    @Override
+    public void getBlock(final @NonNull Location location, final @NonNull Consumer<BlockState> result) {
         ensureLoaded(location, chunk -> {
-            final World world = getWorld(location.getWorld());
-            final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
-            result.accept(BukkitAdapter.asBlockType(block.getType()).getDefaultState());
+            final World world = getWorld(location.getWorldName());
+            final Block block = Objects.requireNonNull(world).getBlockAt(location.getX(), location.getY(), location.getZ());
+            result.accept(Objects.requireNonNull(BukkitAdapter.asBlockType(block.getType())).getDefaultState());
         });
     }
 
-    @Override public BlockState getBlockSynchronous(@NonNull final Location location) {
-        final World world = getWorld(location.getWorld());
-        final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ());
-        return BukkitAdapter.asBlockType(block.getType()).getDefaultState();
+    @Override
+    public @NonNull BlockState getBlockSynchronous(final @NonNull Location location) {
+        final World world = getWorld(location.getWorldName());
+        final Block block = Objects.requireNonNull(world).getBlockAt(location.getX(), location.getY(), location.getZ());
+        return Objects.requireNonNull(BukkitAdapter.asBlockType(block.getType())).getDefaultState();
     }
 
-    @Override public String getMainWorld() {
-        return Bukkit.getWorlds().get(0).getName();
+    @Override
+    @NonNegative
+    public double getHealth(final @NonNull PlotPlayer<?> player) {
+        return Objects.requireNonNull(Bukkit.getPlayer(player.getUUID())).getHealth();
     }
 
-    @Override public double getHealth(PlotPlayer player) {
-        return Bukkit.getPlayer(player.getUUID()).getHealth();
+    @Override
+    @NonNegative
+    public int getFoodLevel(final @NonNull PlotPlayer<?> player) {
+        return Objects.requireNonNull(Bukkit.getPlayer(player.getUUID())).getFoodLevel();
     }
 
-    @Override public int getFoodLevel(PlotPlayer player) {
-        return Bukkit.getPlayer(player.getUUID()).getFoodLevel();
+    @Override
+    public void setHealth(final @NonNull PlotPlayer<?> player, @NonNegative final double health) {
+        Objects.requireNonNull(Bukkit.getPlayer(player.getUUID())).setHealth(health);
     }
 
-    @Override public void setHealth(PlotPlayer player, double health) {
-        Bukkit.getPlayer(player.getUUID()).setHealth(health);
-    }
-
-    @Override public void setFoodLevel(PlotPlayer player, int foodLevel) {
+    @Override
+    public void setFoodLevel(final @NonNull PlotPlayer<?> player, @NonNegative final int foodLevel) {
         Bukkit.getPlayer(player.getUUID()).setFoodLevel(foodLevel);
     }
 
     @Override
-    public Set<com.sk89q.worldedit.world.entity.EntityType> getTypesInCategory(
-        final String category) {
+    public @NonNull Set<com.sk89q.worldedit.world.entity.EntityType> getTypesInCategory(final @NonNull String category) {
         final Collection<Class<?>> allowedInterfaces = new HashSet<>();
         switch (category) {
-            case "animal": {
+            case "animal" -> {
                 allowedInterfaces.add(IronGolem.class);
                 allowedInterfaces.add(Snowman.class);
                 allowedInterfaces.add(Animals.class);
                 allowedInterfaces.add(WaterMob.class);
                 allowedInterfaces.add(Ambient.class);
+                if (PlotSquared.platform().serverVersion()[1] >= 19) {
+                    allowedInterfaces.add(Allay.class);
+                }
             }
-            break;
-            case "tameable": {
-                allowedInterfaces.add(Tameable.class);
-            }
-            break;
-            case "vehicle": {
-                allowedInterfaces.add(Vehicle.class);
-            }
-            break;
-            case "hostile": {
+            case "tameable" -> allowedInterfaces.add(Tameable.class);
+            case "vehicle" -> allowedInterfaces.add(Vehicle.class);
+            case "hostile" -> {
                 allowedInterfaces.add(Shulker.class);
                 allowedInterfaces.add(Monster.class);
                 allowedInterfaces.add(Boss.class);
@@ -588,20 +454,10 @@ public class BukkitUtil extends WorldUtil {
                 allowedInterfaces.add(Phantom.class);
                 allowedInterfaces.add(EnderCrystal.class);
             }
-            break;
-            case "hanging": {
-                allowedInterfaces.add(Hanging.class);
-            }
-            break;
-            case "villager": {
-                allowedInterfaces.add(NPC.class);
-            }
-            break;
-            case "projectile": {
-                allowedInterfaces.add(Projectile.class);
-            }
-            break;
-            case "other": {
+            case "hanging" -> allowedInterfaces.add(Hanging.class);
+            case "villager" -> allowedInterfaces.add(NPC.class);
+            case "projectile" -> allowedInterfaces.add(Projectile.class);
+            case "other" -> {
                 allowedInterfaces.add(ArmorStand.class);
                 allowedInterfaces.add(FallingBlock.class);
                 allowedInterfaces.add(Item.class);
@@ -613,15 +469,8 @@ public class BukkitUtil extends WorldUtil {
                 allowedInterfaces.add(EnderSignal.class);
                 allowedInterfaces.add(Firework.class);
             }
-            break;
-            case "player": {
-                allowedInterfaces.add(Player.class);
-            }
-            break;
-            default: {
-                PlotSquared.log(Captions.PREFIX + "Unknown entity category requested: " + category);
-            }
-            break;
+            case "player" -> allowedInterfaces.add(Player.class);
+            default -> LOGGER.error("Unknown entity category requested: {}", category);
         }
         final Set<com.sk89q.worldedit.world.entity.EntityType> types = new HashSet<>();
         outer:
@@ -640,8 +489,8 @@ public class BukkitUtil extends WorldUtil {
         return types;
     }
 
-    private final Collection<BlockType> tileEntityTypes = new HashSet<>();
-    @Override public Collection<BlockType> getTileEntityTypes() {
+    @Override
+    public @NonNull Collection<BlockType> getTileEntityTypes() {
         if (this.tileEntityTypes.isEmpty()) {
             // Categories
             tileEntityTypes.addAll(BlockCategories.BANNERS.getAll());
@@ -650,46 +499,83 @@ public class BukkitUtil extends WorldUtil {
             tileEntityTypes.addAll(BlockCategories.FLOWER_POTS.getAll());
             // Individual Types
             // Add these from strings
-            Stream.of("barrel", "beacon", "beehive", "bee_nest", "bell", "blast_furnace",
-                "brewing_stand", "campfire", "chest", "ender_chest", "trapped_chest",
-                "command_block", "end_gateway", "hopper", "jigsaw", "jubekox",
-                "lectern", "note_block", "black_shulker_box", "blue_shulker_box",
-                "brown_shulker_box", "cyan_shulker_box", "gray_shulker_box", "green_shulker_box",
-                "light_blue_shulker_box", "light_gray_shulker_box", "lime_shulker_box",
-                "magenta_shulker_box", "orange_shulker_box", "pink_shulker_box",
-                "purple_shulker_box", "red_shulker_box", "shulker_box", "white_shulker_box",
-                "yellow_shulker_box", "smoker", "structure_block", "structure_void")
-                .map(BlockTypes::get)
-                .filter(Objects::nonNull)
-                .forEach(tileEntityTypes::add);
+            Stream.of(
+                            "barrel",
+                            "beacon",
+                            "beehive",
+                            "bee_nest",
+                            "bell",
+                            "blast_furnace",
+                            "brewing_stand",
+                            "campfire",
+                            "chest",
+                            "ender_chest",
+                            "trapped_chest",
+                            "command_block",
+                            "end_gateway",
+                            "hopper",
+                            "jigsaw",
+                            "jubekox",
+                            "lectern",
+                            "note_block",
+                            "black_shulker_box",
+                            "blue_shulker_box",
+                            "brown_shulker_box",
+                            "cyan_shulker_box",
+                            "gray_shulker_box",
+                            "green_shulker_box",
+                            "light_blue_shulker_box",
+                            "light_gray_shulker_box",
+                            "lime_shulker_box",
+                            "magenta_shulker_box",
+                            "orange_shulker_box",
+                            "pink_shulker_box",
+                            "purple_shulker_box",
+                            "red_shulker_box",
+                            "shulker_box",
+                            "white_shulker_box",
+                            "yellow_shulker_box",
+                            "smoker",
+                            "structure_block",
+                            "structure_void"
+                    )
+                    .map(BlockTypes::get).filter(Objects::nonNull).forEach(tileEntityTypes::add);
         }
         return this.tileEntityTypes;
     }
 
     @Override
-    public int getTileEntityCount(String world, BlockVector2 chunk) {
-        return Bukkit.getWorld(world).getChunkAt(chunk.getBlockX(), chunk.getBlockZ())
-            .getTileEntities().length;
+    @NonNegative
+    public int getTileEntityCount(final @NonNull String world, final @NonNull BlockVector2 chunk) {
+        return Objects.requireNonNull(getWorld(world)).
+                getChunkAt(chunk.getBlockX(), chunk.getBlockZ()).getTileEntities().length;
     }
 
-    private static void ensureLoaded(final String world, final int x, final int z,
-        final Consumer<Chunk> chunkConsumer) {
-        PaperLib.getChunkAtAsync(getWorld(world), x >> 4, z >> 4, true)
-            .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk));
-    }
-
-    private static void ensureLoaded(final Location location, final Consumer<Chunk> chunkConsumer) {
-        PaperLib.getChunkAtAsync(getLocation(location), true)
-            .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk));
-    }
-
-    private static <T> void ensureMainThread(final Consumer<T> consumer, final T value) {
+    @Override
+    public Set<BlockVector2> getChunkChunks(String world) {
+        Set<BlockVector2> chunks = super.getChunkChunks(world);
         if (Bukkit.isPrimaryThread()) {
-            consumer.accept(value);
+            for (Chunk chunk : Objects.requireNonNull(Bukkit.getWorld(world)).getLoadedChunks()) {
+                BlockVector2 loc = BlockVector2.at(chunk.getX() >> 5, chunk.getZ() >> 5);
+                chunks.add(loc);
+            }
         } else {
-            Bukkit.getScheduler()
-                .runTask(BukkitMain.getPlugin(BukkitMain.class), () -> consumer.accept(value));
+            final Semaphore semaphore = new Semaphore(1);
+            try {
+                semaphore.acquire();
+                Bukkit.getScheduler().runTask(BukkitPlatform.getPlugin(BukkitPlatform.class), () -> {
+                    for (Chunk chunk : Objects.requireNonNull(Bukkit.getWorld(world)).getLoadedChunks()) {
+                        BlockVector2 loc = BlockVector2.at(chunk.getX() >> 5, chunk.getZ() >> 5);
+                        chunks.add(loc);
+                    }
+                    semaphore.release();
+                });
+                semaphore.acquireUninterruptibly();
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
         }
+        return chunks;
     }
 
 }

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

@@ -0,0 +1,139 @@
+/*
+ * 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.util;
+
+import com.google.common.collect.Maps;
+import com.plotsquared.core.location.World;
+import org.bukkit.Bukkit;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import java.util.Map;
+
+public class BukkitWorld implements World<org.bukkit.World> {
+
+    private static final Map<String, BukkitWorld> worldMap = Maps.newHashMap();
+    private static final boolean HAS_MIN_Y;
+
+    static {
+        boolean temp;
+        try {
+            org.bukkit.World.class.getMethod("getMinHeight");
+            temp = true;
+        } catch (NoSuchMethodException e) {
+            temp = false;
+        }
+        HAS_MIN_Y = temp;
+    }
+
+    private final org.bukkit.World world;
+
+    private BukkitWorld(final org.bukkit.World world) {
+        this.world = world;
+    }
+
+    /**
+     * Get a new {@link BukkitWorld} from a world name
+     *
+     * @param worldName World name
+     * @return World instance
+     */
+    public static @NonNull BukkitWorld of(final @NonNull String worldName) {
+        final org.bukkit.World bukkitWorld = Bukkit.getWorld(worldName);
+        if (bukkitWorld == null) {
+            throw new IllegalArgumentException(String.format("There is no world with the name '%s'", worldName));
+        }
+        return of(bukkitWorld);
+    }
+
+    /**
+     * Get a new {@link BukkitWorld} from a Bukkit world
+     *
+     * @param world Bukkit world
+     * @return World instance
+     */
+    public static @NonNull BukkitWorld of(final org.bukkit.World world) {
+        BukkitWorld bukkitWorld = worldMap.get(world.getName());
+        if (bukkitWorld != null && bukkitWorld.getPlatformWorld().equals(world)) {
+            return bukkitWorld;
+        }
+        bukkitWorld = new BukkitWorld(world);
+        worldMap.put(world.getName(), bukkitWorld);
+        return bukkitWorld;
+    }
+
+    /**
+     * Get the min world height from a Bukkit {@link org.bukkit.World}. Inclusive
+     *
+     * @since 6.6.0
+     */
+    public static int getMinWorldHeight(org.bukkit.World world) {
+        return HAS_MIN_Y ? world.getMinHeight() : 0;
+    }
+
+    /**
+     * Get the max world height from a Bukkit {@link org.bukkit.World}. Exclusive
+     *
+     * @since 6.6.0
+     */
+    public static int getMaxWorldHeight(org.bukkit.World world) {
+        return HAS_MIN_Y ? world.getMaxHeight() : 256;
+    }
+
+    @Override
+    public org.bukkit.World getPlatformWorld() {
+        return this.world;
+    }
+
+    @Override
+    public @NonNull String getName() {
+        return this.world.getName();
+    }
+
+    @Override
+    public int getMinHeight() {
+        return getMinWorldHeight(world);
+    }
+
+    @Override
+    public int getMaxHeight() {
+        return getMaxWorldHeight(world) - 1;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final BukkitWorld that = (BukkitWorld) o;
+        return world.equals(that.world);
+    }
+
+    @Override
+    public int hashCode() {
+        return world.hashCode();
+    }
+
+    public String toString() {
+        return "BukkitWorld(world=" + this.world + ")";
+    }
+
+}

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

@@ -1,39 +1,33 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
 import com.plotsquared.bukkit.entity.EntityWrapper;
 import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.location.PlotLoc;
 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 org.apache.logging.log4j.Logger;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
@@ -46,6 +40,8 @@ import java.util.Set;
 
 public class ContentMap {
 
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + ContentMap.class.getSimpleName());
+
     final Set<EntityWrapper> entities;
     final Map<PlotLoc, BaseBlock[]> allBlocks;
 
@@ -67,14 +63,14 @@ public class ContentMap {
         }
         for (int x = x1; x <= x2; x++) {
             for (int z = z1; z <= z2; z++) {
-                saveBlocks(world, 256, x, z, 0, 0);
+                saveBlocks(world, x, z);
             }
         }
     }
 
     void saveEntitiesOut(Chunk chunk, CuboidRegion region) {
         for (Entity entity : chunk.getEntities()) {
-            Location location = BukkitUtil.getLocation(entity);
+            Location location = BukkitUtil.adapt(entity.getLocation());
             int x = location.getX();
             int z = location.getZ();
             if (BukkitChunkManager.isIn(region, x, z)) {
@@ -89,14 +85,9 @@ public class ContentMap {
         }
     }
 
-    void saveEntitiesIn(Chunk chunk, CuboidRegion region) {
-        saveEntitiesIn(chunk, region, 0, 0, false);
-    }
-
-    void saveEntitiesIn(Chunk chunk, CuboidRegion region, int offsetX, int offsetZ,
-        boolean delete) {
+    void saveEntitiesIn(Chunk chunk, CuboidRegion region, boolean delete) {
         for (Entity entity : chunk.getEntities()) {
-            Location location = BukkitUtil.getLocation(entity);
+            Location location = BukkitUtil.adapt(entity.getLocation());
             int x = location.getX();
             int z = location.getZ();
             if (!BukkitChunkManager.isIn(region, x, z)) {
@@ -106,8 +97,6 @@ public class ContentMap {
                 continue;
             }
             EntityWrapper wrap = new ReplicatingEntityWrapper(entity, (short) 2);
-            wrap.x += offsetX;
-            wrap.z += offsetZ;
             wrap.saveEntity();
             this.entities.add(wrap);
             if (delete) {
@@ -118,27 +107,25 @@ public class ContentMap {
         }
     }
 
-    void restoreEntities(World world, int xOffset, int zOffset) {
+    void restoreEntities(World world) {
         for (EntityWrapper entity : this.entities) {
             try {
-                entity.spawn(world, xOffset, zOffset);
+                entity.spawn(world, 0, 0);
             } catch (Exception e) {
-                PlotSquared.debug("Failed to restore entity (e): " + e.toString());
-                e.printStackTrace();
+                LOGGER.error("Failed to restore entity", e);
             }
         }
         this.entities.clear();
     }
 
-    //todo optimize maxY
-    void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX, int offsetZ) {
-        maxY = Math.min(255, maxY);
-        BaseBlock[] ids = new BaseBlock[maxY + 1];
-        for (short y = 0; y <= maxY; y++) {
-            BaseBlock block = world.getFullBlock(BlockVector3.at(x, y, z));
-            ids[y] = block;
+    private void saveBlocks(BukkitWorld world, int x, int z) {
+        BaseBlock[] ids = new BaseBlock[world.getMaxY() - world.getMinY() + 1];
+        for (short yIndex = 0; yIndex <= world.getMaxY() - world.getMinY(); yIndex++) {
+            BaseBlock block = world.getFullBlock(BlockVector3.at(x, yIndex + world.getMinY(), z));
+            ids[yIndex] = block;
         }
-        PlotLoc loc = new PlotLoc(x + offsetX, z + offsetZ);
+        PlotLoc loc = new PlotLoc(x, z);
         this.allBlocks.put(loc, ids);
     }
+
 }

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

@@ -1,157 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
- *
- *     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 <http://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.util;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.UUID;
-
-import static com.plotsquared.core.util.ReflectionUtils.callConstructor;
-import static com.plotsquared.core.util.ReflectionUtils.callMethod;
-import static com.plotsquared.core.util.ReflectionUtils.getCbClass;
-import static com.plotsquared.core.util.ReflectionUtils.getField;
-import static com.plotsquared.core.util.ReflectionUtils.getNmsClass;
-import static com.plotsquared.core.util.ReflectionUtils.getUtilClass;
-import static com.plotsquared.core.util.ReflectionUtils.makeConstructor;
-import static com.plotsquared.core.util.ReflectionUtils.makeField;
-import static com.plotsquared.core.util.ReflectionUtils.makeMethod;
-
-public class OfflinePlayerUtil {
-
-    public static Player loadPlayer(OfflinePlayer player) {
-        if (player == null) {
-            return null;
-        }
-        if (player instanceof Player) {
-            return (Player) player;
-        }
-        return loadPlayer(player.getUniqueId(), player.getName());
-    }
-
-    private static Player loadPlayer(UUID id, String name) {
-        Object server = getMinecraftServer();
-        Object interactManager = newPlayerInteractManager();
-        Object worldServer = getWorldServer();
-        Object profile = newGameProfile(id, name);
-        Class<?> entityPlayerClass = getNmsClass("EntityPlayer");
-        Constructor entityPlayerConstructor =
-                makeConstructor(entityPlayerClass, getNmsClass("MinecraftServer"),
-                        getNmsClass("WorldServer"), getUtilClass("com.mojang.authlib.GameProfile"),
-                        getNmsClass("PlayerInteractManager"));
-        Object entityPlayer =
-                callConstructor(entityPlayerConstructor, server, worldServer, profile, interactManager);
-        return (Player) getBukkitEntity(entityPlayer);
-    }
-
-    private static Object newGameProfile(UUID id, String name) {
-        Class<?> gameProfileClass = getUtilClass("com.mojang.authlib.GameProfile");
-        if (gameProfileClass == null) { //Before uuids
-            return name;
-        }
-        Constructor gameProfileConstructor =
-            makeConstructor(gameProfileClass, UUID.class, String.class);
-        if (gameProfileConstructor == null) { //Version has string constructor
-            gameProfileConstructor = makeConstructor(gameProfileClass, String.class, String.class);
-            return callConstructor(gameProfileConstructor, id.toString(), name);
-        } else { //Version has uuid constructor
-            return callConstructor(gameProfileConstructor, id, name);
-        }
-    }
-
-    private static Object newPlayerInteractManager() {
-        Object worldServer = getWorldServer();
-        Class<?> playerInteractClass = getNmsClass("PlayerInteractManager");
-        Class<?> worldClass = getNmsClass("World");
-        Constructor<?> c = makeConstructor(playerInteractClass, worldClass);
-        if (c == null) {
-            c = makeConstructor(playerInteractClass, getNmsClass("WorldServer"));
-        }
-        return callConstructor(c, worldServer);
-    }
-
-    public static Object getWorldServer116() {
-        Object server = getMinecraftServer();
-        Class<?> minecraftServerClass = getNmsClass("MinecraftServer");
-        Class<?> genericResourceKey = getNmsClass("ResourceKey");
-        Class<?> minecraftKey = getNmsClass("MinecraftKey");
-        // MinecraftKey + MinecraftKey -> ResourceKey
-        Method constructResourceKey = makeMethod(genericResourceKey, "a", minecraftKey, minecraftKey);
-        // MinecraftKey(String)
-        Constructor<Object> minecraftKeyConstructor = makeConstructor(minecraftKey, String.class);
-        // minecraft:overworld
-        Object overworldKey = callConstructor(minecraftKeyConstructor, "overworld");
-        // minecraft:dimension
-        Object dimensionKey = callConstructor(minecraftKeyConstructor, "dimension");
-        // ResourceKey[minecraft:dimension / minecraft:overworld]
-        Object resourceKey = callMethod(constructResourceKey, null, dimensionKey, overworldKey);
-        Method getWorldServer =
-                makeMethod(minecraftServerClass, "getWorldServer", genericResourceKey);
-        return callMethod(getWorldServer, server, resourceKey);
-    }
-
-    public static Object getWorldServerNew() {
-        Object server = getMinecraftServer();
-        Class<?> minecraftServerClass = getNmsClass("MinecraftServer");
-        Class<?> dimensionManager = getNmsClass("DimensionManager");
-        Object overworld = getField(makeField(dimensionManager, "OVERWORLD"), null);
-        Method getWorldServer =
-            makeMethod(minecraftServerClass, "getWorldServer", dimensionManager);
-        return callMethod(getWorldServer, server, overworld);
-    }
-
-    private static Object getWorldServer() {
-        Object server = getMinecraftServer();
-        Class<?> minecraftServerClass = getNmsClass("MinecraftServer");
-        Method getWorldServer = makeMethod(minecraftServerClass, "getWorldServer", int.class);
-        Object o;
-        try {
-            o = callMethod(getWorldServer, server, 0);
-        } catch (final RuntimeException e) {
-            try {
-                o = getWorldServerNew();
-            } catch (final RuntimeException f) {
-                o = getWorldServer116();
-            }
-        }
-        return o;
-    }
-
-    //NMS Utils
-
-    private static Object getMinecraftServer() {
-        return callMethod(makeMethod(getCbClass("CraftServer"), "getServer"), Bukkit.getServer());
-    }
-
-    private static Entity getBukkitEntity(Object o) {
-        Method getBukkitEntity = makeMethod(o.getClass(), "getBukkitEntity");
-        return callMethod(getBukkitEntity, o);
-    }
-}

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

@@ -1,27 +1,20 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
@@ -38,7 +31,7 @@ import java.util.ArrayList;
 public class SetGenCB {
 
     public static void setGenerator(World world) throws Exception {
-        SetupUtils.manager.updateGenerators();
+        PlotSquared.platform().setupUtils().updateGenerators(false);
         PlotSquared.get().removePlotAreas(world.getName());
         ChunkGenerator gen = world.getGenerator();
         if (gen == null) {
@@ -69,9 +62,10 @@ public class SetGenCB {
         }
         if (!set) {
             world.getPopulators()
-                .removeIf(blockPopulator -> blockPopulator instanceof BukkitAugmentedGenerator);
+                    .removeIf(blockPopulator -> blockPopulator instanceof BukkitAugmentedGenerator);
         }
         PlotSquared.get()
-            .loadWorld(world.getName(), PlotSquared.get().IMP.getGenerator(world.getName(), null));
+                .loadWorld(world.getName(), PlotSquared.platform().getGenerator(world.getName(), null));
     }
+
 }

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

@@ -0,0 +1,72 @@
+/*
+ * 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.util;
+
+import com.intellectualsites.annotations.NotPublic;
+import com.plotsquared.core.PlotSquared;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+
+/**
+ * This is a helper class which replaces older syntax no longer supported by MiniMessage with replacements in messages_%.json.
+ * MiniMessage changed the syntax between major releases. To warrant a smooth upgrade, we attempt to replace any occurrences
+ * while loading PlotSquared.
+ *
+ * @since 7.0.0
+ */
+@NotPublic
+public class TranslationUpdateManager {
+
+    public static void upgradeTranslationFile() throws IOException {
+        String suggestCommand = "suggest_command";
+        String suggestCommandReplacement = "run_command";
+        String minHeight = "minHeight";
+        String minheightReplacement = "minheight";
+        String maxHeight = "maxHeight";
+        String maxheightReplacement = "maxheight";
+
+        try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
+            paths
+                    .filter(Files::isRegularFile)
+                    .filter(p -> p.getFileName().toString().matches("messages_[a-z]{2}\\.json"))
+                    .forEach(p -> {
+                        replaceInFile(p, suggestCommand, suggestCommandReplacement);
+                        replaceInFile(p, minHeight, minheightReplacement);
+                        replaceInFile(p, maxHeight, maxheightReplacement);
+                    });
+        }
+    }
+
+    private static void replaceInFile(Path path, String searchText, String replacementText) {
+        try {
+            String content = Files.readString(path);
+            if (content.contains(searchText)) {
+                content = content.replaceAll(searchText, replacementText);
+                Files.writeString(path, content);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

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

@@ -1,37 +1,32 @@
 /*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2021 IntellectualSites
+ * 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 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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.util;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonReader;
+import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.PlotVersion;
-import com.plotsquared.core.configuration.Captions;
 import com.plotsquared.core.configuration.Settings;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -44,6 +39,8 @@ import java.net.URL;
 
 public class UpdateUtility implements Listener {
 
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + UpdateUtility.class.getSimpleName());
+
     public static PlotVersion internalVersion;
     public static String spigotVersion;
     public static boolean hasUpdate;
@@ -51,48 +48,49 @@ public class UpdateUtility implements Listener {
     public final JavaPlugin javaPlugin;
     private boolean notify = true;
 
+    @Inject
     public UpdateUtility(final JavaPlugin javaPlugin) {
         this.javaPlugin = javaPlugin;
         internalVersion = PlotSquared.get().getVersion();
     }
 
+    @SuppressWarnings({"deprecation", "DefaultCharset"})
+    // Suppress Json deprecation, we can't use features from gson 2.8.1 and newer yet
     public void updateChecker() {
         task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
             try {
                 HttpsURLConnection connection = (HttpsURLConnection) new URL(
-                    "https://api.spigotmc.org/simple/0.1/index.php?action=getResource&id=77506")
-                    .openConnection();
+                        "https://api.spigotmc.org/simple/0.1/index.php?action=getResource&id=77506")
+                        .openConnection();
                 connection.setRequestMethod("GET");
-                JsonObject result = (new JsonParser())
-                    .parse(new JsonReader(new InputStreamReader(connection.getInputStream())))
-                    .getAsJsonObject();
+                JsonObject result = new JsonParser()
+                        .parse(new JsonReader(new InputStreamReader(connection.getInputStream())))
+                        .getAsJsonObject();
                 spigotVersion = result.get("current_version").getAsString();
             } catch (IOException e) {
-                PlotSquared.log(Captions.PREFIX + "&cUnable to check for updates because: " + e);
+                LOGGER.error("Unable to check for updates. Error: {}", e.getMessage());
                 return;
             }
 
             if (internalVersion.isLaterVersion(spigotVersion)) {
-                PlotSquared
-                    .log(Captions.PREFIX + "&6There appears to be a PlotSquared update available!");
-                PlotSquared.log(
-                    Captions.PREFIX + "&6You are running version " + internalVersion.versionString()
-                        + ", &6latest version is " + spigotVersion);
-                PlotSquared
-                    .log(Captions.PREFIX + "&6https://www.spigotmc.org/resources/77506/updates");
+                LOGGER.info("There appears to be a PlotSquared update available!");
+                LOGGER.info("You are running version {}, the latest version is {}",
+                        internalVersion.versionString(), spigotVersion
+                );
+                LOGGER.info("https://www.spigotmc.org/resources/77506/updates");
                 hasUpdate = true;
                 if (Settings.UpdateChecker.NOTIFY_ONCE) {
                     cancelTask();
                 }
             } else if (notify) {
                 notify = false;
-                PlotSquared.log(Captions.PREFIX
-                    + "Congratulations! You are running the latest PlotSquared version.");
+                LOGGER.info("Congratulations! You are running the latest PlotSquared version");
             }
-        }, 0L, Settings.UpdateChecker.POLL_RATE * 60 * 20);
+        }, 0L, (long) Settings.UpdateChecker.POLL_RATE * 60 * 20);
     }
 
     private void cancelTask() {
         Bukkit.getScheduler().runTaskLater(javaPlugin, () -> task.cancel(), 20L);
     }
+
 }