potentially fix the build scripts

note to self: if there are missing core classes when running the game, build core first then build the rest

.dockerignore

@@ -1,19 +0,0 @@
-**/.git
-**/.gitlab
-**/.cache
-
-buildAllJars
-
-**/_Misc Files
-*.bat
-*.md
-*.sh
-*.txt
-
-coreSubProjects/*.md
-coreSubProjects/*.txt
-
-**/.gitignore
-**/.gitattributes
-**/.gitlab-cy.yml
-**/.gitmodules

.editorconfig

@@ -1,701 +0,0 @@
-# DH Main
-root = true
-
-# Note: please keep this and the core .editorconfig in sync
-
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 4
-indent_style = space
-insert_final_newline = false
-max_line_length = 1000
-tab_width = 4
-trim_trailing_whitespace = false
-ij_continuation_indent_size = 8
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = true
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false
-
-[*.java]
-indent_style = tab
-ij_smart_tabs = true
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = false
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = false
-ij_java_align_multiline_chained_methods = false
-ij_java_align_multiline_deconstruction_list_components = false
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = false
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = false
-ij_java_align_multiline_parameters_in_calls = false
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = false
-ij_java_align_multiline_resources = false
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_align_types_in_multi_catch = 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 = normal
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 0
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 0
-ij_java_blank_lines_around_method = 0
-ij_java_blank_lines_around_method_in_interface = 0
-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 = 1
-ij_java_block_brace_style = next_line
-ij_java_block_comment_add_space = false
-ij_java_block_comment_at_first_column = true
-ij_java_builder_methods = none
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = normal
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = true
-ij_java_class_annotation_wrap = off
-ij_java_class_brace_style = next_line
-ij_java_class_count_to_use_import_on_demand = 5
-ij_java_class_names_in_javadoc = 1
-ij_java_deconstruction_list_wrap = normal
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_not_wrap_after_single_annotation_in_parameter = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = false
-ij_java_doc_align_exception_comments = false
-ij_java_doc_align_param_comments = false
-ij_java_doc_do_not_wrap_if_one_line = true
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = false
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = true
-ij_java_enum_constants_wrap = off
-ij_java_extends_keyword_wrap = normal
-ij_java_extends_list_wrap = normal
-ij_java_field_annotation_wrap = off
-ij_java_finally_on_new_line = true
-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 = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-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 = 10
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 10
-ij_java_keep_blank_lines_in_declarations = 10
-ij_java_keep_builder_methods_indents = false
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = true
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = true
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = true
-ij_java_keep_simple_lambdas_in_one_line = true
-ij_java_keep_simple_methods_in_one_line = true
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_add_space_on_reformat = false
-ij_java_line_comment_at_first_column = false
-ij_java_method_annotation_wrap = off
-ij_java_method_brace_style = next_line
-ij_java_method_call_chain_wrap = normal
-ij_java_method_parameters_new_line_after_left_paren = true
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = normal
-ij_java_modifier_list_wrap = false
-ij_java_multi_catch_types_wrap = normal
-ij_java_names_count_to_use_import_on_demand = 3
-ij_java_new_line_after_lparen_in_annotation = false
-ij_java_new_line_after_lparen_in_deconstruction_pattern = true
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
-ij_java_parameter_annotation_wrap = off
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = false
-ij_java_replace_sum_lambda_with_method_ref = false
-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 = on_every_item
-ij_java_rparen_on_new_line_in_annotation = false
-ij_java_rparen_on_new_line_in_deconstruction_pattern = true
-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_deconstruction_list = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = false
-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 = true
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_annotation_eq = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = true
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_deconstruction_list = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = on_every_item
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = normal
-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 = true
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = false
-ij_java_wrap_long_lines = false
-
-[*.nbtt]
-indent_style = tab
-max_line_length = 150
-ij_continuation_indent_size = 4
-ij_nbtt_keep_indents_on_empty_lines = false
-ij_nbtt_space_after_colon = true
-ij_nbtt_space_after_comma = true
-ij_nbtt_space_before_colon = true
-ij_nbtt_space_before_comma = false
-ij_nbtt_spaces_within_brackets = false
-ij_nbtt_spaces_within_parentheses = false
-
-[*.properties]
-ij_properties_align_group_field_declarations = false
-ij_properties_keep_blank_lines = false
-ij_properties_key_value_delimiter = equals
-ij_properties_spaces_around_key_value_delimiter = false
-
-[.editorconfig]
-ij_editorconfig_align_group_field_declarations = false
-ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
-ij_editorconfig_space_before_colon = false
-ij_editorconfig_space_before_comma = false
-ij_editorconfig_spaces_around_assignment_operators = true
-
-[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.jspx,*.pom,*.rng,*.tagx,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
-ij_xml_align_attributes = true
-ij_xml_align_text = false
-ij_xml_attribute_wrap = normal
-ij_xml_block_comment_add_space = false
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_blank_lines = 2
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_keep_line_breaks = true
-ij_xml_keep_line_breaks_in_text = true
-ij_xml_keep_whitespaces = false
-ij_xml_keep_whitespaces_around_cdata = preserve
-ij_xml_keep_whitespaces_inside_cdata = false
-ij_xml_line_comment_at_first_column = true
-ij_xml_space_after_tag_name = false
-ij_xml_space_around_equals_in_attribute = false
-ij_xml_space_inside_empty_tag = false
-ij_xml_text_wrap = normal
-ij_xml_use_custom_settings = false
-
-[{*.bash,*.sh,*.zsh}]
-indent_size = 4
-tab_width = 4
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-ij_shell_use_unix_line_separator = true
-
-[{*.comp,*.frag,*.fsh,*.geom,*.glsl,*.gsh,*.tesc,*.tese,*.vert,*.vsh}]
-ij_glsl_space_after_colon = true
-ij_glsl_space_after_comma = true
-ij_glsl_space_after_for_semicolon = true
-ij_glsl_space_after_quest = true
-ij_glsl_space_before_colon = false
-ij_glsl_space_before_comma = false
-ij_glsl_space_before_for_semicolon = false
-ij_glsl_space_before_quest = true
-ij_glsl_spaces_around_additive_operators = true
-ij_glsl_spaces_around_assignment_operators = true
-ij_glsl_spaces_around_bitwise_operators = true
-ij_glsl_spaces_around_equality_operators = true
-ij_glsl_spaces_around_logical_operators = true
-ij_glsl_spaces_around_multiplicative_operators = true
-ij_glsl_spaces_around_relational_operators = true
-ij_glsl_spaces_around_shift_operators = true
-ij_glsl_spaces_within_brackets = false
-ij_glsl_spaces_within_parentheses = false
-
-[{*.gant,*.groovy,*.gy}]
-ij_groovy_align_group_field_declarations = false
-ij_groovy_align_multiline_array_initializer_expression = false
-ij_groovy_align_multiline_assignment = false
-ij_groovy_align_multiline_binary_operation = false
-ij_groovy_align_multiline_chained_methods = false
-ij_groovy_align_multiline_extends_list = false
-ij_groovy_align_multiline_for = true
-ij_groovy_align_multiline_list_or_map = true
-ij_groovy_align_multiline_method_parentheses = false
-ij_groovy_align_multiline_parameters = true
-ij_groovy_align_multiline_parameters_in_calls = false
-ij_groovy_align_multiline_resources = true
-ij_groovy_align_multiline_ternary_operation = false
-ij_groovy_align_multiline_throws_list = false
-ij_groovy_align_named_args_in_map = true
-ij_groovy_align_throws_keyword = false
-ij_groovy_array_initializer_new_line_after_left_brace = false
-ij_groovy_array_initializer_right_brace_on_new_line = false
-ij_groovy_array_initializer_wrap = off
-ij_groovy_assert_statement_wrap = off
-ij_groovy_assignment_wrap = off
-ij_groovy_binary_operation_wrap = off
-ij_groovy_blank_lines_after_class_header = 0
-ij_groovy_blank_lines_after_imports = 1
-ij_groovy_blank_lines_after_package = 1
-ij_groovy_blank_lines_around_class = 1
-ij_groovy_blank_lines_around_field = 0
-ij_groovy_blank_lines_around_field_in_interface = 0
-ij_groovy_blank_lines_around_method = 1
-ij_groovy_blank_lines_around_method_in_interface = 1
-ij_groovy_blank_lines_before_imports = 1
-ij_groovy_blank_lines_before_method_body = 0
-ij_groovy_blank_lines_before_package = 0
-ij_groovy_block_brace_style = end_of_line
-ij_groovy_block_comment_add_space = false
-ij_groovy_block_comment_at_first_column = true
-ij_groovy_call_parameters_new_line_after_left_paren = false
-ij_groovy_call_parameters_right_paren_on_new_line = false
-ij_groovy_call_parameters_wrap = off
-ij_groovy_catch_on_new_line = false
-ij_groovy_class_annotation_wrap = split_into_lines
-ij_groovy_class_brace_style = end_of_line
-ij_groovy_class_count_to_use_import_on_demand = 5
-ij_groovy_do_while_brace_force = never
-ij_groovy_else_on_new_line = false
-ij_groovy_enable_groovydoc_formatting = true
-ij_groovy_enum_constants_wrap = off
-ij_groovy_extends_keyword_wrap = off
-ij_groovy_extends_list_wrap = off
-ij_groovy_field_annotation_wrap = split_into_lines
-ij_groovy_finally_on_new_line = false
-ij_groovy_for_brace_force = never
-ij_groovy_for_statement_new_line_after_left_paren = false
-ij_groovy_for_statement_right_paren_on_new_line = false
-ij_groovy_for_statement_wrap = off
-ij_groovy_ginq_general_clause_wrap_policy = 2
-ij_groovy_ginq_having_wrap_policy = 1
-ij_groovy_ginq_indent_having_clause = true
-ij_groovy_ginq_indent_on_clause = true
-ij_groovy_ginq_on_wrap_policy = 1
-ij_groovy_ginq_space_after_keyword = true
-ij_groovy_if_brace_force = never
-ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
-ij_groovy_indent_case_from_switch = true
-ij_groovy_indent_label_blocks = true
-ij_groovy_insert_inner_class_imports = false
-ij_groovy_keep_blank_lines_before_right_brace = 2
-ij_groovy_keep_blank_lines_in_code = 2
-ij_groovy_keep_blank_lines_in_declarations = 2
-ij_groovy_keep_control_statement_in_one_line = true
-ij_groovy_keep_first_column_comment = true
-ij_groovy_keep_indents_on_empty_lines = false
-ij_groovy_keep_line_breaks = true
-ij_groovy_keep_multiple_expressions_in_one_line = false
-ij_groovy_keep_simple_blocks_in_one_line = false
-ij_groovy_keep_simple_classes_in_one_line = true
-ij_groovy_keep_simple_lambdas_in_one_line = true
-ij_groovy_keep_simple_methods_in_one_line = true
-ij_groovy_label_indent_absolute = false
-ij_groovy_label_indent_size = 0
-ij_groovy_lambda_brace_style = end_of_line
-ij_groovy_layout_static_imports_separately = true
-ij_groovy_line_comment_add_space = false
-ij_groovy_line_comment_add_space_on_reformat = false
-ij_groovy_line_comment_at_first_column = true
-ij_groovy_method_annotation_wrap = split_into_lines
-ij_groovy_method_brace_style = end_of_line
-ij_groovy_method_call_chain_wrap = off
-ij_groovy_method_parameters_new_line_after_left_paren = false
-ij_groovy_method_parameters_right_paren_on_new_line = false
-ij_groovy_method_parameters_wrap = off
-ij_groovy_modifier_list_wrap = false
-ij_groovy_names_count_to_use_import_on_demand = 3
-ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
-ij_groovy_parameter_annotation_wrap = off
-ij_groovy_parentheses_expression_new_line_after_left_paren = false
-ij_groovy_parentheses_expression_right_paren_on_new_line = false
-ij_groovy_prefer_parameters_wrap = false
-ij_groovy_resource_list_new_line_after_left_paren = false
-ij_groovy_resource_list_right_paren_on_new_line = false
-ij_groovy_resource_list_wrap = off
-ij_groovy_space_after_assert_separator = true
-ij_groovy_space_after_colon = true
-ij_groovy_space_after_comma = true
-ij_groovy_space_after_comma_in_type_arguments = true
-ij_groovy_space_after_for_semicolon = true
-ij_groovy_space_after_quest = true
-ij_groovy_space_after_type_cast = true
-ij_groovy_space_before_annotation_parameter_list = false
-ij_groovy_space_before_array_initializer_left_brace = false
-ij_groovy_space_before_assert_separator = false
-ij_groovy_space_before_catch_keyword = true
-ij_groovy_space_before_catch_left_brace = true
-ij_groovy_space_before_catch_parentheses = true
-ij_groovy_space_before_class_left_brace = true
-ij_groovy_space_before_closure_left_brace = true
-ij_groovy_space_before_colon = true
-ij_groovy_space_before_comma = false
-ij_groovy_space_before_do_left_brace = true
-ij_groovy_space_before_else_keyword = true
-ij_groovy_space_before_else_left_brace = true
-ij_groovy_space_before_finally_keyword = true
-ij_groovy_space_before_finally_left_brace = true
-ij_groovy_space_before_for_left_brace = true
-ij_groovy_space_before_for_parentheses = true
-ij_groovy_space_before_for_semicolon = false
-ij_groovy_space_before_if_left_brace = true
-ij_groovy_space_before_if_parentheses = true
-ij_groovy_space_before_method_call_parentheses = false
-ij_groovy_space_before_method_left_brace = true
-ij_groovy_space_before_method_parentheses = false
-ij_groovy_space_before_quest = true
-ij_groovy_space_before_record_parentheses = false
-ij_groovy_space_before_switch_left_brace = true
-ij_groovy_space_before_switch_parentheses = true
-ij_groovy_space_before_synchronized_left_brace = true
-ij_groovy_space_before_synchronized_parentheses = true
-ij_groovy_space_before_try_left_brace = true
-ij_groovy_space_before_try_parentheses = true
-ij_groovy_space_before_while_keyword = true
-ij_groovy_space_before_while_left_brace = true
-ij_groovy_space_before_while_parentheses = true
-ij_groovy_space_in_named_argument = true
-ij_groovy_space_in_named_argument_before_colon = false
-ij_groovy_space_within_empty_array_initializer_braces = false
-ij_groovy_space_within_empty_method_call_parentheses = false
-ij_groovy_spaces_around_additive_operators = true
-ij_groovy_spaces_around_assignment_operators = true
-ij_groovy_spaces_around_bitwise_operators = true
-ij_groovy_spaces_around_equality_operators = true
-ij_groovy_spaces_around_lambda_arrow = true
-ij_groovy_spaces_around_logical_operators = true
-ij_groovy_spaces_around_multiplicative_operators = true
-ij_groovy_spaces_around_regex_operators = true
-ij_groovy_spaces_around_relational_operators = true
-ij_groovy_spaces_around_shift_operators = true
-ij_groovy_spaces_within_annotation_parentheses = false
-ij_groovy_spaces_within_array_initializer_braces = false
-ij_groovy_spaces_within_braces = true
-ij_groovy_spaces_within_brackets = false
-ij_groovy_spaces_within_cast_parentheses = false
-ij_groovy_spaces_within_catch_parentheses = false
-ij_groovy_spaces_within_for_parentheses = false
-ij_groovy_spaces_within_gstring_injection_braces = false
-ij_groovy_spaces_within_if_parentheses = false
-ij_groovy_spaces_within_list_or_map = false
-ij_groovy_spaces_within_method_call_parentheses = false
-ij_groovy_spaces_within_method_parentheses = false
-ij_groovy_spaces_within_parentheses = false
-ij_groovy_spaces_within_switch_parentheses = false
-ij_groovy_spaces_within_synchronized_parentheses = false
-ij_groovy_spaces_within_try_parentheses = false
-ij_groovy_spaces_within_tuple_expression = false
-ij_groovy_spaces_within_while_parentheses = false
-ij_groovy_special_else_if_treatment = true
-ij_groovy_ternary_operation_wrap = off
-ij_groovy_throws_keyword_wrap = off
-ij_groovy_throws_list_wrap = off
-ij_groovy_use_flying_geese_braces = false
-ij_groovy_use_fq_class_names = false
-ij_groovy_use_fq_class_names_in_javadoc = true
-ij_groovy_use_relative_indents = false
-ij_groovy_use_single_class_imports = true
-ij_groovy_variable_annotation_wrap = off
-ij_groovy_while_brace_force = never
-ij_groovy_while_on_new_line = false
-ij_groovy_wrap_chain_calls_after_dot = false
-ij_groovy_wrap_long_lines = false
-
-[{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}]
-indent_size = 4
-ij_json_array_wrapping = split_into_lines
-ij_json_keep_blank_lines_in_code = 0
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = true
-ij_json_keep_trailing_comma = false
-ij_json_object_wrapping = split_into_lines
-ij_json_property_alignment = do_not_align
-ij_json_space_after_colon = true
-ij_json_space_after_comma = true
-ij_json_space_before_colon = false
-ij_json_space_before_comma = false
-ij_json_spaces_within_braces = false
-ij_json_spaces_within_brackets = false
-ij_json_wrap_long_lines = false
-
-[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
-ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
-ij_html_align_text = false
-ij_html_attribute_wrap = normal
-ij_html_block_comment_add_space = false
-ij_html_block_comment_at_first_column = true
-ij_html_do_not_align_children_of_min_lines = 0
-ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
-ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
-ij_html_enforce_quotes = false
-ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
-ij_html_keep_blank_lines = 2
-ij_html_keep_indents_on_empty_lines = false
-ij_html_keep_line_breaks = true
-ij_html_keep_line_breaks_in_text = true
-ij_html_keep_whitespaces = false
-ij_html_keep_whitespaces_inside = span,pre,textarea
-ij_html_line_comment_at_first_column = true
-ij_html_new_line_after_last_attribute = never
-ij_html_new_line_before_first_attribute = never
-ij_html_quote_style = double
-ij_html_remove_new_line_before_tags = br
-ij_html_space_after_tag_name = false
-ij_html_space_around_equality_in_attribute = false
-ij_html_space_inside_empty_tag = false
-ij_html_text_wrap = normal
-
-[{*.kt,*.kts}]
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = false
-ij_kotlin_allow_trailing_comma_on_call_site = false
-ij_kotlin_assignment_wrap = 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_add_space = false
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = false
-ij_kotlin_call_parameters_right_paren_on_new_line = false
-ij_kotlin_call_parameters_wrap = off
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = split_into_lines
-ij_kotlin_continuation_indent_for_chained_calls = true
-ij_kotlin_continuation_indent_for_expression_bodies = true
-ij_kotlin_continuation_indent_in_argument_lists = true
-ij_kotlin_continuation_indent_in_elvis = true
-ij_kotlin_continuation_indent_in_if_conditions = true
-ij_kotlin_continuation_indent_in_parameter_lists = true
-ij_kotlin_continuation_indent_in_supertype_lists = true
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = off
-ij_kotlin_field_annotation_wrap = split_into_lines
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = false
-ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 2
-ij_kotlin_keep_blank_lines_in_code = 2
-ij_kotlin_keep_blank_lines_in_declarations = 2
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_break_after_multiline_when_entry = true
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_add_space_on_reformat = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = off
-ij_kotlin_method_parameters_new_line_after_left_paren = false
-ij_kotlin_method_parameters_right_paren_on_new_line = false
-ij_kotlin_method_parameters_wrap = off
-ij_kotlin_name_count_to_use_star_import = 5
-ij_kotlin_name_count_to_use_star_import_for_members = 3
-ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 0
-ij_kotlin_wrap_first_method_in_call_chain = false
-
-[{*.markdown,*.md}]
-ij_markdown_force_one_space_after_blockquote_symbol = true
-ij_markdown_force_one_space_after_header_symbol = true
-ij_markdown_force_one_space_after_list_bullet = true
-ij_markdown_force_one_space_between_words = true
-ij_markdown_format_tables = true
-ij_markdown_insert_quote_arrows_on_wrap = true
-ij_markdown_keep_indents_on_empty_lines = false
-ij_markdown_keep_line_breaks_inside_text_blocks = true
-ij_markdown_max_lines_around_block_elements = 1
-ij_markdown_max_lines_around_header = 1
-ij_markdown_max_lines_between_paragraphs = 1
-ij_markdown_min_lines_around_block_elements = 1
-ij_markdown_min_lines_around_header = 1
-ij_markdown_min_lines_between_paragraphs = 1
-ij_markdown_wrap_text_if_long = true
-ij_markdown_wrap_text_inside_blockquotes = true
-
-[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
-ij_toml_keep_indents_on_empty_lines = false
-
-[{*.yaml,*.yml}]
-indent_size = 4
-ij_yaml_align_values_properties = do_not_align
-ij_yaml_autoinsert_sequence_marker = true
-ij_yaml_block_mapping_on_new_line = false
-ij_yaml_indent_sequence_value = true
-ij_yaml_keep_indents_on_empty_lines = false
-ij_yaml_keep_line_breaks = true
-ij_yaml_sequence_on_new_line = false
-ij_yaml_space_before_colon = false
-ij_yaml_spaces_within_braces = true
-ij_yaml_spaces_within_brackets = true

.gitignore

@@ -1,3 +1,31 @@
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
+eclipse
+run
+
+# Files from Forge MDK
+logs
+forge*changelog.txt
+
+.architectury-transformer/
 build/
 *.ipr
 run/
@@ -5,11 +33,9 @@ run/
 out/
 *.iml
 .gradle/
-.gradle-cache/
 output/
 bin/
 libs/
-.architectury-transformer/
 
 .classpath
 .project
@@ -19,18 +45,12 @@ classes/
 .vscode
 .settings
 *.launch
-hs_err_pid*
 
 **/src/generated/
 Merged/
-# Folder created by the buildAll scripts
-buildAllJars/
 
 # file from notepad++
 *.bak
 
 # file genearated via MC version switching using preprocessor
-build.properties
-
-# Sqlite databases
-*.sqlite
+build.properties

.gitlab-ci.yml

@@ -1,22 +1,146 @@
 # use Eclipse's JDK
-# The ci should always use a unix(-like) OS to work
-image: eclipse-temurin:17
+image: gradle:eclipse-temurin
 
 # all stages need to be defined here
-# TODO: Make stages depend on what is in versionProperties
 stages:
-  - build
-  - api
-  - pages
+  - build_19
+  - build_18_2
+  - build_18_1
+  - build_17_1
+  - build_16_5
 
 variables:
-  # Pull core when building
-  GIT_SUBMODULE_STRATEGY: recursive
+    # Pull core when building
+    GIT_SUBMODULE_STRATEGY: recursive
 
 
-# These can be extended so code is a bit less duplicated
-.build_java:
-  #image: eclipse-temurin:17
+before_script:
+    - echo $CI_JOB_ID
+    # Writing GE_JOB_ID variable to environment file, will need the value in the next stage.
+    - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
+
+
+
+# 1.16.5 build
+build_16_5:
+  stage: build_16_5
+  script:
+    - echo "Building 1.16.5..."
+    - ./gradlew deleteMerged -PmcVer="1.16.5" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.16.5" --gradle-user-home cache/;
+    - ./gradlew core:build -PmcVer="1.16.5" --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.16.5" --gradle-user-home cache/;
+  image: eclipse-temurin:17
+  artifacts:
+    name: "Merged_NightlyBuild_1_16_5-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - Merged
+    expire_in: 1 day
+    when: always
+  cache:
+    key: "gradleCache"
+    policy: pull-push
+    paths:
+      - .gradle
+      - cache/
+  allow_failure: true
+
+# 1.17.1 build
+build_17_1:
+  stage: build_17_1
+  script:
+    - echo "Building 1.17.1..."
+    - ./gradlew deleteMerged -PmcVer="1.17.1" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.17.1" --gradle-user-home cache/;
+    - ./gradlew core:build -PmcVer="1.17.7" --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.17.1" --gradle-user-home cache/;
+  image: eclipse-temurin:17
+  artifacts:
+    name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - Merged
+    expire_in: 1 day
+    # even if one build fails, upload the successful jars
+    when: always
+  cache:
+    key: "gradleCache"
+    policy: pull-push
+    paths:
+      - .gradle
+      - cache/
+  allow_failure: true
+
+# 1.18.1 build 
+build_18_1:
+  stage: build_18_1
+  script: 
+    - echo "Building 1.18.1..."
+    - ./gradlew deleteMerged -PmcVer="1.18.1" --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
+    - ./gradlew clean -PmcVer="1.18.1" --gradle-user-home cache/;
+    - ./gradlew core:build -PmcVer="1.18.1" --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.18.1" --gradle-user-home cache/;
+  # build using Java 17
+  image: eclipse-temurin:17
+  artifacts:
+    name: "Merged_NightlyBuild_1_18_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+    # relative to the root directory
+    - Merged
+    expire_in: 1 day
+    when: always
+  cache:
+    key: "gradleCache"
+    policy: pull-push
+    paths:
+      - .gradle
+      - cache/
+  allow_failure: true
+
+# 1.18.2 build
+build_18_2:
+  stage: build_18_2
+  script:
+    - echo "Building 1.18.2..."
+    - ./gradlew deleteMerged -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew core:build -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.18.2" --gradle-user-home cache/;
+  image: eclipse-temurin:17
+  artifacts:
+    name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - Merged
+    expire_in: 1 day
+    when: always
+  cache:
+    key: "gradleCache"
+    policy: pull-push
+    paths:
+      - .gradle
+      - cache/
+  allow_failure: true
+
+# 1.19 build
+build_19:
+  stage: build_19
+  script:
+    - echo "Building 1.19..."
+    - ./gradlew deleteMerged -PmcVer="1.19" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.19" --gradle-user-home cache/;
+    - ./gradlew core:build -PmcVer="1.19" --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.19" --gradle-user-home cache/;
+  image: eclipse-temurin:17
+  artifacts:
+    name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - Merged
+    expire_in: 1 day
+    when: always
   cache:
     key: "gradleCache"
     policy: pull-push
@@ -26,73 +150,27 @@ variables:
   allow_failure: true
 
 
-build:
-  stage: build
-  parallel:
-    matrix:
-      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2"]
-  script:
-    # this both runs the unit tests and assembles the code
-    - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
-  artifacts:
-    name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - quilt/build/libs/*.jar
-    exclude:
-      # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller
-      - fabric/build/libs/*-all.jar
-      - fabric/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-sources.jar
-    expire_in: 14 days
-    when: always
-  extends: .build_java
+# unused deployment stage
+#deploy:
+#    stage: deploy
+#    image: registry.gitlab.com/gitlab-org/release-cli:latest
+#    script:
+#        - echo 'running release_job'
+#        - echo 'Previous Job ID is printed below'
+#        - echo $GE_JOB_ID
+#    # Specifying that this job requires artifacts from the previous job to succeed
+#    needs:
+#        - job: build
+#          artifacts: true
+#    release:
+#        name: 'Unstable Jars for Latest Commit' #: $CI_COMMIT_SHORT_SHA'
+#        description: 'Created automatically using the release-cli.'
+#        # tag_name is a mendatory field and can not be an empty string
+#        tag_name: 'Unstable-$CI_COMMIT_SHORT_SHA'
+#        assets:
+#            links:
+#                - name: 'Fabric Jars'
+#                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/fabric/build/libs'
+#                - name: 'Forge Jars'
+#                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/forge/build/libs' 
 
-
-api:
-  stage: api
-  needs: []
-  script:
-    # this should only run for the API
-    - ./gradlew api:clean --gradle-user-home cache/;
-    # this also runs unit tests
-    - ./gradlew api:build --gradle-user-home cache/;
-    - ./gradlew api:addSourcesToCompiledJar --gradle-user-home cache/;
-  artifacts:
-    name: "Api_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - coreSubProjects/api/build/libs/merged/*.jar
-      # can be uncommented if we don't want a jar with the source code
-      # - coreSubProjects/api/build/libs/*.jar
-    exclude:
-      - coreSubProjects/api/build/libs/merged/*-all.jar
-      - coreSubProjects/api/build/libs/merged/*-sources.jar
-    expire_in: 1 day
-    when: always
-  extends: .build_java
-
-
-# generate and publish API javadocs
-pages:
-  stage: pages
-  needs: []
-  script:
-    # this should only run for the API
-    - ./gradlew api:clean --gradle-user-home cache/;
-    # this also runs unit tests
-    - ./gradlew api:build --gradle-user-home cache/;
-    - ./gradlew api:javadoc --gradle-user-home cache/;
-    - mkdir public
-    - cp -r $CI_PROJECT_DIR/coreSubProjects/api/build/docs/javadoc/. public
-  artifacts:
-    paths:
-      - public
-  allow_failure: false
-  extends: .build_java

.gitlab/issue_templates/Bug.md

@@ -1,37 +0,0 @@
-## Chcek off each item in this list before submitting:
-
-<!-- 
-To mark a section as complete either put an "x" in between the square brackets, example: "[x]" 
-Or click the checkbox once the issue has been created.
--->
-
-1. [ ] Check the FAQ to see if your issue has already been reported and has a solution:
-    [Problems-and-solutions](https://gitlab.com/jeseibel/minecraft-lod-mod/-/wikis/2-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
-
-2. [ ] Make sure you are not using any mods on the incompatible list:
-    [Mod support FAQ](https://gitlab.com/jeseibel/minecraft-lod-mod/-/wikis/2-frequently-asked-questions/4-mod-support/Mod-Support)
-
-3. [ ] Check the existing issues to verify that your bug hasn't already been submitted: 
-    [Issues](https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/)
-
-4. [ ] Upload Minecraft's crash report and/or log. \
-   Minecraft crash reports are located in: `.minecraft/crash-reports` \
-   Minecraft logs are located in: `.minecraft/logs`
-
-5. [ ] Upload your Distant Horizons Config. \
-     The config is found in: `.minecraft/configs/DistantHorizons.toml`
-
- 6. [ ] Fill out the information below:
-
- * **minecraft version**:
-
- * **Distant Horizons version**:
-
- * **Mod loader**:
-
- * **Installed mods (list the smallest number of mods that you can use to re-create the bug)**:
- 
- * **Describe the bug**:
-
- * **Steps to reproduce the bug**:
-

.gitlab/issue_templates/Default.md

@@ -1,3 +0,0 @@
-Before creating an issue, please select the appropriate template from the dropdown above.
-
-The template will walk you through submitting a bug, feature, or improvement request.

.gitlab/issue_templates/FeatureRequest.md

@@ -1,5 +0,0 @@
-- [ ] Check the existing [feature requests](https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Feature) to verify that your feature hasn't already been suggested.
-
-1. **Describe the feature**:
-
-2. **Describe why this feature should be added**:

.gitlab/issue_templates/ImprovementRequest.md

@@ -1,3 +0,0 @@
-1. Check the existing [improvement requests](https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/?sort=updated_desc&state=all&label_name%5B%5D=Improvement) to verify that your improvement hasn't already been suggested.
-
-2. **Describe the improvement**:

.gitmodules

@@ -1,3 +1,4 @@
-[submodule "coreSubProjects"]
-	path = coreSubProjects
+[submodule "core"]
+	path = core
 	url = https://gitlab.com/jeseibel/distant-horizons-core.git
+	branch = main

1.16.5.properties

@@ -0,0 +1,43 @@
+# 1.16.5 version
+
+java_version=8
+minecraft_version=1.16.5
+parchment_version=2022.03.06
+compatible_minecraft_versions=["1.16.4", "1.16.5"]
+
+# Fabric loader
+fabric_loader_version=0.13.2
+fabric_api_version=0.42.0+1.16
+    # Fabric mod versions
+    modmenu_version=1.16.22
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=mc1.16.5-0.6.6
+    sodium_version=3488820
+    iris_version=1.16.x-v1.1.4
+    bclib_version=
+    immersive_portals_version =
+
+    # Fabric mod run
+    # 0 = Dont enable and dont run
+    # 1 = Can be refranced in code but dosnt run
+    # 2 = Can be refranced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_lithium=0
+    enable_sodium=1
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=36.2.28
+    # Forge mod versions
+    starlight_version_forge=
+    terraforged_version=3285909
+
+    # Forge mod run
+    # 0 = Dont enable and dont run
+    # 1 = Can be refranced in code but dosnt run
+    # 2 = Can be refranced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=2

1.17.1.properties

@@ -0,0 +1,43 @@
+# 1.17.1 version
+
+java_version=16
+minecraft_version=1.17.1
+parchment_version=2021.12.12
+compatible_minecraft_versions=["1.17", "1.17.1"]
+
+# Fabric loader
+fabric_loader_version=0.13.2
+fabric_api_version=0.46.1+1.17
+    # Fabric mod versions
+    modmenu_version=2.0.14
+    starlight_version_fabric=3442770
+    phosphor_version_fabric=
+    lithium_version=mc1.17.1-0.7.5
+    sodium_version=3605275
+    iris_version=1.17.x-v1.1.4
+    bclib_version=
+    immersive_portals_version = 0.14-1.17
+
+    # Fabric mod run
+    # 0 = Dont enable and dont run
+    # 1 = Can be refranced in code but dosnt run
+    # 2 = Can be refranced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_lithium=0
+    enable_sodium=1
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=37.1.1
+    # Forge mod versions
+    starlight_version_forge=3457784
+    terraforged_version=
+
+    # Forge mod run
+    # 0 = Dont enable and dont run
+    # 1 = Can be refranced in code but dosnt run
+    # 2 = Can be refranced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0

1.18.1.properties

@@ -0,0 +1,43 @@
+# 1.18.1 version
+
+java_version = 17
+minecraft_version=1.18.1
+parchment_version=2022.03.06
+compatible_minecraft_versions=["1.18", "1.18.1"]
+
+# Fabric loader
+fabric_loader_version=0.13.3
+fabric_api_version=0.46.6+1.18
+    # Fabric mod versions
+    modmenu_version=3.0.1
+    starlight_version_fabric=3554912
+    phosphor_version_fabric=3573395
+    lithium_version=mc1.18.1-0.7.7
+    sodium_version=3605309
+    iris_version=1.18.x-v1.1.4
+    bclib_version=1.2.5
+    immersive_portals_version = v1.0.4-1.18
+
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=39.1.2
+    # Forge mod versions
+    starlight_version_forge=3559934
+    terraforged_version=
+
+    # Forge mod run
+    # 0 = Dont enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0

1.18.2.properties

@@ -0,0 +1,43 @@
+# 1.18.2 version based stuff
+
+java_version = 17
+minecraft_version=1.18.2
+parchment_version=2022.03.13
+compatible_minecraft_versions=["1.18.2"]
+
+# Fabric loader
+fabric_loader_version=0.13.3
+fabric_api_version=0.48.0+1.18.2
+    # Fabric mod versions
+    modmenu_version=3.1.0
+    starlight_version_fabric=3667443
+    phosphor_version_fabric=3573395
+    lithium_version=mc1.18.2-0.7.9
+    sodium_version=3669187
+    iris_version=1.18.x-v1.2.2
+    immersive_portals_version = v1.0.4-1.18
+    bclib_version=0
+
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=40.0.18
+    # Forge mod versions
+    starlight_version_forge=0
+    terraforged_version=
+
+    # Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0

1.19.properties

@@ -0,0 +1,43 @@
+# 1.18.2 version based stuff
+
+java_version = 17
+minecraft_version=1.19
+parchment_version=2022.03.13
+compatible_minecraft_versions=["1.19"]
+
+# Fabric loader
+fabric_loader_version=0.14.7
+fabric_api_version=0.55.3+1.19
+    # Fabric mod versions
+    modmenu_version=4.0.0
+    starlight_version_fabric=0
+    phosphor_version_fabric=0
+    lithium_version=0
+    sodium_version=3820973
+    iris_version=1.19.x-v1.2.5
+    immersive_portals_version = 0
+    bclib_version=0
+
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=41.0.19
+    # Forge mod versions
+    starlight_version_forge=0
+    terraforged_version=
+
+    # Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0

Dockerfile

@@ -1,12 +0,0 @@
-FROM eclipse-temurin:17-jdk
-
-WORKDIR /home/build/
-COPY ./gradlew .
-RUN chmod +x ./gradlew
-CMD echo "\r========== [CLEAN: $MC_VER] ==========" && \
-    ./gradlew clean -PmcVer="$MC_VER" --gradle-user-home .gradle-cache/ && \
-    echo "\r========== [BUILD: $MC_VER] ==========" && \
-    ./gradlew build -PmcVer="$MC_VER" --gradle-user-home .gradle-cache/ && \
-    echo "\r========== [MERGE: $MC_VER] ==========" && \
-    ./gradlew mergeJars -PmcVer="$MC_VER" --gradle-user-home .gradle-cache/ && \
-    echo "\r========== [DONE:  $MC_VER] =========="

Readme.md

@@ -1,167 +1,134 @@
-# <img src="https://gitlab.com/jeseibel/distant-horizons-core/-/raw/main/_Misc%20Files/logo%20files/LOD%20logo%20flat%20-%20with%20boarder.png" width="32"> Distant Horizons
+# <img src="https://gitlab.com/jeseibel/distant-horizons-core/-/raw/main/_logo%20files/LOD%20logo%20flat%20-%20with%20boarder.png" width="32"> Distant Horizons
 
 > A mod that adds a Level of Detail System to Minecraft
 
-
 # What is Distant Horizons?
 
-Distant Horizons is a Minecraft mod that adds a Level Of Detail (LOD) system to\
-render simplified chunks outside the normal render distance\
+This mod adds a Level Of Detail (LOD) system to Minecraft.\
+This implementation renders simplified chunks outside the normal render distance\
 allowing for an increased view distance without harming performance.
 
-In other words: this mod lets you see farther without turning your game into a slide show.\
+Or in other words: this mod lets you see farther without turning your game into a slide show.\
 If you want to see a quick demo, check out a video covering the mod here:
 
 <a href="https://youtu.be/_04BZ8W2bDM" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.6.3](https://cdn.ko-fi.com/cdn/useruploads/png_ef4d209d-50d9-462f-b31f-92e42ec3e260cover.jpg?v=c1097a5b-029c-4484-bec3-80ff58c5d239)</a>
 
-<br>
+### Versions
 
-## Minecraft and Library Versions
+This branch is for these versions of Minecraft
+- 1.19
+- 1.18.2
+- 1.18.1 & 1.18
+- 1.17.1 & 1.17
+- 1.16.5 & 1.16.4
 
-### This branch supports the following versions of Minecraft:
+Architectury version: 3.4-SNAPSHOT\
+Architectury loom version: 0.12.0-SNAPSHOT\
+Java Compiler plugin: Manifold Preprocessor
 
-#### 1.20.2
-Fabric: 0.14.24\
-Fabric API: 0.90.4+1.20.2\
-Forge: 48.0.13\
-Parchment: 1.20.1:2023.09.03\
-Modmenu: 8.0.0
+#### 1.19 mods
+Forge version: 41.0.10\
+Fabric version: 0.14.7\
+Fabric API version: 0.55.3+1.19\
+Modmenu version: 4.0.0
 
-#### 1.20.1, 1.20 (Default)
-Fabric: 0.14.24\
-Fabric API: 0.90.4+1.20.1\
-Forge: 47.2.1\
-Parchment: 1.20.1:2023.09.03\
-Modmenu: 7.2.2
+#### 1.18.2 mods
+Forge version: 40.0.18\
+Fabric version: 0.13.3\
+Fabric API version: 0.48.0+1.18.2\
+Modmenu version: 3.1.0
 
-#### 1.19.4
-Fabric: 0.14.24\
-Fabric API: 0.87.1+1.19.4\
-Forge: 45.2.4\
-Parchment: 1.19.4:2023.06.26\
-Modmenu: 6.3.1
+#### 1.18.1 mods
+Forge version: 39.1.2\
+Fabric version: 0.13.3\
+Fabric API version: 0.42.6+1.18\
+Modmenu version: 3.0.1
 
-#### 1.19.2
-Fabric: 0.14.24\
-Fabric API: 0.76.1+1.19.2\
-Forge: 43.3.2\
-Parchment: 1.19.2:2022.11.27\
-Modmenu: 4.2.0-beta.2
+#### 1.17.1 mods
+Forge version: 37.1.1\
+Fabric version: 0.13.2\
+Fabric API version: 0.46.1+1.17\
+Modmenu version: 2.0.14
 
-#### 1.18.2
-Fabric: 0.14.24\
-Fabric API: 0.76.0+1.18.2\
-Forge: 40.2.10\
-Parchment: 1.18.2:2022.11.06\
-Modmenu: 3.2.5
+#### 1.16.5 mods
+Forge version: 36.2.28\
+Fabric vetsion: 0.13.2\
+Fabric API version: 0.42.0+1.16\
+Modmenu version: 1.16.22
 
-#### 1.17.1, 1.17
-Fabric: 0.14.24\
-Fabric API: 0.46.1+1.17\
-Forge: 37.1.1\
-Parchment: 1.17.1:2021.12.12\
-Modmenu: 2.0.14
 
-#### 1.16.5, 1.16.4
-Fabric: 0.14.24\
-Fabric API: 0.42.0+1.16\
-Forge: 36.2.39\
-Parchment: 1.16.5:2022.03.06\
-Modmenu: 1.16.22
 
-### Versions no longer supported
-- 1.18.1, 1.18
-- 1.19.1, 1.19
-- 1.19.3
-<br><br>
+Notes:\
+This version has been confirmed to work in IDE and Retail Minecraft with ether the Fabric or Forge mod-loader.
 
-### Plugin and Library versions
-
-Fabric loom: 1.1.+\
-Forge gradle (Using Architectury): 3.4-SNAPSHOT\
-Sponge vanilla gradle: 0.2.1-SNAPSHOT\
-Sponge mixin: 0.8.5\
-Java Preprocessor plugin: Manifold Preprocessor
-
-<br>
 
 ## Source Code Installation
 
+#### Nightlly builds
+This mod has an autobuild system to automatically build the mod on each commit
+- 1.19:   https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19
+- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_2
+- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_1
+- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_17_1
+- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_16_5
+
+See the Fabric Documentation online for more detailed instructions:\
+https://fabricmc.net/wiki/tutorial:setup
+
 ### Prerequisites
 
-* A Java Development Kit (JDK) for Java 17 (recommended) or newer. <br>
-  Visit https://www.oracle.com/java/technologies/downloads/ for installers.
-* Git or someway to clone git projects. <br> 
-  Visit https://git-scm.com/ for installers.
+* A Java Development Kit (JDK) for Java 17 (recommended) or newer. Visit https://www.oracle.com/java/technologies/downloads/ for installers.
+* Git or someway to clone git projects. Visit https://git-scm.com/ for installers.
 * (Not required) Any Java IDE with plugins that support Manifold, for example Intellij IDEA.
 
 **If using IntelliJ:**
-1. Install the Manifold plugin
-2. Open IDEA and import the build.gradle
-3. Refresh the Gradle project in IDEA if required
+0. Install Manifold plugin
+1. open IDEA and import the build.gradle
+2. refresh the Gradle project in IDEA if required
 
-**If using Eclipse: (Note that Eclipse doesn't support Manifold's preprocessor!)**
-1. Run the command: `./gradlew geneclipseruns`
-2. Run the command: `./gradlew eclipse`
+**If using Ecplise: (Note that Eclispe currently doesn't support Manifold's preprocessor!)**
+1. run the command: `./gradlew geneclipseruns`
+2. run the command: `./gradlew eclipse`
 3. Make sure eclipse has the JDK 17 installed. (This is needed so that eclipse can run minecraft)
 4. Import the project into eclipse
 
-
-
 ## Switching Versions
+This branch support 5 built versions:
+ - 1.19
+ - 1.18.2
+ - 1.18.1 (which also runs on 1.18)
+ - 1.17.1 (which also runs on 1.17)
+ - 1.16.5 (which also runs 1.16.4)
 
-To switch between different Minecraft versions, change `mcVer=1.?` in the `gradle.properties` file.
-
-If running in an IDE, to ensure the IDE noticed the version change, run any gradle command to refresh gradle. (In IntellJ you will also need to do a gradle sync if it didn't happen automatically.)
->Note: There may be a `java.nio.file.FileSystemException` thrown when running the command after switching versions. To fix it, either restart your IDE (as your IDE is probably locking a file) or use a tool like LockHunter to unlock the linked file(s). (Generally it is a lib file under `common\build\lib`, `forge\build\lib`, or `fabric\build\lib`). \
-> If anyone knows how to solve this issue please let us know here: \
-> https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/233
-
-
-<br>
+To switch between active versions, change `mcVer=1.?` in `gradle.properties` file.
 
+If running on IDE, to ensure IDE pickup the changed versions, you will need to run a gradle command again to allow gradle to update all the libs. (In IntellJ you will also need to do a gradle sync again if it didn't start it automatically.)
+>Note: There may be a `java.nio.file.FileSystemException` thrown on running the command after switching versions. To fix it, either restart your IDE (as your IDE is locking up a file) or use tools like LockHunter to unlock the linked file. (Often a lib file under `common\build\lib` or `forge\build\lib` or `fabric\build\lib`). If anyone knows how to solve this issue please comment to this issue: https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/233
+ 
 ## Compiling
 
-Prerequisites:
-- JDK 17 or newer
-
-From the File Explorer:
-1. Download and extract the project zip
-2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `coreSubProjects`
-3. Open a terminal emulator in the project folder (On Windows you can type `cmd` in the title bar)
-4. Run the commands: `./gradlew assemble` (You may need to use a `.\` on Windows)
-5. Merge the jars wih `./gradlew mergeJars`
+**Using GUI**
+1. Download the zip of the project and extract it
+2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `core`
+3. Open a command line in the project folder
+4. Run the command: `./gradlew assemble`
+5. Then run command: `./gradlew mergeJars`
 6. The compiled jar file will be in the folder `Merged`
 
-From the command line:
-1. `git clone --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
+**If in terminal:**
+1. `git clone -b 1.6.4a_dev --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
 2. `cd minecraft-lod-mod`
 3. `./gradlew assemble`
 4. `./gradlew mergeJars`
 5. The compiled jar file will be in the folder `Merged`
+>Note: You can add the arg: `-PmcVer=1.?` to tell gradle to build a selected MC version instead of having to manually modify the `gradle.properties` file.
 
-Run tests with: `./gradlew test`
-
->Note: You can add the arg: `-PmcVer=?` to tell gradle to build a selected MC version instead of having to modify the `gradle.properties` file. \
-> Example: `./gradlew assemble -PmcVer=1.18.2`
-
-
-<br>
-
-## Compiling with Docker
-
-`./compile <version>`
-
-You can also locally compile the DH jars without a Java environment by using Docker. Where `<version>` is the version of Minecraft to compile for (ie `1.20.1`), or the keyword `all`. See [Versions](#minecraft-and-library-versions) for a list of all supported values.
-
-
-<br>
 
 ## Other commands
 
 `./gradlew --refresh-dependencies` to refresh local dependencies.
 
-`./gradlew clean` to delete any compiled code.
+`./gradlew clean` to reset everything (this does not affect your code) and then start the process again.
 
 
 ## Note to self
@@ -171,37 +138,21 @@ The Minecraft source code is NOT added to your workspace in an editable way. Min
 Source code uses Mojang mappings & [Parchment](https://parchmentmc.org/) mappings.
 
 To generate the source code run `./gradlew genSources`\
-If your IDE fails to auto-detect the source jars when browsing Minecraft classes; manually select the JAR file ending with -sources.jar when prompted by your IDE. <br>
-(In IntelliJ it's at the top where it says "choose sources" when browsing a Minecraft class)
+If your IDE fails to auto-detect the sources JAR when browsing Minecraft classes manually select the JAR file ending with -sources.jar when prompted by your IDE
 
-<br>
+In IntelliJ it's at the top where it says choose sources when browsing Minecraft classes
 
-## Other Useful commands
+## Useful commands
 
-Run the standalone jar: `./gradlew run`\
-Build the standalone jar: `./gradlew core:build`\
-Only build Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
-Only build Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
+Build only Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
+Build only Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
 Run the Fabric client (for debugging): `./gradlew fabric:runClient`\
 Run the Forge client (for debugging): `./gradlew forge:runClient`
 
-To build all versions: `./buildAll` (all builds will end up in the `Merged` folder)
-
-<br>
-
 ## Open Source Acknowledgements
 
-Forgix (To merge multiple mod versions into one jar) [_Formerly_ [_DHJarMerger_](https://github.com/Ran-helo/DHJarMerger)]\
-https://github.com/PacifistMC/Forgix
+XZ for Java (data compression)\
+https://tukaani.org/xz/java.html
 
-LZ4 for Java (data compression)\
-https://github.com/lz4/lz4-java
-
-NightConfig for Json & Toml (config handling)\
-https://github.com/TheElectronWill/night-config
-
-SVG Salamander for SVG support (not being used atm)\
-https://github.com/blackears/svgSalamander
-
-sqlite-jdbc\
-https://github.com/xerial/sqlite-jdbc
+DHJarMerger (To merge multiple mod versions into one jar)\
+https://github.com/Ran-helo/DHJarMerger

build.gradle

@@ -1,638 +1,403 @@
-plugins {
-    id "java"
+import io.github.ran.jarmerger.JarMergerPlugin
 
-    // Plugin to handle dependencies
-    id "com.github.johnrengelman.shadow" version '7.1.2' apply false
-
-    // Plugin to create merged jars
-    id "io.github.pacifistmc.forgix" version "1.2.6"
-
-    // Manifold preprocessor
-    id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
-
-    // Provides mc libraries to core
-//    id "org.spongepowered.gradle.vanilla" version '0.2.1-SNAPSHOT' apply false
-
-    // Architectury is used here only as a replacement for forge's own loom
-    id "dev.architectury.loom" version "1.1.+" apply false
+buildscript {
+    dependencies{
+        classpath files('plugins/DHJarMerger-1.0.jar')
+    }
+}
+
+plugins {
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+}
+
+apply plugin: "java"
+apply plugin: "architectury-plugin"
+apply plugin: "maven-publish"
+apply plugin: JarMergerPlugin
+
+archivesBaseName = rootProject.archives_base_name
+version = rootProject.mod_version
+group = rootProject.maven_group
+
+task printConfigurations {
+    doLast {task ->
+        println "Project Name: $name configurations:"
+        configurations.each {
+            println "    $it.name"
+        }
+    }
 }
 
-/**
- * Creates the list of preprocessors to use.
- *
- * @param mcVers array of all MC versions
- * @param mcIndex array index of the currently active MC version
- */
 def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) {
     ArrayList<String> redefineList = new ArrayList<String>()
-
-    for (int i = 0; i < mcVers.size(); i++) {
-        String mcStr = mcVers[i].replace(".", "_")
-        
-        if (mcIndex < i) {
-            // exclusive before
-            // FIXME doesn't function correctly for 1.16.5 (IE the first item in the list)
-            redefineList.add("PRE_MC_" + mcStr)
+    for (int i=0; i<mcVers.size(); i++) {
+        String mcStr = mcVers.get(i).replace(".", "_")
+        if (mcIndex<i) {
+            redefineList.add("PRE_MC_"+mcStr)
         }
-        if (mcIndex <= i) {
-            // inclusive before
-            redefineList.add("PRE_AND_MC_" + mcStr)
+        if (mcIndex==i) {
+            redefineList.add("MC_"+mcStr)
         }
-        
-        if (mcIndex == i) {
-            // exact
-            redefineList.add("MC_" + mcStr)
-        }
-        
-        if (mcIndex > i) {
-            // inclusive after
-            redefineList.add("POST_AND_MC_" + mcStr)
-        }
-        if (mcIndex >= i) {
-            // exclusive after
-            redefineList.add("POST_MC_" + mcStr)
+        if (mcIndex>=i) {
+            redefineList.add("POST_MC_"+mcStr)
         }
     }
-
-    // Build the list of preprocessors to use
     StringBuilder sb = new StringBuilder()
-
-    sb.append("# DON'T TOUCH THIS FILE, This is handled by the build script\n")
-
-    // Check if this is a development build
-    if (mod_version.toLowerCase().contains("dev")) {
-        // WARNING: only use this for logging, we don't want to have confusion
-        // when a method doesn't work correctly in the release build.
-        sb.append("DEV_BUILD")
-        sb.append("=\n")
-    }
-
-    // Build the MC version preprocessors
-    for (String redefinedVersion : redefineList) {
-        sb.append(redefinedVersion)
+    for (String s : redefineList) {
+        sb.append(s)
         sb.append("=\n")
     }
     new File(projectDir, "build.properties").text = sb.toString()
 }
 
+// Sets up the variables for Manifold in the code
+def loadProperties() {
+    def defaultMcVersion = "1.19"
+    def mcVersion = ""
+    def mcVers = mcVersions.split(",")
+    int mcIndex = -1
+    println "Avalible MC versions: ${mcVersions}"
+    if (project.hasProperty("mcVer")) {
+        mcVersion = mcVer
+        mcIndex = Arrays.asList(mcVers).indexOf(mcVer)
+    }
+    if (mcIndex == -1) {
+        println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}."
+        println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer."
+        mcVersion = defaultMcVersion
+        mcIndex = Arrays.asList(mcVers).indexOf(defaultMcVersion)
+        assert mcIndex != -1
+    }
 
-// Transfers the values set in settings.gradle to the rest of the project
-project.gradle.ext.getProperties().each { prop ->
-    rootProject.ext.set(prop.key, prop.value)
-//    println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
+	println "Loading properties file at " + mcVersion + ".properties"
+	def props = new Properties()
+	props.load(new FileInputStream("$rootProject.rootDir/"+"$mcVersion"+".properties"))
+
+    props.each { prop ->
+      rootProject.ext.set(prop.key, prop.value)
+	  // println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
+    }
+    writeBuildGradlePredefine(Arrays.asList(mcVers), mcIndex)
+
+    // Stuff for access wideners
+    def mcVersionToAcsessWidenerVersion = [
+            "1.16.5": "1_16",
+            "1.17.1": "1_17",
+            "1.18.1": "1_18",
+            "1.18.2": "1_18",
+            "1.19"  : "1_19"
+    ]
+    // Use this as sometimes multiple versions use the same access wideners
+    rootProject.ext.set("acsessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion))
 }
-// Sets up manifold stuff
-writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
+loadProperties()
 
-
-
-
-// Sets up the version string (the name we use for our jar)
-rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm")
-// Forgix settings (used for merging jars)
-forgix {
-    group = "com.seibel.distanthorizons"
-    mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar"
-
-    if (findProject(":forge"))
-        forge {
-            jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
-        }
-
-    if (findProject(":fabric"))
-        fabric {
-            jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar"
-        }
-
-    if (findProject(":quilt"))
-        quilt {
-            jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar"
-        }
-
-    removeDuplicate "com.seibel.distanthorizons"
+architectury {
+    minecraft = rootProject.minecraft_version
 }
 
+repositories {
+    mavenCentral()
+
+    // For parchment mappings
+    maven { url "https://maven.parchmentmc.org" }
+
+    // used to download and compile dependencies from git repos
+    maven { url 'https://jitpack.io' }
+
+    // For Manifold Preprocessor
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+
+    // Required for importing Modrinth mods
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
+        }
+    }
+
+    // Required for importing CursedForge mods
+    maven {
+        url "https://www.cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
+
+    // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
+    flatDir {
+        dirs "${rootDir}/mods/fabric"
+        content {
+            includeGroup "fabric-mod"
+        }
+    }
+    flatDir {
+        dirs "${rootDir}/mods/forge"
+        content {
+            includeGroup "forge-mod"
+        }
+    }
+}
+
+processResources {
+    def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put
+    def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
+    def replaceProperties = [
+            version                      : mod_version,
+            mod_name                     : mod_name,
+            authors                      : mod_authors,
+            description                  : mod_description,
+            homepage                     : mod_homepage,
+            source                       : mod_source,
+            issues                       : mod_issues,
+            minecraft_version            : minecraft_version,
+            compatible_minecraft_versions: compatible_minecraft_versions,
+            java_version                 : java_version
+    ]
+    // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
+    //TODO: Make Forge loader version also be relaced with non hardcoded value instead of "[36,42)"
+
+    inputs.properties replaceProperties
+    replaceProperties.put 'project', project
+    filesMatching(resourceTargets) {
+        expand replaceProperties
+    }
+
+    intoTargets.each { target ->
+        if (file(target).exists()) {
+            copy {
+                from(sourceSets.main.resources) {
+                    include resourceTargets
+                    expand replaceProperties
+                }
+                into target
+            }
+        }
+    }
+}
+
+// Copies the correct accesswidener and renames it
+task copyAccessWidener(type: Copy) {
+    from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
+    into(file("build/resources/main"))
+    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
+}
+
+task copyCoreResources(type: Copy) {
+    from fileTree(project(":core").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+task copyCommonResources(type: Copy) {
+    from fileTree(project(":common").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+java {
+    withSourcesJar()
+}
+
+//runClient.enabled = false
+//runServer.enabled = false
+
+// this deletes the merged folder so we don't carry over
+// the previous merges to each new build job in the CI/CD pipeline
+task deleteMerged(type: Delete) {
+   delete files("./Merged")
+}
+
+
+// ===============================CORE Gradle basically================================
 subprojects { p ->
-    // Does the same as "p == project(":common") || p == project(":fabric") || p == project(":quilt")  || p == project(":forge") || p == project("WhateverWeAddLaterOn")"
-    // Useful later on so we dont have duplicated code
-    def isMinecraftSubProject = p != project(":core") && p != project(":api")
+    if (p == project(":core")) {
 
-
-    // Apply plugins
-    apply plugin: "java"
-    apply plugin: "com.github.johnrengelman.shadow"
-    if (isMinecraftSubProject)
-        apply plugin: "systems.manifold.manifold-gradle-plugin"
-    if (p == project(":core"))
-        apply plugin: "application"
-//    apply plugin: "org.spongepowered.gradle.vanilla" // Provides minecraft libraries
-
-    // Apply forge's loom
-    if (findProject(":forge") && p == project(":forge"))
+        apply plugin: "java"
+        apply plugin: "architectury-plugin"
+        apply plugin: "maven-publish"
         apply plugin: "dev.architectury.loom"
 
+        p.archivesBaseName = rootProject.archives_base_name
+        p.version = rootProject.mod_version
+        p.group = rootProject.maven_group
 
-    // Set the manifold version (may not be required tough)
-    manifold {
-        manifoldVersion = rootProject.manifold_version
-    }
+        loom {
+            silentMojangMappingsLicense()
+        }
 
-
-    // set up custom configurations (configurations are a way to handle dependencies) 
-    configurations {
-        // extends the shadowJar configuration
-        shadowMe
-        // have implemented dependencies automatically embedded in the final jar
-        implementation.extendsFrom(shadowMe)
-
-        // Configuration fpr core & api
-        coreProjects
-        shadowMe.extendsFrom(coreProjects)
-        
-        
-        // FIXME this additional configuration is necessary because forge 
-        //  needs forgeRuntimeLibrary, although adding it to shadowMe
-        //  causes runtime issues where the libraries aren't properly added
-        forgeShadowMe
-        // this should match shadowMe pretty closely
-        implementation.extendsFrom(forgeShadowMe)
-        shadowMe.extendsFrom(forgeShadowMe)
-        forgeRuntimeLibrary.extendsFrom(forgeShadowMe)
-        
-        
-        if (isMinecraftSubProject && p != project(":common")) {
-            // Shadow common
+        configurations {
             common
-            shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-            compileClasspath.extendsFrom common
-            runtimeClasspath.extendsFrom common
-            developmentForge.extendsFrom common
-            compileClasspath.extendsFrom coreProjects
-            runtimeClasspath.extendsFrom coreProjects
-            developmentForge.extendsFrom coreProjects
+            shadowMe
+            implementation.extendsFrom shadowMe
+        }
 
-            if (findProject(":fabricLike") && p != project(":fabricLike")) {
-                // Shadow fabricLike
-                fabricLike
-                shadowFabricLike
-                compileClasspath.extendsFrom fabricLike
-                runtimeClasspath.extendsFrom fabricLike
-                developmentForge.extendsFrom fabricLike
+        dependencies {
+            minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+            // The following line declares the mojmap mappings & parchment mappings
+            mappings loom.layered() {
+                // Mojmap mappings
+                officialMojangMappings()
+                // Parchment mappings (it adds parameter mappings & javadoc)
+                if (rootProject.minecraft_version != "1.19")
+                    parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+                else
+                    parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
             }
+
+            //Manifold
+            annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
+
+            // Toml
+            implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
+
+            // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+            // Do NOT use other classes from fabric loader unless working with fabric
+            modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
         }
-    }
 
-
-    // Let the application plugin know where the main class is
-    // (This will point to a non-existent class in all sub-projects except "Core")
-    if (p == project(":core")) {
-        application {
-            mainClass.set("com.seibel.distanthorizons.core.jar.JarMain")
-        }
-    }
-
-    dependencies {
-        //=====================//
-        // shared dependencies //
-        //=====================//
-        
-        
-        // Manifold
-        if (isMinecraftSubProject) {
-            annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
-        }
-        
-        // Log4j
-        // TODO: Change to shadowMe later to work in the standalone jar
-        // We cannot do this now as it would break Quilt
-        implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-        implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
-
-        // JOML
-        implementation("org.joml:joml:${rootProject.joml_version}")
-
-        // JUnit tests
-        implementation("org.junit.jupiter:junit-jupiter:5.8.2")
-        implementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
-        implementation("junit:junit:4.13")
-        
-        // Compression
-        forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}")
-        
-        // Sqlite Database
-        forgeShadowMe("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
-        
-        // NightConfig (includes Toml & Json)
-        forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
-        forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
-
-        // SVG (not needed atm)
-//        forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
-        
-        // Netty
-        // Breaks 1.16.5
-        //forgeShadowMe("io.netty:netty-all:${rootProject.netty_version}")
-
-        // Remember, for lwjgl dependencies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing
-        forgeShadowMe("org.lwjgl:lwjgl-jawt:${rootProject.lwjgl_version}") {
-            exclude group: "org.lwjgl", module: "lwjgl" // This module is imported by Minecraft so exclude it
-        }
-        
-        
-        
-        //==========================//
-        // conditional dependencies //
-        //==========================//
-
-
-        // Add core
-        if (isMinecraftSubProject) {
-            coreProjects(project(":core")) {
-                // Remove Junit test libraries
-                exclude group: "org.junit.jupiter", module: "junit-jupiter"
-                exclude group: "org.junit.jupiter", module: "junit-jupiter-engine"
-                exclude group: "junit", module: "junit"
-                // Removed dependencies
-                transitive false
+        // Allows the jar to run standalone
+        jar {
+            manifest {
+                attributes 'Implementation-Title': rootProject.archives_base_name,
+                        'Implementation-Version': rootProject.mod_version,
+                        'Main-Class': 'com.seibel.lod.core.JarMain'
+                // When changing the main of the jar change this line
             }
         }
 
-        // Add the api
-        if (p != project(":api")) {
-            coreProjects(project(":api")) {
-                // Remove Junit test libraries
-                exclude group: "org.junit.jupiter", module: "junit-jupiter"
-                exclude group: "org.junit.jupiter", module: "junit-jupiter-engine"
-                exclude group: "junit", module: "junit"
-                // Removed dependencies
-                transitive false
-            }
-        }
-
-        // Add common
-        if (isMinecraftSubProject && p != project(":common")) {
-            // Common
-            common(project(":common")) { transitive false }
-            shadowCommon(project(":common")) { transitive false }
-
-            // FabricLike
-            if (findProject(":fabricLike") && p != project(":fabricLike")) {
-                fabricLike(project(path: ":fabricLike")) { transitive false }
-                shadowFabricLike(project(path: ":fabricLike")) { transitive false }
-            }
-        }
-    }
-
-
-    shadowJar {
-        configurations = [project.configurations.shadowMe]
-        if (isMinecraftSubProject && p != project(":common")) {
-            configurations.push(project.configurations.shadowCommon) // Shadow the common subproject
-            relocate "com.seibel.distanthorizons.common", "loaderCommon.${p.name}.com.seibel.distanthorizons.common" // Move the loader files to a different location
-
-            if (findProject(":fabricLike") && p != project(":fabricLike")) {
-                configurations.push(project.configurations.shadowFabricLike) // Shadow the fabricLike subproject
-                relocate "com.seibel.distanthorizons.fabriclike", "loaderCommon.${p.name}.com.seibel.distanthorizons.fabriclike" // Move the loader files to a different location
-            }
-        }
-        def librariesLocation = "distanthorizons.libraries"
-
-        // LWJGL
-        // Only ever shadow the dependencies we use otherwise some stuff would break when running on an external client
-        relocate "org.lwjgl.system.jawt", "${librariesLocation}.lwjgl.system.jawt"
-
-        // Compression (LZ4)
-        relocate "net.jpountz", "${librariesLocation}.jpountz"
-        
-        // Sqlite Database
-        //At the moment, there is a bug in this library which doesnt allow it to be relocated
-//        relocate "org.sqlite", "${librariesLocation}.sqlite"
-
-        // NightConfig (includes Toml & Json)
-        relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
-
-        // SVG (not needed atm)
-//        relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
-        
-        // Netty
-        relocate "io.netty", "${librariesLocation}.netty"
-
-        mergeServiceFiles()
-    }
-    // Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
-    jar.dependsOn(shadowJar)
-
-
-    // Put stuff from gradle.properties into the mod info
-    processResources {
-        def resourceTargets = [ // Location of where to inject the properties
-                // Holds info like git commit
-                // TODO: For some reason this script doesnt work with the core project
-                "build_info.json",
-
-                // Properties for each of the loaders
-                "fabric.mod.json",
-                "quilt.mod.json",
-                "META-INF/mods.toml",
-
-                // The mixins for each of the loaders
-                "DistantHorizons."+ p.name +".fabricLike.mixins.json"
-        ]
-        def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
-
-        // Fix forge version numbering system as it is weird
-        // For whatever reason forge uses [1.18, 1.18.1, 1.18.2) instead of the standard ["1.18", "1.18.1", "1.18.2"] which make more sense
-        def compatible_forgemc_versions = "${compatible_minecraft_versions}".replaceAll("\"", "").replaceAll("]", ",)")
-//        println compatible_forgemc_versions
-
-        // Quilt's custom contributors system
-        // This has to be like
-        // "Person": "Developer", "Another person": "Developer"
-        def quilt_contributors = []
-        def mod_author_list = mod_authors.replaceAll("\"", "").replace("[", "").replace("]", "").split(",")
-        for (dev in mod_author_list) {
-            quilt_contributors.push("\"${dev.strip()}\": \"Developer\"")
-        }
-        quilt_contributors.reverse()
-//        println quilt_contributors.join(", ")
-
-        // TODOI: Find something we can use so we can basically re-map only when the jar is shadowed and relocated
-//        println p.tasks.findByName('shadowJar')
-
-        
-        // These "hasProperty"'s are so that they can be passed through the cli (ie in the CI)
-        try {
-            if (infoGitCommit == "null")
-                infoGitCommit = 'git rev-parse --verify HEAD'.execute().text.trim()
-            if (infoGitBranch == "null")
-                infoGitBranch = 'git symbolic-ref --short HEAD'.execute().text.trim()
-        } catch (Exception e) {
-            infoGitCommit = infoGitBranch = "Git not found"
-            println "Git or Git project not found"
-        }
-
-        def replaceProperties = [
-                version                      : mod_version,
-                mod_name                     : mod_readable_name,
-                group                        : maven_group,
-                authors                      : mod_authors,
-                description                  : mod_description,
-                homepage                     : mod_homepage,
-                source                       : mod_source,
-                issues                       : mod_issues,
-                discord                      : mod_discord,
-                minecraft_version            : minecraft_version,
-                compatible_minecraft_versions: compatible_minecraft_versions,
-                compatible_forgemc_versions  : compatible_forgemc_versions,
-                java_version                 : java_version,
-                quilt_contributors           : "{"+quilt_contributors.join(", ")+"}",
-
-                info_git_commit              : infoGitBranch,
-                info_git_branch              : infoGitCommit,
-                info_build_source            : infoBuildSource,
-
-                fabric_incompatibility_list  : fabric_incompatibility_list,
-                fabric_recommend_list  : fabric_recommend_list,
-        ]
-        // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
-
-        inputs.properties replaceProperties
-        replaceProperties.put "project", project
-        filesMatching(resourceTargets) {
-            expand replaceProperties
-        }
-
-        intoTargets.each { target ->
-            if (file(target).exists()) {
-                copy {
-                    from(sourceSets.main.resources) {
-                        include resourceTargets
-                        expand replaceProperties
-                    }
-                    into target
+        task printConfigurations {
+            doLast {task ->
+                println "Project Name: $p.name configurations:"
+                configurations.each {
+                    println "    $it.name"
                 }
             }
         }
 
+        repositories {
+            mavenCentral()
 
+            // For parchment mappings
+            maven { url "https://maven.parchmentmc.org" }
 
-        // ==================== Delete un-needed files ====================
-        exclude "DistantHorizons.fabricLike.mixins.json" // This isnt required atm, but we will be using it later
+            // used to download and compile dependencies from git repos
+            maven { url 'https://jitpack.io' }
 
-//        exclude "*.distanthorizons.accesswidener"
-////        include "${accessWidenerVersion}.distanthorizons.accesswidener"
+            // For Manifold Preprocessor
+            maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 
-        // Jank solution to remove all unused accesswideners
-        // The line above would work..., except forge requires the original accesswidener file, meaning we require this jank solution to keep it
-        exclude { file ->
-            if (file.name.contains(".distanthorizons.accesswidener") && file.name != "${accessWidenerVersion}.distanthorizons.accesswidener") {
-                return true
+            // Required for importing Modrinth mods
+            maven {
+                name = "Modrinth"
+                url = "https://api.modrinth.com/maven"
+                content {
+                    includeGroup "maven.modrinth"
+                }
             }
-            return false
-        }
-    }
 
-
-    // Adds the standalone jar's entrypoint
-    jar {
-        from "LICENSE.txt"
-        manifest {
-            attributes 'Implementation-Title': rootProject.mod_name,
-                    'Implementation-Version': rootProject.mod_version,
-                    'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line
-        }
-    }
-
-    // this can be un-commented if we ever wanted to make DH modular (AKA use a module-info.java file) again
-    /*
-    // Tells gradle where to look for other modules
-    // Why isn't the classpath added to the modules path by default?
-    if (p == project(":core")) {
-        compileJava {
-            inputs.property('moduleName', 'dhApi')
-            doFirst {
-                options.compilerArgs = [
-                        '--module-path', classpath.asPath
-                ]
-                classpath = files()
+            // Required for importing CursedForge mods
+            maven {
+                url "https://www.cursemaven.com"
+                content {
+                    includeGroup "curse.maven"
+                }
             }
-        }
-    }
-    */
 
-    // Run mergeJars when running build
-    // TODO: Fix later
-//    if (isMinecraftSubProject) {
-//        build.finalizedBy(mergeJars)
-//        assemble.finalizedBy(mergeJars)
-//    }
-}
-
-allprojects { p ->
-    // Does the same as "p == project(":common") || p == project(":fabric") || p == project(":quilt")  || p == project(":forge")"
-    // Useful later on so we dont have duplicated code
-    def isMinecraftSubProject = p != project(":core") && p != project(":api")
-
-
-    apply plugin: "java"
-    apply plugin: "maven-publish"
-    
-    archivesBaseName = rootProject.mod_name
-    version = project.name + "-" + rootProject.versionStr
-    group = rootProject.maven_group
-    
-    // this is the text that appears at the top of the overview (home) page
-    // and is used when bookmarking a page
-    javadoc.title = rootProject.mod_name + "-" + project.name
-    
-    
-    repositories {
-        // The central repo
-        mavenCentral()
-
-        // Used for Google's Collect library
-        maven { url "https://repo.enonic.com/public/" }
-
-        // For parchment mappings
-        maven { url "https://maven.parchmentmc.org" }
-
-        // For Architectury API
-        maven { url "https://maven.architectury.dev" }
-
-        // For Git repositories
-        maven { url "https://jitpack.io" }
-
-        // For Manifold Preprocessor
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-
-        // Required for importing Modrinth mods
-        maven {
-            name = "Modrinth"
-            url = "https://api.modrinth.com/maven"
-            content {
-                includeGroup "maven.modrinth"
+            // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
+            flatDir {
+                dirs "${rootDir}/mods/fabric"
+                content {
+                    includeGroup "fabric-mod"
+                }
+            }
+            flatDir {
+                dirs "${rootDir}/mods/forge"
+                content {
+                    includeGroup "forge-mod"
+                }
             }
         }
 
-        // Required for importing CursedForge mods
-        maven {
-            url "https://www.cursemaven.com"
-            content {
-                includeGroup "curse.maven"
+        processResources {
+            def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put
+            def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
+            def replaceProperties = [
+                    version                      : mod_version,
+                    mod_name                     : mod_name,
+                    authors                      : mod_authors,
+                    description                  : mod_description,
+                    homepage                     : mod_homepage,
+                    source                       : mod_source,
+                    issues                       : mod_issues,
+                    minecraft_version            : minecraft_version,
+                    compatible_minecraft_versions: compatible_minecraft_versions,
+                    java_version                 : java_version
+            ]
+            // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
+            //TODO: Make Forge loader version also be relaced with non hardcoded value instead of "[36,42)"
+
+            inputs.properties replaceProperties
+            replaceProperties.put 'project', project
+            filesMatching(resourceTargets) {
+                expand replaceProperties
+            }
+
+            intoTargets.each { target ->
+                if (file(target).exists()) {
+                    copy {
+                        from(sourceSets.main.resources) {
+                            include resourceTargets
+                            expand replaceProperties
+                        }
+                        into target
+                    }
+                }
             }
         }
-
-        // Required for ModMenu
-        maven { url "https://maven.terraformersmc.com/" }
-
-        // Required for Mixins & VanillaGradle
-        maven { url "https://repo.spongepowered.org/maven/" }
-
-        // Required for Canvas (mod)
-        maven { url "https://maven.vram.io/" }
-
-        // These 3 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
-        flatDir {
-            dirs "${rootDir}/mods/fabric"
-            content {
-                includeGroup "fabric-mod"
-            }
-        }
-        flatDir {
-            dirs "${rootDir}/mods/quilt"
-            content {
-                includeGroup "quilt-mod"
-            }
-        }
-        flatDir {
-            dirs "${rootDir}/mods/forge"
-            content {
-                includeGroup "forge-mod"
-            }
-        }
-    }
-
-    // Adds some dependencies that are in vanilla but not in core
-    if (p == project(":core")) {
-        OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
-
-        // Set the OS lwjgl is using to the current os
-        project.ext.lwjglNatives = "natives-" + os.toFamilyName()
-
-        dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
-            // Imports most of lwjgl's libraries (well, only the ones that we need)
-            implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions
-
-            // REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use
-            implementation "org.lwjgl:lwjgl"
-            implementation "org.lwjgl:lwjgl-assimp"
-            implementation "org.lwjgl:lwjgl-glfw"
-            implementation "org.lwjgl:lwjgl-openal"
-            implementation "org.lwjgl:lwjgl-opengl"
-            implementation "org.lwjgl:lwjgl-stb"
-            implementation "org.lwjgl:lwjgl-tinyfd"
-            runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
-            implementation "org.joml:joml:${rootProject.joml_version}"
-
-
-            // Some other dependencies
-            implementation("org.jetbrains:annotations:16.0.2")
-            implementation("com.google.code.findbugs:jsr305:3.0.2")
-            implementation("com.google.common:google-collect:0.5")
-            implementation("com.google.guava:guava:31.1-jre")
-            implementation("it.unimi.dsi:fastutil:8.5.11")
-        }
-    }
-
-
-    task copyCommonLoaderResources(type: Copy) {
-        from project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
-        into(file(p.file("build/resources/main")))
-        rename "${accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
-
-
-        // Move the fabricLike mixin to its different places for each subproject
-        if (findProject(":fabricLike")) {
-            from project(":fabricLike").file("src/main/resources/DistantHorizons.fabricLike.mixins.json")
+        // Copies the correct accesswidener and renames it
+        task copyAccessWidener(type: Copy) {
+            from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
             into(file(p.file("build/resources/main")))
-            rename "DistantHorizons.fabricLike.mixins.json", "DistantHorizons." + p.name + ".fabricLike.mixins.json"
+            rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
         }
-    }
 
-    task copyCoreResources(type: Copy) {
-        from fileTree(project(":core").file("src/main/resources"))
-        into p.file("build/resources/main")
-    }
-
-    tasks.withType(JavaCompile) {
-        if (isMinecraftSubProject) {
-            options.release = rootProject.java_version as Integer
-            options.compilerArgs += ["-Xplugin:Manifold"]
-        } else {
-            options.release = 8; // Core & Api should use Java 8 no matter what
-            //options.release = rootProject.java_version as Integer // But if you want to test some stuff, then this can be enabled
+        task copyCoreResources(type: Copy) {
+            from fileTree(project(":core").file("src/main/resources"))
+            into p.file("build/resources/main")
         }
-        options.encoding = "UTF-8"
-    }
 
-    java {
-        withSourcesJar()
-    }
-}
+        task copyCommonResources(type: Copy) {
+            from fileTree(project(":common").file("src/main/resources"))
+            into p.file("build/resources/main")
+        }
 
+        p.tasks.withType(JavaCompile) {
+            // Add Manifold Preprocessor
+//		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
+//		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
+//
+            //options.compilerArgs += ['-deprecation']
+            //options.compilerArgs += ['-verbose']
+            //options.compilerArgs += ['-Xlint:unchecked']
+            //options.compilerArgs += ['-Xdiags:verbose']
+            //options.compilerArgs += ['-Xprint']
+            //options.compilerArgs += ['-XprintProcessorInfo']
+            //options.compilerArgs += ['-XprintRounds']
 
-// Delete the merged folder when running clean
-task cleanMergedJars() {
-    def mergedFolder = file("Merged")
-    if (mergedFolder.exists()) {
-        delete(mergedFolder)
+            // println options.compilerArgs
+
+            // Set the java version
+            options.release = 8; // Core should use Java 8 no matter what
+            // TODO: make everything use java 8
+//        options.release = 8 // Use Java 8 for everything so back porting is easier
+        }
+
+        java {
+            withSourcesJar()
+        }
+
+        p.runClient.enabled = false
+        p.runServer.enabled = false
     }
-}
-// add cleanMergedJars to the end of the "clean" task
-tasks["clean"].finalizedBy(cleanMergedJars)
+}

buildAll

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-echo "==================== Note: All build jars will be in the folder called 'buildAllJars' ===================="
-mkdir -p buildAllJars | true
-
-# Loop trough everything in the version properties folder
-for d in versionProperties/*; do
-  # Get the name of the version that is going to be compiled
-  version=$(echo "$d" | sed "s/versionProperties\///" | sed "s/.properties//")
-
-  # Clean out the folders, build it, and merge it
-  # (We could use "./" to run gradlew, but as it is a shell script im going to be running it with the "sh" command)
-  echo "==================== Cleaning workspace to build $version ===================="
-  sh gradlew clean -PmcVer=$version --no-daemon || true
-  echo "====================Building $version ===================="
-  sh gradlew build -PmcVer=$version --no-daemon || true
-  echo "==================== Merging $version ===================="
-  sh gradlew mergeJars -PmcVer=$version --no-daemon || true
-  echo "==================== Moving jar ===================="
-  mv Merged/*.jar buildAllJars/ || true
-  # The "| true" at the end of those are just to make sure the script continues even if a build fails
-done

buildAll.bat

@@ -1,25 +0,0 @@
-@echo off & setlocal enabledelayedexpansion
-@rem Note for devs: If this script doesnt work, please look at the unix buildAll script
-@rem This script was originally created on linux, so there may be some problems with this translation
-
-
-echo ==================== Note: All build jars will be in the folder called 'buildAllJars' ====================
-mkdir buildAllJars
-
-@rem Loop trough everything in the version properties folder
-for %%f in (versionProperties\*) do (
-    @rem Get the name of the version that is going to be compiled
-    set version=%%~nf
-
-    @rem Clean out the folders, build it, and merge it
-    echo ==================== Cleaning workspace to build !version! ====================
-    call .\gradlew.bat clean -PmcVer="!version!" --no-daemon
-    echo ==================== Building !version! ====================
-    call .\gradlew.bat build -PmcVer="!version!" --no-daemon
-    echo ==================== Merging !version! ====================
-    call .\gradlew.bat mergeJars -PmcVer="!version!" --no-daemon
-    echo ==================== Moving jar ====================
-    move Merged\*.jar buildAllJars\
-)
-
-endlocal

code_of_conduct.md

@@ -1,78 +0,0 @@
-
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or acting
-as an appointed representative at an online or offline event. Representation of
-a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the team lead James Seibel through Discord at `@backsun`. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
-

common/build.gradle

@@ -1,26 +1,71 @@
-plugins {
-    id "org.spongepowered.gradle.vanilla" version "0.2.1-SNAPSHOT"
+apply plugin: "java"
+apply plugin: "architectury-plugin"
+apply plugin: "maven-publish"
+apply plugin: "dev.architectury.loom"
+
+archivesBaseName = rootProject.archives_base_name
+version = rootProject.mod_version
+group = rootProject.maven_group
+
+architectury {
+    common(rootProject.enabled_platforms.split(","))
 }
 
-minecraft {
-    accessWideners(project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"))
-    version(rootProject.minecraft_version)
+loom {
+    silentMojangMappingsLicense()
+    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
 }
 
+configurations {
+    common
+    shadowMe
+    implementation.extendsFrom shadowMe
+}
+java {
+    withSourcesJar()
+}
+
+
 dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-//    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+    // The following line declares the mojmap mappings & parchment mappings
+    mappings loom.layered() {
+        // Mojmap mappings
+        officialMojangMappings()
+        // Parchment mappings (it adds parameter mappings & javadoc)
+        if (rootProject.minecraft_version != "1.19")
+            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+        else
+            parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
+    }
 
-    // So mixins can be written in common
-    compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
+    //Manifold
+    annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
+
+    // Toml
+    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
+
+    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+    // Do NOT use other classes from fabric loader unless working with fabric
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"\
+
+    common(project(":core")) { transitive false }
+    shadowMe(project(":core")) { transitive false }
 }
 
+// Allows the jar to run standalone
+jar {
+    manifest {
+        attributes 'Implementation-Title': rootProject.archives_base_name,
+                'Implementation-Version': rootProject.mod_version,
+                'Main-Class': 'com.seibel.lod.core.JarMain' // When changing the main of the jar change this line
+    }
+}
 
 publishing {
     publications {
         mavenCommon(MavenPublication) {
-            artifactId = rootProject.mod_readable_name
+            artifactId = rootProject.archives_base_name
             from components.java
         }
     }
@@ -30,3 +75,144 @@ publishing {
         // Add repositories to publish to here.
     }
 }
+
+task printConfigurations {
+    doLast {task ->
+        println "Project Name: $name configurations:"
+        configurations.each {
+            println "    $it.name"
+        }
+    }
+}
+repositories {
+    mavenCentral()
+
+    // For parchment mappings
+    maven { url "https://maven.parchmentmc.org" }
+
+    // used to download and compile dependencies from git repos
+    maven { url 'https://jitpack.io' }
+
+    // For Manifold Preprocessor
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+
+    // Required for importing Modrinth mods
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
+        }
+    }
+
+    // Required for importing CursedForge mods
+    maven {
+        url "https://www.cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
+
+    // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
+    flatDir {
+        dirs "${rootDir}/mods/fabric"
+        content {
+            includeGroup "fabric-mod"
+        }
+    }
+    flatDir {
+        dirs "${rootDir}/mods/forge"
+        content {
+            includeGroup "forge-mod"
+        }
+    }
+}
+
+// Copies the correct accesswidener and renames it
+task copyAccessWidener(type: Copy) {
+    from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
+    into(file("build/resources/main"))
+    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
+}
+
+task copyCoreResources(type: Copy) {
+    from fileTree(project(":core").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+task copyCommonResources(type: Copy) {
+    from fileTree(project(":common").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+processResources {
+    def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put
+    def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
+    def replaceProperties = [
+            version                      : mod_version,
+            mod_name                     : mod_name,
+            authors                      : mod_authors,
+            description                  : mod_description,
+            homepage                     : mod_homepage,
+            source                       : mod_source,
+            issues                       : mod_issues,
+            minecraft_version            : minecraft_version,
+            compatible_minecraft_versions: compatible_minecraft_versions,
+            java_version                 : java_version
+    ]
+    // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
+    //TODO: Make Forge loader version also be relaced with non hardcoded value instead of "[36,42)"
+
+    inputs.properties replaceProperties
+    replaceProperties.put 'project', project
+    filesMatching(resourceTargets) {
+        expand replaceProperties
+    }
+
+    intoTargets.each { target ->
+        if (file(target).exists()) {
+            copy {
+                from(sourceSets.main.resources) {
+                    include resourceTargets
+                    expand replaceProperties
+                }
+                into target
+            }
+        }
+    }
+}
+
+println "Copying [common/src/main/resources/${acsessWidenerVersion}.lod.accesswidner] to [fabric/build/resources/main]."
+copy {
+    from project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener")
+    into project(":fabric").file("build/resources/main")
+    rename "${acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
+}
+
+tasks.withType(JavaCompile) {
+    // Add Manifold Preprocessor
+//		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
+//		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
+//
+    //options.compilerArgs += ['-deprecation']
+    //options.compilerArgs += ['-verbose']
+    //options.compilerArgs += ['-Xlint:unchecked']
+    //options.compilerArgs += ['-Xdiags:verbose']
+    //options.compilerArgs += ['-Xprint']
+    //options.compilerArgs += ['-XprintProcessorInfo']
+    //options.compilerArgs += ['-XprintRounds']
+
+    // println options.compilerArgs
+
+    // Set the java version
+    options.compilerArgs += ['-Xplugin:Manifold']
+    options.release = rootProject.java_version as Integer
+    // TODO: make everything use java 8
+//        options.release = 8 // Use Java 8 for everything so back porting is easier
+}
+
+sourcesJar {
+}
+
+runClient.enabled = false
+runServer.enabled = false

common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java

@@ -1,64 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common;
-
-import com.seibel.distanthorizons.common.forge.LodForgeMethodCaller;
-import com.seibel.distanthorizons.common.wrappers.DependencySetup;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.api.internal.SharedApi;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigBase;
-
-/**
- * This is the common main class
- *
- * @author Ran
- */
-public class LodCommonMain
-{
-	public static boolean forge = false;
-	public static LodForgeMethodCaller forgeMethodCaller;
-	
-	
-	
-	public static void startup(LodForgeMethodCaller forgeMethodCaller)
-	{
-		if (forgeMethodCaller != null)
-		{
-			LodCommonMain.forge = true;
-			LodCommonMain.forgeMethodCaller = forgeMethodCaller;
-		}
-		
-		DependencySetup.createSharedBindings();
-		SharedApi.init();
-//        if (!serverSided) {
-//            new NetworkReceiver().register_Client();
-//        } else {
-//            new NetworkReceiver().register_Server();
-//        }
-	}
-	
-	public static void initConfig()
-	{
-		ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, 1);
-		Config.completeDelayedSetup();
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java

@@ -1,52 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.forge;
-
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.core.Direction;
-#if POST_MC_1_19_2
-import net.minecraft.util.RandomSource;
-#endif
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-
-import java.util.List;
-import java.util.Random;
-
-/**
- * used for calling methods that forge modified
- * (forge modifies vanilla methods for some reason)
- *
- * @author Ran
- */
-public interface LodForgeMethodCaller
-{
-	#if PRE_MC_1_19_2
-	List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random); // FIXME: For 1.19
-	#else
-	List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random); // FIXME: For 1.19
-    #endif
-	
-	int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z);
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/rendering/SeamlessOverdraw.java

@@ -1,96 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.rendering;
-
-#if PRE_MC_1_19_4
-
-import com.mojang.math.Matrix4f;
-#else
-
-import org.joml.Matrix4f;
-#endif
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
-import org.lwjgl.opengl.GL15;
-
-import java.nio.FloatBuffer;
-
-public class SeamlessOverdraw
-{
-	/**
-	 * Proof-of-concept experimental option, not intended for normal use. <br>
-	 * (Poorly) replaces Minecraft's far clip plane so it lines up with DH's near clip plane.
-	 */
-	public static float[] overwriteMinecraftNearFarClipPlanes(Matrix4f minecraftProjectionMatrix, float previousPartialTicks)
-	{
-		float[] matrixFloatArray;
-		
-		#if PRE_MC_1_19_4
-		FloatBuffer matrixFloatBuffer = FloatBuffer.allocate(16);
-		minecraftProjectionMatrix.store(matrixFloatBuffer);
-		matrixFloatArray = matrixFloatBuffer.array();
-		#else
-		// Passing float buffers in caused native code crashes, so we are passing in a float array instead			
-		matrixFloatArray = new float[16];
-		minecraftProjectionMatrix.get(matrixFloatArray);
-		#endif
-		
-		return overwriteMinecraftNearFarClipPlanes(matrixFloatArray, previousPartialTicks);
-	}
-	
-	public static float[] overwriteMinecraftNearFarClipPlanes(Mat4f minecraftProjectionMatrix, float previousPartialTicks)
-	{
-		return overwriteMinecraftNearFarClipPlanes(minecraftProjectionMatrix.getValuesAsArray(), previousPartialTicks);
-	}
-	
-	private static float[] overwriteMinecraftNearFarClipPlanes(float[] projectionMatrixFloatArray, float previousPartialTicks)
-	{
-		float dhFarClipPlane = RenderUtil.getNearClipPlaneDistanceInBlocks(previousPartialTicks);
-		
-		// works for fabric, bad not for forge for some reason :/
-		float farClip = dhFarClipPlane * 5.1f; // magic number found via trial and error, James has no idea what it represents, except that it makes the seam between DH and vanilla rendering pretty close
-		float nearClip = 0.5f; // this causes issues with some vanilla rendering, specifically the wireframe around selected blocks is slightly off. Unfortunately the ratio between the near and far clip plane can't be easily modified without completely screwing up the rendering. 
-		
-		// these may be the wrong index locations in any version of MC other than 1.18.2
-		projectionMatrixFloatArray[10] = -((farClip + nearClip) / (farClip - nearClip)); // near clip plane
-		projectionMatrixFloatArray[11] = -((2 * farClip * nearClip) / (farClip - nearClip)); // far clip plane
-		
-		
-		return projectionMatrixFloatArray;
-	}
-	
-	
-	
-	//================//
-	// helper methods //
-	//================//
-	
-	public static void applyLegacyProjectionMatrix(float[] projectionMatrixFloatArray)
-	{
-		int glMatrixMode = GL15.glGetInteger(GL15.GL_MATRIX_MODE);
-		GL15.glMatrixMode(GL15.GL_PROJECTION);
-		
-		GL15.glLoadMatrixf(projectionMatrixFloatArray);
-		
-		GL15.glMatrixMode(glMatrixMode);
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/util/ProxyUtil.java

@@ -1,47 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.util;
-
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.LevelAccessor;
-
-public class ProxyUtil
-{
-	
-	public static ILevelWrapper getLevelWrapper(LevelAccessor level)
-	{
-		ILevelWrapper levelWrapper;
-		if (level instanceof ServerLevel)
-		{
-			levelWrapper = ServerLevelWrapper.getWrapper((ServerLevel) level);
-		}
-		else
-		{
-			levelWrapper = ClientLevelWrapper.getWrapper((ClientLevel) level);
-		}
-		
-		return levelWrapper;
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java

@@ -1,75 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers;
-
-import com.seibel.distanthorizons.common.wrappers.gui.ClassicConfigGUI;
-import com.seibel.distanthorizons.common.wrappers.gui.LangWrapper;
-import com.seibel.distanthorizons.common.wrappers.level.KeyedClientLevelManager;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper;
-import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
-import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
-import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
-
-/**
- * Binds all necessary dependencies, so we
- * can access them in Core. <br>
- * This needs to be called before any Core classes
- * are loaded.
- *
- * @author James Seibel
- * @author Ran
- * @version 12-1-2021
- */
-public class DependencySetup
-{
-	
-	public static void createSharedBindings()
-	{
-		SingletonInjector.INSTANCE.bind(ILangWrapper.class, LangWrapper.INSTANCE);
-		SingletonInjector.INSTANCE.bind(IVersionConstants.class, VersionConstants.INSTANCE);
-		SingletonInjector.INSTANCE.bind(IWrapperFactory.class, WrapperFactory.INSTANCE);
-		SingletonInjector.INSTANCE.bind(IKeyedClientLevelManager.class, KeyedClientLevelManager.INSTANCE);
-		DependencySetupDoneCheck.isDone = true;
-	}
-	
-	//@Environment(EnvType.SERVER)
-	public static void createServerBindings()
-	{
-		SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftDedicatedServerWrapper.INSTANCE);
-	}
-	
-	//@Environment(EnvType.CLIENT)
-	public static void createClientBindings()
-	{
-		SingletonInjector.INSTANCE.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);
-		SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftClientWrapper.INSTANCE);
-		SingletonInjector.INSTANCE.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
-		SingletonInjector.INSTANCE.bind(IConfigGui.class, ClassicConfigGUI.CONFIG_CORE_INTERFACE);
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java

@@ -1,174 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers;
-
-import java.nio.FloatBuffer;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-#if PRE_MC_1_19_4
-import com.mojang.math.Matrix4f;
-#else
-import org.joml.Matrix4f;
-#endif
-
-import com.seibel.distanthorizons.core.enums.EDhDirection;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.ChunkPos;
-
-/**
- * This class converts to and from Minecraft objects (Ex: Matrix4f)
- * and objects we created (Ex: Mat4f).
- *
- * @author James Seibel
- * @version 11-20-2021
- */
-public class McObjectConverter
-{
-	private static int bufferIndex(int x, int y)
-	{
-		return y * 4 + x;
-	}
-	/** Taken from Minecraft's com.mojang.math.Matrix4f class from 1.18.2 */
-	private static void storeMatrix(Matrix4f matrix, FloatBuffer buffer)
-	{
-        #if PRE_MC_1_19_4
-		matrix.store(buffer);
-        #else
-		// Mojang starts to use joml's Matrix4f libary in 1.19.3 so we copy their store method and use it here if its newer than 1.19.3
-		buffer.put(bufferIndex(0, 0), matrix.m00());
-		buffer.put(bufferIndex(0, 1), matrix.m01());
-		buffer.put(bufferIndex(0, 2), matrix.m02());
-		buffer.put(bufferIndex(0, 3), matrix.m03());
-		buffer.put(bufferIndex(1, 0), matrix.m10());
-		buffer.put(bufferIndex(1, 1), matrix.m11());
-		buffer.put(bufferIndex(1, 2), matrix.m12());
-		buffer.put(bufferIndex(1, 3), matrix.m13());
-		buffer.put(bufferIndex(2, 0), matrix.m20());
-		buffer.put(bufferIndex(2, 1), matrix.m21());
-		buffer.put(bufferIndex(2, 2), matrix.m22());
-		buffer.put(bufferIndex(2, 3), matrix.m23());
-		buffer.put(bufferIndex(3, 0), matrix.m30());
-		buffer.put(bufferIndex(3, 1), matrix.m31());
-		buffer.put(bufferIndex(3, 2), matrix.m32());
-		buffer.put(bufferIndex(3, 3), matrix.m33());
-        #endif
-	}
-	
-	/** 4x4 float matrix converter */
-	public static Mat4f Convert(Matrix4f mcMatrix)
-	{
-		FloatBuffer buffer = FloatBuffer.allocate(16);
-		storeMatrix(mcMatrix, buffer);
-		Mat4f matrix = new Mat4f(buffer);
-        #if PRE_MC_1_19_4
-		matrix.transpose(); // In 1.19.3 and later, we no longer need to transpose it
-        #endif
-		return matrix;
-	}
-	
-	
-	static final Direction[] directions;
-	static final EDhDirection[] lodDirections;
-	static
-	{
-		EDhDirection[] lodDirs = EDhDirection.values();
-		directions = new Direction[lodDirs.length];
-		lodDirections = new EDhDirection[lodDirs.length];
-		for (EDhDirection lodDir : lodDirs)
-		{
-			Direction dir;
-			switch (lodDir.name().toUpperCase())
-			{
-				case "DOWN":
-					dir = Direction.DOWN;
-					break;
-				case "UP":
-					dir = Direction.UP;
-					break;
-				case "NORTH":
-					dir = Direction.NORTH;
-					break;
-				case "SOUTH":
-					dir = Direction.SOUTH;
-					break;
-				case "WEST":
-					dir = Direction.WEST;
-					break;
-				case "EAST":
-					dir = Direction.EAST;
-					break;
-				default:
-					dir = null;
-					break;
-			}
-			
-			if (dir == null)
-			{
-				throw new IllegalArgumentException("Invalid direction on init mapping: " + lodDir);
-			}
-			directions[lodDir.ordinal()] = dir;
-			lodDirections[dir.ordinal()] = lodDir;
-		}
-	}
-	
-	public static BlockPos Convert(DhBlockPos wrappedPos)
-	{
-		return new BlockPos(wrappedPos.x, wrappedPos.y, wrappedPos.z);
-	}
-	public static ChunkPos Convert(DhChunkPos wrappedPos)
-	{
-		return new ChunkPos(wrappedPos.x, wrappedPos.z);
-	}
-	
-	public static Direction Convert(EDhDirection lodDirection)
-	{
-		return directions[lodDirection.ordinal()];
-	}
-	public static EDhDirection Convert(Direction direction)
-	{
-		return lodDirections[direction.ordinal()];
-	}
-	public static void DebugCheckAllPackers()
-	{
-		BiConsumer<Integer, Integer> func = (x, z) -> DhChunkPos._DebugCheckPacker(x, z, ChunkPos.asLong(x, z));
-		func.accept(0, 0);
-		func.accept(12345, 134);
-		func.accept(-12345, -134);
-		func.accept(-30000000 / 16, 30000000 / 16);
-		func.accept(30000000 / 16, -30000000 / 16);
-		func.accept(30000000 / 16, 30000000 / 16);
-		func.accept(-30000000 / 16, -30000000 / 16);
-		Consumer<BlockPos> func2 = (p) -> DhBlockPos._DebugCheckPacker(p.getX(), p.getY(), p.getZ(), p.asLong());
-		func2.accept(new BlockPos(0, 0, 0));
-		func2.accept(new BlockPos(12345, 134, 123));
-		func2.accept(new BlockPos(-12345, -134, -80));
-		func2.accept(new BlockPos(-30000000, 2047, 30000000));
-		func2.accept(new BlockPos(30000000, -2048, -30000000));
-		func2.accept(new BlockPos(30000000, 2047, 30000000));
-		func2.accept(new BlockPos(-30000000, -2048, -30000000));
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java

@@ -1,203 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers;
-
-import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.level.IDhServerLevel;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.chunk.ChunkAccess;
-
-import java.io.IOException;
-import java.util.HashSet;
-
-/**
- * This handles creating abstract wrapper objects.
- *
- * @author James Seibel
- * @version 2022-12-5
- */
-public class WrapperFactory implements IWrapperFactory
-{
-	public static final WrapperFactory INSTANCE = new WrapperFactory();
-	
-	
-	
-	
-	@Override
-	public AbstractBatchGenerationEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel)
-	{
-		if (targetLevel instanceof IDhServerLevel)
-		{
-			return new BatchGenerationEnvironment((IDhServerLevel) targetLevel);
-		}
-		else
-		{
-			throw new IllegalArgumentException("The target level must be a server-side level.");
-		}
-	}
-	
-	@Override
-	public IBiomeWrapper deserializeBiomeWrapper(String str, ILevelWrapper levelWrapper) throws IOException { return BiomeWrapper.deserialize(str, levelWrapper); }
-	
-	@Override
-	public IBlockStateWrapper deserializeBlockStateWrapper(String str, ILevelWrapper levelWrapper) throws IOException { return BlockStateWrapper.deserialize(str, levelWrapper); }
-	
-	@Override
-	public IBlockStateWrapper getAirBlockStateWrapper() { return BlockStateWrapper.AIR; }
-	
-	@Override
-	public HashSet<IBlockStateWrapper> getRendererIgnoredBlocks(ILevelWrapper levelWrapper) { return BlockStateWrapper.getRendererIgnoredBlocks(levelWrapper); }
-	
-	
-	/**
-	 * Note: when this is updated for different MC versions, make sure you also update the documentation in
-	 * {@link IDhApiWorldGenerator#generateChunks} and the type list in {@link WrapperFactory#createChunkWrapperErrorMessage}. <br><br>
-	 *
-	 * For full method documentation please see: {@link IWrapperFactory#createChunkWrapper}
-	 *
-	 * @see IWrapperFactory#createChunkWrapper
-	 */
-	public IChunkWrapper createChunkWrapper(Object[] objectArray) throws ClassCastException
-	{
-		if (objectArray.length == 1 && objectArray[0] instanceof IChunkWrapper)
-		{
-			try
-			{
-				// this path should only happen when called by Distant Horizons code
-				// API implementors should never hit this path
-				return (IChunkWrapper) objectArray[0];
-			}
-			catch (Exception e)
-			{
-				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-			}
-		}
-		
-		// MC 1.16, 1.18, 1.19, 1.20
-		#if POST_MC_1_17_1 || MC_1_16_5
-		else if (objectArray.length == 2)
-		{
-			// correct number of parameters from the API
-			
-			// chunk
-			if (!(objectArray[0] instanceof ChunkAccess))
-			{
-				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-			}
-			ChunkAccess chunk = (ChunkAccess) objectArray[0];
-			
-			// level / light source
-			if (!(objectArray[1] instanceof Level))
-			{
-				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-			}
-			// the level is needed for the DH level wrapper...
-			Level level = (Level) objectArray[1];
-			// ...the LevelReader is needed for chunk lighting
-			LevelReader lightSource = level;
-			
-			
-			// level wrapper
-			ILevelWrapper levelWrapper;
-			if (level instanceof ServerLevel)
-			{
-				levelWrapper = ServerLevelWrapper.getWrapper((ServerLevel)level);
-			}
-			else if (level instanceof ClientLevel)
-			{
-				levelWrapper = ClientLevelWrapper.getWrapper((ClientLevel)level);
-			}
-			else
-			{
-				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-			}
-			
-			
-			return new ChunkWrapper(chunk, lightSource, levelWrapper);
-		}
-		// incorrect number of parameters from the API
-		else
-		{
-			throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-		}
-		#else
-			// Intentional compiler error to bring attention to the missing wrapper function.
-			// If you need to work on an unimplemented version but don't have the ability to implement this yet
-			// you can comment it out, but please don't commit it. Someone will have to implement it .
-
-			// After implementing the new version please read this method's javadocs for instructions
-			// on what other locations also need to be updated, the DhAPI specifically needs to
-			// be updated to state which objects this method accepts.
-			not implemented for this version of Minecraft!
-		#endif
-	}
-	/**
-	 * Note: when this is updated for different MC versions,
-	 * make sure you also update the documentation in {@link IDhApiWorldGenerator#generateChunks}.
-	 */
-	private static String createChunkWrapperErrorMessage(Object[] objectArray)
-	{
-		StringBuilder message = new StringBuilder(
-				"Chunk wrapper creation failed. \n" +
-						"Expected parameters: \n");
-		
-		// MC 1.16, 1.18, 1.19, 1.20
-		#if POST_MC_1_17_1 || MC_1_16_5
-		message.append("[" + ChunkAccess.class.getName() + "], \n");
-		message.append("[" + ServerLevel.class.getName() + "] or [" + ClientLevel.class.getName() + "]. \n");
-		#else
-			// See preprocessor comment in createChunkWrapper() for full documentation
-			not implemented for this version of Minecraft!
-		#endif
-		
-		if (objectArray.length != 0)
-		{
-			message.append("Given parameters: ");
-			for (Object obj : objectArray)
-			{
-				message.append("[").append(obj.getClass().getName()).append("], ");
-			}
-		}
-		else
-		{
-			message.append(" No parameters given.");
-		}
-		
-		return message.toString();
-	}
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java

@@ -1,289 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.world.level.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-
-import net.minecraft.client.Minecraft;
-#if POST_MC_1_17
-import net.minecraft.core.Holder;
-import net.minecraft.resources.RegistryOps;
-#endif
-
-#if POST_MC_1_19_2
-#endif
-
-
-#if MC_1_16_5 || MC_1_17_1
-import net.minecraft.core.Registry;
-#elif MC_1_18_2 || MC_1_19_2
-import net.minecraft.core.Holder;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.data.BuiltinRegistries;
-#else
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.Registries;
-#endif
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.biome.Biome;
-#if !PRE_MC_1_18_2
-import net.minecraft.world.level.biome.Biomes;
-#endif
-
-
-/** This class wraps the minecraft BlockPos.Mutable (and BlockPos) class */
-public class BiomeWrapper implements IBiomeWrapper
-{
-	private static final Logger LOGGER = LogManager.getLogger();
-	
-	#if PRE_MC_1_18_2
-	public static final ConcurrentMap<Biome, BiomeWrapper> WRAPPER_BY_BIOME = new ConcurrentHashMap<>();
-	#else
-	public static final ConcurrentMap<Holder<Biome>, BiomeWrapper> WRAPPER_BY_BIOME = new ConcurrentHashMap<>();
-    #endif
-	
-	public static final String EMPTY_STRING = "EMPTY";
-	public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper(null, null);
-	
-	/** keep track of broken biomes so we don't log every time */
-	private static final HashSet<String> BrokenResourceLocationStrings = new HashSet<>();
-	
-	
-	
-	// properties //
-	
-	#if PRE_MC_1_18_2
-	public final Biome biome;
-	#else
-	public final Holder<Biome> biome;
-    #endif
-	
-	/** technically final, but since it requires a method call to generate it can't be marked as such */
-	private String serialString = null;
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	static public IBiomeWrapper getBiomeWrapper(#if PRE_MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
-	{
-		if (biome == null)
-		{
-			return EMPTY_WRAPPER;
-		}
-		
-		
-		if (WRAPPER_BY_BIOME.containsKey(biome))
-		{
-			return WRAPPER_BY_BIOME.get(biome);
-		}
-		else
-		{
-			BiomeWrapper newWrapper = new BiomeWrapper(biome, levelWrapper);
-			WRAPPER_BY_BIOME.put(biome, newWrapper);
-			return newWrapper;
-		}
-	}
-	
-	private BiomeWrapper(#if PRE_MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
-	{
-		this.biome = biome;
-		this.serialString = this.serialize(levelWrapper);
-		LOGGER.trace("Created BiomeWrapper ["+this.serialString+"] for ["+biome+"]");
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	@Override
-	public String getName()
-	{
-		if (this == EMPTY_WRAPPER)
-		{
-			return EMPTY_STRING;
-		}
-		
-        #if PRE_MC_1_18_2
-		return biome.toString();
-        #else
-		return this.biome.unwrapKey().orElse(Biomes.THE_VOID).registry().toString();
-        #endif
-	}
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-		{
-			return true;
-		}
-		else if (obj == null || this.getClass() != obj.getClass())
-		{
-			return false;
-		}
-		
-		BiomeWrapper that = (BiomeWrapper) obj;
-		// the serialized value is used so we can test the contents instead of the references
-		return Objects.equals(this.getSerialString(), that.getSerialString());
-	}
-	
-	@Override
-	public int hashCode() { return Objects.hash(this.getSerialString()); }
-	
-	@Override
-	public String getSerialString() { return this.serialString; }
-	
-	@Override
-	public Object getWrappedMcObject() { return this.biome; }
-	
-	@Override
-	public String toString() { return this.getSerialString(); }
-	
-	
-	
-	//=======================//
-	// serialization methods //
-	//=======================//
-	
-	public String serialize(ILevelWrapper levelWrapper)
-	{
-		if (levelWrapper == null)
-		{
-			return EMPTY_STRING;
-		}
-		
-		
-		if (this.serialString == null)
-		{
-			net.minecraft.core.RegistryAccess registryAccess = Minecraft.getInstance().level.registryAccess();
-			
-			ResourceLocation resourceLocation;
-			#if MC_1_16_5 || MC_1_17_1
-			resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome);
-			#elif MC_1_18_2 || MC_1_19_2
-			resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome.value());
-			#else
-			resourceLocation = registryAccess.registryOrThrow(Registries.BIOME).getKey(this.biome.value());
-			#endif
-			
-			if (resourceLocation == null)
-			{
-				String biomeName;
-				#if MC_1_16_5 || MC_1_17_1
-				biomeName = this.biome.toString();
-				#else
-				biomeName = this.biome.value().toString();
-				#endif
-				
-				LOGGER.warn("unable to serialize: " + biomeName);
-				// shouldn't normally happen, but just in case
-				this.serialString = "";
-			}
-			else
-			{
-				this.serialString = resourceLocation.getNamespace() + ":" + resourceLocation.getPath();
-			}
-		}
-		
-		return this.serialString;
-	}
-	
-	public static IBiomeWrapper deserialize(String resourceLocationString, ILevelWrapper levelWrapper) throws IOException
-	{
-		if (resourceLocationString.equals(EMPTY_STRING))
-		{
-			LOGGER.warn("["+EMPTY_STRING+"] biome string deserialized. This may mean there was a file saving error or a biome saving error.");
-			return EMPTY_WRAPPER;
-		}
-		else if (resourceLocationString.trim().isEmpty() || resourceLocationString.equals(""))
-		{
-			LOGGER.warn("Null biome string deserialized.");
-			return EMPTY_WRAPPER;
-		}
-		
-		
-		
-		// parse the resource location
-		int separatorIndex = resourceLocationString.indexOf(":");
-		if (separatorIndex == -1)
-		{
-			throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
-		}
-		ResourceLocation resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
-		
-		
-		try
-		{
-			Level level = (Level)levelWrapper.getWrappedMcObject();
-			net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
-			
-			boolean success;
-			#if MC_1_16_5 || MC_1_17_1
-			Biome biome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
-			success = (biome != null);
-			#elif MC_1_18_2 || MC_1_19_2
-			Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
-			success = (unwrappedBiome != null);
-			Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-			#else
-			Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
-			success = (unwrappedBiome != null);
-			Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-			#endif
-			
-			
-			
-			if (!success)
-			{
-				if (!BrokenResourceLocationStrings.contains(resourceLocationString))
-				{
-					BrokenResourceLocationStrings.add(resourceLocationString);
-					LOGGER.warn("Unable to deserialize biome from string: [" + resourceLocationString + "]");
-				}
-				return EMPTY_WRAPPER;
-			}
-			
-			return getBiomeWrapper(biome, levelWrapper);
-		}
-		catch (Exception e)
-		{
-			throw new IOException("Failed to deserialize the string [" + resourceLocationString + "] into a BiomeWrapper: " + e.getMessage(), e);
-		}
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -1,432 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-#if MC_1_16_5 || MC_1_17_1
-import net.minecraft.core.Registry;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.EmptyBlockGetter;
-#elif MC_1_18_2 || MC_1_19_2
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.level.Level;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Registry;
-#else
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.level.Level;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.level.EmptyBlockGetter;
-#endif
-
-public class BlockStateWrapper implements IBlockStateWrapper
-{
-	/** example "minecraft:water" */
-	public static final String RESOURCE_LOCATION_SEPARATOR = ":";
-	/** example "minecraft:water_STATE_{level:0}" */
-	public static final String STATE_STRING_SEPARATOR = "_STATE_";
-	
-	
-	// must be defined before AIR, otherwise a null pointer will be thrown
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-    public static final ConcurrentHashMap<BlockState, BlockStateWrapper> WRAPPER_BY_BLOCK_STATE = new ConcurrentHashMap<>();
-	
-	public static final String AIR_STRING = "AIR";
-	public static final BlockStateWrapper AIR = new BlockStateWrapper(null, null);
-	
-	// TODO: Make this changeable through the config
-	public static final String[] RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS = { AIR_STRING, "minecraft:barrier", "minecraft:structure_void", "minecraft:light", "minecraft:tripwire" };
-	public static HashSet<IBlockStateWrapper> rendererIgnoredBlocks = null;
-	
-	/** keep track of broken blocks so we don't log every time */
-	private static final HashSet<ResourceLocation> BrokenResourceLocations = new HashSet<>();
-	
-	
-	
-	// properties //
-	
-	public final BlockState blockState;
-	/** technically final, but since it requires a method call to generate it can't be marked as such */
-	private String serialString;
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	public static BlockStateWrapper fromBlockState(BlockState blockState, ILevelWrapper levelWrapper)
-	{
-		if (blockState == null || blockState.isAir())
-		{
-			return AIR;
-		}
-		
-		
-		if (WRAPPER_BY_BLOCK_STATE.containsKey(blockState))
-		{
-			return WRAPPER_BY_BLOCK_STATE.get(blockState);
-		}
-		else
-		{
-			BlockStateWrapper newWrapper = new BlockStateWrapper(blockState, levelWrapper);
-			WRAPPER_BY_BLOCK_STATE.put(blockState, newWrapper);
-			return newWrapper;
-		}
-	}
-	
-	private BlockStateWrapper(BlockState blockState, ILevelWrapper levelWrapper)
-	{
-		this.blockState = blockState;
-		this.serialString = this.serialize(levelWrapper);
-		LOGGER.trace("Created BlockStateWrapper ["+this.serialString+"] for ["+blockState+"]");
-	}
-	
-	
-	
-	//================//
-	// helper methods //
-	//================//
-	
-	/** 
-	 * Requires a {@link ILevelWrapper} since {@link BlockStateWrapper#deserialize(String,ILevelWrapper)} also requires one. 
-	 * This way the method won't accidentally be called before the deserialization can be completed.
-	 */
-	public static HashSet<IBlockStateWrapper> getRendererIgnoredBlocks(ILevelWrapper levelWrapper)
-	{
-		// use the cached version if possible
-		if (rendererIgnoredBlocks != null)
-		{
-			return rendererIgnoredBlocks;
-		}
-		
-		
-		// deserialize each of the given resource locations
-		HashSet<IBlockStateWrapper> blockStateWrappers = new HashSet<>();
-		for (String blockResourceLocation : RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS)
-		{
-			try
-			{
-				BlockStateWrapper DefaultBlockStateToIgnore = (BlockStateWrapper) deserialize(blockResourceLocation, levelWrapper);
-				blockStateWrappers.add(DefaultBlockStateToIgnore);
-				
-				if (DefaultBlockStateToIgnore == AIR)
-				{
-					continue;
-				}
-				
-				// add all possible blockstates (to account for light blocks with different light values and such)
-				List<BlockState> blockStatesToIgnore = DefaultBlockStateToIgnore.blockState.getBlock().getStateDefinition().getPossibleStates();
-				for (BlockState blockState : blockStatesToIgnore)
-				{
-					BlockStateWrapper newBlockToIgnore = BlockStateWrapper.fromBlockState(blockState, levelWrapper);
-					blockStateWrappers.add(newBlockToIgnore);
-				}
-			}
-			catch (IOException e)
-			{
-				LOGGER.warn("Unable to deserialize rendererIgnoredBlock with the resource location: ["+blockResourceLocation+"]. Error: "+e.getMessage(), e);
-			}
-		}
-		
-		rendererIgnoredBlocks = blockStateWrappers;
-		return rendererIgnoredBlocks;
-	}
-	
-	
-	
-	//=================//
-	// wrapper methods //
-	//=================//
-	
-	@Override
-	public int getOpacity()
-	{
-		// this method isn't perfect, but works well enough for our use case
-		if (this.isAir() || !this.blockState.canOcclude())
-		{
-			// completely transparent
-			return 0;
-		}
-		else
-		{
-			// completely opaque
-			return 16;
-		}
-	}
-	
-	@Override
-	public int getLightEmission() { return (this.blockState != null) ? this.blockState.getLightEmission() : 0; }
-	
-	@Override
-	public String getSerialString() { return this.serialString; }
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-		{
-			return true;
-		}
-		
-		if (obj == null || this.getClass() != obj.getClass())
-		{
-			return false;
-		}
-		
-		BlockStateWrapper that = (BlockStateWrapper) obj;
-		// the serialized value is used so we can test the contents instead of the references
-		return Objects.equals(this.getSerialString(), that.getSerialString());
-	}
-	
-	@Override
-	public int hashCode() { return Objects.hash(this.getSerialString()); }
-	
-	
-	@Override
-	public Object getWrappedMcObject() { return this.blockState; }
-	
-	@Override
-	public boolean isAir() { return this.isAir(this.blockState); }
-	public boolean isAir(BlockState blockState) { return blockState == null || blockState.isAir(); }
-	
-	@Override
-	public boolean isSolid()
-	{
-        #if PRE_MC_1_20_1
-		return this.blockState.getMaterial().isSolid();
-        #else
-		return !this.blockState.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).isEmpty();
-        #endif
-	}
-	
-	@Override
-	public boolean isLiquid()
-	{
-		if (this.isAir())
-		{
-			return false;
-		}
-		
-        #if PRE_MC_1_20_1
-		return this.blockState.getMaterial().isLiquid() || !this.blockState.getFluidState().isEmpty();
-        #else
-		return !this.blockState.getFluidState().isEmpty();
-        #endif
-	}
-	
-	@Override
-	public String toString() { return this.getSerialString(); }
-	
-	
-	
-	//=======================//
-	// serialization methods //
-	//=======================//
-	
-	private String serialize(ILevelWrapper levelWrapper)
-	{
-		if (this.blockState == null)
-		{
-			return AIR_STRING;
-		}
-		
-		
-		
-		// older versions of MC have a static registry
-		#if !(MC_1_16_5 || MC_1_17_1)
-		Level level = (Level)levelWrapper.getWrappedMcObject();
-		net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
-		#endif
-		
-		ResourceLocation resourceLocation;
-		#if MC_1_16_5 || MC_1_17_1
-		resourceLocation = Registry.BLOCK.getKey(this.blockState.getBlock());
-		#elif MC_1_18_2 || MC_1_19_2
-		resourceLocation = registryAccess.registryOrThrow(Registry.BLOCK_REGISTRY).getKey(this.blockState.getBlock());
-		#else
-		resourceLocation = registryAccess.registryOrThrow(Registries.BLOCK).getKey(this.blockState.getBlock());
-		#endif
-		
-		
-		
-		if (resourceLocation == null)
-		{
-			LOGGER.warn("No ResourceLocation found, unable to serialize: " + this.blockState);
-			return AIR_STRING;
-		}
-		
-		this.serialString = resourceLocation.getNamespace() + RESOURCE_LOCATION_SEPARATOR + resourceLocation.getPath()
-				+ STATE_STRING_SEPARATOR + serializeBlockStateProperties(this.blockState);
-		
-		return this.serialString;
-	}
-	
-	
-	/** will only work if a level is currently loaded */
-	public static IBlockStateWrapper deserialize(String resourceStateString, ILevelWrapper levelWrapper) throws IOException
-	{
-		if (resourceStateString.equals(AIR_STRING) || resourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
-		{
-			return AIR;
-		}
-		
-		
-		
-		// try to parse out the BlockState
-		String blockStatePropertiesString = null; // will be null if no properties were included
-		int stateSeparatorIndex = resourceStateString.indexOf(STATE_STRING_SEPARATOR);
-		if (stateSeparatorIndex != -1)
-		{
-			// blockstate properties found
-			blockStatePropertiesString = resourceStateString.substring(stateSeparatorIndex + STATE_STRING_SEPARATOR.length());
-			resourceStateString = resourceStateString.substring(0, stateSeparatorIndex);
-		}
-		
-		// parse the resource location
-		int resourceSeparatorIndex = resourceStateString.indexOf(RESOURCE_LOCATION_SEPARATOR);
-		if (resourceSeparatorIndex == -1)
-		{
-			throw new IOException("Unable to parse Resource Location out of string: [" + resourceStateString + "].");
-		}
-		ResourceLocation resourceLocation = new ResourceLocation(resourceStateString.substring(0, resourceSeparatorIndex), resourceStateString.substring(resourceSeparatorIndex + 1));
-		
-		
-		
-		// attempt to get the BlockState from all possible BlockStates
-		try
-		{
-			
-			#if !(MC_1_16_5 || MC_1_17_1)
-			// use the given level if possible, otherwise try using the currently loaded one 
-			Level level = (levelWrapper != null ? (Level)levelWrapper.getWrappedMcObject() : null);
-			level = (level == null ? Minecraft.getInstance().level : level);
-			#endif
-			
-			Block block;
-			#if MC_1_16_5 || MC_1_17_1
-			block = Registry.BLOCK.get(resourceLocation);
-			#elif MC_1_18_2 || MC_1_19_2
-			net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
-			block = registryAccess.registryOrThrow(Registry.BLOCK_REGISTRY).get(resourceLocation);
-			#else
-			net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
-			block = registryAccess.registryOrThrow(Registries.BLOCK).get(resourceLocation);
-			#endif
-			
-			
-			if (block == null)
-			{
-				// shouldn't normally happen, but here to make the compiler happy
-				if (!BrokenResourceLocations.contains(resourceLocation))
-				{
-					BrokenResourceLocations.add(resourceLocation);
-					LOGGER.warn("Unable to find BlockState with the resourceLocation [" + resourceLocation + "] and properties: [" + blockStatePropertiesString + "]. Air will be used instead, some data may be lost.");
-				}
-				return AIR;
-			}
-			
-			
-			// attempt to find the blockstate from all possibilities
-			BlockState foundState = null;
-			if (blockStatePropertiesString != null)
-			{
-				List<BlockState> possibleStateList = block.getStateDefinition().getPossibleStates();
-				for (BlockState possibleState : possibleStateList)
-				{
-					String possibleStatePropertiesString = serializeBlockStateProperties(possibleState);
-					if (possibleStatePropertiesString.equals(blockStatePropertiesString))
-					{
-						foundState = possibleState;
-						break;
-					}
-				}
-			}
-			
-			// use the default if no state was found or given
-			if (foundState == null)
-			{
-				if (blockStatePropertiesString != null)
-				{
-					// we should have found a blockstate, but didn't
-					if (!BrokenResourceLocations.contains(resourceLocation))
-					{
-						BrokenResourceLocations.add(resourceLocation);
-						LOGGER.warn("Unable to find BlockState for Block [" + resourceLocation + "] with properties: [" + blockStatePropertiesString + "]. Using the default block state.");
-					}
-				}
-				
-				foundState = block.defaultBlockState();
-			}
-			return new BlockStateWrapper(foundState, levelWrapper);
-		}
-		catch (Exception e)
-		{
-			throw new IOException("Failed to deserialize the string [" + resourceStateString + "] into a BlockStateWrapper: " + e.getMessage(), e);
-		}
-	}
-	
-	/** used to compare and save BlockStates based on their properties */
-	private static String serializeBlockStateProperties(BlockState blockState)
-	{
-		// get the property list for this block (doesn't contain this block state's values, just the names and possible values)
-		java.util.Collection<net.minecraft.world.level.block.state.properties.Property<?>> blockPropertyCollection = blockState.getProperties();
-		
-		// alphabetically sort the list so they are always in the same order
-		List<net.minecraft.world.level.block.state.properties.Property<?>> sortedBlockPropteryList = new ArrayList<>(blockPropertyCollection);
-		sortedBlockPropteryList.sort((a, b) -> a.getName().compareTo(b.getName()));
-		
-		
-		StringBuilder stringBuilder = new StringBuilder();
-		for (net.minecraft.world.level.block.state.properties.Property<?> property : sortedBlockPropteryList)
-		{
-			String propertyName = property.getName();
-			
-			String value = "NULL";
-			if (blockState.hasProperty(property))
-			{
-				value = blockState.getValue(property).toString();
-			}
-			
-			stringBuilder.append("{");
-			stringBuilder.append(propertyName).append(RESOURCE_LOCATION_SEPARATOR).append(value);
-			stringBuilder.append("}");
-		}
-		
-		return stringBuilder.toString();
-	}
-	
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java

@@ -1,65 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-/**
- * For wrapping/utilizing around TextureAtlasSprite
- *
- * @author Ran
- */
-public class TextureAtlasSpriteWrapper
-{
-	
-	/**
-	 * This code is from Minecraft Forge
-	 * Which is licensed under the terms of GNU Lesser General Public License
-	 * as published by the Free Software Foundation version 2.1
-	 * of the License.
-	 *
-	 * The code has been modified to use TextureAtlasSprite
-	 */
-	public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y)
-	{
-        #if PRE_MC_1_17_1
-        return sprite.mainImage[0].getPixelRGBA(
-                x + sprite.framesX[frameIndex] * sprite.getWidth(),
-                y + sprite.framesY[frameIndex] * sprite.getHeight());
-        #elif PRE_MC_1_19_4
-		if (sprite.animatedTexture != null)
-		{
-			x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
-			y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
-		}
-		return sprite.mainImage[0].getPixelRGBA(x, y);
-        #else
-		if (sprite.contents().animatedTexture != null)
-		{
-			x += sprite.contents().animatedTexture.getFrameX(frameIndex) * sprite.contents().width();
-			y += sprite.contents().animatedTexture.getFrameY(frameIndex) * sprite.contents().width();
-		}
-		return sprite.contents().originalImage.getPixelRGBA(x, y);
-        #endif
-		
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java

@@ -1,243 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import com.seibel.distanthorizons.common.LodCommonMain;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideFast implements BlockAndTintGetter
-{
-	LevelReader parent;
-	
-	public TintGetterOverrideFast(LevelReader parent)
-	{
-		this.parent = parent;
-	}
-	
-	private Biome _getBiome(BlockPos pos)
-	{
-		#if POST_MC_1_18_2
-		return parent.getBiome(pos).value();
-		#else
-		return parent.getBiome(pos);
-		#endif
-	}
-	
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		if (LodCommonMain.forgeMethodCaller != null)
-		{
-			return LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(blockPos),
-					blockPos.getX(), blockPos.getZ());
-		}
-		else
-		{
-			return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-		}
-	}
-	
-	@Override
-	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
-	
-	@Override
-	public LevelLightEngine getLightEngine()
-	{
-		return parent.getLightEngine();
-	}
-	
-	@Override
-	public int getBrightness(LightLayer lightLayer, BlockPos blockPos)
-	{
-		return parent.getBrightness(lightLayer, blockPos);
-	}
-	
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i)
-	{
-		return parent.getRawBrightness(blockPos, i);
-	}
-	
-	@Override
-	public boolean canSeeSky(BlockPos blockPos)
-	{
-		return parent.canSeeSky(blockPos);
-	}
-	
-	@Override
-	@Nullable
-	public BlockEntity getBlockEntity(BlockPos blockPos)
-	{
-		return parent.getBlockEntity(blockPos);
-	}
-	
-	
-	@Override
-	public BlockState getBlockState(BlockPos blockPos)
-	{
-		return parent.getBlockState(blockPos);
-	}
-	
-	@Override
-	public FluidState getFluidState(BlockPos blockPos)
-	{
-		return parent.getFluidState(blockPos);
-	}
-	
-	@Override
-	public int getLightEmission(BlockPos blockPos)
-	{
-		return parent.getLightEmission(blockPos);
-	}
-	
-	@Override
-	public int getMaxLightLevel()
-	{
-		return parent.getMaxLightLevel();
-	}
-	
-	@Override
-	public Stream<BlockState> getBlockStates(AABB aABB)
-	{
-		return parent.getBlockStates(aABB);
-	}
-	
-	@Override
-	public BlockHitResult clip(ClipContext clipContext)
-	{
-		return parent.clip(clipContext);
-	}
-	
-	@Override
-	@Nullable
-	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
-	{
-		return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-	}
-	
-	@Override
-	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier)
-	{
-		return parent.getBlockFloorHeight(voxelShape, supplier);
-	}
-	
-	@Override
-	public double getBlockFloorHeight(BlockPos blockPos)
-	{
-		return parent.getBlockFloorHeight(blockPos);
-	}
-	
-	@Override
-	public int getMaxBuildHeight()
-	{
-		return parent.getMaxBuildHeight();
-	}
-	
-	#if POST_MC_1_17_1
-	@Override
-	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType)
-	{
-		return parent.getBlockEntity(blockPos, blockEntityType);
-	}
-	
-	@Override
-	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
-	{
-		return parent.isBlockInLine(clipBlockStateContext);
-	}
-	
-	@Override
-	public int getHeight()
-	{
-		return parent.getHeight();
-	}
-	
-	@Override
-	public int getMinBuildHeight()
-	{
-		return parent.getMinBuildHeight();
-	}
-	
-	@Override
-	public int getSectionsCount()
-	{
-		return parent.getSectionsCount();
-	}
-	
-	@Override
-	public int getMinSection()
-	{
-		return parent.getMinSection();
-	}
-	
-	@Override
-	public int getMaxSection()
-	{
-		return parent.getMaxSection();
-	}
-	
-	@Override
-	public boolean isOutsideBuildHeight(BlockPos blockPos)
-	{
-		return parent.isOutsideBuildHeight(blockPos);
-	}
-	
-	@Override
-	public boolean isOutsideBuildHeight(int i)
-	{
-		return parent.isOutsideBuildHeight(i);
-	}
-	
-	@Override
-	public int getSectionIndex(int i)
-	{
-		return parent.getSectionIndex(i);
-	}
-	
-	@Override
-	public int getSectionIndexFromSectionY(int i)
-	{
-		return parent.getSectionIndexFromSectionY(i);
-	}
-	
-	@Override
-	public int getSectionYFromSectionIndex(int i)
-	{
-		return parent.getSectionYFromSectionIndex(i);
-	}
-    #endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java

@@ -1,269 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import com.seibel.distanthorizons.common.LodCommonMain;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideSmooth implements BlockAndTintGetter
-{
-	LevelReader parent;
-	public int smoothingRange;
-	
-	public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange)
-	{
-		this.parent = parent;
-		this.smoothingRange = smoothingRange;
-	}
-	
-	private Biome _getBiome(BlockPos pos)
-	{
-		#if POST_MC_1_18_2
-		return parent.getBiome(pos).value();
-		#else
-		return parent.getBiome(pos);
-		#endif
-	}
-	
-	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		int i = smoothingRange;
-		if (i == 0)
-			return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-		int j = (i * 2 + 1) * (i * 2 + 1);
-		int k = 0;
-		int l = 0;
-		int m = 0;
-		Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-		BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-		while (cursor3D.advance())
-		{
-			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-			int n;
-			if (LodCommonMain.forgeMethodCaller != null)
-			{
-				n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
-						mutableBlockPos.getX(), mutableBlockPos.getZ());
-			}
-			else
-			{
-				n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-			}
-			
-			k += (n & 0xFF0000) >> 16;
-			l += (n & 0xFF00) >> 8;
-			m += n & 0xFF;
-		}
-		return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-	}
-	
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		return calculateBlockTint(blockPos, colorResolver);
-	}
-	
-	@Override
-	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
-	
-	@Override
-	public LevelLightEngine getLightEngine()
-	{
-		return parent.getLightEngine();
-	}
-	
-	@Override
-	public int getBrightness(LightLayer lightLayer, BlockPos blockPos)
-	{
-		return parent.getBrightness(lightLayer, blockPos);
-	}
-	
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i)
-	{
-		return parent.getRawBrightness(blockPos, i);
-	}
-	
-	@Override
-	public boolean canSeeSky(BlockPos blockPos)
-	{
-		return parent.canSeeSky(blockPos);
-	}
-	
-	@Override
-	@Nullable
-	public BlockEntity getBlockEntity(BlockPos blockPos)
-	{
-		return parent.getBlockEntity(blockPos);
-	}
-	
-	@Override
-	public BlockState getBlockState(BlockPos blockPos)
-	{
-		return parent.getBlockState(blockPos);
-	}
-	
-	@Override
-	public FluidState getFluidState(BlockPos blockPos)
-	{
-		return parent.getFluidState(blockPos);
-	}
-	
-	@Override
-	public int getLightEmission(BlockPos blockPos)
-	{
-		return parent.getLightEmission(blockPos);
-	}
-	
-	@Override
-	public int getMaxLightLevel()
-	{
-		return parent.getMaxLightLevel();
-	}
-	
-	@Override
-	public Stream<BlockState> getBlockStates(AABB aABB)
-	{
-		return parent.getBlockStates(aABB);
-	}
-	
-	@Override
-	public BlockHitResult clip(ClipContext clipContext)
-	{
-		return parent.clip(clipContext);
-	}
-	
-	@Override
-	@Nullable
-	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
-	{
-		return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-	}
-	
-	@Override
-	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier)
-	{
-		return parent.getBlockFloorHeight(voxelShape, supplier);
-	}
-	
-	@Override
-	public double getBlockFloorHeight(BlockPos blockPos)
-	{
-		return parent.getBlockFloorHeight(blockPos);
-	}
-	
-	@Override
-	public int getMaxBuildHeight()
-	{
-		return parent.getMaxBuildHeight();
-	}
-	
-	#if POST_MC_1_17_1
-	@Override
-	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType)
-	{
-		return parent.getBlockEntity(blockPos, blockEntityType);
-	}
-	
-	@Override
-	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
-	{
-		return parent.isBlockInLine(clipBlockStateContext);
-	}
-	
-	@Override
-	public int getHeight()
-	{
-		return parent.getHeight();
-	}
-	
-	@Override
-	public int getMinBuildHeight()
-	{
-		return parent.getMinBuildHeight();
-	}
-	
-	@Override
-	public int getSectionsCount()
-	{
-		return parent.getSectionsCount();
-	}
-	
-	@Override
-	public int getMinSection()
-	{
-		return parent.getMinSection();
-	}
-	
-	@Override
-	public int getMaxSection()
-	{
-		return parent.getMaxSection();
-	}
-	
-	@Override
-	public boolean isOutsideBuildHeight(BlockPos blockPos)
-	{
-		return parent.isOutsideBuildHeight(blockPos);
-	}
-	
-	@Override
-	public boolean isOutsideBuildHeight(int i)
-	{
-		return parent.isOutsideBuildHeight(i);
-	}
-	
-	@Override
-	public int getSectionIndex(int i)
-	{
-		return parent.getSectionIndex(i);
-	}
-	
-	@Override
-	public int getSectionIndexFromSectionY(int i)
-	{
-		return parent.getSectionIndexFromSectionY(i);
-	}
-	
-	@Override
-	public int getSectionYFromSectionIndex(int i)
-	{
-		return parent.getSectionYFromSectionIndex(i);
-	}
-    #endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java

@@ -1,100 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import org.jetbrains.annotations.Nullable;
-
-#if POST_MC_1_18_2
-import net.minecraft.core.Holder;
-#endif
-
-public class TintWithoutLevelOverrider implements BlockAndTintGetter
-{
-	final BiomeWrapper biome;
-	
-	public TintWithoutLevelOverrider(BiomeWrapper biome)
-	{
-		this.biome = biome;
-	}
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
-	}
-	private Biome _unwrap(#if POST_MC_1_18_2 Holder<Biome> #else Biome #endif biome)
-	{
-		#if POST_MC_1_18_2
-		return biome.value();
-		#else
-		return biome;
-		#endif
-	}
-	
-	@Override
-	public float getShade(Direction direction, boolean shade)
-	{
-		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public LevelLightEngine getLightEngine()
-	{
-		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Nullable
-	@Override
-	public BlockEntity getBlockEntity(BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	
-	@Override
-	public BlockState getBlockState(BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public FluidState getFluidState(BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	
-	
-	#if MC_1_17_1 || POST_MC_1_18_2
-	@Override
-	public int getHeight()
-	{
-		throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public int getMinBuildHeight()
-	{
-		throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	#endif
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java

@@ -1,132 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import org.jetbrains.annotations.Nullable;
-
-#if POST_MC_1_18_2
-import net.minecraft.core.Holder;
-#endif
-
-public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
-{
-	final BiomeWrapper biome;
-	public int smoothingRange;
-	
-	public TintWithoutLevelSmoothOverrider(BiomeWrapper biome, int smoothingRange)
-	{
-		this.biome = biome;
-		this.smoothingRange = smoothingRange;
-	}
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
-	}
-	private Biome _unwrap(#if POST_MC_1_18_2 Holder<Biome> #else Biome #endif biome)
-	{
-		#if POST_MC_1_18_2
-		return biome.value();
-		#else
-		return biome;
-		#endif
-	}
-//
-//    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-//    {
-//        int i = smoothingRange;
-//        if (i == 0)
-//            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-//        int j = (i * 2 + 1) * (i * 2 + 1);
-//        int k = 0;
-//        int l = 0;
-//        int m = 0;
-//        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-//        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-//        while (cursor3D.advance())
-//        {
-//            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-//            int n;
-//            if (LodCommonMain.forgeMethodCaller != null) {
-//                n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
-//                        mutableBlockPos.getX(), mutableBlockPos.getZ());
-//            } else {
-//                n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-//            }
-//
-//            k += (n & 0xFF0000) >> 16;
-//            l += (n & 0xFF00) >> 8;
-//            m += n & 0xFF;
-//        }
-//        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-//    }
-	
-	@Override
-	public float getShade(Direction direction, boolean shade)
-	{
-		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public LevelLightEngine getLightEngine()
-	{
-		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Nullable
-	@Override
-	public BlockEntity getBlockEntity(BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	
-	@Override
-	public BlockState getBlockState(BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public FluidState getFluidState(BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	
-	
-	#if MC_1_17_1 || POST_MC_1_18_2
-	@Override
-	public int getHeight()
-	{
-		throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public int getMinBuildHeight()
-	{
-		throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	#endif
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java

@@ -1,48 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import net.minecraft.world.level.block.state.BlockState;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ClientBlockDetailMap
-{
-	private final ConcurrentHashMap<BlockState, ClientBlockStateCache> blockCache = new ConcurrentHashMap<>();
-	//private final ConcurrentHashMap<#if PRE_MC_1_18_2 Biome #else Holder<Biome> #endif, Biome> biomeMap = new ConcurrentHashMap<>();
-	private final ClientLevelWrapper level;
-	public ClientBlockDetailMap(ClientLevelWrapper level) { this.level = level; }
-	
-	public ClientBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos)
-	{ //TODO: Allow a per pos unique setting
-		return blockCache.computeIfAbsent(state, (s) -> new ClientBlockStateCache(s, level, pos));
-	}
-	
-	public void clear() { blockCache.clear(); }
-	
-	public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos)
-	{
-		return getBlockStateData(state, pos).getAndResolveFaceColor(biome, pos);
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java

@@ -1,307 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.TextureAtlasSpriteWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.TintWithoutLevelOverrider;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.block.*;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.util.ColorUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.FlowerBlock;
-import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-#if POST_MC_1_19_2
-import net.minecraft.util.RandomSource;
-#else
-import java.util.Random;
-#endif
-import net.minecraft.world.level.block.state.BlockState;
-import org.apache.logging.log4j.Logger;
-
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * @version 2022-9-16
- */
-public class ClientBlockStateCache
-{
-	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
-	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
-	
-	#if PRE_MC_1_19_2
-	public static final Random random = new Random(0);
-	#else
-	public static final RandomSource random = RandomSource.create();
-	#endif
-	
-	public final BlockState blockState;
-	public final LevelReader level;
-	public final BlockPos pos;
-	public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos)
-	{
-		this.blockState = blockState;
-		level = (LevelReader) samplingLevel.getWrappedMcObject();
-		pos = McObjectConverter.Convert(samplingPos);
-		resolveColors();
-		//LOGGER.info("ClientBlocKCache created for {}", blockState);
-	}
-	
-	boolean isColorResolved = false;
-	int baseColor = 0; //TODO: Impl per-face color
-	boolean needShade = true;
-	boolean needPostTinting = false;
-	int tintIndex = 0;
-	
-	
-	public static final int FLOWER_COLOR_SCALE = 5;
-	
-	enum ColorMode
-	{
-		Default,
-		Flower,
-		Leaves;
-		static ColorMode getColorMode(Block b)
-		{
-			if (b instanceof LeavesBlock) return Leaves;
-			if (b instanceof FlowerBlock) return Flower;
-			return Default;
-		}
-	}
-	
-	private static int getWidth(TextureAtlasSprite texture)
-	{
-        #if PRE_MC_1_19_4
-		return texture.getWidth();
-        #else
-		return texture.contents().width();
-        #endif
-	}
-	
-	private static int getHeight(TextureAtlasSprite texture)
-	{
-        #if PRE_MC_1_19_4
-		return texture.getHeight();
-        #else
-		return texture.contents().height();
-        #endif
-	}
-	
-	//TODO: Perhaps make this not just use the first frame?
-	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
-	{
-		int count = 0;
-		double alpha = 0;
-		double red = 0;
-		double green = 0;
-		double blue = 0;
-		int tempColor;
-		{
-			// textures normally use u and v instead of x and y
-			for (int u = 0; u < getWidth(texture); u++)
-			{
-				for (int v = 0; v < getHeight(texture); v++)
-				{
-					//note: Minecraft color format is: 0xAA BB GG RR
-					//________ DH mod color format is: 0xAA RR GG BB
-					//OpenGL RGBA format native order: 0xRR GG BB AA
-					//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
-					tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
-					
-					double r = ((tempColor & 0x000000FF)) / 255.;
-					double g = ((tempColor & 0x0000FF00) >>> 8) / 255.;
-					double b = ((tempColor & 0x00FF0000) >>> 16) / 255.;
-					double a = ((tempColor & 0xFF000000) >>> 24) / 255.;
-					int scale = 1;
-					
-					if (colorMode == ColorMode.Leaves)
-					{
-						r *= a;
-						g *= a;
-						b *= a;
-						a = 1.;
-					}
-					else if (a == 0.)
-					{
-						continue;
-					}
-					else if (colorMode == ColorMode.Flower && (g + 0.1 < b || g + 0.1 < r))
-					{
-						scale = FLOWER_COLOR_SCALE;
-					}
-					
-					count += scale;
-					alpha += a * a * scale;
-					red += r * r * scale;
-					green += g * g * scale;
-					blue += b * b * scale;
-				}
-			}
-		}
-		
-		if (count == 0)
-			// this block is entirely transparent
-			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
-		else
-		{
-			// determine the average color
-			tempColor = ColorUtil.rgbToInt(
-					(int) (Math.sqrt(alpha / count) * 255.),
-					(int) (Math.sqrt(red / count) * 255.),
-					(int) (Math.sqrt(green / count) * 255.),
-					(int) (Math.sqrt(blue / count) * 255.));
-		}
-		return tempColor;
-	}
-	private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
-	
-	private void resolveColors()
-	{
-		if (isColorResolved) return;
-		if (blockState.getFluidState().isEmpty())
-		{
-			List<BakedQuad> quads = null;
-			for (Direction direction : DIRECTION_ORDER)
-			{
-				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-						getBlockModel(blockState).getQuads(blockState, direction, random);
-				if (quads != null && !quads.isEmpty() &&
-						!(blockState.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
-					break;
-			} ;
-			if (quads == null || quads.isEmpty())
-			{
-				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-						getBlockModel(blockState).getQuads(blockState, null, random);
-			}
-			if (quads != null && !quads.isEmpty())
-			{
-				needPostTinting = quads.get(0).isTinted();
-				needShade = quads.get(0).isShade();
-				tintIndex = quads.get(0).getTintIndex();
-				baseColor = calculateColorFromTexture(
-                        #if PRE_MC_1_17_1 quads.get(0).sprite,
-						#else quads.get(0).getSprite(), #endif
-						ColorMode.getColorMode(blockState.getBlock()));
-			}
-			else
-			{ // Backup method.
-				needPostTinting = false;
-				needShade = false;
-				tintIndex = 0;
-				baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(blockState),
-						ColorMode.getColorMode(blockState.getBlock()));
-			}
-		}
-		else
-		{ // Liquid Block
-			needPostTinting = true;
-			needShade = false;
-			tintIndex = 0;
-			baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(blockState),
-					ColorMode.getColorMode(blockState.getBlock()));
-		}
-		isColorResolved = true;
-	}
-	
-	public int getAndResolveFaceColor(BiomeWrapper biome, DhBlockPos pos)
-	{
-		// FIXME: impl per-face colors
-		
-		// only get the tint if the block needs to be tinted
-		if (!this.needPostTinting)
-		{
-			return this.baseColor;
-		}
-		
-		// don't try tinting blocks that don't support our method of tint getting
-		if (BROKEN_BLOCK_STATES.contains(this.blockState))
-		{
-			return this.baseColor;
-		}
-		
-		
-		// attempt to get the tint
-		int tintColor = -1;
-		try
-		{
-			// try to use the fast tint getter logic first
-			if (!BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
-			{
-				try
-				{
-					tintColor = Minecraft.getInstance().getBlockColors()
-							.getColor(this.blockState, new TintWithoutLevelOverrider(biome), McObjectConverter.Convert(pos), this.tintIndex);
-				}
-				catch (UnsupportedOperationException e)
-				{
-					// this exception generally occurs if the tint requires other blocks besides itself
-					LOGGER.debug("Unable to use ["+TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
-					BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
-				}
-			}
-			
-			// use the level logic only if requested
-			if (BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
-			{
-				// this logic can't be used all the time due to it breaking some blocks tinting
-				// specifically oceans don't render correctly
-				tintColor = Minecraft.getInstance().getBlockColors()
-						.getColor(this.blockState, new TintGetterOverrideFast(this.level), McObjectConverter.Convert(pos), this.tintIndex);
-			}
-		}
-		catch (Exception e)
-		{
-			// only display the error once per block/biome type to reduce log spam
-			if (!BROKEN_BLOCK_STATES.contains(this.blockState))
-			{
-				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
-				BROKEN_BLOCK_STATES.add(this.blockState);
-			}
-		}
-		
-		
-		
-		if (tintColor != -1)
-		{
-			return ColorUtil.multiplyARGBwithRGB(this.baseColor, tintColor);
-		}
-		else
-		{
-			// unable to get the tinted color, use the base color instead
-			return this.baseColor;
-		}
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java

@@ -1,43 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import net.minecraft.world.level.block.state.BlockState;
-
-
-public class ServerBlockDetailMap
-{
-	private final ConcurrentHashMap<BlockState, ServerBlockStateCache> blockCache = new ConcurrentHashMap<>();
-	//private final ConcurrentHashMap<#if PRE_MC_1_18_2 Biome #else Holder<Biome> #endif, Biome> biomeMap = new ConcurrentHashMap<>();
-	private final ServerLevelWrapper level;
-	public ServerBlockDetailMap(ServerLevelWrapper level) { this.level = level; }
-	
-	public ServerBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos)
-	{ //TODO: Allow a per pos unique setting
-		return blockCache.computeIfAbsent(state, (s) -> new ServerBlockStateCache(s, level, new DhBlockPos(0, 0, 0)));
-	}
-	
-	public void clear() { blockCache.clear(); }
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java

@@ -1,104 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Arrays;
-
-/**
- * @version 2022-9-16
- */
-public class ServerBlockStateCache
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	public final BlockState state;
-	public final LevelReader level;
-	public final BlockPos pos;
-	
-	public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DhBlockPos samplingPos)
-	{
-		state = blockState;
-		level = (LevelReader) samplingLevel.getWrappedMcObject();
-		pos = McObjectConverter.Convert(samplingPos);
-		resolveShapes();
-		//LOGGER.info("ServerBlockState created for {}", blockState);
-	}
-	
-	boolean noCollision = false;
-	boolean[] occludeFaces = null;
-	boolean[] fullFaces = null;
-	boolean isShapeResolved = false;
-	public void resolveShapes()
-	{
-		if (isShapeResolved) return;
-		if (state.getFluidState().isEmpty())
-		{
-			noCollision = state.getCollisionShape(level, pos).isEmpty();
-			occludeFaces = new boolean[6];
-			if (state.canOcclude())
-			{
-				for (Direction dir : Direction.values())
-				{
-					// Note: isEmpty() isn't quite correct... best would be a isFull() or something...
-					occludeFaces[McObjectConverter.Convert(dir).ordinal()]
-							= !state.getFaceOcclusionShape(level, pos, dir).isEmpty();
-				}
-			}
-			
-			VoxelShape voxelShape = state.getShape(level, pos);
-			fullFaces = new boolean[6];
-			if (!voxelShape.isEmpty())
-			{
-				for (Direction dir : Direction.values())
-				{
-					VoxelShape faceShape = voxelShape.getFaceShape(dir);
-					AABB aabb = faceShape.bounds();
-					boolean xFull = aabb.minX <= 0.01 && aabb.maxX >= 0.99;
-					boolean yFull = aabb.minY <= 0.01 && aabb.maxY >= 0.99;
-					boolean zFull = aabb.minZ <= 0.01 && aabb.maxZ >= 0.99;
-					fullFaces[McObjectConverter.Convert(dir).ordinal()] =
-							(xFull || dir.getAxis().equals(Direction.Axis.X))
-									&& (yFull || dir.getAxis().equals(Direction.Axis.Y))
-									&& (zFull || dir.getAxis().equals(Direction.Axis.Z));
-				}
-			}
-		}
-		else
-		{ // Liquid Block. Treat as full block
-			occludeFaces = new boolean[6];
-			Arrays.fill(occludeFaces, true);
-			fullFaces = new boolean[6];
-			Arrays.fill(fullFaces, true);
-		}
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkLightStorage.java

@@ -1,216 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.chunk;
-
-import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * Compact, efficient storage for light levels. 
- * all blocks only take up 4 bits in total, 
- * and if a 16x16x16 area is detected to have the same light level in all positions,
- * then we store a single byte for that light level, instead of 2 kilobytes.
- * 
- * @author Builderb0y
-*/
-public class ChunkLightStorage 
-{
-	/** the minimum Y level in the chunk which this storage is storing light levels for (inclusive). */
-	public int minY;
-	/** the maximum Y level in the chunk which this storage is storing light levels for (exclusive). */
-	public int maxY;
-	
-	/** the data stored in this storage, split up into 16x16x16 areas. */
-	public LightSection[] lightSections;
-	
-	
-	
-	public ChunkLightStorage(int minY, int maxY) 
-	{
-		this.minY = minY;
-		this.maxY = maxY;
-	}
-	
-	
-	
-	public int get(int x, int y, int z)
-	{
-		if (y < this.minY)
-		{
-			return 0;
-		}	
-		if (y >= this.maxY)
-		{
-			return 15;
-		}
-		
-		if (this.lightSections != null)
-		{
-			LightSection lightSection = this.lightSections[BitShiftUtil.divideByPowerOfTwo(y - this.minY, 4)];
-			if (lightSection != null)
-			{
-				return lightSection.get(x, y, z);
-			}
-		}
-		
-		return 0;
-	}
-	
-	public void set(int x, int y, int z, int lightLevel)
-	{
-		if (y < this.minY || y >= this.maxY)
-		{
-			return;
-		}
-		
-		//populate array if it doesn't exist.
-		if (this.lightSections == null)
-		{
-			this.lightSections = new LightSection[BitShiftUtil.divideByPowerOfTwo(this.maxY - this.minY, 4)];
-		}
-		
-		int index = (y - this.minY) >> 4;
-		LightSection lightSection = this.lightSections[index];
-		
-		//populate lightSection in array if it doesn't exist.
-		if (lightSection == null)
-		{
-			lightSection = new LightSection(0);
-			this.lightSections[index] = lightSection;
-		}
-		lightSection.set(x, y, z, lightLevel);
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	public static class LightSection
-	{
-		public byte constantValue;
-		public long[] data;
-		public short[] counts;
-		
-		public LightSection(int initialValue)
-		{
-			this.constantValue = (byte) (initialValue);
-			this.counts = new short[16];
-			this.counts[initialValue] = 16 * 16 * 16;
-		}
-		
-		public int get(int x, int y, int z)
-		{
-			if (this.constantValue >= 0)
-			{
-				return this.constantValue;
-			}
-			
-			x &= 15;
-			y &= 15;
-			z &= 15;
-			long bits = this.data[(z << 4) | x];
-			return ((int) (bits >>> (y << 2))) & 15;
-		}
-		
-		public void set(int x, int y, int z, int lightLevel)
-		{
-			int oldLightLevel = -1;
-			if (this.constantValue >= 0)
-			{
-				oldLightLevel = this.constantValue;
-				
-				//if the light level didn't change, then there's nothing to do.
-				if (oldLightLevel == lightLevel) return;
-				
-				//if we are a constant value and need to change something,
-				//then that means we need to convert to a non-constant value.
-				this.data = DataRecycler.get();
-				
-				//repeat oldLightLevel 16 times as a bit pattern.
-				long payload = oldLightLevel;
-				payload |= payload << 4;
-				payload |= payload << 8;
-				payload |= payload << 16;
-				payload |= payload << 32;
-				
-				//fill our data with our constant value.
-				Arrays.fill(this.data, payload);
-				
-				//we are no longer a constant value.
-				this.constantValue = -1;
-			}
-			
-			x &= 15;
-			y &= 15;
-			z &= 15;
-			int index = (z << 4) | x;
-			long bits = this.data[index];
-			//if we weren't a constant value before, now's the time to initialize oldLightLevel.
-			if (oldLightLevel < 0)
-			{
-				oldLightLevel = ((int) (bits >>> (y << 2))) & 15;
-			}
-			//clear the 4 bits that correspond to the light level at x, y, z...
-			bits &= ~(15L << (y << 2));
-			//...and then re-populate those bits with the new light level.
-			bits |= ((long) (lightLevel)) << (y << 2);
-			//store the updated bits in our data.
-			this.data[index] = bits;
-			
-			//we have one less of the old light level...
-			this.counts[oldLightLevel]--;
-			//...and one more of the new level.
-			//if the number associated with the new level is now 4096 (AKA 16 ^ 3),
-			//then this implies every position in this section has the same light level,
-			//and therefore we can convert back to a constant value.
-			if (++this.counts[lightLevel] == 4096)
-			{
-				this.constantValue = (byte) (lightLevel);
-				DataRecycler.reclaim(this.data);
-				this.data = null;
-			}
-		}
-		
-	}
-	
-	static class DataRecycler
-	{
-		private static final ArrayList<long[]> recycled = new ArrayList<>(256);
-		
-		static synchronized long[] get()
-		{
-			if (recycled.isEmpty())
-			{
-				return new long[256];
-			}
-			else
-			{
-				return recycled.remove(recycled.size() - 1);
-			}
-		}
-		
-		static synchronized void reclaim(long[] data) { if (recycled.size() < 256) recycled.add(data); }
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java

@@ -1,567 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.chunk;
-
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.client.multiplayer.ClientChunkCache;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.levelgen.Heightmap;
-
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-#if POST_MC_1_17_1
-import net.minecraft.core.QuartPos;
-#endif
-
-#if MC_1_16_5
-import net.minecraft.world.level.chunk.LevelChunkSection;
-#endif
-
-#if MC_1_17_1
-import net.minecraft.world.level.chunk.LevelChunkSection;
-#endif
-
-#if MC_1_18_2
-import net.minecraft.world.level.chunk.LevelChunkSection;
-#endif
-
-#if MC_1_19_2 || MC_1_19_4
-import net.minecraft.world.level.chunk.LevelChunkSection;
-#endif
-
-#if POST_MC_1_20_1
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.core.SectionPos;
-#endif
-
-public class ChunkWrapper implements IChunkWrapper
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	/** useful for debugging, but can slow down chunk operations quite a bit due to being called every time. */
-	private static final boolean RUN_RELATIVE_POS_INDEX_VALIDATION = false;
-	
-	/** can be used for interactions with the underlying chunk where creating new BlockPos objects could cause issues for the garbage collector. */
-	private static final ThreadLocal<BlockPos.MutableBlockPos> MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(() -> new BlockPos.MutableBlockPos());
-	
-	
-	private final ChunkAccess chunk;
-	private final DhChunkPos chunkPos;
-	private final LevelReader lightSource;
-	private final ILevelWrapper wrappedLevel;
-	
-	private boolean isDhLightCorrect = false;
-	/** only used when connected to a dedicated server */
-	private boolean isMcClientLightingCorrect = false;
-	
-	private ChunkLightStorage blockLightStorage;
-	private ChunkLightStorage skyLightStorage;
-	
-	private ArrayList<DhBlockPos> blockLightPosList = null;
-	
-	private boolean useDhLighting;
-	
-	/**
-	 * Due to vanilla `isClientLightReady()` not being designed for use by a non-render thread, it may return 'true'
-	 * before the light engine has ticked, (right after all light changes is marked by the engine to be processed).
-	 * To fix this, on client-only mode, we mixin-redirect the `isClientLightReady()` so that after the call, it will
-	 * trigger a synchronous update of this flag here on all chunks that are wrapped. <br><br>
-	 *
-	 * Note: Using a static weak hash map to store the chunks that need to be updated, as instance of chunk wrapper
-	 * can be duplicated, with same chunk instance. And the data stored here are all temporary, and thus will not be
-	 * visible when a chunk is re-wrapped later. <br>
-	 * (Also, thread safety done via a reader writer lock)
-	 */
-	private static final ConcurrentLinkedQueue<ChunkWrapper> chunksNeedingClientLightUpdating = new ConcurrentLinkedQueue<>(); 
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource, ILevelWrapper wrappedLevel)
-	{
-		this.chunk = chunk;
-		this.lightSource = lightSource;
-		this.wrappedLevel = wrappedLevel;
-		this.chunkPos = new DhChunkPos(chunk.getPos().x, chunk.getPos().z);
-		
-		// TODO is this the best way to differentiate between when we are generating chunks and when MC gave us a chunk?
-		boolean isDhGeneratedChunk = (this.lightSource.getClass() == DhLitWorldGenRegion.class);
-		// MC loaded chunks should get their lighting from MC, DH generated chunks should get their lighting from DH
-		this.useDhLighting = isDhGeneratedChunk;
-		
-		// FIXME +1 is to handle the fact that LodDataBuilder adds +1 to all block lighting calculations, also done in the relative position validator
-
-		chunksNeedingClientLightUpdating.add(this);
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	@Override
-	public int getHeight()
-	{
-		#if PRE_MC_1_17_1
-		return 255;
-		#else
-		return this.chunk.getHeight();
-		#endif
-	}
-	
-	@Override
-	public int getMinBuildHeight()
-	{
-		#if PRE_MC_1_17_1
-		return 0;
-		#else
-		return this.chunk.getMinBuildHeight();
-		#endif
-	}
-	@Override
-	public int getMaxBuildHeight() { return this.chunk.getMaxBuildHeight(); }
-	
-	@Override
-	public int getMinFilledHeight()
-	{
-		LevelChunkSection[] sections = this.chunk.getSections();
-		for (int index = 0; index < sections.length; index++)
-		{
-			if (sections[index] == null)
-			{
-				continue;
-			}
-			
-			#if MC_1_16_5
-			if (!sections[index].isEmpty())
-			{
-				// convert from an index to a block coordinate
-				return this.chunk.getSections()[index].bottomBlockY() * 16;
-			}
-			#elif MC_1_17_1
-			if (!sections[index].isEmpty())
-			{
-				// convert from an index to a block coordinate
-				return this.chunk.getSections()[index].bottomBlockY() * 16;
-			}	
-			#else
-			if (!sections[index].hasOnlyAir())
-			{
-				// convert from an index to a block coordinate
-				return this.chunk.getSectionYFromSectionIndex(index) * 16;
-			}
-			#endif
-		}
-		return Integer.MAX_VALUE;
-	}
-	
-	
-	@Override
-	public int getSolidHeightMapValue(int xRel, int zRel) { return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE).getFirstAvailable(xRel, zRel); }
-	
-	@Override
-	public int getLightBlockingHeightMapValue(int xRel, int zRel) { return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.MOTION_BLOCKING).getFirstAvailable(xRel, zRel); }
-	
-	
-	
-	@Override
-	public IBiomeWrapper getBiome(int relX, int relY, int relZ)
-	{
-		#if PRE_MC_1_17_1
-		return BiomeWrapper.getBiomeWrapper(this.chunk.getBiomes().getNoiseBiome(
-				relX >> 2, relY >> 2, relZ >> 2),
-				this.wrappedLevel);
-		#elif PRE_MC_1_18_2
-		return BiomeWrapper.getBiomeWrapper(this.chunk.getBiomes().getNoiseBiome(
-				QuartPos.fromBlock(relX), QuartPos.fromBlock(relY), QuartPos.fromBlock(relZ)),
-				this.wrappedLevel);
-		#elif PRE_MC_1_18_2
-		return BiomeWrapper.getBiomeWrapper(this.chunk.getNoiseBiome(
-				QuartPos.fromBlock(relX), QuartPos.fromBlock(relY), QuartPos.fromBlock(relZ)),
-				this.wrappedLevel);
-		#else 
-		//Now returns a Holder<Biome> instead of Biome
-		return BiomeWrapper.getBiomeWrapper(this.chunk.getNoiseBiome(
-				QuartPos.fromBlock(relX), QuartPos.fromBlock(relY), QuartPos.fromBlock(relZ)),
-				this.wrappedLevel);
-		#endif
-	}
-	
-	@Override
-	public DhChunkPos getChunkPos() { return this.chunkPos; }
-	
-	public ChunkAccess getChunk() { return this.chunk; }
-	
-	@Override
-	public int getMaxBlockX() { return this.chunk.getPos().getMaxBlockX(); }
-	@Override
-	public int getMaxBlockZ() { return this.chunk.getPos().getMaxBlockZ(); }
-	@Override
-	public int getMinBlockX() { return this.chunk.getPos().getMinBlockX(); }
-	@Override
-	public int getMinBlockZ() { return this.chunk.getPos().getMinBlockZ(); }
-	
-	@Override
-	public long getLongChunkPos() { return this.chunk.getPos().toLong(); }
-	
-	@Override
-	public void setIsDhLightCorrect(boolean isDhLightCorrect) { this.isDhLightCorrect = isDhLightCorrect; }
-	
-	@Override
-	public void setUseDhLighting(boolean useDhLighting) { this.useDhLighting = useDhLighting; }
-	
-	
-	
-	@Override
-	public boolean isLightCorrect()
-	{
-		if (this.useDhLighting)
-		{
-			return this.isDhLightCorrect;
-		}
-		
-		
-		#if MC_1_16_5 || MC_1_17_1
-		return false; // MC's lighting engine doesn't work consistently enough to trust for 1.16 or 1.17
-		#else
-		if (this.chunk instanceof LevelChunk)
-		{
-			LevelChunk levelChunk = (LevelChunk) this.chunk;
-			if (levelChunk.getLevel() instanceof ClientLevel)
-			{
-				// connected to a server
-				return this.isMcClientLightingCorrect;
-			}
-			else
-			{
-				// in a single player world
-				return this.chunk.isLightCorrect() && levelChunk.loaded;	
-			}
-		}
-		else
-		{
-			// called when in a single player world and the chunk is a proto chunk (in world gen, and not active)
-			return this.chunk.isLightCorrect();
-		}
-		#endif
-	}
-	
-	
-	@Override
-	public int getDhBlockLight(int relX, int y, int relZ)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
-		return this.getBlockLightStorage().get(relX, y, relZ);
-	}
-	@Override
-	public void setDhBlockLight(int relX, int y, int relZ, int lightValue)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
-		this.getBlockLightStorage().set(relX, y, relZ, lightValue);
-	}
-	
-	private ChunkLightStorage getBlockLightStorage()
-	{
-		if (this.blockLightStorage == null)
-		{
-			this.blockLightStorage = new ChunkLightStorage(this.getMinBuildHeight(), this.getMaxBuildHeight());
-		}
-		return this.blockLightStorage;
-	}
-	
-	
-	@Override
-	public int getDhSkyLight(int relX, int y, int relZ)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
-		return this.getSkyLightStorage().get(relX, y, relZ);
-	}
-	@Override
-	public void setDhSkyLight(int relX, int y, int relZ, int lightValue)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
-		this.getSkyLightStorage().set(relX, y, relZ, lightValue);
-	}
-	
-	private ChunkLightStorage getSkyLightStorage()
-	{
-		if (this.skyLightStorage == null)
-		{
-			this.skyLightStorage = new ChunkLightStorage(this.getMinBuildHeight(), this.getMaxBuildHeight());
-		}
-		return this.skyLightStorage;
-	}
-	
-	
-	@Override
-	public int getBlockLight(int relX, int y, int relZ)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
-		
-		// use the full lighting engine when the chunks are within render distance or the config requests it
-		if (this.useDhLighting)
-		{
-			// DH lighting method
-			return this.getBlockLightStorage().get(relX, y, relZ);
-		}
-		else
-		{
-			// note: this returns 0 if the chunk is unload
-			
-			// MC lighting method
-			return this.lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(relX + this.getMinBlockX(), y, relZ + this.getMinBlockZ()));
-		}
-	}
-	
-	@Override
-	public int getSkyLight(int relX, int y, int relZ)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
-		
-		// use the full lighting engine when the chunks are within render distance or the config requests it
-		if (this.useDhLighting)
-		{
-			// DH lighting method
-			return this.getSkyLightStorage().get(relX, y, relZ);
-		}
-		else
-		{
-			// MC lighting method
-			return this.lightSource.getBrightness(LightLayer.SKY, new BlockPos(relX + this.getMinBlockX(), y, relZ + this.getMinBlockZ()));
-		}
-	}
-	
-	@Override
-	public ArrayList<DhBlockPos> getBlockLightPosList()
-	{
-		// only populate the list once
-		if (this.blockLightPosList == null)
-		{
-			this.blockLightPosList = new ArrayList<>();
-			
-			
-			#if PRE_MC_1_20_1
-			this.chunk.getLights().forEach((blockPos) ->
-			{
-				this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()));
-			});
-			#elif MC_1_20_1
-			this.chunk.findBlockLightSources((blockPos, blockState) ->
-			{
-				this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()));
-			});
-			#endif
-		}
-		
-		return this.blockLightPosList;
-	}
-	
-	@Override
-	public boolean doNearbyChunksExist()
-	{
-		if (this.lightSource instanceof DhLitWorldGenRegion)
-		{
-			return true;
-		}
-		
-		for (int dx = -1; dx <= 1; dx++)
-		{
-			for (int dz = -1; dz <= 1; dz++)
-			{
-				if (dx == 0 && dz == 0)
-				{
-					continue;
-				}
-				else if (this.lightSource.getChunk(dx + this.chunk.getPos().x, dz + this.chunk.getPos().z, ChunkStatus.BIOMES, false) == null)
-				{
-					return false;
-				}
-			}
-		}
-		
-		return true;
-	}
-	
-	public LevelReader getColorResolver() { return this.lightSource; }
-	
-	@Override
-	public String toString() { return this.chunk.getClass().getSimpleName() + this.chunk.getPos(); }
-	
-	@Override
-	public IBlockStateWrapper getBlockState(int relX, int relY, int relZ)
-	{
-		BlockPos.MutableBlockPos blockPos = MUTABLE_BLOCK_POS_REF.get();
-		
-		blockPos.setX(relX);
-		blockPos.setY(relY);
-		blockPos.setZ(relZ);
-		
-		return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(blockPos), this.wrappedLevel);
-	}
-	
-	@Override
-	public boolean isStillValid() { return this.wrappedLevel.tryGetChunk(this.chunkPos) == this; }
-	
-	
-	public static void syncedUpdateClientLightStatus()
-	{
-		#if PRE_MC_1_18_2
-		// TODO: Check what to do in 1.18.1 and older
-		
-		// since we don't currently handle this list,
-		// clear it to prevent memory leaks
-		chunksNeedingClientLightUpdating.clear();
-		
-		#else
-		
-		// update the chunks client lighting
-		ChunkWrapper chunkWrapper = chunksNeedingClientLightUpdating.poll();
-		while (chunkWrapper != null)
-		{
-			chunkWrapper.updateIsClientLightingCorrect();
-			chunkWrapper = chunksNeedingClientLightUpdating.poll();
-		}
-		
-		#endif
-	}
-	/** Should be called after client light updates are triggered. */
-	private void updateIsClientLightingCorrect()
-	{
-		if (this.chunk instanceof LevelChunk && ((LevelChunk) this.chunk).getLevel() instanceof ClientLevel)
-		{
-			LevelChunk levelChunk = (LevelChunk) this.chunk;
-			ClientChunkCache clientChunkCache = ((ClientLevel) levelChunk.getLevel()).getChunkSource();
-			this.isMcClientLightingCorrect = clientChunkCache.getChunkForLighting(this.chunk.getPos().x, this.chunk.getPos().z) != null &&
-					#if MC_1_16_5 || MC_1_17_1
-					levelChunk.isLightCorrect();
-					#elif PRE_MC_1_20_1
-					levelChunk.isClientLightReady();
-					#else
-					checkLightSectionsOnChunk(levelChunk, levelChunk.getLevel().getLightEngine());
-					#endif
-		}
-	}
-	#if POST_MC_1_20_1
-	private static boolean checkLightSectionsOnChunk(LevelChunk chunk, LevelLightEngine engine)
-	{
-		LevelChunkSection[] sections = chunk.getSections();
-		int minY = chunk.getMinSection();
-		int maxY = chunk.getMaxSection();
-		for (int y = minY; y < maxY; ++y)
-		{
-			LevelChunkSection section = sections[chunk.getSectionIndexFromSectionY(y)];
-			if (section.hasOnlyAir()) continue;
-			if (!engine.lightOnInSection(SectionPos.of(chunk.getPos(), y)))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-	#endif
-	
-	
-	
-	//================//
-	// helper methods //
-	//================//
-	
-	/** used to prevent accidentally attempting to get/set values outside this chunk's boundaries */
-	private void throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(int x, int y, int z) throws IndexOutOfBoundsException
-	{
-		if (RUN_RELATIVE_POS_INDEX_VALIDATION)
-		{
-			return;
-		}
-		
-		
-		// FIXME +1 is to handle the fact that LodDataBuilder adds +1 to all block lighting calculations, also done in the constructor
-		int minHeight = this.getMinBuildHeight();
-		int maxHeight = this.getMaxBuildHeight() + 1;
-		
-		if (x < 0 || x >= LodUtil.CHUNK_WIDTH
-				|| z < 0 || z >= LodUtil.CHUNK_WIDTH
-				|| y < minHeight || y > maxHeight)
-		{
-			String errorMessage = "Relative position [" + x + "," + y + "," + z + "] out of bounds. \n" +
-					"X/Z must be between 0 and 15 (inclusive) \n" +
-					"Y must be between [" + minHeight + "] and [" + maxHeight + "] (inclusive).";
-			throw new IndexOutOfBoundsException(errorMessage);
-		}
-	}
-	
-	
-	/**
-	 * Converts a 3D position into a 1D array index. <br><br>
-	 *
-	 * Source: <br>
-	 * <a href="https://stackoverflow.com/questions/7367770/how-to-flatten-or-index-3d-array-in-1d-array">stackoverflow</a>
-	 */
-	public int relativeBlockPosToIndex(int xRel, int y, int zRel)
-	{
-		int yRel = y - this.getMinBuildHeight();
-		return (zRel * LodUtil.CHUNK_WIDTH * this.getHeight()) + (yRel * LodUtil.CHUNK_WIDTH) + xRel;
-	}
-	
-	/**
-	 * Converts a 3D position into a 1D array index. <br><br>
-	 *
-	 * Source: <br>
-	 * <a href="https://stackoverflow.com/questions/7367770/how-to-flatten-or-index-3d-array-in-1d-array">stackoverflow</a>
-	 */
-	public DhBlockPos indexToRelativeBlockPos(int index)
-	{
-		final int zRel = index / (LodUtil.CHUNK_WIDTH * this.getHeight());
-		index -= (zRel * LodUtil.CHUNK_WIDTH * this.getHeight());
-		
-		final int y = index / LodUtil.CHUNK_WIDTH;
-		final int yRel = y + this.getMinBuildHeight();
-		
-		final int xRel = index % LodUtil.CHUNK_WIDTH;
-		return new DhBlockPos(xRel, yRel, zRel);
-	}
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java

@@ -1,675 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
-// Logger (for debug stuff)
-
-import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui;
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigBase;
-import com.seibel.distanthorizons.core.config.types.*;
-import com.seibel.distanthorizons.common.wrappers.gui.updater.ChangelogScreen;
-
-// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this)
-
-// Gets info from our own mod
-
-// Minecraft imports
-
-import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
-import com.seibel.distanthorizons.core.util.AnnotationUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-#if PRE_MC_1_20_1
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.GuiComponent;
-#else
-import net.minecraft.client.gui.GuiGraphics;
-#endif
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-import net.minecraft.client.resources.language.I18n;    // translation
-#if POST_MC_1_17_1
-import net.minecraft.client.gui.narration.NarratableEntry;
-#endif
-import net.minecraft.resources.ResourceLocation;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
-
-
-/**
- * Based upon TinyConfig but is highly modified
- * https://github.com/Minenash/TinyConfig
- *
- * Credits to Motschen
- *
- * @author coolGi
- * @version 5-21-2022
- */
-// FLOATS DONT WORK WITH THIS
-
-/** This file is going to be removed sometime soon, please dont hook onto anything within this file until the new UI is compleated */
-@SuppressWarnings("unchecked")
-public class ClassicConfigGUI
-{
-	/*
-	    This would be removed later on as it is going to be re-written in java swing
-	 */
-	
-	private static final Logger LOGGER = LogManager.getLogger();
-	
-	public static final ConfigCoreInterface CONFIG_CORE_INTERFACE = new ConfigCoreInterface();
-	
-	
-	
-	//==============//
-	// Initializers //
-	//==============//
-	
-	// Some regexes to check if an input is valid
-	private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)");
-	private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
-	
-	private static class ConfigScreenConfigs
-	{
-		// This contains all the configs for the configs
-		public static final int SpaceFromRightScreen = 10;
-		public static final int ButtonWidthSpacing = 5;
-		public static final int ResetButtonWidth = 40;
-		
-	}
-	
-	/**
-	 * The terribly coded old stuff
-	 */
-	public static class EntryInfo
-	{
-		Object widget;
-		Map.Entry<EditBox, Component> error;
-		String tempValue;
-		int index;
-		
-	}
-	
-	/**
-	 * creates a text field
-	 */
-	private static void textField(AbstractConfigType info, Function<String, Number> func, Pattern pattern, boolean cast)
-	{
-		boolean isNumber = pattern != null;
-		((EntryInfo) info.guiValue).widget = (BiFunction<EditBox, Button, Predicate<String>>) (editBox, button) -> stringValue ->
-		{
-			stringValue = stringValue.trim();
-			if (!(stringValue.isEmpty() || !isNumber || pattern.matcher(stringValue).matches()))
-				return false;
-			
-			Number value = 0;
-			((EntryInfo) info.guiValue).error = null;
-			if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals("."))
-			{
-				try
-				{
-					value = func.apply(stringValue);
-				}
-				catch (Exception e)
-				{
-					value = null;
-				}
-				
-				byte isValid = ((ConfigEntry) info).isValid(value);
-				switch (isValid)
-				{
-					case 0:
-						((EntryInfo) info.guiValue).error = null; break;
-					case -1:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin())); break;
-					case 1:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax())); break;
-					case 2:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid")); break;
-				}
-			}
-			
-			((EntryInfo) info.guiValue).tempValue = stringValue;
-			editBox.setTextColor(((ConfigEntry) info).isValid(value) == 0 ? 0xFFFFFFFF : 0xFFFF7777);
-//            button.active = entries.stream().allMatch(e -> e.inLimits);
-			
-			
-			if (((ConfigEntry) info).isValid(value) == 0 && info.getType() != List.class)
-			{
-				if (!cast)
-					((ConfigEntry) info).uiSetWithoutSaving(value);
-				else
-					((ConfigEntry) info).uiSetWithoutSaving(value.intValue());
-			}
-//            else if (((ConfigEntry) info).isValidMemoryAddress() == 0)
-//            {
-//                if (((List<String>) info.get()).size() == ((EntryInfo) info.guiValue).index)
-//                    info.uiSet(((List<String>) info.get()).add(""));
-//                info.uiSet(((List<String>) info.get()).set(((EntryInfo) info.guiValue).index, Arrays.stream(((EntryInfo) info.guiValue).tempValue.replace("[", "").replace("]", "").split(", ")).collect(Collectors.toList()).get(0)));
-//            }
-			
-			return true;
-		};
-	}
-	
-	//==============//
-	// GUI handling //
-	//==============//
-	
-	/**
-	 * if you want to get this config gui's screen call this
-	 */
-	public static Screen getScreen(ConfigBase configBase, Screen parent, String category)
-	{
-		return new ConfigScreen(configBase, parent, category);
-	}
-	
-	/**
-	 * Pain
-	 */
-	private static class ConfigScreen extends DhScreen
-	{
-		protected ConfigScreen(ConfigBase configBase, Screen parent, String category)
-		{
-			super(Translatable(
-					I18n.exists(configBase.modID + ".config" + (category.isEmpty() ? "." + category : "") + ".title") ?
-							configBase.modID + ".config.title" :
-							configBase.modID + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
-			);
-			this.configBase = configBase;
-			this.parent = parent;
-			this.category = category;
-			this.translationPrefix = configBase.modID + ".config.";
-		}
-		private final ConfigBase configBase;
-		
-		private final String translationPrefix;
-		private final Screen parent;
-		private final String category;
-		private ConfigListWidget list;
-		private boolean reload = false;
-		
-		private Button doneButton;
-		
-		// Real Time config update //
-		@Override
-		public void tick()
-		{
-			super.tick();
-		}
-		
-		
-		/**
-		 * When you close it, it goes to the previous screen and saves
-		 */
-		@Override
-		public void onClose()
-		{
-			ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
-			Objects.requireNonNull(this.minecraft).setScreen(this.parent);
-			
-			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
-		}
-		
-		@Override
-		protected void init()
-		{
-			super.init();
-			if (!reload)
-			{
-				ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
-			}
-			
-			// Changelog button
-			if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE)
-			{
-				this.addBtn(new TexturedButtonWidget(
-						// Where the button is on the screen
-						this.width - 28, this.height - 28,
-						// Width and height of the button
-						20, 20,
-						// Offset
-						0, 0,
-						// Some textuary stuff
-						0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
-						// Create the button and tell it where to go
-						(buttonWidget) -> {
-							ChangelogScreen changelogScreen = new ChangelogScreen(this);
-							if (changelogScreen.usable)
-								Objects.requireNonNull(minecraft).setScreen(changelogScreen);
-							else 
-								LOGGER.warn("Changelog was not able to open");
-						},
-						// Add a title to the button
-						Translatable(ModInfo.ID + ".updater.title")
-				));
-			}
-			
-			
-			addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), this.width / 2 - 154, this.height - 28, 150, 20, button -> {
-				ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
-				Objects.requireNonNull(minecraft).setScreen(parent);
-			}));
-			doneButton = addBtn(MakeBtn(Translatable("distanthorizons.general.done"), this.width / 2 + 4, this.height - 28, 150, 20, (button) -> {
-				ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
-				Objects.requireNonNull(minecraft).setScreen(parent);
-			}));
-			
-			this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 25);
-			if (this.minecraft != null && this.minecraft.level != null)
-				this.list.setRenderBackground(false);
-			
-			this.addWidget(this.list);
-			
-			for (AbstractConfigType info : ConfigBase.INSTANCE.entries)
-			{
-				try
-				{
-					if (info.getCategory().matches(category) && info.getAppearance().showInGui)
-						addMenuItem(info);
-				}
-				catch (Exception e)
-				{
-					System.out.println("ERROR: Failed to show [" + info.getNameWCategory() + "]");
-					if (info.get() != null)
-						System.out.print(" with the value [" + info.get() + "] with type [" + info.getType() + "]");
-					e.printStackTrace();
-				}
-			}
-			
-			
-			
-			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
-			
-		}
-		
-		private void addMenuItem(AbstractConfigType info)
-		{
-			initEntry(info, this.translationPrefix);
-			Component name = Translatable(translationPrefix + info.getNameWCategory());
-			
-			if (ConfigEntry.class.isAssignableFrom(info.getClass()))
-			{
-				Button.OnPress btnAction = button -> {
-					((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry) info).getDefaultValue());
-					((EntryInfo) info.guiValue).index = 0;
-					this.reload = true;
-					Objects.requireNonNull(minecraft).setScreen(this);
-				};
-				int a = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth;
-				int b = 0;
-				int c = ConfigScreenConfigs.ResetButtonWidth;
-				int d = 20;
-				
-				Button resetButton = MakeBtn(Translatable("distanthorizons.general.reset").withStyle(ChatFormatting.RED), a, b, c, d, btnAction);
-				
-				if (((EntryInfo) info.guiValue).widget instanceof Map.Entry)
-				{
-					Map.Entry<Button.OnPress, Function<Object, Component>> widget = (Map.Entry<Button.OnPress, Function<Object, Component>>) ((EntryInfo) info.guiValue).widget;
-					if (info.getType().isEnum())
-					{
-						widget.setValue(value -> Translatable(translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString()));
-					}
-					this.list.addButton(MakeBtn(widget.getValue().apply(info.get()), this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen, 0, 150, 20, widget.getKey()), resetButton, null, name);
-					return;
-				}
-				else if (((EntryInfo) info.guiValue).widget != null)
-				{
-					EditBox widget = new EditBox(font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, null);
-					widget.setMaxLength(150);
-					widget.insertText(String.valueOf(info.get()));
-					Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) ((EntryInfo) info.guiValue).widget).apply(widget, doneButton);
-					widget.setFilter(processor);
-					this.list.addButton(widget, resetButton, null, name);
-					return;
-				}
-			}
-			if (ConfigCategory.class.isAssignableFrom(info.getClass()))
-			{
-				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
-					ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
-					Objects.requireNonNull(minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination()));
-				}));
-				this.list.addButton(widget, null, null, null);
-				return;
-			}
-			if (ConfigUIButton.class.isAssignableFrom(info.getClass()))
-			{
-				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
-					((ConfigUIButton) info).runAction();
-				}));
-				this.list.addButton(widget, null, null, null);
-				return;
-			}
-			if (ConfigUIComment.class.isAssignableFrom(info.getClass()))
-			{
-				this.list.addButton(null, null, null, name);
-				return;
-			}
-			if (ConfigLinkedEntry.class.isAssignableFrom(info.getClass()))
-			{
-				this.addMenuItem(((ConfigLinkedEntry) info).get());
-				return;
-			}
-			
-			LOGGER.warn("Config [" + info.getNameWCategory() + "] failed to show. Please try something like changing its type.");
-		}
-		
-		@Override
-        #if PRE_MC_1_20_1
-		public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
-        #else
-		public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-		#endif
-		{
-			#if PRE_MC_1_20_2 // 1.20.2 now enables this by default in the `this.list.render` function
-			this.renderBackground(matrices); // Renders background
-			#else
-			super.render(matrices, mouseX, mouseY, delta);
-			#endif
-			this.list.render(matrices, mouseX, mouseY, delta); // Render buttons
-			
-			DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
-			
-			if (this.configBase.modID.equals("distanthorizons"))
-			{
-				// Display version
-				DhDrawString(matrices, font, TextOrLiteral(ModInfo.VERSION), 2, height - 10, 0xAAAAAA);
-				
-				// If the update is pending, display this message to inform the user that it will apply when the game restarts
-				if (SelfUpdater.deleteOldJarOnJvmShutdown)
-					DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height - 38, 0xFFFFFF);
-			}
-			
-			
-			// Render the tooltip only if it can find a tooltip in the language file
-			for (AbstractConfigType info : ConfigBase.INSTANCE.entries)
-			{
-				if (info.getCategory().matches(category) && info.getAppearance().showInGui)
-				{
-					if (list.getHoveredButton(mouseX, mouseY).isPresent())
-					{
-						AbstractWidget buttonWidget = list.getHoveredButton(mouseX, mouseY).get();
-						Component text = ButtonEntry.buttonsWithText.get(buttonWidget);
-						if (text == null)
-						{
-							continue;
-						}
-						
-						// A quick fix for tooltips on linked entries
-						AbstractConfigType newInfo = ConfigLinkedEntry.class.isAssignableFrom(info.getClass()) ?
-								((ConfigLinkedEntry) info).get() :
-								info;
-						
-						Component name = Translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.getName());
-						String key = translationPrefix + (newInfo.category.isEmpty() ? "" : newInfo.category + ".") + newInfo.getName() + ".@tooltip";
-						
-						if (((EntryInfo) newInfo.guiValue).error != null && text.equals(name))
-							DhRenderTooltip(matrices, font, ((EntryInfo) newInfo.guiValue).error.getValue(), mouseX, mouseY);
-						else if (I18n.exists(key) && (text != null && text.equals(name)))
-						{
-							List<Component> list = new ArrayList<>();
-							for (String str : I18n.get(key).split("\n"))
-							{
-								list.add(TextOrTranslatable(str));
-							}
-							DhRenderComponentTooltip(matrices, font, list, mouseX, mouseY);
-						}
-					}
-				}
-			}
-			#if PRE_MC_1_20_2
-			super.render(matrices, mouseX, mouseY, delta);
-			#endif
-		}
-		
-	}
-	
-	
-	
-	
-	
-	private static void initEntry(AbstractConfigType info, String translationPrefix)
-	{
-		info.guiValue = new EntryInfo();
-		Class<?> fieldClass = info.getType();
-		
-		if (ConfigEntry.class.isAssignableFrom(info.getClass()))
-		{
-			if (fieldClass == Integer.class)
-			{
-				// For int
-				textField(info, Integer::parseInt, INTEGER_ONLY_REGEX, true);
-			}
-			else if (fieldClass == Double.class)
-			{
-				// For double
-				textField(info, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
-			}
-			else if (fieldClass == String.class || fieldClass == List.class)
-			{
-				// For string or list
-				textField(info, String::length, null, true);
-			}
-			else if (fieldClass == Boolean.class)
-			{
-				// For boolean
-				Function<Object, Component> func = value -> Translatable("distanthorizons.general."+((Boolean) value ? "true" : "false")).withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
-				
-				((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
-					((ConfigEntry) info).uiSetWithoutSaving(!(Boolean) info.get());
-					button.setMessage(func.apply(info.get()));
-				}, func);
-			}
-			else if (fieldClass.isEnum())
-			{
-				// For enum
-				List<?> values = Arrays.asList(info.getType().getEnumConstants());
-				Function<Object, Component> func = value -> Translatable(translationPrefix + "enum." + fieldClass.getSimpleName() + "." + info.get().toString());
-				((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
-					
-					// get the currently selected enum and enum index
-					int startingIndex = values.indexOf(info.get());
-					Enum<?> enumValue = (Enum<?>) values.get(startingIndex);
-					
-					// search for the next enum that is selectable
-					int index = startingIndex + 1;
-					index = (index >= values.size()) ? 0 : index;
-					while (index != startingIndex)
-					{
-						enumValue = (Enum<?>) values.get(index);
-						if (!AnnotationUtil.doesEnumHaveAnnotation(enumValue, DisallowSelectingViaConfigGui.class))
-						{
-							// this enum shouldn't be selectable via the UI,
-							// skip it
-							break;
-						}
-						
-						index++;
-						index = (index >= values.size()) ? 0 : index;
-					}
-					
-					if (index == startingIndex)
-					{
-						// none of the enums should be selectable, this is a programmer error
-						enumValue = (Enum<?>) values.get(startingIndex);
-						LOGGER.warn("Enum [" + enumValue.getClass() + "] doesn't contain any values that should be selectable via the UI, sticking to the currently selected value [" + enumValue + "].");
-					}
-					
-					
-					((ConfigEntry<Enum<?>>) info).uiSetWithoutSaving(enumValue);
-					button.setMessage(func.apply(info.get()));
-				}, func);
-			}
-		}
-		else if (ConfigCategory.class.isAssignableFrom(info.getClass()))
-		{
-//            if (!info.info.getName().equals(""))
-//                info.name = new TranslatableComponent(info.info.getName());
-		}
-//        return info;
-	}
-	
-	public static class ConfigListWidget extends ContainerObjectSelectionList<ButtonEntry>
-	{
-		Font textRenderer;
-		
-		public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m)
-		{
-			super(minecraftClient, i, j, k, l, m);
-			this.centerListVertically = false;
-			textRenderer = minecraftClient.font;
-		}
-		
-		public void addButton(AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text)
-		{
-			this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
-		}
-		
-		@Override
-		public int getRowWidth()
-		{
-			return 10000;
-		}
-		
-		public Optional<AbstractWidget> getHoveredButton(double mouseX, double mouseY)
-		{
-			for (ButtonEntry buttonEntry : this.children())
-			{
-				if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY))
-				{
-					return Optional.of(buttonEntry.button);
-				}
-			}
-			return Optional.empty();
-		}
-		
-	}
-	
-	
-	public static class ButtonEntry extends ContainerObjectSelectionList.Entry<ButtonEntry>
-	{
-		private static final Font textRenderer = Minecraft.getInstance().font;
-		public final AbstractWidget button;
-		private final AbstractWidget resetButton;
-		private final AbstractWidget indexButton;
-		private final Component text;
-		private final List<AbstractWidget> children = new ArrayList<>();
-		public static final Map<AbstractWidget, Component> buttonsWithText = new HashMap<>();
-		
-		private ButtonEntry(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
-		{
-			buttonsWithText.put(button, text);
-			this.button = button;
-			this.resetButton = resetButton;
-			this.text = text;
-			this.indexButton = indexButton;
-			if (button != null)
-				children.add(button);
-			if (resetButton != null)
-				children.add(resetButton);
-			if (indexButton != null)
-				children.add(indexButton);
-		}
-		
-		public static ButtonEntry create(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
-		{
-			return new ButtonEntry(button, text, resetButton, indexButton);
-		}
-		
-		@Override
-        #if PRE_MC_1_20_1
-		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-        #else
-		public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		#endif
-		{
-			if (button != null)
-			{
-				SetY(button, y);
-				button.render(matrices, mouseX, mouseY, tickDelta);
-			}
-			if (resetButton != null)
-			{
-				SetY(resetButton, y);
-				resetButton.render(matrices, mouseX, mouseY, tickDelta);
-			}
-			if (indexButton != null)
-			{
-				SetY(indexButton, y);
-				indexButton.render(matrices, mouseX, mouseY, tickDelta);
-			}
-			if (text != null && (!text.getString().contains("spacer") || button != null))
-                #if PRE_MC_1_20_1
-				GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
-				#else
-				matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
-				#endif
-		}
-		
-		@Override
-		public List<? extends GuiEventListener> children()
-		{
-			return children;
-		}
-		
-		// Only for 1.17 and over
-		// Remove in 1.16 and below
-		#if POST_MC_1_17_1
-		@Override
-		public List<? extends NarratableEntry> narratables()
-		{
-			return children;
-		}
-		#endif
-	}
-	
-	
-	
-	
-	
-	//================//
-	// event handling //
-	//================//
-	
-	private static class ConfigCoreInterface implements IConfigGui
-	{
-		/**
-		 * in the future it would be good to pass in the current page and other variables, 
-		 * but for now just knowing when the page is closed is good enough 
-		 */
-		public final ArrayList<Runnable> onScreenChangeListenerList = new ArrayList<>();
-		
-		
-		
-		@Override
-		public void addOnScreenChangeListener(Runnable newListener) { this.onScreenChangeListenerList.add(newListener); }
-		@Override
-		public void removeOnScreenChangeListener(Runnable oldListener) { this.onScreenChangeListenerList.remove(oldListener); }
-		
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhScreen.java

@@ -1,77 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-import net.minecraft.client.gui.Font;
-#if PRE_MC_1_20_1
-import com.mojang.blaze3d.vertex.PoseStack;
-#else
-import net.minecraft.client.gui.GuiGraphics;
-#endif
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-
-import java.util.List;
-
-public class DhScreen extends Screen
-{
-	
-	protected DhScreen(Component $$0)
-	{
-		super($$0);
-	}
-	
-	// addRenderableWidget in 1.17 and over
-	// addButton in 1.16 and below
-	protected Button addBtn(Button button)
-	{
-		#if PRE_MC_1_17_1
-        return this.addButton(button);
-		#else
-		return this.addRenderableWidget(button);
-		#endif
-	}
-	
-	#if PRE_MC_1_20_1
-	protected void DhDrawCenteredString(PoseStack guiStack, Font font, Component text, int x, int y, int color)
-	{
-		drawCenteredString(guiStack, font, text, x, y, color);
-	}
-	protected void DhDrawString(PoseStack guiStack, Font font, Component text, int x, int y, int color)
-	{
-		drawString(guiStack, font, text, x, y, color);
-	}
-	protected void DhRenderTooltip(PoseStack guiStack, Font font, List<? extends net.minecraft.util.FormattedCharSequence> text, int x, int y)
-	{
-		renderTooltip(guiStack, text, x, y);
-	}
-	protected void DhRenderComponentTooltip(PoseStack guiStack, Font font, List<Component> comp, int x, int y)
-	{
-		renderComponentTooltip(guiStack, comp, x, y);
-	}
-	protected void DhRenderTooltip(PoseStack guiStack, Font font, Component comp, int x, int y)
-	{
-		renderTooltip(guiStack, comp, x, y);
-	}
-	#else
-	protected void DhDrawCenteredString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
-	{
-		guiStack.drawCenteredString(font, text, x, y, color);
-	}
-	protected void DhDrawString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
-	{
-		guiStack.drawString(font, text, x, y, color);
-	}
-	protected void DhRenderTooltip(GuiGraphics guiStack, Font font, List<? extends net.minecraft.util.FormattedCharSequence> text, int x, int y)
-	{
-		guiStack.renderTooltip(font, text, x, y);
-	}
-	protected void DhRenderComponentTooltip(GuiGraphics guiStack, Font font, List<Component> comp, int x, int y)
-	{
-		guiStack.renderComponentTooltip(font, comp, x, y);
-	}
-	protected void DhRenderTooltip(GuiGraphics guiStack, Font font, Component text, int x, int y)
-	{
-		guiStack.renderTooltip(font, text, x, y);
-	}
-        #endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java

@@ -1,43 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.config.ConfigBase;
-import com.seibel.distanthorizons.core.config.gui.ConfigScreen;
-import com.seibel.distanthorizons.core.config.gui.JavaScreenHandlerScreen;
-import com.seibel.distanthorizons.core.config.gui.OpenGLConfigScreen;
-import net.minecraft.client.gui.screens.Screen;
-
-public class GetConfigScreen
-{
-	public static type useScreen = type.Classic;
-	
-	public enum type
-	{
-		Classic,
-		@Deprecated
-		OpenGL, // This was just an attempt, it didn't work out, and we are going to change to javafx soon (as soon as that works)
-		JavaFX;
-	}
-	
-	public static Screen getScreen(Screen parent)
-	{
-		// Generate the language
-		// This shouldn't be here, but I need a way to test it after Minecraft inits its assets
-		//System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
-		
-		switch (useScreen)
-		{
-			case Classic:
-				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
-			case OpenGL:
-				MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
-				return null;
-//            case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
-			case JavaFX:
-				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
-			default:
-				return null;
-		}
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GuiHelper.java

@@ -1,72 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
-#if PRE_MC_1_19_2
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
-#endif
-
-public class GuiHelper
-{
-	/**
-	 * Helper static methods for versional compat
-	 */
-	public static Button MakeBtn(Component base, int a, int b, int c, int d, Button.OnPress action)
-	{
-        #if PRE_MC_1_19_4
-		return new Button(a, b, c, d, base, action);
-        #else
-		return Button.builder(base, action).bounds(a, b, c, d).build();
-        #endif
-	}
-	
-	public static MutableComponent TextOrLiteral(String text)
-	{
-        #if PRE_MC_1_19_2
-		return new TextComponent(text);
-        #else
-		return Component.literal(text);
-        #endif
-	}
-	
-	public static MutableComponent TextOrTranslatable(String text)
-	{
-        #if PRE_MC_1_19_2
-		return new TextComponent(text);
-        #else
-		return Component.translatable(text);
-        #endif
-	}
-	
-	public static MutableComponent Translatable(String text, Object... args)
-	{
-        #if PRE_MC_1_19_2
-		return new TranslatableComponent(text, args);
-        #else
-		return Component.translatable(text, args);
-        #endif
-	}
-	
-	public static void SetX(AbstractWidget w, int x)
-	{
-        #if PRE_MC_1_19_4
-		w.x = x;
-        #else
-		w.setX(x);
-        #endif
-	}
-	
-	public static void SetY(AbstractWidget w, int y)
-	{
-        #if PRE_MC_1_19_4
-		w.y = y;
-        #else
-		w.setY(y);
-        #endif
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java

@@ -1,21 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
-import net.minecraft.client.resources.language.I18n;
-
-public class LangWrapper implements ILangWrapper
-{
-	public static final LangWrapper INSTANCE = new LangWrapper();
-	@Override
-	public boolean langExists(String str)
-	{
-		return I18n.exists(str);
-	}
-	
-	@Override
-	public String getLang(String str)
-	{
-		return I18n.get(str);
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java

@@ -1,142 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-import com.mojang.blaze3d.platform.Window;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.seibel.distanthorizons.core.config.gui.AbstractScreen;
-import net.minecraft.client.Minecraft;
-#if POST_MC_1_20_1
-import net.minecraft.client.gui.GuiGraphics;
-#endif
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.screens.Screen;
-import org.jetbrains.annotations.NotNull;
-
-import java.nio.file.Path;
-import java.util.*;
-
-public class MinecraftScreen
-{
-	public static Screen getScreen(Screen parent, AbstractScreen screen, String translationName)
-	{
-		return new ConfigScreenRenderer(parent, screen, translationName);
-	}
-	
-	private static class ConfigScreenRenderer extends DhScreen
-	{
-		private final Screen parent;
-		private ConfigListWidget list;
-		private AbstractScreen screen;
-		
-		
-		#if PRE_MC_1_19_2
-		public static net.minecraft.network.chat.TranslatableComponent translate(String str, Object... args)
-		{
-			return new net.minecraft.network.chat.TranslatableComponent(str, args);
-		}
-		#else
-		public static net.minecraft.network.chat.MutableComponent translate(String str, Object... args)
-		{
-			return net.minecraft.network.chat.Component.translatable(str, args);
-		}
-    #endif
-		
-		protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName)
-		{
-			super(translate(translationName));
-			screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow();
-			this.parent = parent;
-			this.screen = screen;
-		}
-		
-		@Override
-		protected void init()
-		{
-			super.init(); // Init Minecraft's screen
-			Window mcWindow = this.minecraft.getWindow();
-			screen.width = mcWindow.getWidth();
-			screen.height = mcWindow.getHeight();
-			screen.scaledWidth = this.width;
-			screen.scaledHeight = this.height;
-			screen.init(); // Init our own config screen
-			
-			this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, this.height, 25); // Select the area to tint
-			if (this.minecraft != null && this.minecraft.level != null) // Check if in game
-				this.list.setRenderBackground(false); // Disable from rendering
-			this.addWidget(this.list); // Add the tint to the things to be rendered
-		}
-		
-		@Override
-        #if PRE_MC_1_20_1
-		public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
-        #else
-		public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-        #endif
-		{
-			#if MC_1_20_2
-			this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
-			#else
-			this.renderBackground(matrices); // Render background
-			#endif
-			this.list.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
-			
-			screen.mouseX = mouseX;
-			screen.mouseY = mouseY;
-			screen.render(delta); // Render everything on the main screen
-			
-			super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint)
-		}
-		
-		@Override
-		public void resize(Minecraft mc, int width, int height)
-		{
-			super.resize(mc, width, height); // Resize Minecraft's screen
-			Window mcWindow = this.minecraft.getWindow();
-			screen.width = mcWindow.getWidth();
-			screen.height = mcWindow.getHeight();
-			screen.scaledWidth = this.width;
-			screen.scaledHeight = this.height;
-			screen.onResize(); // Resize our screen
-		}
-		
-		@Override
-		public void tick()
-		{
-			super.tick(); // Tick Minecraft's screen
-			screen.tick(); // Tick our screen
-			if (screen.close) // If we decide to close the screen, then actually close the screen
-				onClose();
-		}
-		
-		@Override
-		public void onClose()
-		{
-			screen.onClose(); // Close our screen
-			Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
-		}
-		
-		@Override
-		public void onFilesDrop(@NotNull List<Path> files)
-		{
-			screen.onFilesDrop(files);
-		}
-		
-		// For checking if it should close when you press the escape key
-		@Override
-		public boolean shouldCloseOnEsc()
-		{
-			return screen.shouldCloseOnEsc;
-		}
-		
-	}
-	
-	public static class ConfigListWidget extends ContainerObjectSelectionList
-	{
-		public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m)
-		{
-			super(minecraftClient, i, j, k, l, m);
-			this.centerListVertically = false;
-		}
-		
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java

@@ -1,177 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-/**
- * Creates a button with a texture on it (and a background) that works with all mc versions
- * 
- * @author coolGi
- * @version 2023-10-03
- */
-
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.components.AbstractButton;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.ImageButton;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-
-#if POST_MC_1_17_1
-import net.minecraft.client.renderer.GameRenderer;
-#endif
-#if PRE_MC_1_20_1
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-#else
-import net.minecraft.client.gui.GuiGraphics;
-#endif
-
-#if PRE_MC_1_20_2
-public class TexturedButtonWidget extends ImageButton
-#else
-public class TexturedButtonWidget extends Button
-#endif
-{
-	public final boolean renderBackground;
-	
-	#if POST_MC_1_20_2
-	private final int u;
-	private final int v;
-	private final int hoveredVOffset;
-	
-	private final ResourceLocation texture;
-	
-	private final int textureWidth;
-	private final int textureHeight;
-	#endif
-	
-	
-	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text) {
-		this(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text, true);
-	}
-	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text, boolean renderBackground)
-	{
-		#if PRE_MC_1_20_2
-		super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
-		#else
-		// We don't pass on the text option as otherwise it will render (we normally pass it for narration)
-		// TODO: Find a fix for it
-		super(x, y, width, height, Component.empty(), pressAction, DEFAULT_NARRATION);
-		
-		this.u = u;
-		this.v = v;
-		this.hoveredVOffset = hoveredVOffset;
-		
-		this.texture = texture;
-		
-		this.textureWidth = textureWidth;
-		this.textureHeight = textureHeight;
-		#endif
-		
-		this.renderBackground = renderBackground;
-	}
-	
-	#if PRE_MC_1_20_2
-	#if PRE_MC_1_19_4
-	@Override
-	public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
-		if (this.renderBackground) // Renders the background of the button
-		{
-			#if PRE_MC_1_17_1
-			Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION);
-			RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
-			#else
-			RenderSystem.setShader(GameRenderer::getPositionTexShader);
-			RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
-			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-			#endif
-
-			int i = this.getYImage(this.isHovered);
-			RenderSystem.enableBlend();
-			RenderSystem.defaultBlendFunc();
-			RenderSystem.enableDepthTest();
-			#if PRE_MC_1_19_4
-			this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
-			this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
-			#else
-			this.blit(matrices, this.getX(), this.getY(), 0, 46 + i * 20, this.getWidth() / 2, this.getHeight());
-			this.blit(matrices, this.getX() + this.getWidth() / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.getWidth() / 2, this.getHeight());
-			#endif
-		}
-
-		super.renderButton(matrices, mouseX, mouseY, delta);
-	}
-	#else
-    #if PRE_MC_1_20_1
-	@Override
-    public void renderWidget(PoseStack matrices, int mouseX, int mouseY, float delta)
-    {
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-    #else
-	@Override
-	public void renderWidget(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-	{
-    #endif
-		if (this.renderBackground) // Renders the background of the button
-		{
-			int i = 1;
-			if (!this.active)           i = 0;
-			else if (this.isHovered)    i = 2;
-
-            #if PRE_MC_1_20_1
-            RenderSystem.enableBlend();
-            RenderSystem.defaultBlendFunc();
-            RenderSystem.enableDepthTest();
-			
-            this.blit(matrices, this.getX(), this.getY(), 0, 46 + i * 20, this.getWidth() / 2, this.getHeight());
-            this.blit(matrices, this.getX() + this.getWidth() / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.getWidth() / 2, this.getHeight());
-            #else
-			matrices.blit(WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46 + i * 20, this.getWidth() / 2, this.getHeight());
-			matrices.blit(WIDGETS_LOCATION, this.getX() + this.getWidth() / 2, this.getY(), 200 - this.width / 2, 46 + i * 20, this.getWidth() / 2, this.getHeight());
-            #endif
-		}
-		
-		super.renderWidget(matrices, mouseX, mouseY, delta);
-	}
-	#endif
-	#else
-	@Override
-	public void renderWidget(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-	{
-		if (this.renderBackground)
-		{
-			//RenderSystem.enableBlend();
-			//RenderSystem.enableDepthTest();
-			matrices.blitSprite(SPRITES.get(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
-		}
-		
-		
-		// Renders the sprite
-		int i = 0;
-		if (!this.active)           i = 2;
-		else if (this.isHovered)    i = 1;
-		
-		matrices.blit(this.texture, this.getX(), this.getY(), this.u, this.v + (this.hoveredVOffset * i), this.width, this.height, this.textureWidth, this.textureHeight);
-	}
-	#endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java

@@ -1,252 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui.updater;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.seibel.distanthorizons.common.wrappers.gui.DhScreen;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.jar.installer.MarkdownFormatter;
-import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.ContainerObjectSelectionList;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.Component;
-
-#if POST_MC_1_17_1
-import net.minecraft.client.gui.narration.NarratableEntry;
-#endif
-
-#if PRE_MC_1_20_1
-import net.minecraft.client.gui.GuiComponent;
-#else
-import net.minecraft.client.gui.GuiGraphics;
-#endif
-
-
-import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
-
-import java.util.*;
-
-/**
- * The screen that pops up if the mod has an update.
- *
- * @author coolGi
- */
-// TODO: After finishing the config, rewrite this in openGL as well
-// TODO: Make this
-public class ChangelogScreen extends DhScreen
-{
-	private Screen parent;
-	private String versionID;
-	private List<String> changelog;
-	private TextArea changelogArea;
-	
-	public boolean usable = false;
-	
-	public ChangelogScreen(Screen parent)
-	{
-		this(parent, null);
-		
-		if (!ModrinthGetter.initted) // Make sure the modrinth stuff is initted
-			ModrinthGetter.init();
-		if (!ModrinthGetter.initted) // If its not initted, then this isnt usable
-			return;
-		
-		if (!ModrinthGetter.mcVersions.contains(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()))
-			return;
-		
-		String versionID = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion());
-		if (versionID == null)
-			return;
-		try
-		{
-			setupChangelog(versionID);
-			usable = true;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-	}
-	
-	public ChangelogScreen(Screen parent, String versionID)
-	{
-		super(Translatable(ModInfo.ID + ".updater.title"));
-		this.parent = parent;
-		this.versionID = versionID;
-		
-		
-		if (versionID == null)
-			return;
-		try
-		{
-			setupChangelog(versionID);
-			usable = true;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-	}
-	
-	private void setupChangelog(String versionID)
-	{
-		this.changelog = new ArrayList<>();
-		
-		// Put the new version name at the very top of the change log
-		this.changelog.add("§lChangelog for " + ModrinthGetter.releaseNames.get(versionID) + "§r");
-		this.changelog.add("");
-		this.changelog.add("");
-		
-		// Get the release changelog and split it by the new lines
-		String[] unwrappedChangelog = // Arrays.asList could be used if a list object is desired here vs List.of which is only available for Java 9+
-				new MarkdownFormatter.MinecraftFormat().convertTo( // This formats markdown to minecraft's "§" characters
-						ModrinthGetter.changeLogs.get(versionID)
-				).split("\\n");
-		// Makes the words wrap around to not go off the screen
-		for (String str : unwrappedChangelog)
-		{
-			this.changelog.addAll(
-					MarkdownFormatter.splitString(str, 75)
-			);
-		}
-		// Debugging
-//        System.out.println(this.changelog);
-	}
-	
-	
-	
-	@Override
-	protected void init()
-	{
-		super.init();
-		if (!usable)
-			return;
-		
-		
-		this.addBtn( // Close
-				MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> {
-					this.onClose();
-				})
-		);
-		
-		
-		this.changelogArea = new TextArea(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 10);
-		for (int i = 0; i < changelog.size(); i++)
-		{
-			this.changelogArea.addButton(TextOrLiteral(changelog.get(i)));
-//            drawString(matrices, this.font, changelog.get(i), this.width / 2 - 175, this.height / 2 - 100 + i*10, 0xFFFFFF);
-		}
-		
-	}
-	
-	@Override
-    #if PRE_MC_1_20_1
-	public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
-    #else
-	public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-    #endif
-	{
-		#if MC_1_20_2
-		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
-		#else
-		this.renderBackground(matrices); // Render background
-		#endif
-		if (!usable)
-			return;
-		
-		// Set the scroll position to the mouse height relative to the screen
-		// This is a bit of a hack as we cannot scroll on this area
-		double scrollAmount = ((double) mouseY) / ((double) this.height) * 1.1 * this.changelogArea.getMaxScroll();
-	    #if MC_1_16_5 || MC_1_17_1
-		this.changelogArea.setScrollAmount(scrollAmount);
-		#else
-		this.changelogArea.scrollAmount = scrollAmount;
-		#endif
-		
-		
-		this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog
-		
-		super.render(matrices, mouseX, mouseY, delta); // Render the buttons
-		
-		DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
-	}
-	
-	@Override
-	public void onClose()
-	{
-		Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
-	}
-	
-	public static class TextArea extends ContainerObjectSelectionList<ButtonEntry>
-	{
-		Font textRenderer;
-		
-		public TextArea(Minecraft minecraftClient, int i, int j, int k, int l, int m)
-		{
-			super(minecraftClient, i, j, k, l, m);
-			this.centerListVertically = false;
-			textRenderer = minecraftClient.font;
-		}
-		
-		public void addButton(Component text)
-		{
-			this.addEntry(ButtonEntry.create(text));
-		}
-		
-		@Override
-		public int getRowWidth()
-		{
-			return 10000;
-		}
-		
-	}
-	
-	public static class ButtonEntry extends ContainerObjectSelectionList.Entry<ButtonEntry>
-	{
-		private static final Font textRenderer = Minecraft.getInstance().font;
-		private final Component text;
-		private final List<AbstractWidget> children = new ArrayList<>();
-		
-		private ButtonEntry(Component text)
-		{
-			this.text = text;
-		}
-		
-		public static ButtonEntry create(Component text)
-		{
-			return new ButtonEntry(text);
-		}
-		
-		#if PRE_MC_1_20_1
-		@Override
-		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{
-			GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
-		}
-		#else
-		@Override
-		public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{
-			matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
-		}
-        #endif
-		
-		@Override
-		public List<? extends GuiEventListener> children()
-		{
-			return children;
-		}
-		#if POST_MC_1_17_1
-		@Override
-		public List<? extends NarratableEntry> narratables()
-		{
-			return children;
-		}
-		#endif
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java

@@ -1,180 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui.updater;
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
-import com.seibel.distanthorizons.common.wrappers.gui.DhScreen;
-import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget;
-import com.seibel.distanthorizons.core.jar.ModJarInfo;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.jar.JarUtils;
-import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
-import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
-import net.minecraft.client.Minecraft;
-#if POST_MC_1_20_1
-import net.minecraft.client.gui.GuiGraphics;
-#else
-import com.mojang.blaze3d.vertex.PoseStack;
-#endif
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.resources.ResourceLocation;
-
-import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
-
-import java.util.*;
-
-/**
- * The screen that pops up if the mod has an update.
- *
- * @author coolGi
- */
-// TODO: After finishing the config, rewrite this in Java Swing as well
-// and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192
-public class UpdateModScreen extends DhScreen
-{
-	private Screen parent;
-	private String newVersionID;
-	
-	private String currentVer;
-	private String nextVer;
-	
-	
-	public UpdateModScreen(Screen parent, String newVersionID)
-	{
-		super(Translatable(ModInfo.ID + ".updater.title"));
-		this.parent = parent;
-		this.newVersionID = newVersionID;
-
-        switch (Config.Client.Advanced.AutoUpdater.updateBranch.get()) {
-	        case STABLE:
-                currentVer = ModInfo.VERSION;
-                nextVer = ModrinthGetter.releaseNames.get(this.newVersionID);
-				break;
-	        case NIGHTLY:
-                currentVer = ModJarInfo.Git_Commit.substring(0,7);
-                nextVer = this.newVersionID.substring(0,7);
-				break;
-        }
-	}
-	
-	@Override
-	protected void init()
-	{
-		super.init();
-		
-		
-		try
-		{
-			// We cannot get assets from the root of the mod so we use this hack
-			// TODO: Load the icon.png and logo.png in the mod initialise rather than here
-			ResourceLocation logoLocation = new ResourceLocation(ModInfo.ID, "logo.png");
-			Minecraft.getInstance().getTextureManager().register(
-					logoLocation,
-					new DynamicTexture(NativeImage.read(JarUtils.accessFile("logo.png")))
-			);
-			
-			
-			// Logo image
-			this.addBtn(new TexturedButtonWidget(
-					// Where the button is on the screen
-					this.width / 2 - 65, this.height / 2 - 110,
-					// Width and height of the button
-					130, 65,
-					// Offset
-					0, 0,
-					// Some textuary stuff
-					0, logoLocation, 130, 65,
-					// Create the button and tell it where to go
-					// For now it goes to the client option by default
-					(buttonWidget) -> System.out.println("Nice, you found an easter egg :)"), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
-					// Add a title to the button
-					Translatable(ModInfo.ID + ".updater.title"),
-					// Dont render the background of the button
-					false
-			));
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		
-		if (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE)
-		{
-			this.addBtn(new TexturedButtonWidget(
-					// Where the button is on the screen
-					this.width / 2 - 97, this.height / 2 + 8,
-					// Width and height of the button
-					20, 20,
-					// Offset
-					0, 0,
-					// Some textuary stuff
-					0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
-					// Create the button and tell it where to go
-					(buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
-					// Add a title to the button
-					Translatable(ModInfo.ID + ".updater.title")
-			));
-		}
-		
-		
-		this.addBtn( // Update
-				MakeBtn(Translatable(ModInfo.ID + ".updater.update"), this.width / 2 - 75, this.height / 2 + 8, 150, 20, (btn) -> {
-					SelfUpdater.updateMod();
-					this.onClose();
-				})
-		);
-		this.addBtn( // Silent update
-				MakeBtn(Translatable(ModInfo.ID + ".updater.silent"), this.width / 2 - 75, this.height / 2 + 30, 150, 20, (btn) -> {
-					Config.Client.Advanced.AutoUpdater.enableSilentUpdates.set(true);
-					SelfUpdater.updateMod();
-					this.onClose();
-				})
-		);
-		this.addBtn( // Later (not now)
-				MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> {
-					this.onClose();
-				})
-		);
-		this.addBtn( // Never
-				MakeBtn(Translatable(ModInfo.ID + ".updater.never"), this.width / 2 - 102, this.height / 2 + 70, 100, 20, (btn) -> {
-					Config.Client.Advanced.AutoUpdater.enableAutoUpdater.set(false);
-					this.onClose();
-				})
-		);
-		
-	}
-	
-	@Override
-    #if PRE_MC_1_20_1
-	public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
-    #else
-	public void render(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-    #endif
-	{
-		#if MC_1_20_2
-		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
-		#else
-		this.renderBackground(matrices); // Render background
-		#endif
-		
-		
-		// Render the text's
-		DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF);
-		DhDrawCenteredString(matrices, this.font, 
-				Translatable(ModInfo.ID + ".updater.text2", currentVer, nextVer), 
-				this.width / 2, this.height / 2 - 20, 0x52FD52);
-		
-		// TODO: add the tooltips for the buttons
-		super.render(matrices, mouseX, mouseY, delta); // Render the buttons
-		
-		// TODO: Add tooltips
-	}
-	
-	@Override
-	public void onClose()
-	{
-		Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java

@@ -1,54 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.level;
-
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.client.multiplayer.ClientLevel;
-
-import java.util.Objects;
-
-public class KeyedClientLevelManager implements IKeyedClientLevelManager
-{
-	public static final KeyedClientLevelManager INSTANCE = new KeyedClientLevelManager();
-	
-	/** This is set and managed by the ClientApi for servers with support for DH. */
-	private IServerKeyedClientLevel overrideWrapper = null;
-	private boolean useOverrideWrapper = false;
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	private KeyedClientLevelManager() { }
-	
-	
-	
-	//======================//
-	// level override logic //
-	//======================//
-	
-	@Override
-	public void setServerKeyedLevel(IServerKeyedClientLevel clientLevel) { this.overrideWrapper = clientLevel; }
-	@Override
-	public IServerKeyedClientLevel getOverrideWrapper() { return this.overrideWrapper; }
-	
-	@Override
-	public IServerKeyedClientLevel getServerKeyedLevel(ILevelWrapper level, String serverLevelKey)
-	{
-		Objects.requireNonNull(level);
-		Objects.requireNonNull(serverLevelKey);
-		return new ServerKeyedClientLevel((ClientLevel) level.getWrappedMcObject(), serverLevelKey);
-	}
-	
-	
-	@Override
-	public void setUseOverrideWrapper(boolean useOverrideWrapper) { this.useOverrideWrapper = useOverrideWrapper; }
-	@Override
-	public boolean getUseOverrideWrapper() { return this.useOverrideWrapper; }
-	
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java

@@ -1,21 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.level;
-
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import net.minecraft.client.multiplayer.ClientLevel;
-
-public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServerKeyedClientLevel
-{
-	/** A unique identifier (generally the level's name) for differentiating multiverse levels */
-	private final String serverLevelKey;
-	
-	public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey)
-	{
-		super(level);
-		this.serverLevelKey = serverLevelKey;
-	}
-	
-	@Override
-	public String getServerLevelKey() { return this.serverLevelKey; }
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -1,309 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.minecraft;
-
-import java.io.File;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.UUID;
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.api.enums.config.ELodShading;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.enums.EDhDirection;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-
-import net.minecraft.CrashReport;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-#if PRE_MC_1_19_2
-import net.minecraft.network.chat.TextComponent;
-#endif
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A singleton that wraps the Minecraft object.
- *
- * @author James Seibel
- * @version 3-5-2022
- */
-//@Environment(EnvType.CLIENT)
-public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecraftSharedWrapper
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
-	
-	public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
-	
-	public final Minecraft mc = Minecraft.getInstance();
-	
-	/**
-	 * The lightmap for the current:
-	 * Time, dimension, brightness setting, etc.
-	 */
-	private NativeImage lightMap = null;
-	
-	private ProfilerWrapper profilerWrapper;
-	
-	
-	private MinecraftClientWrapper()
-	{
-		
-	}
-	
-	
-	
-	//================//
-	// helper methods //
-	//================//
-	
-	/**
-	 * This should be called at the beginning of every frame to
-	 * clear any Minecraft data that becomes out of date after a frame. <br> <br>
-	 * <p>
-	 * LightMaps and other time sensitive objects fall in this category. <br> <br>
-	 * <p>
-	 * This doesn't affect OpenGL objects in any way.
-	 */
-	@Override
-	public void clearFrameObjectCache()
-	{
-		lightMap = null;
-	}
-	
-	
-	
-	//=================//
-	// method wrappers //
-	//=================//
-	
-	@Override
-	public float getShade(EDhDirection lodDirection)
-	{
-		ELodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get();
-		switch (lodShading)
-		{
-			default:
-			case MINECRAFT:
-				if (this.mc.level != null)
-				{
-					Direction mcDir = McObjectConverter.Convert(lodDirection);
-					return this.mc.level.getShade(mcDir, true);
-				}
-				else
-				{
-					return 0.0f;
-				}
-			
-			case OLD_LIGHTING:
-				switch (lodDirection)
-				{
-					case DOWN:
-						return 0.5F;
-					default:
-					case UP:
-						return 1.0F;
-					case NORTH:
-					case SOUTH:
-						return 0.8F;
-					case WEST:
-					case EAST:
-						return 0.6F;
-				}
-			
-			case NONE:
-				return 1.0F;
-		}
-	}
-	
-	@Override
-	public boolean hasSinglePlayerServer() { return mc.hasSingleplayerServer(); }
-	@Override
-	public boolean clientConnectedToDedicatedServer() { return mc.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
-	
-	@Override
-	public String getCurrentServerName() { return mc.getCurrentServer().name; }
-	
-	@Override
-	public String getCurrentServerIp() { return mc.getCurrentServer().ip; }
-	
-	@Override
-	public String getCurrentServerVersion()
-	{
-		return mc.getCurrentServer().version.getString();
-	}
-	
-	//=============//
-	// Simple gets //
-	//=============//
-	
-	public LocalPlayer getPlayer()
-	{
-		return mc.player;
-	}
-	
-	@Override
-	public boolean playerExists()
-	{
-		return mc.player != null;
-	}
-	
-	@Override
-	public UUID getPlayerUUID()
-	{
-		return getPlayer().getUUID();
-	}
-	
-	@Override
-	public DhBlockPos getPlayerBlockPos()
-	{
-		BlockPos playerPos = getPlayer().blockPosition();
-		return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ());
-	}
-	
-	@Override
-	public DhChunkPos getPlayerChunkPos()
-	{
-        #if PRE_MC_1_17_1
-        ChunkPos playerPos = new ChunkPos(getPlayer().blockPosition());
-        #else
-		ChunkPos playerPos = getPlayer().chunkPosition();
-        #endif
-		return new DhChunkPos(playerPos.x, playerPos.z);
-	}
-	
-	public ModelManager getModelManager()
-	{
-		return mc.getModelManager();
-	}
-	
-	@Nullable
-	@Override
-	public IClientLevelWrapper getWrappedClientLevel()
-	{
-		if (this.mc.level == null)
-		{
-			return null;
-		}
-		
-		return ClientLevelWrapper.getWrapperIgnoringOverride(this.mc.level);
-	}
-	
-	/** Please move over to getInstallationDirectory() */
-	@Deprecated
-	@Override
-	public File getGameDirectory()
-	{
-		return getInstallationDirectory();
-	}
-	
-	@Override
-	public IProfilerWrapper getProfiler()
-	{
-		if (profilerWrapper == null)
-			profilerWrapper = new ProfilerWrapper(mc.getProfiler());
-		else if (mc.getProfiler() != profilerWrapper.profiler)
-			profilerWrapper.profiler = mc.getProfiler();
-		return profilerWrapper;
-	}
-	
-	/** Returns all worlds available to the server */
-	@Override
-	public ArrayList<ILevelWrapper> getAllServerWorlds()
-	{
-		ArrayList<ILevelWrapper> worlds = new ArrayList<ILevelWrapper>();
-		
-		Iterable<ServerLevel> serverWorlds = mc.getSingleplayerServer().getAllLevels();
-		for (ServerLevel world : serverWorlds)
-		{
-			worlds.add(ServerLevelWrapper.getWrapper(world));
-		}
-		
-		return worlds;
-	}
-	
-	
-	
-	@Override
-	public void sendChatMessage(String string)
-	{
-		LocalPlayer p = getPlayer();
-		if (p == null) return;
-        #if PRE_MC_1_19_2
-		p.sendMessage(new TextComponent(string), getPlayer().getUUID());
-        #else
-		p.sendSystemMessage(net.minecraft.network.chat.Component.translatable(string));
-        #endif
-	}
-	
-	/**
-	 * Crashes Minecraft, displaying the given errorMessage <br> <br>
-	 * In the following format: <br>
-	 *
-	 * The game crashed whilst <strong>errorMessage</strong>  <br>
-	 * Error: <strong>ExceptionClass: exceptionErrorMessage</strong>  <br>
-	 * Exit Code: -1  <br>
-	 */
-	@Override
-	public void crashMinecraft(String errorMessage, Throwable exception)
-	{
-		LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
-		CrashReport report = new CrashReport(errorMessage, exception);
-		Minecraft.crash(report);
-	}
-	
-	@Override
-	public Object getOptionsObject()
-	{
-		return mc.options;
-	}
-	
-	@Override
-	public boolean isDedicatedServer()
-	{
-		return false;
-	}
-	
-	@Override
-	public File getInstallationDirectory()
-	{
-		return mc.gameDirectory;
-	}
-	
-	@Override
-	public void executeOnRenderThread(Runnable runnable) { this.mc.execute(runnable); }
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java

@@ -1,27 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.minecraft;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
-import net.minecraft.server.dedicated.DedicatedServer;
-
-import java.io.File;
-
-//@Environment(EnvType.SERVER)
-public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
-{
-	public static final MinecraftDedicatedServerWrapper INSTANCE = new MinecraftDedicatedServerWrapper();
-	private MinecraftDedicatedServerWrapper() { }
-	public DedicatedServer dedicatedServer = null;
-	@Override
-	public boolean isDedicatedServer()
-	{
-		return true;
-	}
-	@Override
-	public File getInstallationDirectory()
-	{
-		if (dedicatedServer == null)
-			throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!");
-		return dedicatedServer.getServerDirectory();
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -1,402 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.minecraft;
-
-import java.awt.Color;
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.stream.Collectors;
-
-import com.mojang.blaze3d.pipeline.RenderTarget;
-import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.WrapperFactory;
-import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
-
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
-import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
-
-#if PRE_MC_1_19_4
-import com.mojang.math.Vector3f;
-#else
-import org.joml.Vector3f;
-#endif
-#if MC_1_20_2
-import net.minecraft.client.renderer.chunk.SectionRenderDispatcher;
-#endif
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
-import com.seibel.distanthorizons.coreapi.util.math.Vec3d;
-import com.seibel.distanthorizons.coreapi.util.math.Vec3f;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-
-import net.minecraft.client.Camera;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.FogRenderer;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.effect.MobEffects;
-#if PRE_MC_1_17_1
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.material.FluidState;
-import org.lwjgl.opengl.GL15;
-#else
-import net.minecraft.world.level.material.FogType;
-#endif
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import org.apache.logging.log4j.Logger;
-
-
-/**
- * A singleton that contains everything
- * related to rendering in Minecraft.
- *
- * @author James Seibel
- * @version 12-12-2021
- */
-//@Environment(EnvType.CLIENT)
-public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
-{
-	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
-	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
-	private static final Minecraft MC = Minecraft.getInstance();
-	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
-	
-	private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
-	
-	/** 
-	 * In the case of immersive portals multiple levels may be active at once, causing conflicting lightmaps. <br> 
-	 * Requiring the use of multiple {@link LightMapWrapper}.
-	 */
-	public HashMap<IDimensionTypeWrapper, LightMapWrapper> lightmapByDimensionType = new HashMap<>();
-	
-	/** 
-	 * Holds the render buffer that should be used when displaying levels to the screen.
-	 * This is used for Optifine shader support so we can render directly to Optifine's level frame buffer.
-	 */
-	public int finalLevelFrameBufferId = -1;
-	
-	
-	
-	@Override
-	public Vec3f getLookAtVector()
-	{
-		Camera camera = MC.gameRenderer.getMainCamera();
-		Vector3f cameraDir = camera.getLookVector();
-		return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
-	}
-	
-	@Override
-	public DhBlockPos getCameraBlockPosition()
-	{
-		Camera camera = MC.gameRenderer.getMainCamera();
-		BlockPos blockPos = camera.getBlockPosition();
-		return new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-	}
-	
-	@Override
-	/** Unless you really need to know if the player is blind, use {@link MinecraftRenderWrapper#isFogStateSpecial()}/{@link IMinecraftRenderWrapper#isFogStateSpecial()} instead */
-	public boolean playerHasBlindingEffect()
-	{
-		return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null
-				#if POST_AND_MC_1_19_2
-				|| MC.player.getActiveEffectsMap().get(MobEffects.DARKNESS) != null // Deep dark effect
-				#endif
-				;
-	}
-	
-	@Override
-	public Vec3d getCameraExactPosition()
-	{
-		Camera camera = MC.gameRenderer.getMainCamera();
-		Vec3 projectedView = camera.getPosition();
-		
-		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
-	}
-	
-	@Override
-	public Mat4f getDefaultProjectionMatrix(float partialTicks)
-	{
-		#if PRE_MC_1_17_1
-		return McObjectConverter.Convert(Minecraft.getInstance().gameRenderer.getProjectionMatrix(Minecraft.getInstance().gameRenderer.getMainCamera(), partialTicks, true));
-		#else
-		return McObjectConverter.Convert(MC.gameRenderer.getProjectionMatrix(MC.gameRenderer.getFov(MC.gameRenderer.getMainCamera(), partialTicks, true)));
-		#endif
-	}
-	
-	@Override
-	public double getGamma()
-	{
-		#if PRE_MC_1_19_2
-		return MC.options.gamma;
-		#else
-		return MC.options.gamma().get();
-		#endif
-	}
-	
-	@Override
-	public Color getFogColor(float partialTicks)
-	{
-		#if PRE_MC_1_17_1
-		float[] colorValues = new float[4];
-		GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
-		#else
-		FogRenderer.setupColor(MC.gameRenderer.getMainCamera(), partialTicks, MC.level, 1, MC.gameRenderer.getDarkenWorldAmount(partialTicks));
-		float[] colorValues = RenderSystem.getShaderFogColor();
-		#endif
-		return new Color(
-				Math.max(0f, Math.min(colorValues[0], 1f)),
-				Math.max(0f, Math.min(colorValues[1], 1f)),
-				Math.max(0f, Math.min(colorValues[2], 1f)),
-				Math.max(0f, Math.min(colorValues[3], 1f))
-		);
-	}
-	// getSpecialFogColor() is the same as getFogColor()
-	
-	@Override
-	public Color getSkyColor()
-	{
-		if (MC.level.dimensionType().hasSkyLight())
-		{
-			#if PRE_MC_1_17_1
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime());
-			#else
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
-			#endif
-			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
-		}
-		else
-			return new Color(0, 0, 0);
-	}
-	
-	@Override
-	public double getFov(float partialTicks)
-	{
-		return MC.gameRenderer.getFov(MC.gameRenderer.getMainCamera(), partialTicks, true);
-	}
-	
-	/** Measured in chunks */
-	@Override
-	public int getRenderDistance()
-	{
-		#if PRE_MC_1_18_2
-		//FIXME: How to resolve this?
-		return MC.options.renderDistance;
-		#else
-		return MC.options.getEffectiveRenderDistance();
-		#endif
-	}
-	
-	@Override
-	public int getScreenWidth()
-	{
-		// alternate ways of getting the window's resolution,
-		// using one of these methods may fix the optifine render resolution bug
-		// TODO: test these once we can run with Optifine again
-//		int[] heightArray = new int[1];
-//		int[] widthArray = new int[1];
-//		
-//		long window = GLProxy.getInstance().minecraftGlContext;
-//		GLFW.glfwGetWindowSize(window, widthArray, heightArray); // option 1
-//		GLFW.glfwGetFramebufferSize(window, widthArray, heightArray); // option 2
-		
-		
-		
-		int width = MC.getWindow().getWidth();
-		if (OPTIFINE_ACCESSOR != null)
-		{
-			// TODO remove comment after testing:
-			// this should fix the issue where different optifine render resolutions screw up the LOD rendering
-			width *= OPTIFINE_ACCESSOR.getRenderResolutionMultiplier();
-		}
-		return width;
-	}
-	@Override
-	public int getScreenHeight()
-	{
-		int height = MC.getWindow().getHeight();
-		if (OPTIFINE_ACCESSOR != null)
-		{
-			height *= OPTIFINE_ACCESSOR.getRenderResolutionMultiplier();
-		}
-		return height;
-	}
-	
-	private RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
-	
-	@Override
-	public int getTargetFrameBuffer()
-	{
-		int frameBufferOverrideId = DhApiRenderProxy.INSTANCE.targetFrameBufferOverride;
-		if (frameBufferOverrideId != -1)
-		{
-			return frameBufferOverrideId;
-		}
-		
-		// used so we can access the framebuffer shaders end up rendering to
-		if (AbstractOptifineAccessor.optifinePresent())
-		{
-			return this.finalLevelFrameBufferId;
-		}
-		
-		return this.getRenderTarget().frameBufferId;
-	}
-	
-	@Override
-	public void clearTargetFrameBuffer() { this.finalLevelFrameBufferId = -1; }
-	
-	@Override
-	public int getDepthTextureId() { return this.getRenderTarget().getDepthTextureId(); }
-	
-	@Override
-	public int getTargetFrameBufferViewportWidth()
-	{
-		return getRenderTarget().viewWidth;
-	}
-	
-	@Override
-	public int getTargetFrameBufferViewportHeight()
-	{
-		return getRenderTarget().viewHeight;
-	}
-	
-	/**
-	 * This method returns the ChunkPos of all chunks that Minecraft
-	 * is going to render this frame. <br><br>
-	 * <p>
-	 */
-	
-	public boolean usingBackupGetVanillaRenderedChunks = false;
-	@Override
-	public HashSet<DhChunkPos> getVanillaRenderedChunks()
-	{
-		ISodiumAccessor sodium = ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class);
-		if (sodium != null)
-		{
-			return sodium.getNormalRenderedChunks();
-		}
-		IOptifineAccessor optifine = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
-		if (optifine != null)
-		{
-			HashSet<DhChunkPos> pos = optifine.getNormalRenderedChunks();
-			if (pos == null)
-				pos = getMaximumRenderedChunks();
-			return pos;
-		}
-		if (!usingBackupGetVanillaRenderedChunks)
-		{
-			try
-			{
-				#if MC_1_20_2
-				LevelRenderer levelRenderer = MC.levelRenderer;
-				Collection<SectionRenderDispatcher.RenderSection> chunks = levelRenderer.visibleSections;
-				
-				return (chunks.stream().map((chunk) -> {
-					AABB chunkBoundingBox = chunk.getBoundingBox();
-					return new DhChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-				}).collect(Collectors.toCollection(HashSet::new)));
-				#else
-				LevelRenderer levelRenderer = MC.levelRenderer;
-				Collection<LevelRenderer.RenderChunkInfo> chunks =
-					#if PRE_MC_1_18_2 levelRenderer.renderChunks;
-					#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
-				
-				return (chunks.stream().map((chunk) -> {
-					AABB chunkBoundingBox =
-						#if PRE_MC_1_18_2 chunk.chunk.bb;
-						#else chunk.chunk.getBoundingBox(); #endif
-					return new DhChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-				}).collect(Collectors.toCollection(HashSet::new)));
-				#endif
-			}
-			catch (LinkageError e)
-			{
-				try
-				{
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-									+ " Using Backup Method.");
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7eOverdraw prevention will be worse than normal.");
-				}
-				catch (Exception e2)
-				{
-				}
-				LOGGER.error("getVanillaRenderedChunks Error: ", e);
-				usingBackupGetVanillaRenderedChunks = true;
-			}
-		}
-		return getMaximumRenderedChunks();
-	}
-	
-	@Override
-	public ILightMapWrapper getLightmapWrapper(ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); }
-	
-	@Override
-	public boolean isFogStateSpecial()
-	{
-		#if PRE_MC_1_17_1
-		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
-		FluidState fluidState = camera.getFluidInCamera();
-		Entity entity = camera.getEntity();
-		boolean isBlind = this.playerHasBlindingEffect();
-			isBlind |= fluidState.is(FluidTags.WATER);
-			isBlind |= fluidState.is(FluidTags.LAVA);
-		return isBlind;
-		#else
-		boolean isBlind = this.playerHasBlindingEffect();
-		return MC.gameRenderer.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
-		#endif
-	}
-	
-	public void updateLightmap(NativeImage lightPixels, IClientLevelWrapper level)
-	{
-		// Using ClientLevelWrapper as the key would be better, but we don't have a consistent way to create the same
-		// object for the same MC level and/or the same hash,
-		// so this will have to do for now
-		IDimensionTypeWrapper dimensionType = level.getDimensionType();
-		
-		if (!this.lightmapByDimensionType.containsKey(dimensionType))
-		{
-			this.lightmapByDimensionType.put(dimensionType, new LightMapWrapper());
-		}
-		this.lightmapByDimensionType.get(dimensionType).uploadLightmap(lightPixels);
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java

@@ -1,61 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.minecraft;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
-
-import net.minecraft.util.profiling.ProfilerFiller;
-
-/**
- * @author James Seibel
- * @version 11-20-2021
- */
-public class ProfilerWrapper implements IProfilerWrapper
-{
-	public ProfilerFiller profiler;
-	
-	public ProfilerWrapper(ProfilerFiller newProfiler)
-	{
-		profiler = newProfiler;
-	}
-	
-	
-	/** starts a new section inside the currently running section */
-	@Override
-	public void push(String newSection)
-	{
-		profiler.push(newSection);
-	}
-	
-	/** ends the currently running section and starts a new one */
-	@Override
-	public void popPush(String newSection)
-	{
-		profiler.popPush(newSection);
-	}
-	
-	/** ends the currently running section */
-	@Override
-	public void pop()
-	{
-		profiler.pop();
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java

@@ -1,74 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.misc;
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
-import org.lwjgl.opengl.GL32;
-
-import java.nio.ByteBuffer;
-
-/**
- * @author James Seibel
- * @version 11-21-2021
- */
-public class LightMapWrapper implements ILightMapWrapper
-{
-	private int textureId = 0;
-	
-	public LightMapWrapper()
-	{
-	}
-	
-	private void createLightmap(NativeImage image)
-	{
-		textureId = GL32.glGenTextures();
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
-		GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, image.format().glFormat(), image.getWidth(), image.getHeight(),
-				0, image.format().glFormat(), GL32.GL_UNSIGNED_BYTE, (ByteBuffer) null);
-	}
-	
-	public void uploadLightmap(NativeImage image)
-	{
-		int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
-		if (textureId == 0)
-		{
-			createLightmap(image);
-		}
-		// NativeImage::upload(int levelOfDetail, int xOffset, int yOffset, bool shouldCleanup?)
-		image.upload(0, 0, 0, false);
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
-	}
-	
-	@Override
-	public void bind()
-	{
-		GL32.glActiveTexture(GL32.GL_TEXTURE0);
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, this.textureId);
-	}
-	
-	@Override
-	public void unbind()
-	{
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0);
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java

@@ -1,54 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.misc;
-
-import com.google.common.collect.MapMaker;
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import net.minecraft.server.level.ServerPlayer;
-
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-
-public class ServerPlayerWrapper implements IServerPlayerWrapper
-{
-	private static final ConcurrentMap<ServerPlayer, ServerPlayerWrapper>
-			serverPlayerWrapperMap = new MapMaker().weakKeys().makeMap();
-	
-	private final ServerPlayer serverPlayer;
-	
-	public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
-	{
-		return serverPlayerWrapperMap.computeIfAbsent(serverPlayer, ServerPlayerWrapper::new);
-	}
-	
-	private ServerPlayerWrapper(ServerPlayer serverPlayer)
-	{
-		this.serverPlayer = serverPlayer;
-	}
-	
-	public UUID getUUID()
-	{
-		return serverPlayer.getUUID();
-	}
-	
-	public IServerLevelWrapper getLevel()
-	{
-		#if PRE_MC_1_20_1
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
-		#else
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.serverLevel());
-		#endif
-	}
-	
-	public Object getWrappedMcObject()
-	{
-		return serverPlayer;
-	}
-	
-	@Override
-	public String toString()
-	{
-		return "Wrapped{" + serverPlayer.toString() + "}";
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java

@@ -1,192 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.world;
-
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
-import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.cache.ClientBlockDetailMap;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ClientLevelWrapper implements IClientLevelWrapper
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName());
-	private static final ConcurrentHashMap<ClientLevel, ClientLevelWrapper> LEVEL_WRAPPER_BY_CLIENT_LEVEL = new ConcurrentHashMap<>();
-	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
-	
-	private final ClientLevel level;
-	private final ClientBlockDetailMap blockMap = new ClientBlockDetailMap(this);
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	protected ClientLevelWrapper(ClientLevel level) { this.level = level; }
-	
-	
-	
-	//===============//
-	// wrapper logic //
-	//===============//
-	
-	public static IClientLevelWrapper getWrapper(ClientLevel level)
-	{
-		// used if the client is connected to a server that defines the currently loaded level
-		if (KEYED_CLIENT_LEVEL_MANAGER.getUseOverrideWrapper())
-		{
-			return KEYED_CLIENT_LEVEL_MANAGER.getOverrideWrapper();
-		}
-		
-		return getWrapperIgnoringOverride(level);
-	}
-	public static IClientLevelWrapper getWrapperIgnoringOverride(ClientLevel level)
-	{
-		return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new);
-	}
-	
-	@Nullable
-	@Override
-	public IServerLevelWrapper tryGetServerSideWrapper()
-	{
-		try
-		{
-			Iterable<ServerLevel> serverLevels = MinecraftClientWrapper.INSTANCE.mc.getSingleplayerServer().getAllLevels();
-			
-			// attempt to find the server level with the same dimension type
-			// TODO this assumes only one level per dimension type, the SubDimensionLevelMatcher will need to be added for supporting multiple levels per dimension
-			ServerLevelWrapper foundLevelWrapper = null;
-			
-			// TODO: Surely there is a more efficient way to write this code
-			for (ServerLevel serverLevel : serverLevels)
-			{
-				if (serverLevel.dimension() == this.level.dimension())
-				{
-					foundLevelWrapper = ServerLevelWrapper.getWrapper(serverLevel);
-					break;
-				}
-			}
-			
-			return foundLevelWrapper;
-		}
-		catch (Exception e)
-		{
-			LOGGER.error("Failed to get server side wrapper for client level: " + level);
-			return null;
-		}
-	}
-	
-	
-	
-	//====================//
-	// base level methods //
-	//====================//
-	
-	@Override
-	public int computeBaseColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockState)
-	{
-		return this.blockMap.getColor(((BlockStateWrapper) blockState).blockState, (BiomeWrapper) biome, pos);
-	}
-	
-	@Override
-	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
-	
-	@Override
-	public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; }
-	
-	public ClientLevel getLevel() { return this.level; }
-	
-	@Override
-	public boolean hasCeiling() { return this.level.dimensionType().hasCeiling(); }
-	
-	@Override
-	public boolean hasSkyLight() { return this.level.dimensionType().hasSkyLight(); }
-	
-	@Override
-	public int getHeight() { return this.level.getHeight(); }
-	
-	@Override
-	public int getMinHeight()
-	{
-        #if PRE_MC_1_17_1
-        return 0;
-        #else
-		return this.level.getMinBuildHeight();
-        #endif
-	}
-	
-	@Override
-	public IChunkWrapper tryGetChunk(DhChunkPos pos)
-	{
-		if (!this.level.hasChunk(pos.x, pos.z))
-		{
-			return null;
-		}
-		
-		ChunkAccess chunk = this.level.getChunk(pos.x, pos.z, ChunkStatus.EMPTY, false);
-		if (chunk == null)
-		{
-			return null;
-		}
-		
-		return new ChunkWrapper(chunk, this.level, this);
-	}
-	
-	@Override
-	public boolean hasChunkLoaded(int chunkX, int chunkZ)
-	{
-		ChunkSource source = this.level.getChunkSource();
-		return source.hasChunk(chunkX, chunkZ);
-	}
-	
-	@Override
-	public IBlockStateWrapper getBlockState(DhBlockPos pos)
-	{
-		return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this);
-	}
-	
-	@Override
-	public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this); }
-	
-	@Override
-	public ClientLevel getWrappedMcObject() { return this.level; }
-	
-	@Override
-	public void onUnload() { LEVEL_WRAPPER_BY_CLIENT_LEVEL.remove(this.level); }
-	
-	@Override
-	public String toString()
-	{
-		if (this.level == null)
-		{
-			return "Wrapped{null}";
-		}
-		
-		return "Wrapped{" + this.level.toString() + "@" + this.getDimensionType().getDimensionName() + "}";
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java

@@ -1,105 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.world;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-
-import net.minecraft.world.level.dimension.DimensionType;
-
-/**
- * @author James Seibel
- * @version 2022-9-16
- */
-public class DimensionTypeWrapper implements IDimensionTypeWrapper
-{
-	private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
-	private final DimensionType dimensionType;
-	
-	public DimensionTypeWrapper(DimensionType dimensionType)
-	{
-		this.dimensionType = dimensionType;
-	}
-	
-	public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
-	{
-		//first we check if the biome has already been wrapped
-		if (dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
-			return dimensionTypeWrapperMap.get(dimensionType);
-		
-		
-		//if it hasn't been created yet, we create it and save it in the map
-		DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
-		dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
-		
-		//we return the newly created wrapper
-		return dimensionTypeWrapper;
-	}
-	
-	public static void clearMap()
-	{
-		dimensionTypeWrapperMap.clear();
-	}
-	
-	
-	@Override
-	public String getDimensionName()
-	{
-		return dimensionType.effectsLocation().getPath();
-	}
-	
-	@Override
-	public boolean hasCeiling()
-	{
-		return dimensionType.hasCeiling();
-	}
-	
-	@Override
-	public boolean hasSkyLight()
-	{
-		return dimensionType.hasSkyLight();
-	}
-	
-	@Override
-	public Object getWrappedMcObject()
-	{
-		return this.dimensionType;
-	}
-	
-	
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj.getClass() != DimensionTypeWrapper.class)
-		{
-			return false;
-		}
-		else
-		{
-			DimensionTypeWrapper other = (DimensionTypeWrapper) obj;
-			return other.getDimensionName().equals(this.getDimensionName());
-		}
-	}
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java

@@ -1,183 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.world;
-
-import java.io.File;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.cache.ServerBlockDetailMap;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.level.chunk.ChunkStatus;
-
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @version 2022-9-16
- */
-public class ServerLevelWrapper implements IServerLevelWrapper
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	private static final ConcurrentHashMap<ServerLevel, ServerLevelWrapper> LEVEL_WRAPPER_BY_SERVER_LEVEL = new ConcurrentHashMap<>();
-	
-	final ServerLevel level;
-	ServerBlockDetailMap blockMap = new ServerBlockDetailMap(this);
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	public static ServerLevelWrapper getWrapper(ServerLevel level) { return LEVEL_WRAPPER_BY_SERVER_LEVEL.computeIfAbsent(level, ServerLevelWrapper::new); }
-	
-	public ServerLevelWrapper(ServerLevel level)
-	{
-		this.level = level;
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	@Nullable
-	@Override
-	public IClientLevelWrapper tryGetClientLevelWrapper()
-	{
-		MinecraftClientWrapper client = MinecraftClientWrapper.INSTANCE;
-		if (client.mc.level == null)
-		{
-			return null;
-		}
-		
-		return ClientLevelWrapper.getWrapper(client.mc.level);
-	}
-	
-	@Override
-	public File getSaveFolder()
-	{
-		return level.getChunkSource().getDataStorage().dataFolder;
-	}
-	
-	@Override
-	public DimensionTypeWrapper getDimensionType()
-	{
-		return DimensionTypeWrapper.getDimensionTypeWrapper(level.dimensionType());
-	}
-	
-	@Override
-	public EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; }
-	
-	public ServerLevel getLevel()
-	{
-		return level;
-	}
-	
-	@Override
-	public boolean hasCeiling()
-	{
-		return level.dimensionType().hasCeiling();
-	}
-	
-	@Override
-	public boolean hasSkyLight()
-	{
-		return level.dimensionType().hasSkyLight();
-	}
-	
-	@Override
-	public int getHeight()
-	{
-		return level.getHeight();
-	}
-	
-	@Override
-	public int getMinHeight()
-	{
-        #if PRE_MC_1_17_1
-        return 0;
-        #else
-		return level.getMinBuildHeight();
-        #endif
-	}
-	@Override
-	public IChunkWrapper tryGetChunk(DhChunkPos pos)
-	{
-		if (!level.hasChunk(pos.x, pos.z)) return null;
-		ChunkAccess chunk = level.getChunk(pos.x, pos.z, ChunkStatus.FULL, false);
-		if (chunk == null) return null;
-		return new ChunkWrapper(chunk, level, this);
-	}
-	
-	@Override
-	public boolean hasChunkLoaded(int chunkX, int chunkZ)
-	{
-		// world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
-		ChunkSource source = level.getChunkSource();
-		return source.hasChunk(chunkX, chunkZ);
-	}
-	
-	@Override
-	public IBlockStateWrapper getBlockState(DhBlockPos pos)
-	{
-		return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos)), this);
-	}
-	
-	@Override
-	public IBiomeWrapper getBiome(DhBlockPos pos)
-	{
-		return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos)), this);
-	}
-	
-	@Override
-	public ServerLevel getWrappedMcObject()
-	{
-		return level;
-	}
-	
-	@Override
-	public void onUnload() { LEVEL_WRAPPER_BY_SERVER_LEVEL.remove(this.level); }
-	
-	@Override
-	public String toString()
-	{
-		return "Wrapped{" + level.toString() + "@" + getDimensionType().getDimensionName() + "}";
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java

@@ -1,740 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2021  Tom Lee (TomTheFurry)
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration;
-
-import com.google.common.collect.ImmutableMap;
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.*;
-import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer;
-import com.seibel.distanthorizons.core.generation.DhLightingEngine;
-import com.seibel.distanthorizons.core.level.IDhServerLevel;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
-import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.util.objects.EventTimer;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepBiomes;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepFeatures;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepNoise;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepStructureReference;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepStructureStart;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepSurface;
-
-#if POST_MC_1_19_4
-import net.minecraft.core.registries.Registries;
-#else
-import net.minecraft.core.Registry;
-#endif
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.UpgradeData;
-import net.minecraft.world.level.chunk.storage.RegionFileStorage;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
-import net.minecraft.nbt.CompoundTag;
-import org.apache.logging.log4j.LogManager;
-
-/*
-Total:                   3.135214124s
-=====================================
-Empty Chunks:            0.000558328s
-StructureStart Step:     0.025177207s
-StructureReference Step: 0.00189559s
-Biome Step:              0.13789155s
-Noise Step:              1.570347555s
-Surface Step:            0.741238194s
-Carver Step:             0.000009923s
-Feature Step:            0.389072425s
-Lod Generation:          0.269023348s
-*/
-public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvironmentWrapper
-{
-	public static final ConfigBasedSpamLogger PREF_LOGGER =
-			new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"),
-					() -> Config.Client.Advanced.Logging.logWorldGenPerformance.get(), 1);
-	public static final ConfigBasedLogger EVENT_LOGGER =
-			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
-					() -> Config.Client.Advanced.Logging.logWorldGenEvent.get());
-	public static final ConfigBasedLogger LOAD_LOGGER =
-			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
-					() -> Config.Client.Advanced.Logging.logWorldGenLoadEvent.get());
-	
-	//TODO: Make actual proper support for StarLight
-	
-	public static class PerfCalculator
-	{
-		private static final String[] TIME_NAMES = {
-				"total",
-				"setup",
-				"structStart",
-				"structRef",
-				"biome",
-				"noise",
-				"surface",
-				"carver",
-				"feature",
-				"light",
-				"cleanup",
-				//"lodCreation" (No longer used)
-		};
-		
-		public static final int SIZE = 50;
-		ArrayList<Rolling> times = new ArrayList<>();
-		
-		public PerfCalculator()
-		{
-			for (int i = 0; i < 11; i++)
-			{
-				times.add(new Rolling(SIZE));
-			}
-		}
-		
-		public void recordEvent(EventTimer event)
-		{
-			for (EventTimer.Event e : event.events)
-			{
-				String name = e.name;
-				int index = Arrays.asList(TIME_NAMES).indexOf(name);
-				if (index == -1) continue;
-				times.get(index).add(e.timeNs);
-			}
-			times.get(0).add(event.getTotalTimeNs());
-		}
-		
-		public String toString()
-		{
-			StringBuilder sb = new StringBuilder();
-			for (int i = 0; i < times.size(); i++)
-			{
-				if (times.get(i).getAverage() == 0) continue;
-				sb.append(TIME_NAMES[i]).append(": ").append(times.get(i).getAverage()).append("\n");
-			}
-			return sb.toString();
-		}
-		
-	}
-	
-	private final IDhServerLevel serverlevel;
-	
-	//=================Generation Step===================
-	
-	public final LinkedBlockingQueue<GenerationEvent> generationEventList = new LinkedBlockingQueue<>();
-	public final GlobalParameters params;
-	public final StepStructureStart stepStructureStart = new StepStructureStart(this);
-	public final StepStructureReference stepStructureReference = new StepStructureReference(this);
-	public final StepBiomes stepBiomes = new StepBiomes(this);
-	public final StepNoise stepNoise = new StepNoise(this);
-	public final StepSurface stepSurface = new StepSurface(this);
-	public final StepFeatures stepFeatures = new StepFeatures(this);
-	public boolean unsafeThreadingRecorded = false;
-	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
-	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
-	public static final int RANGE_TO_RANGE_EMPTY_EXTENSION = 1;
-	public int unknownExceptionCount = 0;
-	public long lastExceptionTriggerTime = 0;
-	
-	private AtomicReference<RegionFileStorageExternalCache> regionFileStorageCacheRef = new AtomicReference<>();
-	
-	public RegionFileStorageExternalCache getOrCreateRegionFileCache(RegionFileStorage storage)
-	{
-		RegionFileStorageExternalCache cache = regionFileStorageCacheRef.get();
-		if (cache == null)
-		{
-			cache = new RegionFileStorageExternalCache(storage);
-			if (!regionFileStorageCacheRef.compareAndSet(null, cache))
-			{
-				cache = regionFileStorageCacheRef.get();
-			}
-		}
-		return cache;
-	}
-	
-	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<>();
-	public static ThreadLocal<Object> onDistantGenerationMixinData = new ThreadLocal<>();
-	public static boolean isCurrentThreadDistantGeneratorThread() { return (isDistantGeneratorThread.get() != null); }
-	public static void putDistantGenerationMixinData(Object data)
-	{
-		LodUtil.assertTrue(isCurrentThreadDistantGeneratorThread());
-		onDistantGenerationMixinData.set(data);
-	}
-	public static Object getDistantGenerationMixinData()
-	{
-		LodUtil.assertTrue(isCurrentThreadDistantGeneratorThread());
-		return onDistantGenerationMixinData.get();
-	}
-	
-	public static void clearDistantGenerationMixinData()
-	{
-		LodUtil.assertTrue(isCurrentThreadDistantGeneratorThread());
-		onDistantGenerationMixinData.remove();
-	}
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	public static ImmutableMap<EDhApiWorldGenerationStep, Integer> BorderNeeded;
-	public static int MaxBorderNeeded;
-	
-	static
-	{
-		DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-		
-		boolean isTerraFirmaCraft = false;
-		try
-		{
-			Class.forName("net.dries007.tfc.world.TFCChunkGenerator");
-			isTerraFirmaCraft = true;
-		}
-		catch (ClassNotFoundException e)
-		{
-			//Ignore
-		}
-		EVENT_LOGGER.info("DH TerraFirmaCraft detection: " + isTerraFirmaCraft);
-		ImmutableMap.Builder<EDhApiWorldGenerationStep, Integer> builder = ImmutableMap.builder();
-		builder.put(EDhApiWorldGenerationStep.EMPTY, 1);
-		builder.put(EDhApiWorldGenerationStep.STRUCTURE_START, 0);
-		builder.put(EDhApiWorldGenerationStep.STRUCTURE_REFERENCE, 0);
-		builder.put(EDhApiWorldGenerationStep.BIOMES, isTerraFirmaCraft ? 1 : 0);
-		builder.put(EDhApiWorldGenerationStep.NOISE, isTerraFirmaCraft ? 1 : 0);
-		builder.put(EDhApiWorldGenerationStep.SURFACE, 0);
-		builder.put(EDhApiWorldGenerationStep.CARVERS, 0);
-		builder.put(EDhApiWorldGenerationStep.LIQUID_CARVERS, 0);
-		builder.put(EDhApiWorldGenerationStep.FEATURES, 0);
-		builder.put(EDhApiWorldGenerationStep.LIGHT, 0);
-		BorderNeeded = builder.build();
-		MaxBorderNeeded = BorderNeeded.values().stream().mapToInt(Integer::intValue).max().getAsInt();
-	}
-	
-	public BatchGenerationEnvironment(IDhServerLevel serverlevel)
-	{
-		super(serverlevel);
-		this.serverlevel = serverlevel;
-		
-		EVENT_LOGGER.info("================WORLD_GEN_STEP_INITING=============");
-		
-		serverlevel.getServerLevelWrapper().getDimensionType();
-		
-		ChunkGenerator generator = ((ServerLevelWrapper) (serverlevel.getServerLevelWrapper())).getLevel().getChunkSource().getGenerator();
-		if (!(generator instanceof NoiseBasedChunkGenerator ||
-				generator instanceof DebugLevelSource ||
-				generator instanceof FlatLevelSource))
-		{
-			if (generator.getClass().toString().equals("class com.terraforged.mod.chunk.TFChunkGenerator"))
-			{
-				EVENT_LOGGER.info("TerraForge Chunk Generator detected: [" + generator.getClass() + "], Distant Generation will try its best to support it.");
-				EVENT_LOGGER.info("If it does crash, turn Distant Generation off or set it to to [" + EDhApiDistantGeneratorMode.PRE_EXISTING_ONLY + "].");
-			}
-			else if (generator.getClass().toString().equals("class net.dries007.tfc.world.TFCChunkGenerator"))
-			{
-				EVENT_LOGGER.info("TerraFirmaCraft Chunk Generator detected: [" + generator.getClass() + "], Distant Generation will try its best to support it.");
-				EVENT_LOGGER.info("If it does crash, turn Distant Generation off or set it to to [" + EDhApiDistantGeneratorMode.PRE_EXISTING_ONLY + "].");
-			}
-			else
-			{
-				EVENT_LOGGER.warn("Unknown Chunk Generator detected: [" + generator.getClass() + "], Distant Generation May Fail!");
-				EVENT_LOGGER.warn("If it does crash, disable Distant Generation or set the Generation Mode to [" + EDhApiDistantGeneratorMode.PRE_EXISTING_ONLY + "].");
-			}
-		}
-		
-		this.params = new GlobalParameters(serverlevel);
-	}
-	
-	
-	
-	
-	public <T> T joinSync(CompletableFuture<T> future)
-	{
-		if (!unsafeThreadingRecorded && !future.isDone())
-		{
-			EVENT_LOGGER.error("Unsafe MultiThreading in Chunk Generator: ", new RuntimeException("Concurrent future"));
-			EVENT_LOGGER.error("To increase stability, it is recommended to set world generation threads count to 1.");
-			unsafeThreadingRecorded = true;
-		}
-		
-		return future.join();
-	}
-	
-	public void updateAllFutures()
-	{
-		if (this.unknownExceptionCount > 0)
-		{
-			if (System.nanoTime() - this.lastExceptionTriggerTime >= EXCEPTION_TIMER_RESET_TIME)
-			{
-				this.unknownExceptionCount = 0;
-			}
-		}
-		
-		
-		// Update all current out standing jobs
-		Iterator<GenerationEvent> iter = this.generationEventList.iterator();
-		while (iter.hasNext())
-		{
-			GenerationEvent event = iter.next();
-			if (event.future.isDone())
-			{
-				if (event.future.isCompletedExceptionally() && !event.future.isCancelled())
-				{
-					try
-					{
-						event.future.get(); // Should throw exception
-						LodUtil.assertNotReach();
-					}
-					catch (Exception e)
-					{
-						this.unknownExceptionCount++;
-						this.lastExceptionTriggerTime = System.nanoTime();
-						EVENT_LOGGER.error("Batching World Generator event ["+event+"] threw an exception: "+e.getMessage(), e);
-					}
-				}
-				
-				iter.remove();
-			}
-			else if (event.hasTimeout(Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(), TimeUnit.SECONDS))
-			{
-				EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
-				EVENT_LOGGER.info("Dump PrefEvent: " + event.timer);
-				try
-				{
-					if (!event.terminate())
-					{
-						EVENT_LOGGER.error("Failed to terminate the stuck generation event!");
-					}
-				}
-				finally
-				{
-					iter.remove();
-				}
-			}
-		}
-		
-		if (this.unknownExceptionCount > EXCEPTION_COUNTER_TRIGGER)
-		{
-			EVENT_LOGGER.error("Too many exceptions in Batching World Generator! Disabling the generator.");
-			this.unknownExceptionCount = 0;
-			Config.Client.Advanced.WorldGenerator.enableDistantGeneration.set(false);
-		}
-	}
-	
-	private static ProtoChunk EmptyChunk(ServerLevel level, ChunkPos chunkPos)
-	{
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY
-					#if POST_MC_1_17_1 , level #endif
-					#if POST_MC_1_18_2 , level.registryAccess().registryOrThrow(
-						#if PRE_MC_1_19_4
-				Registry.BIOME_REGISTRY
-						#else
-				Registries.BIOME
-						#endif
-		), null #endif
-		);
-		
-	}
-	
-	public ChunkAccess loadOrMakeChunk(ChunkPos chunkPos)
-	{
-		ServerLevel level = this.params.level;
-		
-		CompoundTag chunkData = null;
-		try
-		{
-			// Warning: if multiple threads attempt to access this method at the same time,
-			// it can throw EOFExceptions that are caught and logged by Minecraft
-			//chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
-			
-			RegionFileStorage storage = this.params.level.getChunkSource().chunkMap.worker.storage;
-			RegionFileStorageExternalCache cache = this.getOrCreateRegionFileCache(storage);
-			chunkData = cache.read(chunkPos);
-		}
-		catch (Exception e)
-		{
-			LOAD_LOGGER.error("DistantHorizons: Couldn't load or make chunk " + chunkPos + ". Error: " + e.getMessage(), e);
-		}
-		
-		if (chunkData == null)
-		{
-			return EmptyChunk(level, chunkPos);
-		}
-		else
-		{
-			try
-			{
-				LOAD_LOGGER.info("DistantHorizons: Loading chunk " + chunkPos + " from disk.");
-				return ChunkLoader.read(level, chunkPos, chunkData);
-			}
-			catch (Exception e)
-			{
-				LOAD_LOGGER.error("DistantHorizons: Couldn't load or make chunk " + chunkPos + ". Returning an empty chunk. Error: " + e.getMessage(), e);
-				return EmptyChunk(level, chunkPos);
-			}
-		}
-	}
-	
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border)
-	{
-		return new ArrayGridList<>(total, border, total.gridSize - border);
-	}
-	
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step)
-	{
-		return GetCutoutFrom(total, MaxBorderNeeded - BorderNeeded.get(step));
-	}
-	
-	public void generateLodFromList(GenerationEvent genEvent) throws InterruptedException
-	{
-		EVENT_LOGGER.debug("Lod Generate Event: " + genEvent.minPos);
-		
-		ArrayGridList<ChunkWrapper> chunkWrapperList;
-		DhLitWorldGenRegion region;
-		DummyLightEngine lightEngine;
-		LightGetterAdaptor adaptor;
-		
-		int borderSize = MaxBorderNeeded;
-		int refSize = genEvent.size + borderSize * 2;
-		int refPosX = genEvent.minPos.x - borderSize;
-		int refPosZ = genEvent.minPos.z - borderSize;
-		
-		try
-		{
-			ArrayGridList<ChunkAccess> totalChunks;
-			
-			adaptor = new LightGetterAdaptor(this.params.level);
-			lightEngine = new DummyLightEngine(adaptor);
-			
-			EmptyChunkGenerator generator = (int x, int z) ->
-			{
-				ChunkPos chunkPos = new ChunkPos(x, z);
-				ChunkAccess target = null;
-				try
-				{
-					target = this.loadOrMakeChunk(chunkPos);
-				}
-				catch (RuntimeException e2)
-				{
-					// Continue...
-				}
-				
-				if (target == null)
-				{
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY
-							#if POST_MC_1_17_1 , params.level #endif
-							#if POST_MC_1_18_2 , params.biomes, null #endif
-					);
-				}
-				return target;
-			};
-			
-			totalChunks = new ArrayGridList<>(refSize, (x, z) -> generator.generate(x + refPosX, z + refPosZ));
-			
-			genEvent.refreshTimeout();
-			region = new DhLitWorldGenRegion(params.level, lightEngine, totalChunks,
-					ChunkStatus.STRUCTURE_STARTS, refSize / 2, generator);
-			adaptor.setRegion(region);
-			genEvent.threadedParam.makeStructFeat(region, params);
-			
-			
-			chunkWrapperList = new ArrayGridList<>(totalChunks.gridSize);
-			totalChunks.forEachPos((x, z) ->
-			{
-				ChunkAccess chunk = totalChunks.get(x, z);
-				if (chunk != null)
-				{
-					chunkWrapperList.set(x, z, new ChunkWrapper(chunk, region, serverlevel.getLevelWrapper()));
-				}
-			});
-			
-			this.generateDirect(genEvent, chunkWrapperList, borderSize, genEvent.targetGenerationStep, region);
-			genEvent.timer.nextEvent("cleanup");
-		}
-		catch (StepStructureStart.StructStartCorruptedException f)
-		{
-			genEvent.threadedParam.markAsInvalid();
-			throw (RuntimeException) f.getCause();
-		}
-		
-		ArrayGridList<ChunkWrapper> finalGenChunks = GetCutoutFrom(chunkWrapperList, borderSize);
-		for (int offsetY = 0; offsetY < finalGenChunks.gridSize; offsetY++)
-		{
-			for (int offsetX = 0; offsetX < finalGenChunks.gridSize; offsetX++)
-			{
-				ChunkWrapper wrappedChunk = finalGenChunks.get(offsetX, offsetY);
-				ChunkAccess target = wrappedChunk.getChunk();
-				if (target instanceof LevelChunk)
-				{
-					#if MC_1_16_5 || MC_1_17_1
-					((LevelChunk) target).setLoaded(true);
-					#else
-					((LevelChunk) target).loaded = true;
-					#endif
-				}
-				
-				if (!wrappedChunk.isLightCorrect())
-				{
-					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
-				}
-				
-				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				#if POST_MC_1_18_2
-				boolean isPartial = target.isOldNoiseGeneration();
-				#endif
-				if (isFull)
-				{
-					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				#if POST_MC_1_18_2
-				else if (isPartial)
-				{
-					LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos());
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				#endif
-				else if (target.getStatus() == ChunkStatus.EMPTY)
-				{
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				else
-				{
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-			}
-		}
-		
-		genEvent.timer.complete();
-		genEvent.refreshTimeout();
-		if (PREF_LOGGER.canMaybeLog())
-		{
-			genEvent.threadedParam.perf.recordEvent(genEvent.timer);
-			PREF_LOGGER.infoInc("{}", genEvent.timer);
-		}
-	}
-	
-	public void generateDirect(
-			GenerationEvent genEvent, ArrayGridList<ChunkWrapper> chunksToGenerate, int border,
-			EDhApiWorldGenerationStep step, DhLitWorldGenRegion region) throws InterruptedException
-	{
-		if (Thread.interrupted())
-		{
-			return;
-		}
-		
-		try
-		{
-			chunksToGenerate.forEach((chunkWrapper) ->
-			{
-				ChunkAccess chunk = chunkWrapper.getChunk();
-				if (chunk instanceof ProtoChunk)
-				{
-					ProtoChunk protoChunk = ((ProtoChunk) chunk);
-					
-					protoChunk.setLightEngine(region.getLightEngine());
-				}
-			});
-			
-			if (step == EDhApiWorldGenerationStep.EMPTY)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("structStart");
-			throwIfThreadInterrupted();
-			this.stepStructureStart.generateGroup(genEvent.threadedParam, region, GetCutoutFrom(chunksToGenerate, EDhApiWorldGenerationStep.STRUCTURE_START));
-			genEvent.refreshTimeout();
-			if (step == EDhApiWorldGenerationStep.STRUCTURE_START)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("structRef");
-			throwIfThreadInterrupted();
-			this.stepStructureReference.generateGroup(genEvent.threadedParam, region, GetCutoutFrom(chunksToGenerate, EDhApiWorldGenerationStep.STRUCTURE_REFERENCE));
-			genEvent.refreshTimeout();
-			if (step == EDhApiWorldGenerationStep.STRUCTURE_REFERENCE)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("biome");
-			throwIfThreadInterrupted();
-			this.stepBiomes.generateGroup(genEvent.threadedParam, region, GetCutoutFrom(chunksToGenerate, EDhApiWorldGenerationStep.BIOMES));
-			genEvent.refreshTimeout();
-			if (step == EDhApiWorldGenerationStep.BIOMES)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("noise");
-			throwIfThreadInterrupted();
-			this.stepNoise.generateGroup(genEvent.threadedParam, region, GetCutoutFrom(chunksToGenerate, EDhApiWorldGenerationStep.NOISE));
-			genEvent.refreshTimeout();
-			if (step == EDhApiWorldGenerationStep.NOISE)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("surface");
-			throwIfThreadInterrupted();
-			this.stepSurface.generateGroup(genEvent.threadedParam, region, GetCutoutFrom(chunksToGenerate, EDhApiWorldGenerationStep.SURFACE));
-			genEvent.refreshTimeout();
-			if (step == EDhApiWorldGenerationStep.SURFACE)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("carver");
-			throwIfThreadInterrupted();
-			// caves can generally be ignored since they aren't generally visible from far away
-			if (step == EDhApiWorldGenerationStep.CARVERS)
-			{
-				return;
-			}
-			
-			genEvent.timer.nextEvent("feature");
-			throwIfThreadInterrupted();
-			this.stepFeatures.generateGroup(genEvent.threadedParam, region, GetCutoutFrom(chunksToGenerate, EDhApiWorldGenerationStep.FEATURES));
-			genEvent.refreshTimeout();
-		}
-		finally
-		{
-			genEvent.timer.nextEvent("light");
-			
-			// generate lighting using DH's lighting engine
-				
-			int maxSkyLight = this.serverlevel.getServerLevelWrapper().hasSkyLight() ? 15 : 0;
-			
-			ArrayList<IChunkWrapper> iChunkWrapperList = new ArrayList<>(chunksToGenerate);
-			for (int i = 0; i < iChunkWrapperList.size(); i++)
-			{
-				IChunkWrapper centerChunk = iChunkWrapperList.get(i);
-				if (centerChunk == null)
-				{
-					continue;
-				}
-				
-				throwIfThreadInterrupted();
-				
-				// make sure the height maps are all properly generated
-				// if this isn't done everything else afterward may fail
-				Heightmap.primeHeightmaps(((ChunkWrapper)centerChunk).getChunk(), ChunkStatus.FEATURES.heightmapsAfter());
-				
-				// populate the lighting
-				DhLightingEngine.INSTANCE.lightChunk(centerChunk, iChunkWrapperList, maxSkyLight);
-			}
-			
-			genEvent.refreshTimeout();
-		}
-	}
-	
-	public interface EmptyChunkGenerator
-	{
-		ChunkAccess generate(int x, int z);
-		
-	}
-	
-	@Override
-	public int getEventCount() { return this.generationEventList.size(); }
-	
-	@Override
-	public void stop()
-	{
-		EVENT_LOGGER.info(BatchGenerationEnvironment.class.getSimpleName() + " shutting down...");
-		
-		EVENT_LOGGER.info("Canceling in progress generation event futures...");
-		Iterator<GenerationEvent> iter = this.generationEventList.iterator();
-		while (iter.hasNext())
-		{
-			GenerationEvent event = iter.next();
-			event.future.cancel(true);
-			iter.remove();
-		}
-		
-		// clear the chunk cache
-		RegionFileStorageExternalCache regionStorage = this.regionFileStorageCacheRef.get();
-		if (regionStorage != null)
-		{
-			try
-			{
-				regionStorage.close();
-			}
-			catch (IOException e)
-			{
-				EVENT_LOGGER.error("Failed to close region file storage cache!", e);
-			}
-		}
-		
-		EVENT_LOGGER.info(BatchGenerationEnvironment.class.getSimpleName() + " shutdown complete.");
-	}
-	
-	@Override
-	public CompletableFuture<Void> generateChunks(
-			int minX, int minZ, int genSize, EDhApiWorldGenerationStep targetStep,
-			ExecutorService worldGeneratorThreadPool, Consumer<IChunkWrapper> resultConsumer)
-	{
-		//System.out.println("GenerationEvent: "+genSize+"@"+minX+","+minZ+" "+targetStep);
-		
-		// TODO: Check event overlap via e.tooClose()
-		GenerationEvent genEvent = GenerationEvent.startEvent(new DhChunkPos(minX, minZ), genSize, this, targetStep, resultConsumer, worldGeneratorThreadPool);
-		this.generationEventList.add(genEvent);
-		return genEvent.future;
-	}
-	
-	/**
-	 * Called before code that may run for an extended period of time. <br>
-	 * This is necessary to allow canceling world gen since waiting
-	 * for some world gen requests to finish can take a while.
-	 */
-	public static void throwIfThreadInterrupted() throws InterruptedException
-	{
-		if (Thread.interrupted())
-		{
-			throw new InterruptedException(FullDataToRenderDataTransformer.class.getSimpleName() + " task interrupted.");
-		}
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java

@@ -1,155 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration;
-
-import java.lang.invoke.MethodHandles;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.distanthorizons.core.generation.WorldGenerationQueue;
-import com.seibel.distanthorizons.core.util.ThreadUtil;
-import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.util.objects.EventTimer;
-import com.seibel.distanthorizons.core.util.threading.ThreadPools;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-
-import org.apache.logging.log4j.Logger;
-
-public final class GenerationEvent
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
-	private static int generationFutureDebugIDs = 0;
-	
-	public final int id;
-	public final ThreadedParameters threadedParam;
-	public final DhChunkPos minPos;
-	public final int size;
-	public final EDhApiWorldGenerationStep targetGenerationStep;
-	public EventTimer timer = null;
-	public long inQueueTime;
-	public long timeoutTime = -1;
-	public CompletableFuture<Void> future = null;
-	public final Consumer<IChunkWrapper> resultConsumer;
-	
-	
-	
-	public GenerationEvent(
-			DhChunkPos minPos, int size, BatchGenerationEnvironment generationGroup,
-			EDhApiWorldGenerationStep targetGenerationStep, Consumer<IChunkWrapper> resultConsumer)
-	{
-		this.inQueueTime = System.nanoTime();
-		this.id = generationFutureDebugIDs++;
-		this.minPos = minPos;
-		this.size = size;
-		this.targetGenerationStep = targetGenerationStep;
-		this.threadedParam = ThreadedParameters.getOrMake(generationGroup.params);
-		this.resultConsumer = resultConsumer;
-	}
-	
-	
-	
-	public static GenerationEvent startEvent(
-			DhChunkPos minPos, int size, BatchGenerationEnvironment genEnvironment,
-			EDhApiWorldGenerationStep target, Consumer<IChunkWrapper> resultConsumer,
-			ExecutorService worldGeneratorThreadPool)
-	{
-		if (size % 2 == 0)
-		{
-			size += 1; // size must be odd for vanilla world gen regions to work
-		}
-		
-		
-		GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, target, resultConsumer);
-		generationEvent.future = CompletableFuture.runAsync(() ->
-		{
-			long runStartTime = System.nanoTime();
-			generationEvent.timeoutTime = runStartTime;
-			generationEvent.inQueueTime = runStartTime - generationEvent.inQueueTime;
-			generationEvent.timer = new EventTimer("setup");
-			
-			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
-			try
-			{
-				//LOGGER.info("generating [{}]", event.minPos);
-				genEnvironment.generateLodFromList(generationEvent);
-			}
-			catch (InterruptedException ignored)
-			{
-			}
-			finally
-			{
-				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
-			}
-		}, worldGeneratorThreadPool);
-		return generationEvent;
-	}
-	
-	public boolean isComplete() { return this.future.isDone(); }
-	
-	public boolean hasTimeout(int duration, TimeUnit unit)
-	{
-		if (this.timeoutTime == -1)
-		{
-			return false;
-		}
-		
-		long currentTime = System.nanoTime();
-		long delta = currentTime - this.timeoutTime;
-		return (delta > TimeUnit.NANOSECONDS.convert(duration, unit));
-	}
-	
-	public boolean terminate()
-	{
-		LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
-		ThreadPools.WORLD_GEN_THREAD_FACTORY.dumpAllThreadStacks();
-		this.future.cancel(true);
-		return this.future.isCancelled();
-	}
-	
-	public boolean tooClose(int minX, int minZ, int width)
-	{
-		int aMinX = this.minPos.x;
-		int aMinZ = this.minPos.z;
-		int aSize = this.size;
-		// Account for required empty chunks in the border
-		aSize += 1;
-		width += 1;
-		// Do a AABB to AABB intersection test
-		return (aMinX + aSize >= minX &&
-				aMinX <= minX + width &&
-				aMinZ + aSize >= minZ &&
-				aMinZ <= minZ + width);
-	}
-	
-	public void refreshTimeout()
-	{
-		this.timeoutTime = System.nanoTime();
-		UncheckedInterruptedException.throwIfInterrupted();
-	}
-	
-	@Override
-	public String toString() { return this.id + ":" + this.size + "@" + this.minPos + "(" + this.targetGenerationStep + ")"; }
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java

@@ -1,109 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration;
-
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.WorldGenStructFeatManager;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.WorldGenLevel;
-#if POST_MC_1_18_2
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-#endif
-
-public final class ThreadedParameters
-{
-	private static final ThreadLocal<ThreadedParameters> LOCAL_PARAM = new ThreadLocal<>();
-	
-	final ServerLevel level;
-	public WorldGenStructFeatManager structFeat = null;
-	#if POST_MC_1_18_2
-	public StructureCheck structCheck;
-	#endif
-	boolean isValid = true;
-	public final PerfCalculator perf = new PerfCalculator();
-	
-	private static GlobalParameters previousGlobalParameters = null;
-	
-	
-	
-	public static ThreadedParameters getOrMake(GlobalParameters param)
-	{
-		ThreadedParameters tParam = LOCAL_PARAM.get();
-		if (tParam != null && tParam.isValid && tParam.level == param.level)
-		{
-			return tParam;
-		}
-		
-		tParam = new ThreadedParameters(param);
-		LOCAL_PARAM.set(tParam);
-		return tParam;
-	}
-	
-	private ThreadedParameters(GlobalParameters param)
-	{
-		previousGlobalParameters = param;
-		
-		this.level = param.level;
-		#if PRE_MC_1_18_2
-		this.structFeat = new WorldGenStructFeatManager(param.worldGenSettings, level);
-		#elif PRE_MC_1_19_2
-		this.structCheck = this.createStructureCheck(param);
-		#else
-		this.structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, param.randomState, level, param.generator.getBiomeSource(), param.worldSeed,
-				param.fixerUpper);
-		#endif
-	}
-	
-	
-	
-	public void markAsInvalid() { isValid = false; }
-	
-	public void makeStructFeat(WorldGenLevel genLevel, GlobalParameters param)
-	{
-		#if PRE_MC_1_19_4
-		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, genLevel #if POST_MC_1_18_2 , structCheck #endif );
-		#else
-		structFeat = new WorldGenStructFeatManager(param.worldOptions, genLevel, structCheck);
-		#endif
-	}
-	
-	
-	#if POST_MC_1_18_2 && PRE_MC_1_19_2
-	public void recreateStructureCheck()
-	{
-		if (previousGlobalParameters != null)
-		{
-			this.structCheck = createStructureCheck(previousGlobalParameters);
-		}
-	}
-	private StructureCheck createStructureCheck(GlobalParameters param)
-	{
-		return new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, this.level, param.generator.getBiomeSource(), param.worldSeed,
-				param.fixerUpper);
-	}
-	#else
-	public void recreateStructureCheck() { /* do nothing */ }	
-	#endif
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java

@@ -1,99 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
-
-import net.minecraft.world.level.lighting.*;
-import org.jetbrains.annotations.Nullable;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
-import net.minecraft.world.level.ChunkPos;
-
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.DataLayer;
-
-public class DummyLightEngine extends LevelLightEngine
-{
-	
-	public DummyLightEngine(LightGetterAdaptor genRegion)
-	{
-		super(genRegion, false, false);
-	}
-	
-	
-	#if PRE_MC_1_20_1
-	@Override
-	public void onBlockEmissionIncrease(BlockPos blockPos, int i) { }
-	
-	@Override
-	public int runUpdates(int i, boolean bl, boolean bl2) { return 0; }
-	
-	@Override
-	public void enableLightSources(ChunkPos chunkPos, boolean bl) { }
-
-	#else
-	@Override
-	public int runLightUpdates() { return 0; }
-	
-	@Override
-	public void setLightEnabled(ChunkPos $$0, boolean $$1) { }
-	
-	@Override
-	public void propagateLightSources(ChunkPos arg) { }
-	
-	public boolean lightOnInSection(SectionPos $$0) { return false; }
-    #endif
-	
-	@Override
-	public void queueSectionData(LightLayer lightLayer, SectionPos sectionPos, @Nullable DataLayer dataLayer #if PRE_MC_1_20_1 , boolean bl #endif ) { }
-	
-	@Override
-	public void checkBlock(BlockPos blockPos) { }
-	
-	@Override
-	public boolean hasLightWork() { return false; }
-	
-	@Override
-	public void updateSectionStatus(SectionPos sectionPos, boolean bl) { }
-	
-	@Override
-	public LayerLightEventListener getLayerListener(LightLayer lightLayer) { return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE; }
-	
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i) { return 0; }
-	
-	public void lightChunk(ChunkAccess chunkAccess, boolean needLightBlockUpdate) { }
-	
-	@Override
-	public String getDebugData(LightLayer lightLayer, SectionPos sectionPos) { throw new UnsupportedOperationException("This should never be used!"); }
-	@Override
-	public void retainData(ChunkPos chunkPos, boolean bl) { }
-	
-	#if POST_MC_1_17_1
-	@Override
-	public int getLightSectionCount() { throw new UnsupportedOperationException("This should never be used!"); }
-	@Override
-	public int getMinLightSection() { throw new UnsupportedOperationException("This should never be used!"); }
-	@Override
-	public int getMaxLightSection() { throw new UnsupportedOperationException("This should never be used!"); }
-    #endif
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java

@@ -1,73 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
-
-import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
-
-import net.minecraft.world.level.BlockGetter;
-#if POST_MC_1_17_1
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LightChunkGetter;
-#if POST_MC_1_20_1
-import net.minecraft.world.level.chunk.LightChunk;
-#endif
-
-public class LightGetterAdaptor implements LightChunkGetter
-{
-	private final BlockGetter heightGetter;
-	public DhLitWorldGenRegion genRegion = null;
-	final boolean shouldReturnNull;
-	
-	public LightGetterAdaptor(BlockGetter heightAccessor)
-	{
-		this.heightGetter = heightAccessor;
-		shouldReturnNull = ModAccessorInjector.INSTANCE.get(IStarlightAccessor.class) != null;
-	}
-	
-	public void setRegion(DhLitWorldGenRegion region)
-	{
-		genRegion = region;
-	}
-	
-	@Override
-	public #if PRE_MC_1_20_1 BlockGetter #else LightChunk #endif getChunkForLighting(int chunkX, int chunkZ)
-	{
-		if (genRegion == null)
-			throw new IllegalStateException("World Gen region has not been set!");
-		// May be null
-		return genRegion.getChunk(chunkX, chunkZ, ChunkStatus.EMPTY, false);
-	}
-	
-	@Override
-	public BlockGetter getLevel()
-	{
-		return shouldReturnNull ? null : (genRegion != null ? genRegion : heightGetter);
-	}
-	
-	#if POST_MC_1_17_1
-	public LevelHeightAccessor getLevelHeightAccessor()
-	{
-		return heightGetter;
-	}
-	#endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java

@@ -1,194 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
-
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.storage.RegionFile;
-import net.minecraft.world.level.chunk.storage.RegionFileStorage;
-
-import javax.annotation.Nullable;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class RegionFileStorageExternalCache implements AutoCloseable
-{
-	public final RegionFileStorage storage;
-	public static final int MAX_CACHE_SIZE = 16;
-	
-	/**
-	 * Present to reduce the chance that we accidentally break underlying MC code that isn't thread safe, 
-	 * specifically: "it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap.getAndMoveToFirst()"
-	 */
-	ReentrantLock getRegionFileLock = new ReentrantLock();
-	
-	
-	
-	static class RegionFileCache
-	{
-		public final long pos;
-		public final RegionFile file;
-		
-		public RegionFileCache(long pos, RegionFile file)
-		{
-			this.pos = pos;
-			this.file = file;
-		}
-		
-	}
-	
-	
-	
-	public ConcurrentLinkedQueue<RegionFileCache> regionFileCache = new ConcurrentLinkedQueue<>();
-	
-	public RegionFileStorageExternalCache(RegionFileStorage storage) { this.storage = storage; }
-	
-	@Nullable
-	public RegionFile getRegionFile(ChunkPos pos) throws IOException
-	{
-		long posLong = ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ());
-		RegionFile rFile = null;
-		
-		// Check vanilla cache
-		int retryCount = 0;
-		int maxRetryCount = 8;
-		while (retryCount < maxRetryCount)
-		{
-			retryCount++;
-			
-			try
-			{
-				this.getRegionFileLock.lock();
-				
-				#if MC_1_16_5 || MC_1_17_1
-				rFile = this.storage.getRegionFile(pos);
-				
-				// keeping the region cache size low helps prevent concurrency issues
-				if (this.storage.regionCache.size() > 150) // max 256
-				{
-					RegionFile removedFile = this.storage.regionCache.removeLast();
-					if (removedFile != null)
-					{
-						removedFile.close();
-					}
-				}
-				#else
-				rFile = this.storage.regionCache.getOrDefault(posLong, null);	
-				#endif
-				
-				break;
-			}
-			catch (ArrayIndexOutOfBoundsException e)
-			{
-				#if MC_1_16_5 || MC_1_17_1
-				// the file just wasn't cached
-				break;
-				#else
-				// potential concurrency issue, wait a second and try to get the file again
-				try
-				{
-					Thread.sleep(250);
-				}
-				catch (InterruptedException ignored)
-				{
-				}
-				#endif
-			}
-			finally
-			{
-				this.getRegionFileLock.unlock();
-			}
-		}
-		
-		if (retryCount >= maxRetryCount)
-		{
-			BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at " + pos + ".");
-		}
-		
-		
-		if (rFile != null)
-		{
-			return rFile;
-		}
-		
-		// Then check our custom cache
-		for (RegionFileCache cache : this.regionFileCache)
-		{
-			if (cache.pos == posLong)
-			{
-				return cache.file;
-			}
-		}
-		
-		// Otherwise, check if file exist, and if so, add it to the cache
-		Path storageFolderPath;
-		#if MC_1_16_5 || MC_1_17_1
-		storageFolderPath = this.storage.folder.toPath();
-		#else
-		storageFolderPath = this.storage.folder;
-		#endif
-		
-		if (!Files.exists(storageFolderPath))
-		{
-			return null;
-		}
-		
-		Path regionFilePath = storageFolderPath.resolve("r." + pos.getRegionX() + "." + pos.getRegionZ() + ".mca");
-		#if MC_1_16_5 || MC_1_17_1
-		rFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false);
-		#else
-		rFile = new RegionFile(regionFilePath, storageFolderPath, false);
-		#endif
-		
-		this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()), rFile));
-		while (this.regionFileCache.size() > MAX_CACHE_SIZE)
-		{
-			this.regionFileCache.poll().file.close();
-		}
-		
-		return rFile;
-	}
-	
-	
-	@Nullable
-	public CompoundTag read(ChunkPos pos) throws IOException
-	{
-		RegionFile file = this.getRegionFile(pos);
-		if (file == null)
-		{
-			return null;
-		}
-		
-		
-		try (DataInputStream stream = file.getChunkDataInputStream(pos))
-		{
-			if (stream == null)
-			{
-				return null;
-			}
-			
-			return NbtIo.read(stream);
-		}
-		catch (Throwable e)
-		{
-			return null;
-		}
-	}
-	
-	
-	@Override
-	public void close() throws IOException
-	{
-		RegionFileCache cache;
-		while ((cache = this.regionFileCache.poll()) != null)
-		{
-			cache.file.close();
-		}
-	}
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java

@@ -1,271 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-import com.google.common.collect.ImmutableList;
-
-import it.unimi.dsi.fastutil.longs.LongSet;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
-#if PRE_MC_1_19_2
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-import net.minecraft.world.level.StructureFeatureManager;
-#else
-#if POST_MC_1_19_4
-import net.minecraft.world.level.levelgen.WorldOptions;
-#endif
-import net.minecraft.world.level.levelgen.structure.Structure;
-import net.minecraft.world.level.StructureManager;
-#endif
-#if POST_MC_1_18_2
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-#endif
-
-import net.minecraft.world.level.levelgen.structure.StructureStart;
-
-#if PRE_MC_1_18_2
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-#endif
-
-
-
-public class WorldGenStructFeatManager extends #if PRE_MC_1_19_2 StructureFeatureManager #else StructureManager #endif
-{
-	final WorldGenLevel genLevel;
-	
-	#if PRE_MC_1_19_4
-	WorldGenSettings worldGenSettings;
-	#else
-	WorldOptions worldOptions;
-	#endif
-	
-	#if POST_MC_1_18_2
-	StructureCheck structureCheck;
-	#endif
-	
-	#if PRE_MC_1_19_4
-	public WorldGenStructFeatManager(
-			WorldGenSettings worldGenSettings,
-			WorldGenLevel genLevel #if POST_MC_1_18_2 , StructureCheck structureCheck #endif )
-	{
-		
-		super(genLevel, worldGenSettings #if POST_MC_1_18_2 , structureCheck #endif );
-		this.genLevel = genLevel;
-		this.worldGenSettings = worldGenSettings;
-	}
-	#else
-	public WorldGenStructFeatManager(
-			WorldOptions worldOptions,
-			WorldGenLevel genLevel, StructureCheck structureCheck)
-	{
-		
-		super(genLevel, worldOptions, structureCheck);
-		this.genLevel = genLevel;
-		this.worldOptions = worldOptions;
-	}
-	#endif
-	
-	@Override
-	public WorldGenStructFeatManager forWorldGenRegion(WorldGenRegion worldGenRegion)
-	{
-		if (worldGenRegion == genLevel)
-			return this;
-	#if PRE_MC_1_19_4
-		return new WorldGenStructFeatManager(worldGenSettings, worldGenRegion #if POST_MC_1_18_2 , structureCheck #endif );
-	#else
-		return new WorldGenStructFeatManager(worldOptions, worldGenRegion, structureCheck);
-	#endif
-	}
-	
-	private ChunkAccess _getChunk(int x, int z, ChunkStatus status)
-	{
-		if (genLevel == null) return null;
-		return genLevel.getChunk(x, z, status, false);
-	}
-	
-	#if PRE_MC_1_18_2
-	@Override
-	public Stream<? extends StructureStart<?>> startsForFeature(
-			SectionPos sectionPos2,
-			StructureFeature<?> structureFeature)
-	{
-		ChunkAccess chunk = _getChunk(sectionPos2.x(), sectionPos2.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return Stream.empty();
-		
-		// FIXME getReferencesForFeature can throw ConcurrentModificationException's
-		return chunk.getReferencesForFeature(structureFeature).stream().map(pos -> {
-			SectionPos sectPos = SectionPos.of(ChunkPos.getX(pos), 0, ChunkPos.getZ(pos));
-			ChunkAccess startChunk = _getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS);
-			if (startChunk == null) return null;
-			return this.getStartForFeature(sectPos, structureFeature, startChunk);
-		}).filter(structureStart -> structureStart != null && structureStart.isValid());
-	}
-	#else
-	@Override
-	public boolean hasAnyStructureAt(BlockPos blockPos)
-	{
-		SectionPos sectionPos = SectionPos.of(blockPos);
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return false;
-		return chunk.hasAnyStructureReferences();
-	}
-	
-	#if MC_1_18_1
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-															  StructureFeature<?> structureFeature) {
-
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return List.of();
-
-		// Copied from StructureFeatureManager::startsForFeature(...) with slight tweaks
-		LongSet longSet = chunk.getReferencesForFeature(structureFeature);
-		ImmutableList.Builder builder = ImmutableList.builder();
-		LongIterator longIterator = longSet.iterator();
-		while (longIterator.hasNext()) {
-			long l = (Long)longIterator.next();
-			SectionPos sectPos = SectionPos.of(new ChunkPos(l), genLevel.getMinSection());
-			ChunkAccess startChunk = _getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS);
-			if (startChunk == null) continue;
-			StructureStart<?> structureStart = this.getStartForFeature(sectPos, structureFeature, startChunk);
-			if (structureStart == null || !structureStart.isValid()) continue;
-			builder.add(structureStart);
-		}
-		return builder.build();
-	}
-	#else
-	#if PRE_MC_1_19_2
-	@Override
-	public List<StructureStart> startsForFeature(SectionPos sectionPos, Predicate<ConfiguredStructureFeature<?, ?>> predicate)
-	{
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return List.of();
-		
-		// Copied from StructureFeatureManager::startsForFeature(...)
-		Map<ConfiguredStructureFeature<?, ?>, LongSet> map = chunk.getAllReferences();
-		
-		ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-		Iterator<Map.Entry<ConfiguredStructureFeature<?, ?>, LongSet>> var5 = map.entrySet().iterator();
-		
-		while (var5.hasNext())
-		{
-			Map.Entry<ConfiguredStructureFeature<?, ?>, LongSet> entry = var5.next();
-			ConfiguredStructureFeature<?, ?> configuredStructureFeature = entry.getKey();
-			if (predicate.test(configuredStructureFeature))
-			{
-				LongSet var10002 = (LongSet) entry.getValue();
-				Objects.requireNonNull(builder);
-				this.fillStartsForFeature(configuredStructureFeature, var10002, builder::add);
-			}
-		}
-		
-		return builder.build();
-	}
-	
-	@Override
-	public List<StructureStart> startsForFeature(SectionPos sectionPos, ConfiguredStructureFeature<?, ?> configuredStructureFeature)
-	{
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return (List<StructureStart>) Stream.empty();
-		
-		// Copied from StructureFeatureManager::startsForFeature(...)
-		LongSet longSet = chunk.getReferencesForFeature(configuredStructureFeature);
-		ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-		Objects.requireNonNull(builder);
-		this.fillStartsForFeature(configuredStructureFeature, longSet, builder::add);
-		return builder.build();
-	}
-	
-	@Override
-	public Map<ConfiguredStructureFeature<?, ?>, LongSet> getAllStructuresAt(BlockPos blockPos)
-	{
-		SectionPos sectionPos = SectionPos.of(blockPos);
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return (Map<ConfiguredStructureFeature<?, ?>, LongSet>) Stream.empty();
-		return chunk.getAllReferences();
-	}
-	#else
-	@Override
-	public List<StructureStart> startsForStructure(ChunkPos sectionPos, Predicate<Structure> predicate)
-	{
-		ChunkAccess chunk = _getChunk(sectionPos.x, sectionPos.z, ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return List.of();
-		
-		// Copied from StructureFeatureManager::startsForFeature(...)
-		Map<Structure, LongSet> map = chunk.getAllReferences();
-		
-		ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-		Iterator<Map.Entry<Structure, LongSet>> var5 = map.entrySet().iterator();
-		
-		while (var5.hasNext())
-		{
-			Map.Entry<Structure, LongSet> entry = var5.next();
-			Structure configuredStructureFeature = entry.getKey();
-			if (predicate.test(configuredStructureFeature))
-			{
-				LongSet var10002 = (LongSet) entry.getValue();
-				Objects.requireNonNull(builder);
-				this.fillStartsForStructure(configuredStructureFeature, var10002, builder::add);
-			}
-		}
-		
-		return builder.build();
-	}
-	
-	@Override
-	public List<StructureStart> startsForStructure(SectionPos sectionPos, Structure structure)
-	{
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return (List<StructureStart>) Stream.empty();
-		
-		// Copied from StructureFeatureManager::startsForFeature(...)
-		LongSet longSet = chunk.getReferencesForStructure(structure);
-		ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-		Objects.requireNonNull(builder);
-		this.fillStartsForStructure(structure, longSet, builder::add);
-		return builder.build();
-	}
-	
-	@Override
-	public Map<Structure, LongSet> getAllStructuresAt(BlockPos blockPos)
-	{
-		SectionPos sectionPos = SectionPos.of(blockPos);
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return (Map<Structure, LongSet>) Stream.empty();
-		return chunk.getAllReferences();
-	}
-	#endif
-	#endif
-	#endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java

@@ -1,70 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
-
-import net.minecraft.server.level.WorldGenRegion;
-#if PRE_MC_1_19_2
-#endif
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-
-public final class StepStructureReference
-{
-	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
-	
-	private final BatchGenerationEnvironment environment;
-	
-	
-	
-	public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
-	
-	
-	
-	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers)
-	{
-		
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		{
-			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
-			((ProtoChunk) chunk).setStatus(STATUS);
-			chunksToDo.add(chunk);
-		}
-		
-		for (ChunkAccess chunk : chunksToDo)
-		{
-			// System.out.println("StepStructureReference: "+chunk.getPos());
-			this.environment.params.generator.createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
-		}
-	}
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java

@@ -1,148 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
-
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import org.apache.logging.log4j.Logger;
-
-public final class StepStructureStart
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
-	private static final ReentrantLock STRUCTURE_PLACEMENT_LOCK = new ReentrantLock();
-	
-	private final BatchGenerationEnvironment environment;
-	
-	
-	
-	public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
-	
-	
-	
-	public static class StructStartCorruptedException extends RuntimeException
-	{
-		private static final long serialVersionUID = -8987434342051563358L;
-		
-		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e)
-		{
-			super("StructStartCorruptedException");
-			super.initCause(e);
-			fillInStackTrace();
-		}
-		
-	}
-	
-	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers) throws InterruptedException
-	{
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		{
-			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunk.getStatus().isOrAfter(STATUS))
-			{
-				((ProtoChunk) chunk).setStatus(STATUS);
-				chunksToDo.add(chunk);
-			}
-		}
-		
-		#if PRE_MC_1_19_2
-		if (environment.params.worldGenSettings.generateFeatures())
-		{
-		#elif PRE_MC_1_19_4
-		if (environment.params.worldGenSettings.generateStructures()) {
-		#else
-		if (environment.params.worldOptions.generateStructures())
-		{
-		#endif
-			for (ChunkAccess chunk : chunksToDo)
-			{
-				// System.out.println("StepStructureStart: "+chunk.getPos());
-				
-				// there are a few cases where the structure generator call may lock up (either due to teleporting or leaving the world).
-				// hopefully allowing interrupts here will prevent that from happening.
-				BatchGenerationEnvironment.throwIfThreadInterrupted();
-				
-				// hopefully this shouldn't cause any performance issues (this step is generally quite quick so hopefully it should be fine)
-				// and should prevent some concurrency issues
-				STRUCTURE_PLACEMENT_LOCK.lock();
-				
-				#if PRE_MC_1_19_2
-				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
-						environment.params.worldSeed);
-				#elif PRE_MC_1_19_4
-				environment.params.generator.createStructures(environment.params.registry, environment.params.randomState, tParams.structFeat, chunk, environment.params.structures,
-						environment.params.worldSeed);
-				#else
-				environment.params.generator.createStructures(environment.params.registry,
-						environment.params.level.getChunkSource().getGeneratorState(),
-						tParams.structFeat, chunk, environment.params.structures);
-				#endif
-				
-				#if POST_MC_1_18_2
-				try
-				{
-					tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
-				}
-				catch (ArrayIndexOutOfBoundsException firstEx)
-				{
-					// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
-					// This means the structFeat is corrupted (For some reason) and I need to reset it.
-					// TODO: Figure out in the future why this happens even though I am using new structFeat - OLD
-					
-					// reset the structureStart
-					tParams.recreateStructureCheck();
-					
-					try
-					{
-						// try running the structure logic again
-						tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
-					}
-					catch (ArrayIndexOutOfBoundsException secondEx)
-					{
-						// the structure logic failed again, log it and move on
-						LOGGER.error("Unable to create structure starts for " + chunk.getPos() + ". This is an error with MC's world generation. Ignoring and continuing generation. Error: " + secondEx.getMessage()); // don't log the full stack trace since it is long and will generally end up in MC's code
-						
-						//throw new StepStructureStart.StructStartCorruptedException(secondEx);
-					}
-				}
-				
-				#endif
-				
-				STRUCTURE_PLACEMENT_LOCK.unlock();
-			}
-		}
-	}
-	
-}

common/src/main/java/com/seibel/lod/common/Config.java

@@ -0,0 +1,482 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common;
+
+import com.seibel.lod.core.config.*;
+import com.seibel.lod.core.enums.config.*;
+import com.seibel.lod.core.enums.rendering.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.IAdvancedFog;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.IAdvancedFog.IHeightFog;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.*;
+
+
+/**
+ * This handles any configuration the user has access to.
+ * @author coolGi
+ * @version 12-12-2021
+ */
+
+public class Config
+//public class Config extends TinyConfig
+{
+	// CONFIG STRUCTURE
+	// 	-> Client
+	//		|
+	//		|-> Graphics
+	//		|		|-> Quality
+	//		|		|-> FogQuality
+	//		|		|-> AdvancedGraphics
+	//		|
+	//		|-> World Generation
+	//		|
+	//		|-> Advanced
+	//				|-> Threads
+	//				|-> Buffers
+	//				|-> Debugging
+	
+	// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
+	
+	@ConfigAnnotations.ScreenEntry
+	public static Client client;
+	
+	@ConfigAnnotations.FileComment
+	public static String _optionsButton = ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DESC;
+	// I know this option should be in Client
+	// This is a hacky method to not show the button in the options screen but show it in the mod menu
+	// Tough it is in client in the wrapper singleton
+	@ConfigAnnotations.Entry
+	public static boolean optionsButton = true;
+	
+	public static class Client
+	{
+		@ConfigAnnotations.ScreenEntry
+		public static Graphics graphics;
+		
+		@ConfigAnnotations.ScreenEntry
+		public static WorldGenerator worldGenerator;
+		
+		@ConfigAnnotations.ScreenEntry
+		public static Multiplayer multiplayer;
+		
+		@ConfigAnnotations.ScreenEntry
+		public static Advanced advanced;
+		
+		
+		public static class Graphics
+		{
+			@ConfigAnnotations.ScreenEntry
+			public static Quality quality;
+			
+			@ConfigAnnotations.ScreenEntry
+			public static FogQuality fogQuality;
+			
+			@ConfigAnnotations.ScreenEntry
+			public static AdvancedGraphics advancedGraphics;
+			
+			
+			public static class Quality
+			{
+				@ConfigAnnotations.FileComment
+				public static String _drawResolution = IQuality.DRAW_RESOLUTION_DESC;
+				@ConfigAnnotations.Entry
+				public static HorizontalResolution drawResolution = IQuality.DRAW_RESOLUTION_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC;
+				@ConfigAnnotations.Entry(minValue = 32, maxValue = 2048)
+				public static int lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue;
+				
+				@ConfigAnnotations.FileComment
+				public static String _verticalQuality = IQuality.VERTICAL_QUALITY_DESC;
+				@ConfigAnnotations.Entry
+				public static VerticalQuality verticalQuality = IQuality.VERTICAL_QUALITY_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _horizontalScale = IQuality.HORIZONTAL_SCALE_DESC;
+				@ConfigAnnotations.Entry(minValue = 2, maxValue = 64)
+				public static int horizontalScale = IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.defaultValue;
+				
+				@ConfigAnnotations.FileComment
+				public static String _horizontalQuality = IQuality.HORIZONTAL_SCALE_DESC;
+				@ConfigAnnotations.Entry
+				public static HorizontalQuality horizontalQuality = IQuality.HORIZONTAL_QUALITY_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _dropoffQuality = IQuality.DROPOFF_QUALITY_DESC;
+				@ConfigAnnotations.Entry
+				public static DropoffQuality dropoffQuality = IQuality.DROPOFF_QUALITY_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_DESC;
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 7)
+				public static int lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_MIN_DEFAULT_MAX.defaultValue;
+			}
+			
+			
+			public static class FogQuality
+			{
+				@ConfigAnnotations.FileComment
+				public static String _fogDistance = IFogQuality.FOG_DISTANCE_DESC;
+				@ConfigAnnotations.Entry
+				public static FogDistance fogDistance = IFogQuality.FOG_DISTANCE_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _fogDrawMode = IFogQuality.FOG_DRAW_MODE_DESC;
+				@ConfigAnnotations.Entry
+				public static FogDrawMode fogDrawMode = IFogQuality.FOG_DRAW_MODE_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _fogColorMode = IFogQuality.FOG_COLOR_MODE_DESC;
+				@ConfigAnnotations.Entry
+				public static FogColorMode fogColorMode = IFogQuality.FOG_COLOR_MODE_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DEFAULT;
+				
+				@ConfigAnnotations.ScreenEntry
+				public static AdvancedFog advancedFog;
+				
+				public static class AdvancedFog {
+					static final double SQRT2 = 1.4142135623730951;
+					
+					@ConfigAnnotations.FileComment
+					public static String _farFogStart = IAdvancedFog.FAR_FOG_START_DESC;
+					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
+					public static double farFogStart = IAdvancedFog.FAR_FOG_START_MIN_DEFAULT_MAX.defaultValue;
+					
+					@ConfigAnnotations.FileComment
+					public static String _farFogEnd = IAdvancedFog.FAR_FOG_END_DESC;
+					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
+					public static double farFogEnd = IAdvancedFog.FAR_FOG_END_MIN_DEFAULT_MAX.defaultValue;
+					
+					@ConfigAnnotations.FileComment
+					public static String _farFogMin = IAdvancedFog.FAR_FOG_MIN_DESC;
+					@ConfigAnnotations.Entry(minValue = -5.0, maxValue = SQRT2)
+					public static double farFogMin = IAdvancedFog.FAR_FOG_MIN_MIN_DEFAULT_MAX.defaultValue;
+					
+					@ConfigAnnotations.FileComment
+					public static String _farFogMax = IAdvancedFog.FAR_FOG_MAX_DESC;
+					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 5.0)
+					public static double farFogMax = IAdvancedFog.FAR_FOG_MAX_MIN_DEFAULT_MAX.defaultValue;
+					
+					@ConfigAnnotations.FileComment
+					public static String _farFogType = IAdvancedFog.FAR_FOG_TYPE_DESC;
+					@ConfigAnnotations.Entry
+					public static FogSetting.FogType farFogType = IAdvancedFog.FAR_FOG_TYPE_DEFAULT;
+					
+					@ConfigAnnotations.FileComment
+					public static String _farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_DESC;
+					@ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0)
+					public static double farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue;
+					
+					@ConfigAnnotations.ScreenEntry
+					public static HeightFog heightFog;
+					
+					public static class HeightFog {
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DESC;
+						@ConfigAnnotations.Entry
+						public static HeightFogMixMode heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DEFAULT;
+						@ConfigAnnotations.FileComment
+						public static String _heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DESC;
+						@ConfigAnnotations.Entry
+						public static HeightFogMode heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DEFAULT;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_DESC;
+						@ConfigAnnotations.Entry(minValue = -4096.0, maxValue = 4096.0)
+						public static double heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_MIN_DEFAULT_MAX.defaultValue;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogStart = IHeightFog.HEIGHT_FOG_START_DESC;
+						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
+						public static double heightFogStart = IHeightFog.HEIGHT_FOG_START_MIN_DEFAULT_MAX.defaultValue;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogEnd = IHeightFog.HEIGHT_FOG_END_DESC;
+						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
+						public static double heightFogEnd = IHeightFog.HEIGHT_FOG_END_MIN_DEFAULT_MAX.defaultValue;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogMin = IHeightFog.HEIGHT_FOG_MIN_DESC;
+						@ConfigAnnotations.Entry(minValue = -5.0, maxValue = SQRT2)
+						public static double heightFogMin = IHeightFog.HEIGHT_FOG_MIN_MIN_DEFAULT_MAX.defaultValue;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogMax = IHeightFog.HEIGHT_FOG_MAX_DESC;
+						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 5.0)
+						public static double heightFogMax = IHeightFog.HEIGHT_FOG_MAX_MIN_DEFAULT_MAX.defaultValue;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DESC;
+						@ConfigAnnotations.Entry
+						public static FogSetting.FogType heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DEFAULT;
+						
+						@ConfigAnnotations.FileComment
+						public static String _heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_DESC;
+						@ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0)
+						public static double heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue;
+						
+					}
+				}
+			}
+			
+			
+			public static class AdvancedGraphics
+			{
+				@ConfigAnnotations.FileComment
+				public static String _disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC;
+				@ConfigAnnotations.Entry
+				public static VanillaOverdraw vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _overdrawOffset = IAdvancedGraphics.OVERDRAW_OFFSET_DESC;
+				@ConfigAnnotations.Entry(minValue = -16, maxValue = 16)
+				public static int overdrawOffset = IAdvancedGraphics.OVERDRAW_OFFSET_MIN_DEFAULT_MAX.defaultValue;
+
+				@ConfigAnnotations.FileComment
+				public static String _useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DESC;
+				@ConfigAnnotations.Entry
+				public static double brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DESC;
+				@ConfigAnnotations.Entry
+				public static double saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _enableCaveCulling = IAdvancedGraphics.ENABLE_CAVE_CULLING_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean enableCaveCulling = IAdvancedGraphics.ENABLE_CAVE_CULLING_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _caveCullingHeight = IAdvancedGraphics.CAVE_CULLING_HEIGHT_DESC;
+				@ConfigAnnotations.Entry(minValue = -4096, maxValue = 4096)
+                public static int caveCullingHeight = IAdvancedGraphics.CAVE_CULLING_HEIGHT_MIN_DEFAULT_MAX.defaultValue;
+
+				@ConfigAnnotations.FileComment
+				public static String _earthCurveRatio = IAdvancedGraphics.EARTH_CURVE_RATIO_DESC;
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 5000)
+				public static int earthCurveRatio = IAdvancedGraphics.EARTH_CURVE_RATIO_MIN_DEFAULT_MAX.defaultValue;
+
+				/*
+				@ConfigAnnotations.FileComment
+				public static String _backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_DESC;
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 512)
+				public static int backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_MIN_DEFAULT_MAX.defaultValue;
+				*/
+			}
+		}
+		
+		
+		public static class WorldGenerator
+		{
+			@ConfigAnnotations.FileComment
+			public static String _enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC;
+			@ConfigAnnotations.Entry
+			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
+			
+			//			@ConfigAnnotations.FileComment
+//			public static String _distanceGenerationMode = IWorldGenerator.getDistanceGenerationModeDesc();
+			@ConfigAnnotations.Entry
+			public static DistanceGenerationMode distanceGenerationMode = IWorldGenerator.DISTANCE_GENERATION_MODE_DEFAULT;
+			
+			@ConfigAnnotations.FileComment
+			public static String _lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DESC;
+			@ConfigAnnotations.Entry
+			public static LightGenerationMode lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DEFAULT;
+			
+			@ConfigAnnotations.FileComment
+			public static String _generationPriority = IWorldGenerator.GENERATION_PRIORITY_DESC;
+			@ConfigAnnotations.Entry
+			public static GenerationPriority generationPriority = IWorldGenerator.GENERATION_PRIORITY_DEFAULT;
+			
+			@ConfigAnnotations.FileComment
+			public static String _blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DESC;
+			@ConfigAnnotations.Entry
+			public static BlocksToAvoid blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DEFAULT;
+		}
+		
+		
+		public static class Multiplayer
+		{
+			@ConfigAnnotations.FileComment
+			public static String _serverFolderNameMode = IMultiplayer.SERVER_FOLDER_NAME_MODE_DESC;
+			@ConfigAnnotations.Entry
+			public static ServerFolderNameMode serverFolderNameMode = IMultiplayer.SERVER_FOLDER_NAME_MODE_DEFAULT;
+			
+			@ConfigAnnotations.FileComment
+			public static String _multiDimensionRequiredSimilarity = IMultiplayer.MULTI_DIMENSION_REQUIRED_SIMILARITY_DESC;
+			@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 1.0)
+			public static double multiDimensionRequiredSimilarity = IMultiplayer.MULTI_DIMENSION_REQUIRED_SIMILARITY_MIN_DEFAULT_MAX.defaultValue;
+			
+		}
+		
+		
+		public static class Advanced
+		{
+			@ConfigAnnotations.ScreenEntry
+			public static Threading threading;
+			
+			@ConfigAnnotations.ScreenEntry
+			public static Debugging debugging;
+			
+			@ConfigAnnotations.ScreenEntry
+			public static Buffers buffers;
+
+			@ConfigAnnotations.FileComment
+			public static String _lodOnlyMode = IAdvanced.LOD_ONLY_MODE_DESC;
+			@ConfigAnnotations.Entry
+			public static boolean lodOnlyMode = IAdvanced.LOD_ONLY_MODE_DEFAULT;
+
+
+			public static class Threading
+			{
+				@ConfigAnnotations.FileComment
+				public static String _numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DESC;
+				@ConfigAnnotations.Entry(minValue = 0.1, maxValue = 50.0)
+				public static double numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue;
+				
+				@ConfigAnnotations.FileComment
+				public static String _numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_DESC;
+				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
+				public static int numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.defaultValue;
+			}
+			
+			
+			public static class Debugging
+			{
+				@ConfigAnnotations.FileComment
+				public static String _rendererType = IDebugging.RENDERER_TYPE_DESC;
+				@ConfigAnnotations.Entry
+				public static RendererType rendererType = IDebugging.RENDERER_TYPE_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _debugMode = IDebugging.DEBUG_MODE_DESC;
+				@ConfigAnnotations.Entry
+				public static DebugMode debugMode = IDebugging.DEBUG_MODE_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT;
+
+				@ConfigAnnotations.ScreenEntry
+				public static DebugSwitch debugSwitch;
+
+				public static class DebugSwitch {
+					/* The logging switches available:
+					 * WorldGenEvent
+					 * WorldGenPerformance
+					 * WorldGenLoadEvent
+					 * LodBuilderEvent
+					 * RendererBufferEvent
+					 * RendererGLEvent
+					 * FileReadWriteEvent
+					 * FileSubDimEvent
+					 * NetworkEvent //NOT IMPL YET
+					 */
+					@ConfigAnnotations.FileComment
+					public static String _logWorldGenEvent = IDebugSwitch.LOG_WORLDGEN_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logWorldGenEvent = IDebugSwitch.LOG_WORLDGEN_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logWorldGenPerformance = IDebugSwitch.LOG_WORLDGEN_PERFORMANCE_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logWorldGenPerformance = IDebugSwitch.LOG_WORLDGEN_PERFORMANCE_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logWorldGenLoadEvent = IDebugSwitch.LOG_WORLDGEN_LOAD_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logWorldGenLoadEvent = IDebugSwitch.LOG_WORLDGEN_LOAD_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logLodBuilderEvent = IDebugSwitch.LOG_LODBUILDER_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logLodBuilderEvent = IDebugSwitch.LOG_LODBUILDER_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logRendererBufferEvent = IDebugSwitch.LOG_RENDERER_BUFFER_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logRendererBufferEvent = IDebugSwitch.LOG_RENDERER_BUFFER_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logRendererGLEvent = IDebugSwitch.LOG_RENDERER_GL_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logRendererGLEvent = IDebugSwitch.LOG_RENDERER_GL_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logFileReadWriteEvent = IDebugSwitch.LOG_FILE_READWRITE_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logFileReadWriteEvent = IDebugSwitch.LOG_FILE_READWRITE_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logFileSubDimEvent = IDebugSwitch.LOG_FILE_SUB_DIM_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logFileSubDimEvent = IDebugSwitch.LOG_FILE_SUB_DIM_EVENT_DEFAULT;
+
+					@ConfigAnnotations.FileComment
+					public static String _logNetworkEvent = IDebugSwitch.LOG_NETWORK_EVENT_DESC;
+					@ConfigAnnotations.Entry
+					public static LoggerMode logNetworkEvent = IDebugSwitch.LOG_NETWORK_EVENT_DEFAULT;
+				}
+			}
+			
+			
+			public static class Buffers
+			{
+				@ConfigAnnotations.FileComment
+				public static String _gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DESC;
+				@ConfigAnnotations.Entry
+				public static GpuUploadMethod gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DEFAULT;
+				
+				@ConfigAnnotations.FileComment
+				public static String _gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC;
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 50)
+				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
+				
+				@ConfigAnnotations.FileComment
+				public static String _rebuildTimes = IBuffers.REBUILD_TIMES_DESC;
+				@ConfigAnnotations.Entry
+				public static BufferRebuildTimes rebuildTimes = IBuffers.REBUILD_TIMES_DEFAULT;
+			}
+		}
+	}
+}

common/src/main/java/com/seibel/lod/common/LodCommonMain.java

@@ -0,0 +1,50 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common;
+
+import com.seibel.lod.common.forge.LodForgeMethodCaller;
+import com.seibel.lod.common.networking.NetworkInterface;
+import com.seibel.lod.common.wrappers.DependencySetup;
+import com.seibel.lod.common.wrappers.config.ConfigGui;
+
+/**
+ * This is the common main class
+ * @author Ran
+ */
+public class LodCommonMain {
+    public static boolean forge = false;
+    public static boolean serverSided;
+    public static LodForgeMethodCaller forgeMethodCaller;
+
+    public static void startup(LodForgeMethodCaller caller, boolean serverSided) {
+        LodCommonMain.serverSided = serverSided;
+        if (caller != null) {
+            LodCommonMain.forge = true;
+            forgeMethodCaller = caller;
+        }
+
+        DependencySetup.createInitialBindings();
+    }
+
+
+    public static void initConfig() {
+        ConfigGui.init(Config.class);
+    }
+}

common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java

@@ -0,0 +1,49 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.forge;
+
+import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.core.Direction;
+#if POST_MC_1_19
+import net.minecraft.util.RandomSource;
+#endif
+import net.minecraft.world.level.ColorResolver;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+
+import java.util.List;
+import java.util.Random;
+
+/**
+ * used for calling methods that forge modified
+ * (forge modifies vanilla methods for some reason)
+ * @author Ran
+ */
+public interface LodForgeMethodCaller {
+    #if PRE_MC_1_19
+    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random); // FIXME: For 1.19
+    #else
+    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random); // FIXME: For 1.19
+    #endif
+
+    int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z);
+}

common/src/main/java/com/seibel/lod/common/networking/NetworkHandler.java

@@ -0,0 +1,49 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.networking;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+
+/**
+ * This is packet handler for our mod
+ * It basically handles the packets sent from the server & client
+ *
+ * @author Ran
+ */
+public class NetworkHandler {
+    // If you need the response sender then tell me
+    // I'll add extra code to get the response sender
+    public static void receivePacketClient(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf) {
+        // TODO: Server sided stuff here
+        // You can make client execute something by using client.execute(Runnable)
+        // In the fabric docs it says that client.execute is ran on the render thread?
+    }
+
+    // If you need the response sender then tell me
+    // I'll add extra code to get the response sender
+    public static void receivePacketServer(MinecraftServer server, ServerPlayer client, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf) {
+        // TODO: Server sided stuff here
+    }
+}

common/src/main/java/com/seibel/lod/common/networking/NetworkInterface.java

@@ -0,0 +1,28 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.networking;
+
+/**
+ * @author Ran
+ */
+public interface NetworkInterface {
+    void register_Client();
+    void register_Server();
+}

common/src/main/java/com/seibel/lod/common/networking/Networking.java

@@ -0,0 +1,119 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.networking;
+
+import com.seibel.lod.core.ModInfo;
+import io.netty.buffer.Unpooled;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
+import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerPlayer;
+
+import java.util.Objects;
+
+/**
+ * This class holds most of the networking code for the mod.
+ * @author Ran
+ */
+public class Networking {
+    public static final ResourceLocation resourceLocation_meow = new ResourceLocation("lod", "meow");
+
+    public static FriendlyByteBuf createNew() {
+        // TODO: Probably replace the Unpooled.buffer()
+        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
+        buf.writeInt(ModInfo.PROTOCOL_VERSION);
+        return buf;
+    }
+
+    /*
+     * All code below is from the fabric api and might have been modified to work with Distant Horizons
+     * Which is licensed under the Apache License 2.0
+     */
+
+    /**
+     * Sends a packet to a player.
+     *
+     * @param player the player to send the packet to
+     * @param buf the payload of the packet.
+     */
+    public static void send(ServerPlayer player, FriendlyByteBuf buf) {
+        Objects.requireNonNull(player, "Server player entity cannot be null");
+        Objects.requireNonNull(resourceLocation_meow, "Channel name cannot be null");
+        Objects.requireNonNull(buf, "Packet byte buf cannot be null");
+
+        player.connection.send(createS2CPacket(resourceLocation_meow, buf));
+    }
+
+    /**
+     * Sends a packet to the connected server.
+     *
+     * @param buf the payload of the packet
+     * @throws IllegalStateException if the client is not connected to a server
+     */
+    public static void send(FriendlyByteBuf buf) throws IllegalStateException {
+        // You cant send without a client player, so this is fine
+        if (Minecraft.getInstance().getConnection() != null) {
+            Minecraft.getInstance().getConnection().send(createC2SPacket(resourceLocation_meow, buf));
+            return;
+        }
+
+        throw new IllegalStateException("Cannot send packets when not in game!");
+    }
+
+    /**
+     * Creates a packet which may be sent to the connected client.
+     *
+     * @param channelName the channel name
+     * @param buf the packet byte buf which represents the payload of the packet
+     * @return a new packet
+     */
+    public static Packet<?> createS2CPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
+        Objects.requireNonNull(channelName, "Channel cannot be null");
+        Objects.requireNonNull(buf, "Buf cannot be null");
+
+        return createPlayS2CPacket(channelName, buf);
+    }
+
+    public static Packet<?> createPlayS2CPacket(ResourceLocation channel, FriendlyByteBuf buf) {
+        return new ClientboundCustomPayloadPacket(channel, buf);
+    }
+
+    /**
+     * Creates a packet which may be sent to a the connected server.
+     *
+     * @param channelName the channel name
+     * @param buf the packet byte buf which represents the payload of the packet
+     * @return a new packet
+     */
+    public static Packet<?> createC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
+        Objects.requireNonNull(channelName, "Channel name cannot be null");
+        Objects.requireNonNull(buf, "Buf cannot be null");
+
+        return createPlayC2SPacket(channelName, buf);
+    }
+
+    public static Packet<?> createPlayC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
+        return new ServerboundCustomPayloadPacket(channelName, buf);
+    }
+
+}

common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java

@@ -0,0 +1,57 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers;
+
+import com.seibel.lod.common.LodCommonMain;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.core.handlers.IReflectionHandler;
+import com.seibel.lod.core.handlers.ReflectionHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+
+/**
+ * Binds all necessary dependencies, so we
+ * can access them in Core. <br>
+ * This needs to be called before any Core classes
+ * are loaded.
+ *
+ * @author James Seibel
+ * @author Ran
+ * @version 12-1-2021
+ */
+public class DependencySetup {
+    public static void createInitialBindings()
+    {
+        SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
+        if (!LodCommonMain.serverSided)
+        {
+            SingletonHandler.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);
+            SingletonHandler.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
+            SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftClientWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftClientWrapper.INSTANCE.getOptions()));
+        }
+
+        SingletonHandler.bind(IWrapperFactory.class, WrapperFactory.INSTANCE);
+        DependencySetupDoneCheck.isDone = true;
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/DependencySetupDoneCheck.java

@@ -1,31 +1,29 @@
 /*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020-2022  James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
+ *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation, version 3.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
+ *    GNU General Public License for more details.
  *
- *    You should have received a copy of the GNU Lesser General Public License
+ *    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.seibel.distanthorizons.common.wrappers;
+ 
+package com.seibel.lod.common.wrappers;
 
 import java.util.function.Supplier;
 
 public class DependencySetupDoneCheck
 {
-	// TODO move to DependencySetup
 	public static boolean isDone = false;
-	// TODO why is this here and what is its purpose?
-	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> { return false; });
+	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> {return false;});
 	
 }

common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java

@@ -0,0 +1,82 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers;
+
+import java.nio.FloatBuffer;
+
+import com.mojang.math.Matrix4f;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.core.enums.LodDirection;
+import com.seibel.lod.core.objects.math.Mat4f;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+
+/**
+ * This class converts to and from Minecraft objects (Ex: Matrix4f)
+ * and objects we created (Ex: Mat4f).
+ *
+ * @author James Seibel
+ * @version 11-20-2021
+ */
+public class McObjectConverter
+{
+    /** 4x4 float matrix converter */
+    public static Mat4f Convert(Matrix4f mcMatrix)
+    {
+        FloatBuffer buffer = FloatBuffer.allocate(16);
+        mcMatrix.store(buffer);
+        Mat4f matrix = new Mat4f(buffer);
+        matrix.transpose();
+        return matrix;
+    }
+
+
+    static final Direction[] directions;
+    static final LodDirection[] lodDirections;
+    static {
+    	LodDirection[] lodDirs = LodDirection.values();
+    	directions = new Direction[lodDirs.length];
+    	lodDirections = new LodDirection[lodDirs.length];
+    	for (LodDirection lodDir : lodDirs) {
+    		Direction dir = Enum.valueOf(Direction.class, lodDir.name());
+            if (dir == null) {
+                throw new IllegalArgumentException("Invalid direction on init mapping: " + lodDir);
+            }
+    		directions[lodDir.ordinal()] = dir;
+    		lodDirections[dir.ordinal()] = lodDir;
+    	}
+    }
+    
+    public static BlockPos Convert(AbstractBlockPosWrapper wrappedPos) {
+    	return new BlockPos(wrappedPos.getX(),wrappedPos.getY(), wrappedPos.getZ());
+    }
+    
+    
+    public static Direction Convert(LodDirection lodDirection)
+    {
+        return directions[lodDirection.ordinal()];
+    }
+    public static LodDirection Convert(Direction direction)
+    {
+        return lodDirections[direction.ordinal()];
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java

@@ -1,27 +1,26 @@
 /*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020-2022  James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
+ *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation, version 3.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
+ *    GNU General Public License for more details.
  *
- *    You should have received a copy of the GNU Lesser General Public License
+ *    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.seibel.lod.common.wrappers;
 
-package com.seibel.distanthorizons.common.wrappers;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
+import com.seibel.lod.core.enums.config.DistanceGenerationMode;
+import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
 
 /**
  * @author James Seibel
@@ -43,27 +42,16 @@ public class VersionConstants implements IVersionConstants
 	{
 		return 0;
 	}
-	
+
 	@Override
 	public int getWorldGenerationCountPerThread()
 	{
 		return 1;
 	}
-	
+
 	@Override
 	public boolean isVanillaRenderedChunkSquare()
 	{
 		return false;
 	}
-	
-	@Override
-	public String getMinecraftVersion()
-	{
-		#if PRE_MC_1_19_2
-		return Minecraft.getInstance().getGame().getVersion().getId();
-		#else
-		return SharedConstants.getCurrentVersion().getId();
-		#endif
-	}
-	
 }

common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java

@@ -0,0 +1,94 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers;
+
+import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
+import com.seibel.lod.core.objects.lod.LodDimension;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
+import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+
+/**
+ * This handles creating abstract wrapper objects.
+ *
+ * @author James Seibel
+ * @version 11-20-2021
+ */
+public class WrapperFactory implements IWrapperFactory
+{
+	public static final WrapperFactory INSTANCE = new WrapperFactory();
+	
+	
+	@Override
+	public AbstractBlockPosWrapper createBlockPos()
+	{
+		return new BlockPosWrapper();
+	}
+	
+	@Override
+	public AbstractBlockPosWrapper createBlockPos(int x, int y, int z)
+	{
+		return new BlockPosWrapper(x, y, z);
+	}
+	
+	
+	
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos()
+	{
+		return new ChunkPosWrapper();
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(long xAndZPositionCombined)
+	{
+		return new ChunkPosWrapper(xAndZPositionCombined);
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(int x, int z)
+	{
+		return new ChunkPosWrapper(x, z);
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(AbstractChunkPosWrapper newChunkPos)
+	{
+		return new ChunkPosWrapper(newChunkPos);
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(AbstractBlockPosWrapper blockPos)
+	{
+		return new ChunkPosWrapper(blockPos);
+	}
+	
+	public AbstractBatchGenerationEnvionmentWrapper createBatchGenerator(LodBuilder newLodBuilder,
+			LodDimension newLodDimension, IWorldWrapper worldWrapper)
+	{
+		return new BatchGenerationEnvironment(worldWrapper, newLodBuilder, newLodDimension);
+	}
+}

common/src/main/java/com/seibel/lod/common/wrappers/WrapperUtil.java

@@ -0,0 +1,34 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers;
+
+import net.minecraft.world.level.levelgen.Heightmap;
+
+/**
+ * Stores any variables or code that
+ * may be shared between wrapper objects.
+ *
+ * @author James Seibel
+ * @version 11-20-2021
+ */
+public class WrapperUtil {
+    /** If we ever need to use a heightmap for any reason, use this one. */
+    public static final Heightmap.Types DEFAULT_HEIGHTMAP = Heightmap.Types.WORLD_SURFACE_WG;
+}

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailMap.java

@@ -0,0 +1,47 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.seibel.lod.core.api.ApiShared;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class BlockDetailMap
+{
+	
+	private static ConcurrentHashMap<BlockState, BlockDetailWrapper> map = new ConcurrentHashMap<BlockState, BlockDetailWrapper>();
+	
+	private BlockDetailMap() {}
+	
+	public static BlockDetailWrapper getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
+		if (!bs.getFluidState().isEmpty()) {
+			bs = bs.getFluidState().createLegacyBlock();
+		}
+		BlockDetailWrapper cache = map.get(bs);
+		if (cache != null) return cache;
+		cache = BlockDetailWrapper.make(bs, pos, getter);
+		//ApiShared.LOGGER.info("New blockDetail cache for {} to {} ", bs, cache);
+		BlockDetailWrapper cacheCAS = map.putIfAbsent(bs, cache);
+		return cacheCAS==null ? cache : cacheCAS;
+	}
+}

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java

@@ -0,0 +1,350 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import com.seibel.lod.common.Config;
+import com.seibel.lod.common.wrappers.McObjectConverter;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.core.api.ApiShared;
+import com.seibel.lod.core.enums.LodDirection;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.ColorUtil;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
+
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.FlowerBlock;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.RotatedPillarBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+#if POST_MC_1_19
+import net.minecraft.util.RandomSource;
+#endif
+
+/*-- WARN: This class should NEVER hold reference to anything large,
+ as this is never dealloc until the end of runtime!! --*/
+public class BlockDetailWrapper extends IBlockDetailWrapper
+{
+	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+
+	public static final int FLOWER_COLOR_SCALE = 5;
+
+	#if PRE_MC_1_19
+	public static final Random random = new Random(0);
+	#else
+	public static final RandomSource random = RandomSource.create();
+	#endif
+
+	enum ColorMode {
+		Default,
+		Flower,
+		Leaves;
+		static ColorMode getColorMode(Block b) {
+			if (b instanceof LeavesBlock) return Leaves;
+			if (b instanceof FlowerBlock) return Flower;
+			return Default;
+		}
+	}
+	//TODO: Perhaps make this not just use the first frame?
+	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode) {
+		
+		int count = 0;
+		double alpha = 0;
+		double red = 0;
+		double green = 0;
+		double blue = 0;
+	    int tempColor;
+	    
+	    {
+	        // textures normally use u and v instead of x and y
+	        for (int u = 0; u < texture.getWidth(); u++)
+	        {
+	            for (int v = 0; v < texture.getHeight(); v++)
+	            {
+	            	//note: Minecraft color format is: 0xAA BB GG RR
+	            	//________ DH mod color format is: 0xAA RR GG BB
+	            	//OpenGL RGBA format native order: 0xRR GG BB AA
+	            	//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
+	                tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
+	
+	                double r = ((tempColor & 0x000000FF)      )/255.;
+	                double g = ((tempColor & 0x0000FF00) >>> 8)/255.;
+	                double b = ((tempColor & 0x00FF0000) >>> 16)/255.;
+	                double a = ((tempColor & 0xFF000000) >>> 24)/255.;
+	                int scale = 1;
+	                
+	                if (colorMode == ColorMode.Leaves) {
+	                	r *= a;
+	                	g *= a;
+	                	b *= a;
+	                	a = 1.;
+	                } else if (a==0.) {
+	                	continue;
+	                } else if (colorMode == ColorMode.Flower && (g+0.1<b || g+0.1<r)) {
+	                	scale = FLOWER_COLOR_SCALE;
+	                }
+	                
+	                count += scale;
+	                alpha += a*a*scale;
+	                red += r*r*scale;
+	                green += g*g*scale;
+	                blue += b*b*scale;
+	            }
+	        }
+	    }
+	
+	    if (count == 0)
+	        // this block is entirely transparent
+	        tempColor = ColorUtil.rgbToInt(255,255,0,255);
+	    else
+	    {
+	        // determine the average color
+	        tempColor = ColorUtil.rgbToInt(
+	                (int) (Math.sqrt(alpha/count)*255.),
+	                (int) (Math.sqrt(red / count)*255.),
+	                (int) (Math.sqrt(green / count)*255.),
+	                (int) (Math.sqrt(blue / count)*255.));
+	    }
+	    // TODO: Remove this when transparency is added!
+	    double colorAlpha = ColorUtil.getAlpha(tempColor)/255.;
+	    tempColor = ColorUtil.rgbToInt(
+	    		ColorUtil.getAlpha(tempColor),
+	    		(int)(ColorUtil.getRed(tempColor) * colorAlpha),
+	    		(int)(ColorUtil.getGreen(tempColor) * colorAlpha),
+	    		(int)(ColorUtil.getBlue(tempColor) * colorAlpha)
+	    		);
+		return tempColor;
+	}
+
+	private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
+
+	private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
+	
+	private static boolean isBlockToBeAvoid(Block b) {
+		for (Block bta : BLOCK_TO_AVOID)
+			if (bta==b) return true;
+		return false;
+	}
+	
+	final BlockState state;
+	
+	//boolean isShapeResolved = false;
+	//^ Shapes no longer lazy resolved due to memory leaks from needing
+	// to keep a reference to the block getter
+
+	boolean[] dontOccludeFaces = null;
+	boolean noCollision = false;
+	boolean noFullFace = false;
+	
+	boolean isColorResolved = false;
+	int baseColor = 0; //TODO: Impl per-face color
+	boolean needShade = true;
+	boolean needPostTinting = false;
+	int tintIndex = 0;
+	
+	public static BlockDetailWrapper NULL_BLOCK_DETAIL = new BlockDetailWrapper();
+	
+	public BlockDetailWrapper(BlockState state, BlockPos pos, LevelReader getter) {
+		this.state = state;
+		resolveShapes(getter, pos);
+		//ApiShared.LOGGER.info("Created BlockDetailWrapper for blockstate {} at {}", state, pos);
+	}
+	
+	private BlockDetailWrapper() {
+		this.state = null;
+	}
+
+	static BlockDetailWrapper make(BlockState bs, BlockPos pos, LevelReader getter) {
+		if(!bs.getFluidState().isEmpty()) { // Is a fluidBlock
+			if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+			if (bs.isAir()) return NULL_BLOCK_DETAIL;
+			return new BlockDetailWrapper(bs, pos, getter);
+		} else {
+			if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
+			if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+			return new BlockDetailWrapper(bs, pos, getter);
+		}
+	}
+	
+	private void resolveShapes(LevelReader sampleGetter, BlockPos samplePos) {
+		//if (isShapeResolved) return;
+		if (state.getFluidState().isEmpty()) {
+			noCollision = state.getCollisionShape(sampleGetter, samplePos).isEmpty();
+			dontOccludeFaces = new boolean[6];
+			if (state.canOcclude()) {
+				/* FIXME: Figure out how or if needed to impl per-face culling?
+				for (Direction dir : Direction.values()) {
+					dontOccludeFaces[McObjectConverter.Convert(dir).ordinal()]
+							= state.getFaceOcclusionShape(sampleGetter, samplePos, dir).isEmpty();
+				}*/
+			} else {
+				Arrays.fill(dontOccludeFaces, true);
+			}
+			
+			VoxelShape voxelShape = state.getShape(sampleGetter, samplePos);
+            if (voxelShape.isEmpty()) {
+            	noFullFace = true;
+            } else {
+	            AABB bbox = voxelShape.bounds();
+	            double xWidth = (bbox.maxX - bbox.minX);
+	            double yWidth = (bbox.maxY - bbox.minY);
+	            double zWidth = (bbox.maxZ - bbox.minZ);
+	            noFullFace = xWidth < 1 && zWidth < 1 && yWidth < 1;
+            }
+		} else { // Liquid Block
+			dontOccludeFaces = new boolean[6];
+		}
+	}
+	
+	private void resolveColors() {
+		if (isColorResolved) return;
+		if (state.getFluidState().isEmpty()) {
+			List<BakedQuad> quads = null;
+			for (Direction direction : DIRECTION_ORDER)
+	        {
+	        	quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+	        			getBlockModel(state).getQuads(state, direction, random);
+	            if (!quads.isEmpty() &&
+	            	!(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
+	                break;
+	        };
+			if (quads == null || quads.isEmpty()) {
+				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+						getBlockModel(state).getQuads(state, null, random);
+			}
+	        if (quads != null && !quads.isEmpty()) {
+	        	needPostTinting = quads.get(0).isTinted();
+	        	needShade = quads.get(0).isShade();
+	        	tintIndex = quads.get(0).getTintIndex();
+	        	baseColor = calculateColorFromTexture(
+						#if PRE_MC_1_17_1 quads.get(0).sprite,
+						#else quads.get(0).getSprite(), #endif
+	        		ColorMode.getColorMode(state.getBlock()));
+	        } else { // Backup method.
+				needPostTinting = false;
+				needShade = false;
+				tintIndex = 0;
+				baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+						ColorMode.getColorMode(state.getBlock()));
+			}
+		} else { // Liquid Block
+			needPostTinting = true;
+			needShade = false;
+			tintIndex = 0;
+			baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+					ColorMode.getColorMode(state.getBlock()));
+		}
+		isColorResolved = true;
+	}
+	
+	private BlockAndTintGetter wrapColorResolver(LevelReader level) {
+		int blendDistance = CONFIG.client().graphics().quality().getLodBiomeBlending();
+		if (blendDistance == 0) {
+			return new TintGetterOverrideFast(level);
+		} else {
+			return new TintGetterOverrideSmooth(level, blendDistance);
+		}
+	}
+	
+	@Override
+	public int getAndResolveFaceColor(LodDirection dir, IChunkWrapper chunk, AbstractBlockPosWrapper blockPos)
+	{
+		// FIXME: impl per-face colors
+		resolveColors();
+		if (!needPostTinting) return baseColor;
+		int tintColor = Minecraft.getInstance().getBlockColors()
+				.getColor(state, wrapColorResolver(((ChunkWrapper)chunk).getColorResolver()),
+					McObjectConverter.Convert(blockPos), tintIndex);
+		if (tintColor == -1) return baseColor;
+		return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
+	}
+
+	@Override
+	public boolean hasFaceCullingFor(LodDirection dir)
+	{
+		//resolveShapes();
+		return !dontOccludeFaces[dir.ordinal()];
+	}
+
+	@Override
+	public boolean hasNoCollision()
+	{
+		//resolveShapes();
+		return noCollision;
+	}
+
+	@Override
+	public boolean noFaceIsFullFace()
+	{
+		//resolveShapes();
+		return noFullFace;
+	}
+
+	@Override
+	public String serialize()
+	{
+		// FIXME: Impl this for the blockState Storage stuff
+		return null;
+	}
+
+	@Override
+	protected boolean isSame(IBlockDetailWrapper iBlockDetail)
+	{
+		return ((BlockDetailWrapper)iBlockDetail).state.getBlock().equals(state.getBlock());
+	}
+
+	public String toString() {
+		return "BlockDetail{" + state + "}";
+	}
+}

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockPosWrapper.java

@@ -0,0 +1,103 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import java.util.Objects;
+
+import com.seibel.lod.core.enums.LodDirection;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+
+import net.minecraft.core.BlockPos;
+
+
+/**
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+public class BlockPosWrapper extends AbstractBlockPosWrapper
+{
+    private final BlockPos.MutableBlockPos blockPos;
+
+
+    public BlockPosWrapper()
+    {
+        this.blockPos = new BlockPos.MutableBlockPos(0,0,0);
+    }
+
+    public BlockPosWrapper(int x, int y, int z)
+    {
+        this.blockPos = new BlockPos.MutableBlockPos(x, y, z);
+    }
+
+
+
+    @Override
+    public void set(int x, int y, int z)
+    {
+        blockPos.set(x, y, z);
+    }
+
+    @Override
+    public int getX()
+    {
+        return blockPos.getX();
+    }
+
+    @Override
+    public int getY()
+    {
+        return blockPos.getY();
+    }
+
+    @Override
+    public int getZ()
+    {
+        return blockPos.getZ();
+    }
+
+    @Override
+    public int get(LodDirection.Axis axis)
+    {
+        return axis.choose(getX(), getY(), getZ());
+    }
+
+    public BlockPos.MutableBlockPos getBlockPos()
+    {
+        return blockPos;
+    }
+
+    @Override public boolean equals(Object o)
+    {
+        return blockPos.equals(o);
+    }
+
+    @Override public int hashCode()
+    {
+        return Objects.hash(blockPos);
+    }
+
+    @Override
+    public BlockPosWrapper offset(int x, int y, int z)
+    {
+        blockPos.set(blockPos.getX() + x, blockPos.getY() + y, blockPos.getZ() + z);
+        return this;
+    }
+
+}

common/src/main/java/com/seibel/lod/common/wrappers/block/TextureAtlasSpriteWrapper.java

@@ -0,0 +1,52 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+
+/**
+ * For wrapping/utilizing around TextureAtlasSprite
+ * @author Ran
+ */
+public class TextureAtlasSpriteWrapper {
+
+    /**
+     * This code is from Minecraft Forge
+     * Which is licensed under the terms of GNU Lesser General Public License
+     * as published by the Free Software Foundation version 2.1
+     * of the License.
+     *
+     * The code has been modified to use TextureAtlasSprite
+     */
+    public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
+        #if PRE_MC_1_17_1
+        return sprite.mainImage[0].getPixelRGBA(
+                x + sprite.framesX[frameIndex] * sprite.getWidth(),
+                y + sprite.framesY[frameIndex] * sprite.getHeight());
+        #else
+        if (sprite.animatedTexture != null) {
+            x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
+            y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
+        }
+        return sprite.mainImage[0].getPixelRGBA(x, y);
+        #endif
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java

@@ -0,0 +1,217 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import com.seibel.lod.common.LodCommonMain;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class TintGetterOverrideFast implements BlockAndTintGetter {
+    LevelReader parent;
+
+    public TintGetterOverrideFast(LevelReader parent) {
+        this.parent = parent;
+    }
+
+    private Biome _getBiome(BlockPos pos) {
+		#if POST_MC_1_18_2
+        return parent.getBiome(pos).value();
+		#else
+		return parent.getBiome(pos);
+		#endif
+    }
+
+    @Override
+    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
+        if (LodCommonMain.forgeMethodCaller != null) {
+            return LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(blockPos),
+                    blockPos.getX(), blockPos.getZ());
+        } else {
+            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+        }
+    }
+
+    @Override
+    public float getShade(Direction direction, boolean bl) {
+        return parent.getShade(direction, bl);
+    }
+
+    @Override
+    public LevelLightEngine getLightEngine() {
+        return parent.getLightEngine();
+    }
+
+    @Override
+    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
+        return parent.getBrightness(lightLayer, blockPos);
+    }
+
+    @Override
+    public int getRawBrightness(BlockPos blockPos, int i) {
+        return parent.getRawBrightness(blockPos, i);
+    }
+
+    @Override
+    public boolean canSeeSky(BlockPos blockPos) {
+        return parent.canSeeSky(blockPos);
+    }
+
+    @Override
+    @Nullable
+    public BlockEntity getBlockEntity(BlockPos blockPos) {
+        return parent.getBlockEntity(blockPos);
+    }
+
+
+    @Override
+    public BlockState getBlockState(BlockPos blockPos) {
+        return parent.getBlockState(blockPos);
+    }
+
+    @Override
+    public FluidState getFluidState(BlockPos blockPos) {
+        return parent.getFluidState(blockPos);
+    }
+
+    @Override
+    public int getLightEmission(BlockPos blockPos) {
+        return parent.getLightEmission(blockPos);
+    }
+
+    @Override
+    public int getMaxLightLevel() {
+        return parent.getMaxLightLevel();
+    }
+
+    @Override
+    public Stream<BlockState> getBlockStates(AABB aABB) {
+        return parent.getBlockStates(aABB);
+    }
+
+    @Override
+    public BlockHitResult clip(ClipContext clipContext) {
+        return parent.clip(clipContext);
+    }
+
+    @Override
+    @Nullable
+    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
+        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+    }
+
+    @Override
+    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
+        return parent.getBlockFloorHeight(voxelShape, supplier);
+    }
+
+    @Override
+    public double getBlockFloorHeight(BlockPos blockPos) {
+        return parent.getBlockFloorHeight(blockPos);
+    }
+
+    @Override
+    public int getMaxBuildHeight() {
+        return parent.getMaxBuildHeight();
+    }
+
+    #if POST_MC_1_17_1
+    @Override
+    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
+        return parent.getBlockEntity(blockPos, blockEntityType);
+    }
+
+    @Override
+    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
+        return parent.isBlockInLine(clipBlockStateContext);
+    }
+
+    @Override
+    public int getHeight() {
+        return parent.getHeight();
+    }
+
+    @Override
+    public int getMinBuildHeight() {
+        return parent.getMinBuildHeight();
+    }
+
+    @Override
+    public int getSectionsCount() {
+        return parent.getSectionsCount();
+    }
+
+    @Override
+    public int getMinSection() {
+        return parent.getMinSection();
+    }
+
+    @Override
+    public int getMaxSection() {
+        return parent.getMaxSection();
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(BlockPos blockPos) {
+        return parent.isOutsideBuildHeight(blockPos);
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(int i) {
+        return parent.isOutsideBuildHeight(i);
+    }
+
+    @Override
+    public int getSectionIndex(int i) {
+        return parent.getSectionIndex(i);
+    }
+
+    @Override
+    public int getSectionIndexFromSectionY(int i) {
+        return parent.getSectionIndexFromSectionY(i);
+    }
+
+    @Override
+    public int getSectionYFromSectionIndex(int i) {
+        return parent.getSectionYFromSectionIndex(i);
+    }
+    #endif
+}

common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java

@@ -0,0 +1,241 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import com.seibel.lod.common.LodCommonMain;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class TintGetterOverrideSmooth implements BlockAndTintGetter {
+    LevelReader parent;
+    public int smoothingRange;
+
+    public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
+        this.parent = parent;
+        this.smoothingRange = smoothingRange;
+    }
+
+    private Biome _getBiome(BlockPos pos) {
+		#if POST_MC_1_18_2
+        return parent.getBiome(pos).value();
+		#else
+        return parent.getBiome(pos);
+		#endif
+    }
+
+    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+    {
+        int i = smoothingRange;
+        if (i == 0)
+            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+        int j = (i * 2 + 1) * (i * 2 + 1);
+        int k = 0;
+        int l = 0;
+        int m = 0;
+        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
+        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+        while (cursor3D.advance())
+        {
+            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
+            int n;
+            if (LodCommonMain.forgeMethodCaller != null) {
+                n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
+                        mutableBlockPos.getX(), mutableBlockPos.getZ());
+            } else {
+                n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+            }
+
+            k += (n & 0xFF0000) >> 16;
+            l += (n & 0xFF00) >> 8;
+            m += n & 0xFF;
+        }
+        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
+    }
+
+    @Override
+    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
+        return calculateBlockTint(blockPos, colorResolver);
+    }
+
+    @Override
+    public float getShade(Direction direction, boolean bl) {
+        return parent.getShade(direction, bl);
+    }
+
+    @Override
+    public LevelLightEngine getLightEngine() {
+        return parent.getLightEngine();
+    }
+
+    @Override
+    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
+        return parent.getBrightness(lightLayer, blockPos);
+    }
+
+    @Override
+    public int getRawBrightness(BlockPos blockPos, int i) {
+        return parent.getRawBrightness(blockPos, i);
+    }
+
+    @Override
+    public boolean canSeeSky(BlockPos blockPos) {
+        return parent.canSeeSky(blockPos);
+    }
+
+    @Override
+    @Nullable
+    public BlockEntity getBlockEntity(BlockPos blockPos) {
+        return parent.getBlockEntity(blockPos);
+    }
+
+    @Override
+    public BlockState getBlockState(BlockPos blockPos) {
+        return parent.getBlockState(blockPos);
+    }
+
+    @Override
+    public FluidState getFluidState(BlockPos blockPos) {
+        return parent.getFluidState(blockPos);
+    }
+
+    @Override
+    public int getLightEmission(BlockPos blockPos) {
+        return parent.getLightEmission(blockPos);
+    }
+
+    @Override
+    public int getMaxLightLevel() {
+        return parent.getMaxLightLevel();
+    }
+
+    @Override
+    public Stream<BlockState> getBlockStates(AABB aABB) {
+        return parent.getBlockStates(aABB);
+    }
+
+    @Override
+    public BlockHitResult clip(ClipContext clipContext) {
+        return parent.clip(clipContext);
+    }
+
+    @Override
+    @Nullable
+    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
+        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+    }
+
+    @Override
+    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
+        return parent.getBlockFloorHeight(voxelShape, supplier);
+    }
+
+    @Override
+    public double getBlockFloorHeight(BlockPos blockPos) {
+        return parent.getBlockFloorHeight(blockPos);
+    }
+
+    @Override
+    public int getMaxBuildHeight() {
+        return parent.getMaxBuildHeight();
+    }
+
+    #if POST_MC_1_17_1
+    @Override
+    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
+        return parent.getBlockEntity(blockPos, blockEntityType);
+    }
+
+    @Override
+    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
+        return parent.isBlockInLine(clipBlockStateContext);
+    }
+
+    @Override
+    public int getHeight() {
+        return parent.getHeight();
+    }
+
+    @Override
+    public int getMinBuildHeight() {
+        return parent.getMinBuildHeight();
+    }
+
+    @Override
+    public int getSectionsCount() {
+        return parent.getSectionsCount();
+    }
+
+    @Override
+    public int getMinSection() {
+        return parent.getMinSection();
+    }
+
+    @Override
+    public int getMaxSection() {
+        return parent.getMaxSection();
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(BlockPos blockPos) {
+        return parent.isOutsideBuildHeight(blockPos);
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(int i) {
+        return parent.isOutsideBuildHeight(i);
+    }
+
+    @Override
+    public int getSectionIndex(int i) {
+        return parent.getSectionIndex(i);
+    }
+
+    @Override
+    public int getSectionIndexFromSectionY(int i) {
+        return parent.getSectionIndexFromSectionY(i);
+    }
+
+    @Override
+    public int getSectionYFromSectionIndex(int i) {
+        return parent.getSectionYFromSectionIndex(i);
+    }
+    #endif
+}

common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java

@@ -0,0 +1,159 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.chunk;
+
+import java.util.Objects;
+
+import com.seibel.lod.core.util.LevelPosUtil;
+import com.seibel.lod.core.util.LodUtil;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.ChunkPos;
+
+
+/**
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+public class ChunkPosWrapper extends AbstractChunkPosWrapper
+{
+    private final net.minecraft.world.level.ChunkPos chunkPos;
+
+    public ChunkPosWrapper()
+    {
+        this.chunkPos = new ChunkPos(0, 0);
+    }
+
+    public ChunkPosWrapper(BlockPos blockPos)
+    {
+        this.chunkPos = new ChunkPos(blockPos);
+    }
+
+    public ChunkPosWrapper(AbstractChunkPosWrapper newChunkPos)
+    {
+        this.chunkPos = ((ChunkPosWrapper) newChunkPos).chunkPos;
+    }
+
+    public ChunkPosWrapper(AbstractBlockPosWrapper blockPos)
+    {
+        this.chunkPos = new ChunkPos(((BlockPosWrapper) blockPos).getBlockPos());
+    }
+
+    public ChunkPosWrapper(int chunkX, int chunkZ)
+    {
+        this.chunkPos = new ChunkPos(chunkX, chunkZ);
+    }
+    
+    public ChunkPosWrapper(long l) {
+    	this.chunkPos = new ChunkPos(l);
+    }
+
+
+    public ChunkPosWrapper(ChunkPos pos)
+    {
+        this.chunkPos = pos;
+    }
+
+
+
+
+    @Override
+    public int getX()
+    {
+        return chunkPos.x;
+    }
+
+    @Override
+    public int getZ()
+    {
+        return chunkPos.z;
+    }
+
+    @Override
+    public int getMinBlockX()
+    {
+        return chunkPos.getMinBlockX();
+    }
+
+    @Override
+    public int getMinBlockZ()
+    {
+        return chunkPos.getMinBlockZ();
+    }
+
+    @Override
+    public int getRegionX()
+    {
+    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL);
+    }
+
+    @Override
+    public int getRegionZ()
+    {
+    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
+    }
+    
+    @Override
+    public long getLong() {
+    	return chunkPos.toLong();
+    }
+
+    public ChunkPos getChunkPos()
+    {
+        return chunkPos;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+		// If the object is compared with itself then return true 
+        if (o == this) {
+            return true;
+        }
+        // Check if o is an instance of RegionPos or not
+        if (!(o instanceof ChunkPosWrapper)) {
+            return false;
+        }
+        ChunkPosWrapper c = (ChunkPosWrapper) o;
+        return c.chunkPos.equals(chunkPos);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hash(chunkPos);
+    }
+
+    @Override
+    public AbstractBlockPosWrapper getWorldPosition()
+    {
+        // the parameter here is the y position
+        #if PRE_MC_1_17_1
+        BlockPos blockPos = chunkPos.getWorldPosition();
+        #else
+        BlockPos blockPos = chunkPos.getMiddleBlockPosition(0);
+        #endif
+        return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
+    }
+
+}

common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java

@@ -0,0 +1,251 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.chunk;
+
+import com.seibel.lod.common.wrappers.block.BlockDetailWrapper;
+import com.seibel.lod.core.enums.LodDirection;
+import com.seibel.lod.core.util.LevelPosUtil;
+import com.seibel.lod.core.util.LodUtil;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
+
+import com.seibel.lod.common.wrappers.WrapperUtil;
+import com.seibel.lod.common.wrappers.block.BlockDetailMap;
+import com.seibel.lod.common.wrappers.world.BiomeWrapper;
+import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
+
+import net.minecraft.core.BlockPos;
+#if POST_MC_1_17_1
+import net.minecraft.core.QuartPos;
+#endif
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.block.LiquidBlockContainer;
+import net.minecraft.world.level.block.SimpleWaterloggedBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.levelgen.Heightmap;
+
+/**
+ *
+ * @author James Seibel
+ * @version 3-5-2022
+ */
+public class ChunkWrapper implements IChunkWrapper
+{
+	private final ChunkAccess chunk;
+	private final LevelReader lightSource;
+	
+	
+	public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource)
+	{
+		this.chunk = chunk;
+		this.lightSource = lightSource;
+	}
+	
+	@Override
+	public int getHeight(){
+		#if PRE_MC_1_17_1
+		return 255;
+		#else
+		return chunk.getHeight();
+		#endif
+	}
+	
+	@Override
+	public int getMinBuildHeight()
+	{
+		#if PRE_MC_1_17_1
+		return 0;
+		#else
+		return chunk.getMinBuildHeight();
+		#endif
+	}
+	@Override
+	public int getMaxBuildHeight()
+	{
+		return chunk.getMaxBuildHeight();
+	}
+	
+	@Override
+	public int getHeightMapValue(int xRel, int zRel)
+	{
+		return chunk.getOrCreateHeightmapUnprimed(WrapperUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
+	}
+	
+	@Override
+	public IBiomeWrapper getBiome(int x, int y, int z)
+	{
+		#if PRE_MC_1_17_1
+		return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
+				x >> 2, y >> 2, z >> 2));
+		#elif PRE_MC_1_18_1
+		return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
+				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
+		#elif PRE_MC_1_18_2
+		return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
+				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
+		#else
+		return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
+				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)).value());
+		#endif
+	}
+	
+	@Override
+	public IBlockDetailWrapper getBlockDetail(int x, int y, int z) {
+		BlockPos pos = new BlockPos(x,y,z);
+		BlockState blockState = chunk.getBlockState(pos);
+		IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
+		return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
+	}
+
+    @Override
+    public IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, LodDirection dir) {
+        int fy = y+dir.getNormal().y;
+        if (fy < getMinBuildHeight() || fy > getMaxBuildHeight()) return null;
+        BlockPos pos = new BlockPos(x+dir.getNormal().x,fy,z+dir.getNormal().z);
+        BlockState blockState;
+        if (blockPosInsideChunk(x,y,z))
+            blockState = chunk.getBlockState(pos);
+        else {
+            blockState = lightSource.getBlockState(pos);
+        }
+        if (blockState == null || blockState.isAir()) return null;
+		IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
+        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
+    }
+	
+	public ChunkAccess getChunk() {
+		return chunk;
+	}
+	
+	@Override
+	public int getChunkPosX(){
+		return chunk.getPos().x;
+	}
+	
+	@Override
+	public int getChunkPosZ(){
+		return chunk.getPos().z;
+	}
+	
+	@Override
+	public int getRegionPosX(){
+		return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL);
+	}
+	
+	@Override
+	public int getRegionPosZ(){
+		return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
+	}
+	
+	@Override
+	public int getMaxY(int x, int z) {
+		return chunk.getHeight(Heightmap.Types.WORLD_SURFACE, Math.floorMod(x, 16), Math.floorMod(z, 16));
+	}
+	
+	@Override
+	public int getMaxX(){
+		return chunk.getPos().getMaxBlockX();
+	}
+	@Override
+	public int getMaxZ(){
+		return chunk.getPos().getMaxBlockZ();
+	}
+	@Override
+	public int getMinX(){
+		return chunk.getPos().getMinBlockX();
+	}
+	@Override
+	public int getMinZ() {
+		return chunk.getPos().getMinBlockZ();
+	}
+	
+	@Override
+	public long getLongChunkPos() {
+		return chunk.getPos().toLong();
+	}
+	
+	@Override
+	public boolean isLightCorrect(){
+		#if PRE_MC_1_18_1
+		return true;
+		#else
+		if (chunk instanceof LevelChunk) {
+			return ((LevelChunk) chunk).isClientLightReady();
+		}
+		return chunk.isLightCorrect();
+		#endif
+	}
+	
+	public boolean isWaterLogged(int x, int y, int z)
+	{
+		BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
+		
+		//This type of block is always in water
+		return (!(blockState.getBlock() instanceof LiquidBlockContainer) && (blockState.getBlock() instanceof SimpleWaterloggedBlock))
+				&& (blockState.hasProperty(BlockStateProperties.WATERLOGGED) && blockState.getValue(BlockStateProperties.WATERLOGGED));
+	}
+	
+	@Override
+	public int getEmittedBrightness(int x, int y, int z)
+	{
+		return chunk.getLightEmission(new BlockPos(x,y,z));
+	}
+	
+	@Override
+	public int getBlockLight(int x, int y, int z) {
+		if (lightSource == null) return -1;
+		return lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
+	}
+	
+	@Override
+	public int getSkyLight(int x, int y, int z) {
+		if (lightSource == null) return -1;
+		return lightSource.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
+	}
+	
+	@Override
+	public boolean doesNearbyChunksExist() {
+		if (lightSource instanceof LightedWorldGenRegion) return true;
+		for (int dx = -1; dx <= 1; dx++) {
+			for (int dz = -1; dz <= 1; dz++) {
+				if (dx==0 && dz==0) continue;
+				if (lightSource.getChunk(dx+getChunkPosX(), dz+getChunkPosZ(), ChunkStatus.BIOMES, false) == null) return false;
+			}
+		}
+		return true;
+	}
+	
+	public LevelReader getColorResolver()
+	{
+		return lightSource;
+	}
+
+	@Override
+	public String toString() {
+		return chunk.getClass().getSimpleName() + chunk.getPos();
+	}
+	
+}

common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java

@@ -0,0 +1,817 @@
+package com.seibel.lod.common.wrappers.config;
+
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+// Logger (for debug stuff)
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this)
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+
+// Gets info from our own mod
+
+import com.seibel.lod.common.LodCommonMain;
+import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.core.config.*;
+
+// Minecraft imports
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.ContainerObjectSelectionList;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+#if PRE_MC_1_19
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
+#endif
+import net.minecraft.client.resources.language.I18n;	// translation
+#if POST_MC_1_17_1
+import net.minecraft.client.gui.narration.NarratableEntry;
+#endif
+
+/**
+ * Based upon TinyConfig
+ * https://github.com/Minenash/TinyConfig
+ *
+ * This config should work for both Fabric and Forge as long as you use Mojang mappings
+ *
+ * Credits to Motschen
+ *
+ * REMOVED IN a1.7
+ *
+ * @author coolGi
+ * @version 1-14-2022
+ */
+@Deprecated
+@SuppressWarnings("unchecked")
+public abstract class ConfigGui
+{
+	private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)");
+	private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
+
+	private static final List<EntryInfo> entries = new ArrayList<>();
+	public static final Map<String,EntryInfo> entryMap = new HashMap<>();
+
+	// Change these to your own mod
+	private static final String MOD_NAME = ModInfo.NAME;					// For file saving and identifying
+	private static final String MOD_NAME_READABLE = ModInfo.READABLE_NAME;	// For logs
+	//	private static final Logger LOGGER = ApiShared.LOGGER;						// For logs
+	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME);		// For logs (this inits before ClientAPI so this is a temp fix)
+
+
+
+
+	//==============//
+	// Initializers //
+	//==============//
+
+	private static class ConfigScreenConfigs
+	{
+		// This contains all the configs for the configs
+		public static final int SpaceFromRightScreen = 10;
+		public static final int ButtonWidthSpacing = 5;
+		public static final int ResetButtonWidth = 40;
+	}
+
+	public static class EntryInfo<T>
+	{
+		Field field;
+		Object widget;
+		int width = 0;
+		int max;
+		Map.Entry<EditBox, Component> error;
+		Object defaultValue;
+		Object value;
+		String tempValue;
+		boolean inLimits = true;
+		#if PRE_MC_1_19
+		TranslatableComponent name;
+		#else
+		Component name;
+		#endif
+		int index;
+		/** Hides the button */
+		boolean hideOption = false;
+		/** This asks if it is a button to goto a new screen */
+		boolean screenButton = false;
+		/** This is only called if button is true */
+		String gotoScreen = "";
+		String category;
+		Class<T> varClass;
+
+
+		@Deprecated
+		boolean fileComment = false;
+	}
+
+	private static Path configFilePath;
+
+
+
+	public static void init(Class<?> config)
+	{
+		Minecraft mc =  Minecraft.getInstance();
+		configFilePath = mc.gameDirectory.toPath().resolve("config").resolve(MOD_NAME + ".toml");
+
+		initNestedClass(config, "");
+
+		for (EntryInfo info : entries) {
+			if (info.field.isAnnotationPresent(ConfigAnnotations.Entry.class)) {
+				try {
+					info.value = info.field.get(null);
+					info.tempValue = info.value.toString();
+				} catch (IllegalAccessException ignored) {
+				}
+			}
+		}
+
+		loadFromFile();
+	}
+
+	private static void initNestedClass(Class<?> config, String category)
+	{
+		for (Field field : config.getFields())
+		{
+			EntryInfo info = new EntryInfo();
+			if (field.isAnnotationPresent(ConfigAnnotations.Entry.class) || field.isAnnotationPresent(ConfigAnnotations.Comment.class) || field.isAnnotationPresent(ConfigAnnotations.ScreenEntry.class))
+			{
+				// If putting in your own mod then put your own check for server sided
+				info.category = category;
+				if (!LodCommonMain.serverSided)
+					initClient(field, info, category);
+			}
+
+			if (field.isAnnotationPresent(ConfigAnnotations.Entry.class))
+			{
+				entryMap.put((!category.isEmpty() ? category + "." : "") + field.getName(), info);
+				info.varClass = field.getType();
+				try
+				{
+					info.defaultValue = field.get(null);
+				}
+				catch (IllegalAccessException ignored) {}
+			}
+
+			if (field.isAnnotationPresent(ConfigAnnotations.ScreenEntry.class))
+				initNestedClass(field.getType(), (!category.isEmpty() ? category + "." : "") + field.getName());
+
+			// File comment (WILL BE REMOVED SOON)
+			if (field.isAnnotationPresent(ConfigAnnotations.FileComment.class)) {
+				entryMap.put((!category.isEmpty() ? category + "." : "") + field.getName(), info);
+				info.fileComment = true;
+				try
+				{
+					info.value = info.defaultValue = field.get(null);
+				}
+				catch (IllegalAccessException ignored) {}
+			}
+
+			info.field = field;
+		}
+	}
+
+	/** This adds the buttons to the queue to be rendered */
+	private static void initClient(Field field, EntryInfo info, String category)
+	{
+		Class<?> fieldClass = field.getType();
+		ConfigAnnotations.Entry entry = field.getAnnotation(ConfigAnnotations.Entry.class);
+		ConfigAnnotations.ScreenEntry screenEntry = field.getAnnotation(ConfigAnnotations.ScreenEntry.class);
+
+		if (entry != null)
+			info.width = entry.width();
+		else if (screenEntry != null)
+			info.width = screenEntry.width();
+
+		if (entry != null)
+		{
+			if (!entry.name().equals(""))
+				#if PRE_MC_1_19
+				info.name = new TranslatableComponent(entry.name());
+				#else
+				info.name = Component.translatable(entry.name());
+				#endif
+
+			if (fieldClass == int.class)
+			{
+				// For int
+				textField(info, Integer::parseInt, INTEGER_ONLY_REGEX, entry.minValue(), entry.maxValue(), true);
+			}
+			else if (fieldClass == double.class)
+			{
+				// For double
+				textField(info, Double::parseDouble, DECIMAL_ONLY_REGEX, entry.minValue(), entry.maxValue(), false);
+			}
+			else if (fieldClass == String.class || fieldClass == List.class)
+			{
+				// For string or list
+				info.max = entry.maxValue() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) entry.maxValue();
+				textField(info, String::length, null, Math.min(entry.minValue(), 0), Math.max(entry.maxValue(), 1), true);
+			}
+			else if (fieldClass == boolean.class)
+			{
+				// For boolean
+				#if PRE_MC_1_19
+				Function<Object, Component> func = value -> new TextComponent((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
+				#else
+				Function<Object, Component> func = value -> Component.translatable((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
+				#endif
+				info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
+					info.value = !(Boolean) info.value;
+					button.setMessage(func.apply(info.value));
+				}, func);
+			}
+			else if (fieldClass.isEnum())
+			{
+				// For enum
+				List<?> values = Arrays.asList(field.getType().getEnumConstants());
+				#if PRE_MC_1_19
+				Function<Object, Component> func = value -> new TranslatableComponent(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString());
+				#else
+				Function<Object, Component> func = value -> Component.translatable(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString());
+				#endif
+				info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
+					int index = values.indexOf(info.value) + 1;
+					info.value = values.get(index >= values.size() ? 0 : index);
+					button.setMessage(func.apply(info.value));
+				}, func);
+			}
+		}
+		else if (screenEntry != null)
+		{
+			if (!screenEntry.name().equals(""))
+				#if PRE_MC_1_19
+				info.name = new TranslatableComponent(screenEntry.name());
+				#else
+				info.name = Component.translatable(screenEntry.name());
+				#endif
+
+
+			info.screenButton = true;
+			info.gotoScreen = (!info.category.isEmpty() ? info.category + "." : "") + field.getName();
+		}
+		entries.add(info);
+	}
+
+
+
+
+	/** creates a text field */
+	private static void textField(EntryInfo info, Function<String, Number> func, Pattern pattern, double minValue, double maxValue, boolean cast)
+	{
+		boolean isNumber = pattern != null;
+		info.widget = (BiFunction<EditBox, Button, Predicate<String>>) (editBox, button) -> stringValue ->
+		{
+			stringValue = stringValue.trim();
+			if (!(stringValue.isEmpty() || !isNumber || pattern.matcher(stringValue).matches()))
+				return false;
+
+			Number value = 0;
+			boolean inLimits = false;
+			info.error = null;
+			if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals("."))
+			{
+				value = func.apply(stringValue);
+				inLimits = value.doubleValue() >= minValue && value.doubleValue() <= maxValue;
+				#if PRE_MC_1_19
+				info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, new TextComponent(value.doubleValue() < minValue ?
+				#else
+				info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, Component.translatable(value.doubleValue() < minValue ?
+				#endif
+						"§cMinimum " + "length" + (cast ? " is " + (int) minValue : " is " + minValue) :
+						"§cMaximum " + "length" + (cast ? " is " + (int) maxValue : " is " + maxValue)));
+			}
+
+			info.tempValue = stringValue;
+			editBox.setTextColor(inLimits ? 0xFFFFFFFF : 0xFFFF7777);
+			info.inLimits = inLimits;
+			button.active = entries.stream().allMatch(e -> e.inLimits);
+
+
+			if (inLimits && info.field.getType() != List.class)
+			{
+				info.value = value;
+			}
+			else if (inLimits)
+			{
+				if (((List<String>) info.value).size() == info.index)
+					((List<String>) info.value).add("");
+				((List<String>) info.value).set(info.index, Arrays.stream(info.tempValue.replace("[", "").replace("]", "").split(", ")).collect(Collectors.toList()).get(0));
+			}
+
+			return true;
+		};
+	}
+
+
+
+
+	//===============//
+	// File Handling //
+	//===============//
+
+	/** Grabs what is in the config and puts it in modid.toml */
+	public static void saveToFile()
+	{
+		CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).build();
+
+		// First try to create a config file
+		try {
+			if (!configFilePath.getParent().toFile().exists())
+				Files.createDirectory(configFilePath.getParent());
+			if (!Files.exists(configFilePath))
+				Files.createFile(configFilePath);
+		}
+		catch (Exception e) {
+			LOGGER.info("Failed creating config file for " + MOD_NAME_READABLE + " at the path [" + configFilePath.toString() + "].");
+			e.printStackTrace();
+		}
+
+		loadFileWithErrorCheck(config);
+
+
+		// Just put this here for the future
+		config.set("_version", 1);
+
+
+		for (EntryInfo info : entries) {
+			if (info.field.isAnnotationPresent(ConfigAnnotations.Entry.class)) {
+				editSingleOption.saveOption(info, config);
+
+				if (editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()) != null)
+					config.setComment((info.category.isEmpty() ? "" : info.category + ".") + info.field.getName(), String.valueOf(editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()).defaultValue));
+			}
+		}
+
+		config.save();
+		config.close();
+	}
+
+	/**
+	 * Grabs what is in modid.toml and puts it into the config
+	 * If the file doesn't exist then it runs saveToFile
+	 */
+	public static void loadFromFile()
+	{
+		CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).autosave().build();
+
+		// First checks if the config file was already made
+		if (!Files.exists(configFilePath)) {
+			LOGGER.info("Config file not found for " + MOD_NAME_READABLE + ". Creating config...");
+			saveToFile();
+			return;
+		}
+
+		loadFileWithErrorCheck(config);
+
+
+		// Just put this here for the future
+		config.set("_version", 1);
+
+
+		// Puts everything into its variable
+		for (EntryInfo info : entries) {
+			if (info.field.isAnnotationPresent(ConfigAnnotations.Entry.class)) {
+				editSingleOption.loadOption(info, config);
+
+				// File comments (WILL REMOVE SOON)
+				if (editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()) != null)
+					config.setComment((info.category.isEmpty() ? "" : info.category + ".") + info.field.getName(), String.valueOf(editSingleOption.getEntry((info.category.isEmpty() ? "" : info.category + ".") + "_" + info.field.getName()).defaultValue));
+			}
+		}
+
+		config.close();
+	}
+
+	public static class editSingleOption {
+		/** Get the entry info of an item using its string name */
+		public static EntryInfo getEntry(String name)
+		{
+			return entryMap.get(name);
+		}
+
+		/** Save a single item using its string name */
+		public static void saveOption(String name)
+		{
+			saveOption(entryMap.get(name));
+		}
+
+		/** Saves a single item using entry info */
+		public static void saveOption(EntryInfo info)
+		{
+			CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).autosave().build();
+
+			loadFileWithErrorCheck(config);
+
+			saveOption(info, config);
+
+			config.close();
+		}
+
+		/** Saves a single item using its entry info and its config builder */
+		public static void saveOption(EntryInfo info, CommentedFileConfig config)
+		{
+			config.set((info.category.isEmpty() ? "" : info.category + ".") + info.field.getName(), info.value);
+		}
+
+		/** Load a single item using its string name */
+		public static void loadOption(String name)
+		{
+			loadOption(entryMap.get(name));
+		}
+
+		/** Load a single item using entry info */
+		public static void loadOption(EntryInfo info)
+		{
+			CommentedFileConfig config = CommentedFileConfig.builder(configFilePath.toFile()).autosave().build();
+
+			loadFileWithErrorCheck(config);
+
+			loadOption(info, config);
+
+			config.close();
+		}
+
+		/** Loads a single item using its entry info and its config builder */
+		public static void loadOption(EntryInfo info, CommentedFileConfig config)
+		{
+			String itemPath = (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName();
+			if (config.contains(itemPath)) {
+				if (info.field.getType().isEnum()) {
+					try {
+						info.value = config.getEnum(itemPath, info.varClass);
+					} catch (IllegalArgumentException ignored) {
+						return;
+					}
+				}
+				else
+					info.value = config.get(itemPath);
+			} else
+				config.set(itemPath, info.value);
+
+			try {
+				info.field.set(null, info.value);
+			} catch (IllegalAccessException ignored) {
+			}
+		}
+	}
+
+	/** Dose config.load(); but with error checking to avoid crashes */
+	public static void loadFileWithErrorCheck(CommentedFileConfig config) {
+		try {
+			config.load();
+		} catch (Exception e) {
+			LOGGER.info("Error loading config for " + MOD_NAME_READABLE + " at the path [" + configFilePath.toString() + "].");
+			LOGGER.info("Creating a new config...");
+			try {
+				Files.deleteIfExists(configFilePath);
+				saveToFile();
+			} catch (Exception f) {
+				LOGGER.info("Failed creating config file for " + MOD_NAME_READABLE + " at the path [" + configFilePath.toString() + "].");
+				f.printStackTrace();
+			}
+		}
+	}
+
+
+
+
+	//==============//
+	// GUI handling //
+	//==============//
+
+	public static Screen getScreen(Screen parent, String category)
+	{
+		return new ConfigScreen(parent, category);
+	}
+
+	private static class ConfigScreen extends Screen
+	{
+		protected ConfigScreen(Screen parent, String category)
+		{
+			#if PRE_MC_1_19
+			super(new TranslatableComponent(
+			#else
+			super(Component.translatable(
+			#endif
+					I18n.exists(MOD_NAME + ".config" + (category.isEmpty()? "." + category : "") + ".title") ?
+							MOD_NAME + ".config.title" :
+							MOD_NAME + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
+			);
+			this.parent = parent;
+			this.category = category;
+			this.translationPrefix = MOD_NAME + ".config.";
+		}
+
+		private final String translationPrefix;
+		private final Screen parent;
+		private final String category;
+		private ConfigListWidget list;
+		private boolean reload = false;
+
+		// Real Time config update //
+		@Override
+		public void tick()
+		{
+			super.tick();
+		}
+
+
+		/** When you close it, it goes to the previous screen and saves */
+		@Override
+		public void onClose()
+		{
+			saveToFile();
+			Objects.requireNonNull(minecraft).setScreen(this.parent);
+		}
+
+		// addRenderableWidget in 1.17 and over
+		// addButton in 1.16 and below
+		private Button addBtn(Button button) {
+			#if PRE_MC_1_17_1
+			this.addButton(button);
+			#else
+			this.addRenderableWidget(button);
+			#endif
+			return button;
+		}
+
+		@Override
+		protected void init()
+		{
+			super.init();
+			if (!reload)
+				loadFromFile();
+
+			addBtn(new Button(this.width / 2 - 154, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, button -> {
+				loadFromFile();
+				Objects.requireNonNull(minecraft).setScreen(parent);
+			}));
+			Button done = addBtn(new Button(this.width / 2 + 4, this.height - 28, 150, 20, CommonComponents.GUI_DONE, (button) -> {
+				saveToFile();
+				Objects.requireNonNull(minecraft).setScreen(parent);
+			}));
+
+			this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, this.height - 32, 25);
+			if (this.minecraft != null && this.minecraft.level != null)
+				this.list.setRenderBackground(false);
+			this.addWidget(this.list);
+			for (EntryInfo info : entries)
+			{
+				if (info.category.matches(category) && !info.hideOption)
+				{
+					#if PRE_MC_1_19
+					TranslatableComponent name = (info.name == null ? new TranslatableComponent(translationPrefix + (!info.category.isEmpty() ? info.category + "." : "") + info.field.getName()) : info.name);
+					Button resetButton = new Button(this.width - ConfigScreenConfigs.SpaceFromRightScreen - info.width - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth, 0, ConfigScreenConfigs.ResetButtonWidth, 20, new TextComponent("Reset").withStyle(ChatFormatting.RED), (button -> {
+					#else
+					Component name = (info.name == null ? Component.translatable(translationPrefix + (!info.category.isEmpty() ? info.category + "." : "") + info.field.getName()) : info.name);
+					Button resetButton = new Button(this.width - ConfigScreenConfigs.SpaceFromRightScreen - info.width - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth, 0, ConfigScreenConfigs.ResetButtonWidth, 20, Component.translatable("Reset").withStyle(ChatFormatting.RED), (button -> {
+					#endif
+						info.value = info.defaultValue;
+						info.tempValue = info.defaultValue.toString();
+						info.index = 0;
+						this.reload = true;
+						Objects.requireNonNull(minecraft).setScreen(this);
+					}));
+
+					if (info.widget instanceof Map.Entry)
+					{
+						Map.Entry<Button.OnPress, Function<Object, Component>> widget = (Map.Entry<Button.OnPress, Function<Object, Component>>) info.widget;
+						if (info.field.getType().isEnum())
+							#if PRE_MC_1_19
+							widget.setValue(value -> new TranslatableComponent(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
+							#else
+							widget.setValue(value -> Component.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
+							#endif
+						this.list.addButton(new Button(this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()), resetButton, null, name);
+					}
+					else if (info.field.getType() == List.class)
+					{
+						if (!reload)
+							info.index = 0;
+						EditBox widget = new EditBox(font, this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen, 0, info.width, 20, null);
+						widget.setMaxLength(info.width);
+						if (info.index < ((List<String>) info.value).size())
+							widget.insertText((String.valueOf(((List<String>) info.value).get(info.index))));
+						else
+							widget.insertText("");
+						Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) info.widget).apply(widget, done);
+						widget.setFilter(processor);
+						resetButton.setWidth(20);
+                        #if PRE_MC_1_19
+                        resetButton.setMessage(new TextComponent("R").withStyle(ChatFormatting.RED));
+                        Button cycleButton = new Button(this.width - 185, 0, 20, 20, new TextComponent(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
+                        #else
+                        resetButton.setMessage(Component.translatable("R").withStyle(ChatFormatting.RED));
+                        Button cycleButton = new Button(this.width - 185, 0, 20, 20, Component.translatable(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
+                        #endif
+							((List<String>) info.value).remove("");
+							this.reload = true;
+							info.index = info.index + 1;
+							if (info.index > ((List<String>) info.value).size())
+								info.index = 0;
+							Objects.requireNonNull(minecraft).setScreen(this);
+						}));
+						this.list.addButton(widget, resetButton, cycleButton, name);
+					}
+					else if (info.widget != null)
+					{
+						EditBox widget = new EditBox(font, this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, info.width - 4, 20, null);
+						widget.setMaxLength(info.width);
+						widget.insertText(String.valueOf(info.value));
+						Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) info.widget).apply(widget, done);
+						widget.setFilter(processor);
+						this.list.addButton(widget, resetButton, null, name);
+					}
+					else if (info.screenButton)
+					{
+						Button widget = new Button(this.width / 2 - info.width, this.height - 28, info.width * 2, 20, name, (button -> {
+							saveToFile();
+							Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, info.gotoScreen));
+						}));
+						this.list.addButton(widget, null, null, null);
+					}
+					else if (!info.fileComment)
+					{
+						this.list.addButton(null, null, null, name);
+					}
+				}
+			}
+
+		}
+
+		@Override
+		public void render(PoseStack matrices, int mouseX, int mouseY, float delta)
+		{
+			this.renderBackground(matrices); // Renders background
+			this.list.render(matrices, mouseX, mouseY, delta); // Render buttons
+			drawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
+
+			// Render the tooltip only if it can find a tooltip in the language file
+			for (EntryInfo info : entries) {
+				if (info.category.matches(category) && !info.hideOption) {
+					if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
+						AbstractWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
+						Component text = ButtonEntry.buttonsWithText.get(buttonWidget);
+						#if PRE_MC_1_19
+						TranslatableComponent name = new TranslatableComponent(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName());
+						#else
+						Component name = Component.translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName());
+						#endif
+						String key = translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName() + ".@tooltip";
+
+						if (info.error != null && text.equals(name)) renderTooltip(matrices, (Component) info.error.getValue(), mouseX, mouseY);
+						else if (I18n.exists(key) && (text != null && text.equals(name))) {
+							List<Component> list = new ArrayList<>();
+							for (String str : I18n.get(key).split("\n"))
+								#if PRE_MC_1_19
+								list.add(new TextComponent(str));
+								#else
+								list.add(Component.translatable(str));
+								#endif
+							renderComponentTooltip(matrices, list, mouseX, mouseY);
+						}
+					}
+				}
+			}
+			super.render(matrices, mouseX, mouseY, delta);
+		}
+	}
+
+
+
+
+	public static class ConfigListWidget extends ContainerObjectSelectionList<ButtonEntry>
+	{
+		Font textRenderer;
+
+		public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m)
+		{
+			super(minecraftClient, i, j, k, l, m);
+			this.centerListVertically = false;
+			textRenderer = minecraftClient.font;
+		}
+
+		public void addButton(AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text)
+		{
+			this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
+		}
+
+		@Override
+		public int getRowWidth()
+		{
+			return 10000;
+		}
+
+		public Optional<AbstractWidget> getHoveredButton(double mouseX, double mouseY)
+		{
+			for (ButtonEntry buttonEntry : this.children())
+			{
+				if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY))
+				{
+					return Optional.of(buttonEntry.button);
+				}
+			}
+			return Optional.empty();
+		}
+	}
+
+
+
+
+
+	public static class ButtonEntry extends ContainerObjectSelectionList.Entry<ButtonEntry>
+	{
+		private static final Font textRenderer = Minecraft.getInstance().font;
+		public final AbstractWidget button;
+		private final AbstractWidget resetButton;
+		private final AbstractWidget indexButton;
+		private final Component text;
+		private final List<AbstractWidget> children = new ArrayList<>();
+		public static final Map<AbstractWidget, Component> buttonsWithText = new HashMap<>();
+
+		private ButtonEntry(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
+		{
+			buttonsWithText.put(button, text);
+			this.button = button;
+			this.resetButton = resetButton;
+			this.text = text;
+			this.indexButton = indexButton;
+			if (button != null)
+				children.add(button);
+			if (resetButton != null)
+				children.add(resetButton);
+			if (indexButton != null)
+				children.add(indexButton);
+		}
+
+		public static ButtonEntry create(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
+		{
+			return new ButtonEntry(button, text, resetButton, indexButton);
+		}
+
+		@Override
+		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
+		{
+			if (button != null)
+			{
+				button.y = y;
+				button.render(matrices, mouseX, mouseY, tickDelta);
+			}
+			if (resetButton != null)
+			{
+				resetButton.y = y;
+				resetButton.render(matrices, mouseX, mouseY, tickDelta);
+			}
+			if (indexButton != null)
+			{
+				indexButton.y = y;
+				indexButton.render(matrices, mouseX, mouseY, tickDelta);
+			}
+			if (text != null && (!text.getString().contains("spacer") || button != null))
+				GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
+		}
+
+		@Override
+		public List<? extends GuiEventListener> children()
+		{
+			return children;
+		}
+
+		// Only for 1.17 and over
+		// Remove in 1.16 and below
+		#if POST_MC_1_17_1
+        @Override
+        public List<? extends NarratableEntry> narratables()
+        {
+            return children;
+        }
+		#endif
+	}
+}

common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java

@@ -0,0 +1,966 @@
+package com.seibel.lod.common.wrappers.config;
+
+import com.seibel.lod.core.enums.config.*;
+import com.seibel.lod.core.enums.rendering.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.common.Config;
+
+/**
+ * This holds the config defaults and setters/getters
+ * that should be hooked into the host mod loader (Fabric, Forge, etc.).
+ *
+ * @author James Seibel
+ * @version 11-16-2021
+ */
+public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
+{
+	public static final LodConfigWrapperSingleton INSTANCE = new LodConfigWrapperSingleton();
+	
+	
+	private static final Client client = new Client();
+	@Override
+	public IClient client()
+	{
+		return client;
+	}
+	
+	public static class Client implements IClient
+	{
+		public final IGraphics graphics;
+		public final IWorldGenerator worldGenerator;
+		public final IMultiplayer multiplayer;
+		public final IAdvanced advanced;
+		
+		
+		@Override
+		public IGraphics graphics()
+		{
+			return graphics;
+		}
+		
+		@Override
+		public IWorldGenerator worldGenerator()
+		{
+			return worldGenerator;
+		}
+		
+		@Override
+		public IMultiplayer multiplayer() {
+			return multiplayer;
+		}
+		
+		@Override
+		public IAdvanced advanced()
+		{
+			return advanced;
+		}
+		
+		
+		@Override
+		public boolean getOptionsButton()
+		{
+			return Config.optionsButton;
+		}
+		@Override
+		public void setOptionsButton(boolean newOptionsButton)
+		{
+			ConfigGui.editSingleOption.getEntry("optionsButton").value = newOptionsButton;
+			ConfigGui.editSingleOption.saveOption("optionsButton");
+		}
+		
+		
+		//================//
+		// Client Configs //
+		//================//
+		public Client()
+		{
+			graphics = new Graphics();
+			worldGenerator = new WorldGenerator();
+			multiplayer = new Multiplayer();
+			advanced = new Advanced();
+		}
+		
+		
+		//==================//
+		// Graphics Configs //
+		//==================//
+		public static class Graphics implements IGraphics
+		{
+			public final IQuality quality;
+			public final IFogQuality fogQuality;
+			public final IAdvancedGraphics advancedGraphics;
+			
+			
+			
+			@Override
+			public IQuality quality()
+			{
+				return quality;
+			}
+			
+			@Override
+			public IFogQuality fogQuality()
+			{
+				return fogQuality;
+			}
+			
+			@Override
+			public IAdvancedGraphics advancedGraphics()
+			{
+				return advancedGraphics;
+			}
+			
+			
+			Graphics()
+			{
+				quality = new Quality();
+				fogQuality = new FogQuality();
+				advancedGraphics = new AdvancedGraphics();
+			}
+			
+			
+			public static class Quality implements IQuality
+			{
+				@Override
+				public HorizontalResolution getDrawResolution()
+				{
+					return Config.Client.Graphics.Quality.drawResolution;
+				}
+				@Override
+				public void setDrawResolution(HorizontalResolution newHorizontalResolution)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.drawResolution").value = newHorizontalResolution;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.drawResolution");
+				}
+				
+				
+				@Override
+				public int getLodChunkRenderDistance()
+				{
+					return Config.Client.Graphics.Quality.lodChunkRenderDistance;
+				}
+				@Override
+				public void setLodChunkRenderDistance(int newLodChunkRenderDistance)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodChunkRenderDistance").value = newLodChunkRenderDistance;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodChunkRenderDistance");
+				}
+				
+				
+				@Override
+				public VerticalQuality getVerticalQuality()
+				{
+					return Config.Client.Graphics.Quality.verticalQuality;
+				}
+				@Override
+				public void setVerticalQuality(VerticalQuality newVerticalQuality)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.verticalQuality").value = newVerticalQuality;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.verticalQuality");
+				}
+				
+				
+				@Override
+				public int getHorizontalScale()
+				{
+					return Config.Client.Graphics.Quality.horizontalScale;
+				}
+				@Override
+				public void setHorizontalScale(int newHorizontalScale)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalScale").value = newHorizontalScale;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalScale");
+				}
+				
+				
+				@Override
+				public HorizontalQuality getHorizontalQuality()
+				{
+					return Config.Client.Graphics.Quality.horizontalQuality;
+				}
+				@Override
+				public void setHorizontalQuality(HorizontalQuality newHorizontalQuality)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalQuality").value = newHorizontalQuality;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalQuality");
+				}
+				
+				@Override
+				public DropoffQuality getDropoffQuality() {
+					return Config.Client.Graphics.Quality.dropoffQuality;
+				}
+				@Override
+				public void setDropoffQuality(DropoffQuality newDropoffQuality) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.dropoffQuality").value = newDropoffQuality;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.dropoffQuality");
+				}
+
+				@Override
+				public int getLodBiomeBlending() {
+					return Config.Client.Graphics.Quality.lodBiomeBlending;
+				}
+
+				@Override
+				public void setLodBiomeBlending(int newLodBiomeBlending) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodBiomeBlending").value = newLodBiomeBlending;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodBiomeBlending");
+				}
+			}
+			
+			
+			public static class FogQuality implements IFogQuality
+			{
+				public final IAdvancedFog advancedFog;
+
+				FogQuality()
+				{
+					advancedFog = new AdvancedFog();
+				}
+
+				@Override
+				public FogDistance getFogDistance()
+				{
+					return Config.Client.Graphics.FogQuality.fogDistance;
+				}
+				@Override
+				public void setFogDistance(FogDistance newFogDistance)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogDistance").value = newFogDistance;
+					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogDistance");
+				}
+				
+				
+				@Override
+				public FogDrawMode getFogDrawMode()
+				{
+					return Config.Client.Graphics.FogQuality.fogDrawMode;
+				}
+				
+				@Override
+				public void setFogDrawMode(FogDrawMode setFogDrawMode)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogDrawMode").value = setFogDrawMode;
+					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogDrawMode");
+				}
+				
+				
+				@Override
+				public FogColorMode getFogColorMode()
+				{
+					return Config.Client.Graphics.FogQuality.fogColorMode;
+				}
+				
+				@Override
+				public void setFogColorMode(FogColorMode newFogColorMode)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogColorMode").value = newFogColorMode;
+					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogColorMode");
+				}
+				
+				
+				@Override
+				public boolean getDisableVanillaFog()
+				{
+					return Config.Client.Graphics.FogQuality.disableVanillaFog;
+				}
+				@Override
+				public void setDisableVanillaFog(boolean newDisableVanillaFog)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.disableVanillaFog").value = newDisableVanillaFog;
+					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.disableVanillaFog");
+				}
+
+				@Override
+				public IAdvancedFog advancedFog() {
+					return advancedFog;
+				}
+
+				public static class AdvancedFog implements IAdvancedFog {
+					public final IHeightFog heightFog;
+
+					public AdvancedFog() {
+						heightFog = new HeightFog();
+					}
+
+					@Override
+					public double getFarFogStart() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogStart;
+					}
+					@Override
+					public double getFarFogEnd() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogEnd;
+					}
+					@Override
+					public double getFarFogMin() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMin;
+					}
+					@Override
+					public double getFarFogMax() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMax;
+					}
+					@Override
+					public FogSetting.FogType getFarFogType() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogType;
+					}
+					@Override
+					public double getFarFogDensity() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogDensity;
+					}
+
+					@Override
+					public void setFarFogStart(double newFarFogStart) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogStart").value = newFarFogStart;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogStart");
+					}
+					@Override
+					public void setFarFogEnd(double newFarFogEnd) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogEnd").value = newFarFogEnd;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogEnd");
+					}
+					@Override
+					public void setFarFogMin(double newFarFogMin) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMin").value = newFarFogMin;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMin");
+					}
+					@Override
+					public void setFarFogMax(double newFarFogMax) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMax").value = newFarFogMax;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMax");
+					}
+					@Override
+					public void setFarFogType(FogSetting.FogType newFarFogType) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogType").value = newFarFogType;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogType");
+					}
+					@Override
+					public void setFarFogDensity(double newFarFogDensity) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogDensity").value = newFarFogDensity;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogDensity");
+					}
+
+					@Override
+					public IHeightFog heightFog() {
+						return heightFog;
+					}
+					
+					public static class HeightFog implements IHeightFog {
+
+						@Override
+						public HeightFogMixMode getHeightFogMixMode() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMixMode;
+						}
+						@Override
+						public HeightFogMode getHeightFogMode() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMode;
+						}
+						@Override
+						public double getHeightFogHeight() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogHeight;
+						}
+						@Override
+						public double getHeightFogStart() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogStart;
+						}
+						@Override
+						public double getHeightFogEnd() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogEnd;
+						}
+						@Override
+						public double getHeightFogMin() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMin;
+						}
+						@Override
+						public double getHeightFogMax() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMax;
+						}
+						@Override
+						public FogSetting.FogType getHeightFogType() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogType;
+						}
+						@Override
+						public double getHeightFogDensity() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogDensity;
+						}
+
+						@Override
+						public void setHeightFogMixMode(HeightFogMixMode newHeightFogMixMode) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode").value = newHeightFogMixMode;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode");
+						}
+						@Override
+						public void setHeightFogMode(HeightFogMode newHeightFogMode) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode").value = newHeightFogMode;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode");
+						}
+						@Override
+						public void setHeightFogHeight(double newHeightFogHeight) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight").value = newHeightFogHeight;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight");
+						}
+						@Override
+						public void setHeightFogStart(double newHeightFogStart) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart").value = newHeightFogStart;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart");
+						}
+						@Override
+						public void setHeightFogEnd(double newHeightFogEnd) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd").value = newHeightFogEnd;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd");
+						}
+						@Override
+						public void setHeightFogMin(double newHeightFogMin) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin").value = newHeightFogMin;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin");
+						}
+						@Override
+						public void setHeightFogMax(double newHeightFogMax) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax").value = newHeightFogMax;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax");
+						}
+						@Override
+						public void setHeightFogType(FogSetting.FogType newHeightFogType) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogType").value = newHeightFogType;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogType");
+						}
+						@Override
+						public void setHeightFogDensity(double newHeightFogDensity) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity").value = newHeightFogDensity;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity");
+						}
+					}
+				}
+
+			}
+			
+			
+			public static class AdvancedGraphics implements IAdvancedGraphics
+			{
+				@Override
+				public boolean getDisableDirectionalCulling()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
+				}
+				@Override
+				public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.disableDirectionalCulling").value = newDisableDirectionalCulling;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.disableDirectionalCulling");
+				}
+				
+				
+				@Override
+				public VanillaOverdraw getVanillaOverdraw()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
+				}
+				@Override
+				public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.vanillaOverdraw").value = newVanillaOverdraw;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.vanillaOverdraw");
+				}
+
+				@Override
+				public int getOverdrawOffset() {
+					return Config.Client.Graphics.AdvancedGraphics.overdrawOffset;
+				}
+
+				@Override
+				public void setOverdrawOffset(int newOverdrawOffset) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.overdrawOffset").value = newOverdrawOffset;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.overdrawOffset");
+				}
+				/*
+				@Override
+				public int getBacksideCullingRange()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.backsideCullingRange;
+				}
+				@Override
+				public void setBacksideCullingRange(int newBacksideCullingRange)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.backsideCullingRange").value = newBacksideCullingRange;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.backsideCullingRange");
+				}*/
+				
+				@Override
+				public boolean getUseExtendedNearClipPlane()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
+				}
+				@Override
+				public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.useExtendedNearClipPlane").value = newUseExtendedNearClipPlane;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.useExtendedNearClipPlane");
+				}
+				
+				@Override
+				public double getBrightnessMultiplier()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.brightnessMultiplier;
+				}
+				@Override
+				public void setBrightnessMultiplier(double newBrightnessMultiplier)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.brightnessMultiplier").value = newBrightnessMultiplier;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.brightnessMultiplier");
+				}
+				
+				@Override
+				public double getSaturationMultiplier()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.saturationMultiplier;
+				}
+				@Override
+				public void setSaturationMultiplier(double newSaturationMultiplier)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.saturationMultiplier").value = newSaturationMultiplier;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.saturationMultiplier");
+				}
+
+				@Override
+				public boolean getEnableCaveCulling() {
+					return Config.Client.Graphics.AdvancedGraphics.enableCaveCulling;
+				}
+
+				@Override
+				public void setEnableCaveCulling(boolean newEnableCaveCulling) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.enableCaveCulling").value = newEnableCaveCulling;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.enableCaveCulling");
+
+				}
+
+				@Override
+				public int getCaveCullingHeight() {
+					return Config.Client.Graphics.AdvancedGraphics.caveCullingHeight;
+				}
+
+				@Override
+				public void setCaveCullingHeight(int newCaveCullingHeight) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.caveCullingHeight").value = newCaveCullingHeight;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.caveCullingHeight");
+
+				}
+
+				@Override
+				public int getEarthCurveRatio()
+				{
+					return (int) ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.earthCurveRatio").value;
+				}
+				@Override
+				public void setEarthCurveRatio(int newEarthCurveRatio)
+				{
+					if (newEarthCurveRatio < 50) newEarthCurveRatio = 0;
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.earthCurveRatio").value = newEarthCurveRatio;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.earthCurveRatio");
+				}
+			}
+		}
+		
+		
+		
+		
+		//========================//
+		// WorldGenerator Configs //
+		//========================//
+		public static class WorldGenerator implements IWorldGenerator
+		{
+			@Override
+			public GenerationPriority getGenerationPriority()
+			{
+				return Config.Client.WorldGenerator.generationPriority;
+			}
+			@Override
+			public void setGenerationPriority(GenerationPriority newGenerationPriority)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.generationPriority").value = newGenerationPriority;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.generationPriority");
+			}
+			
+			
+			@Override
+			public DistanceGenerationMode getDistanceGenerationMode()
+			{
+				return Config.Client.WorldGenerator.distanceGenerationMode;
+			}
+			@Override
+			public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.distanceGenerationMode").value = newDistanceGenerationMode;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.distanceGenerationMode");
+			}
+
+			/*
+			@Override
+			public boolean getAllowUnstableFeatureGeneration()
+			{
+				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
+			}
+			@Override
+			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.allowUnstableFeatureGeneration").value = newAllowUnstableFeatureGeneration;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.allowUnstableFeatureGeneration");
+			}*/
+			
+			
+			@Override
+			public BlocksToAvoid getBlocksToAvoid()
+			{
+				return Config.Client.WorldGenerator.blocksToAvoid;
+			}
+			@Override
+			public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.blocksToAvoid").value = newBlockToAvoid;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.blocksToAvoid");
+			}
+			@Override
+			public boolean getEnableDistantGeneration()
+			{
+				return (boolean) ConfigGui.editSingleOption.getEntry("client.worldGenerator.enableDistantGeneration").value;
+			}
+			@Override
+			public void setEnableDistantGeneration(boolean newEnableDistantGeneration)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.enableDistantGeneration").value = newEnableDistantGeneration;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.enableDistantGeneration");
+			}
+			@Override
+			public LightGenerationMode getLightGenerationMode()
+			{
+				return Config.Client.WorldGenerator.lightGenerationMode;
+			}
+			@Override
+			public void setLightGenerationMode(LightGenerationMode newLightGenerationMode)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.lightGenerationMode").value = newLightGenerationMode;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.lightGenerationMode");
+			}
+		}
+		
+		
+		
+		//=====================//
+		// Multiplayer Configs //
+		//=====================//
+		public static class Multiplayer implements IMultiplayer
+		{
+			@Override
+			public ServerFolderNameMode getServerFolderNameMode()
+			{
+				return Config.Client.Multiplayer.serverFolderNameMode;
+			}
+			@Override
+			public void setServerFolderNameMode(ServerFolderNameMode newServerFolderNameMode)
+			{
+				ConfigGui.editSingleOption.getEntry("client.multiplayer.serverFolderNameMode").value = newServerFolderNameMode;
+				ConfigGui.editSingleOption.saveOption("client.multiplayer.serverFolderNameMode");
+			}
+			
+			@Override
+			public double getMultiDimensionRequiredSimilarity()
+			{
+				return Config.Client.Multiplayer.multiDimensionRequiredSimilarity;
+			}
+			
+			@Override
+			public void setMultiDimensionRequiredSimilarity(double newMultiDimensionMinimumSimilarityPercent)
+			{
+				ConfigGui.editSingleOption.getEntry("client.multiplayer.multiDimensionMinimumSimilarityPercent").value = newMultiDimensionMinimumSimilarityPercent;
+				ConfigGui.editSingleOption.saveOption("client.multiplayer.multiDimensionMinimumSimilarityPercent");
+			}
+		}
+		
+		
+		
+		//============================//
+		// AdvancedModOptions Configs //
+		//============================//
+		public static class Advanced implements IAdvanced
+		{
+			public final IThreading threading;
+			public final IDebugging debugging;
+			public final IBuffers buffers;
+			
+			
+			@Override
+			public IThreading threading()
+			{
+				return threading;
+			}
+			
+			
+			@Override
+			public IDebugging debugging()
+			{
+				return debugging;
+			}
+			
+			
+			@Override
+			public IBuffers buffers()
+			{
+				return buffers;
+			}
+
+
+			public Advanced()
+			{
+				threading = new Threading();
+				debugging = new Debugging();
+				buffers = new Buffers();
+			}
+			
+			public static class Threading implements IThreading
+			{
+				@Override
+				public double getNumberOfWorldGenerationThreads()
+				{
+					return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads;
+				}
+				@Override
+				public void setNumberOfWorldGenerationThreads(double newNumberOfWorldGenerationThreads)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.threading.numberOfWorldGenerationThreads").value = newNumberOfWorldGenerationThreads;
+					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfWorldGenerationThreads");
+				}
+				
+				
+				@Override
+				public int getNumberOfBufferBuilderThreads()
+				{
+					return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads;
+				}
+				@Override
+				public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.threading.numberOfBufferBuilderThreads").value = newNumberOfWorldBuilderThreads;
+					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfBufferBuilderThreads");
+				}
+			}
+			
+			
+			
+			
+			//===============//
+			// Debug Options //
+			//===============//
+			public static class Debugging implements IDebugging
+			{
+				public final IDebugSwitch debugSwitch;
+
+				@Override
+				public IDebugSwitch debugSwitch()
+				{
+					return debugSwitch;
+				}
+
+				/* RendererType:
+				 * DEFAULT
+				 * DEBUG
+				 * DISABLED
+				 * */
+				@Override
+				public RendererType getRendererType() {
+					return (RendererType) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value;
+				}
+				@Override
+				public void setRendererType(RendererType newRenderType) {
+					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value = newRenderType;
+					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.rendererType");
+				}
+				
+				@Override
+				public DebugMode getDebugMode()
+				{
+					return (DebugMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugMode").value;
+				}
+				@Override
+				public void setDebugMode(DebugMode newDebugMode)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugMode").value = newDebugMode;
+					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugMode");
+				}
+				
+				
+				@Override
+				public boolean getDebugKeybindingsEnabled()
+				{
+					return (boolean) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.enableDebugKeybindings").value;
+				}
+				@Override
+				public void setDebugKeybindingsEnabled(boolean newEnableDebugKeybindings)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.enableDebugKeybindings").value = newEnableDebugKeybindings;
+					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.enableDebugKeybindings");
+				}
+
+				public Debugging()
+				{
+					debugSwitch = new DebugSwitch();
+				}
+
+				public static class DebugSwitch implements IDebugSwitch {
+
+					/* The logging switches available:
+					 * WorldGenEvent
+					 * WorldGenPerformance
+					 * WorldGenLoadEvent
+					 * LodBuilderEvent
+					 * RendererBufferEvent
+					 * RendererGLEvent
+					 * FileReadWriteEvent
+					 * FileSubDimEvent
+					 * NetworkEvent //NOT IMPL YET
+					 */
+
+					@Override
+					public LoggerMode getLogWorldGenEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenEvent").value;
+					}
+					@Override
+					public void setLogWorldGenEvent(LoggerMode newLogWorldGenEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenEvent").value = newLogWorldGenEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenEvent");
+					}
+
+					@Override
+					public LoggerMode getLogWorldGenPerformance() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenPerformance").value;
+					}
+					@Override
+					public void setLogWorldGenPerformance(LoggerMode newLogWorldGenPerformance) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenPerformance").value = newLogWorldGenPerformance;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenPerformance");
+					}
+
+					@Override
+					public LoggerMode getLogWorldGenLoadEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent").value;
+					}
+					@Override
+					public void setLogWorldGenLoadEvent(LoggerMode newLogWorldGenLoadEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent").value = newLogWorldGenLoadEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent");
+					}
+
+					@Override
+					public LoggerMode getLogLodBuilderEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logLodBuilderEvent").value;
+					}
+					@Override
+					public void setLogLodBuilderEvent(LoggerMode newLogLodBuilderEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logLodBuilderEvent").value = newLogLodBuilderEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logLodBuilderEvent");
+					}
+
+					@Override
+					public LoggerMode getLogRendererBufferEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererBufferEvent").value;
+					}
+					@Override
+					public void setLogRendererBufferEvent(LoggerMode newLogRendererBufferEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererBufferEvent").value = newLogRendererBufferEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logRendererBufferEvent");
+					}
+
+					@Override
+					public LoggerMode getLogRendererGLEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererGLEvent").value;
+					}
+					@Override
+					public void setLogRendererGLEvent(LoggerMode newLogRendererGLEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererGLEvent").value = newLogRendererGLEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logRendererGLEvent");
+					}
+
+					@Override
+					public LoggerMode getLogFileReadWriteEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileReadWriteEvent").value;
+					}
+					@Override
+					public void setLogFileReadWriteEvent(LoggerMode newLogFileReadWriteEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileReadWriteEvent").value = newLogFileReadWriteEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logFileReadWriteEvent");
+					}
+
+					@Override
+					public LoggerMode getLogFileSubDimEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileSubDimEvent").value;
+					}
+					@Override
+					public void setLogFileSubDimEvent(LoggerMode newLogFileSubDimEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileSubDimEvent").value = newLogFileSubDimEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logFileSubDimEvent");
+					}
+
+					@Override
+					public LoggerMode getLogNetworkEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logNetworkEvent").value;
+					}
+					@Override
+					public void setLogNetworkEvent(LoggerMode newLogNetworkEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logNetworkEvent").value = newLogNetworkEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logNetworkEvent");
+					}
+				}
+			}
+			
+			
+			public static class Buffers implements IBuffers
+			{
+				
+				@Override
+				public GpuUploadMethod getGpuUploadMethod()
+				{
+					return Config.Client.Advanced.Buffers.gpuUploadMethod;
+				}
+				@Override
+				public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.gpuUploadMethod").value = newDisableVanillaFog;
+					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.gpuUploadMethod");
+				}
+				
+				
+				@Override
+				public int getGpuUploadPerMegabyteInMilliseconds()
+				{
+					return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
+				}
+				@Override
+				public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) {
+					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds").value = newMilliseconds;
+					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds");
+				}
+				
+				
+				@Override
+				public BufferRebuildTimes getRebuildTimes()
+				{
+					return Config.Client.Advanced.Buffers.rebuildTimes;
+				}
+				@Override
+				public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.newBufferRebuildTimes").value = newBufferRebuildTimes;
+					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.newBufferRebuildTimes");
+				}
+			}
+
+			@Override
+			public boolean getLodOnlyMode() {
+				return Config.Client.Advanced.lodOnlyMode;
+			}
+
+			@Override
+			public void setLodOnlyMode(boolean newLodOnlyMode) {
+				ConfigGui.editSingleOption.getEntry("client.advanced.buffers.lodOnlyMode").value = newLodOnlyMode;
+				ConfigGui.editSingleOption.saveOption("client.advanced.buffers.lodOnlyMode");
+
+			}
+		}
+	}
+}

common/src/main/java/com/seibel/lod/common/wrappers/config/TexturedButtonWidget.java

@@ -0,0 +1,72 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.config;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+
+/**
+ * Creates a button with a texture on it
+ */
+public class TexturedButtonWidget extends ImageButton {
+    #if POST_MC_1_17_1
+    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
+        super(x, y, width, height, u, v, texture, pressAction);
+    }
+    #endif
+
+    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction) {
+        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
+    }
+
+    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text) {
+        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
+    }
+
+    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, OnTooltip tooltipSupplier, Component text) {
+        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, tooltipSupplier, text);
+    }
+
+    @Override
+    public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
+        #if PRE_MC_1_17_1
+        Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION);
+        RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
+        #else
+        RenderSystem.setShader(GameRenderer::getPositionTexShader);
+        RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
+        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
+        #endif
+
+        int i = this.getYImage(this.isHovered);
+        RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.enableDepthTest();
+        this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
+        this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+
+        super.renderButton(matrices, mouseX, mouseY, delta);
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -0,0 +1,398 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers.minecraft;
+
+import java.awt.Color;
+import java.io.File;
+import java.util.ArrayList;
+
+import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.blaze3d.platform.Window;
+import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.core.api.ApiShared;
+import com.seibel.lod.core.enums.LodDirection;
+import com.seibel.lod.core.util.LodUtil;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
+import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
+import com.seibel.lod.common.wrappers.McObjectConverter;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkPosWrapper;
+import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
+import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.common.wrappers.world.WorldWrapper;
+
+import net.minecraft.CrashReport;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.Options;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.resources.model.ModelManager;
+import net.minecraft.client.server.IntegratedServer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+#if PRE_MC_1_19
+import net.minecraft.network.chat.TextComponent;
+#endif
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.dimension.DimensionType;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A singleton that wraps the Minecraft object.
+ *
+ * @author James Seibel
+ * @version 3-5-2022
+ */
+public class MinecraftClientWrapper implements IMinecraftClientWrapper
+{
+    public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
+
+    public final Minecraft mc = Minecraft.getInstance();
+
+    /**
+     * The lightmap for the current:
+     * Time, dimension, brightness setting, etc.
+     */
+    private NativeImage lightMap = null;
+
+    private ProfilerWrapper profilerWrapper;
+
+
+    private MinecraftClientWrapper()
+    {
+
+    }
+
+
+
+    //================//
+    // helper methods //
+    //================//
+
+    /**
+     * This should be called at the beginning of every frame to
+     * clear any Minecraft data that becomes out of date after a frame. <br> <br>
+     * <p>
+     * LightMaps and other time sensitive objects fall in this category. <br> <br>
+     * <p>
+     * This doesn't affect OpenGL objects in any way.
+     */
+    @Override
+    public void clearFrameObjectCache()
+    {
+        lightMap = null;
+    }
+
+
+
+    //=================//
+    // method wrappers //
+    //=================//
+
+    @Override
+    public float getShade(LodDirection lodDirection) {
+        if (mc.level != null)
+        {
+            Direction mcDir = McObjectConverter.Convert(lodDirection);
+            return mc.level.getShade(mcDir, true);
+        }
+        else return 0.0f;
+    }
+
+    @Override
+    public boolean hasSinglePlayerServer()
+    {
+        return mc.hasSingleplayerServer();
+    }
+
+    @Override
+    public String getCurrentServerName()
+    {
+        return mc.getCurrentServer().name;
+    }
+
+    @Override
+    public String getCurrentServerIp()
+    {
+        return mc.getCurrentServer().ip;
+    }
+
+    @Override
+    public String getCurrentServerVersion()
+    {
+        return mc.getCurrentServer().version.getString();
+    }
+
+    /** Returns the dimension the player is currently in */
+    @Override
+    public IDimensionTypeWrapper getCurrentDimension()
+    {
+        if (mc.player != null)
+            return DimensionTypeWrapper.getDimensionTypeWrapper(mc.player.level.dimensionType());
+        else return null;
+    }
+
+    @Override
+    public String getCurrentDimensionId()
+    {
+        return LodUtil.getDimensionIDFromWorld(WorldWrapper.getWorldWrapper(mc.level));
+    }
+
+    //=============//
+    // Simple gets //
+    //=============//
+
+    public LocalPlayer getPlayer()
+    {
+        return mc.player;
+    }
+
+    @Override
+    public boolean playerExists()
+    {
+        return mc.player != null;
+    }
+
+    @Override
+    public BlockPosWrapper getPlayerBlockPos()
+    {
+        BlockPos playerPos = getPlayer().blockPosition();
+        return new BlockPosWrapper(playerPos.getX(), playerPos.getY(), playerPos.getZ());
+    }
+
+    @Override
+    public ChunkPosWrapper getPlayerChunkPos()
+    {
+        #if PRE_MC_1_17_1
+        ChunkPos playerPos = new ChunkPos(getPlayer().blockPosition());
+        #else
+        ChunkPos playerPos = getPlayer().chunkPosition();
+        #endif
+        return new ChunkPosWrapper(playerPos.x, playerPos.z);
+    }
+
+    public Options getOptions()
+    {
+        return mc.options;
+    }
+
+    public ModelManager getModelManager()
+    {
+        return mc.getModelManager();
+    }
+
+    public ClientLevel getClientLevel()
+    {
+        return mc.level;
+    }
+
+    @Override
+    public IWorldWrapper getWrappedServerWorld()
+    {
+        if (mc.level == null)
+            return null;
+
+        DimensionType dimension = mc.level.dimensionType();
+        IntegratedServer server = mc.getSingleplayerServer();
+
+        if (server == null)
+            return null;
+
+        ServerLevel serverWorld = null;
+        Iterable<ServerLevel> worlds = server.getAllLevels();
+        for (ServerLevel world : worlds)
+        {
+            if (world.dimensionType() == dimension)
+            {
+                serverWorld = world;
+                break;
+            }
+        }
+        return WorldWrapper.getWorldWrapper(serverWorld);
+    }
+
+    public WorldWrapper getWrappedClientLevel()
+    {
+        return WorldWrapper.getWorldWrapper(mc.level);
+    }
+
+    public WorldWrapper getWrappedServerLevel()
+    {
+
+        if (mc.level == null)
+            return null;
+        DimensionType dimension = mc.level.dimensionType();
+        IntegratedServer server = mc.getSingleplayerServer();
+        if (server == null)
+            return null;
+
+        Iterable<ServerLevel> worlds = server.getAllLevels();
+        ServerLevel returnWorld = null;
+
+        for (ServerLevel world : worlds)
+        {
+            if (world.dimensionType() == dimension)
+            {
+                returnWorld = world;
+                break;
+            }
+        }
+
+        return WorldWrapper.getWorldWrapper(returnWorld);
+    }
+
+    @Nullable
+    @Override
+    public IWorldWrapper getWrappedClientWorld()
+    {
+        return WorldWrapper.getWorldWrapper(mc.level);
+    }
+
+    @Override
+    public File getGameDirectory()
+    {
+        return mc.gameDirectory;
+    }
+
+    @Override
+    public IProfilerWrapper getProfiler()
+    {
+        if (profilerWrapper == null)
+            profilerWrapper = new ProfilerWrapper(mc.getProfiler());
+        else if (mc.getProfiler() != profilerWrapper.profiler)
+            profilerWrapper.profiler = mc.getProfiler();
+
+        return profilerWrapper;	}
+
+    public ClientPacketListener getConnection()
+    {
+        return mc.getConnection();
+    }
+
+    public GameRenderer getGameRenderer()
+    {
+        return mc.gameRenderer;
+    }
+
+    public Entity getCameraEntity()
+    {
+        return mc.cameraEntity;
+    }
+
+    public Window getWindow()
+    {
+        return mc.getWindow();
+    }
+
+    @Override
+    public float getSkyDarken(float partialTicks)
+    {
+        return mc.level.getSkyDarken(partialTicks);
+    }
+
+    public IntegratedServer getSinglePlayerServer()
+    {
+        return mc.getSingleplayerServer();
+    }
+
+    @Override
+    public boolean connectedToServer()
+    {
+        return mc.getCurrentServer() != null;
+    }
+
+    @Override
+    public int getPlayerSkylight() {
+        if (mc.level == null) return -1;
+        if (mc.player == null) return -1;
+        if (mc.player.blockPosition() == null) return -1;
+        return mc.level.getBrightness(LightLayer.SKY, mc.player.blockPosition());
+    }
+
+    public ServerData getCurrentServer()
+    {
+        return mc.getCurrentServer();
+    }
+
+    public LevelRenderer getLevelRenderer()
+    {
+        return mc.levelRenderer;
+    }
+
+    /** Returns all worlds available to the server */
+    @Override
+    public ArrayList<IWorldWrapper> getAllServerWorlds()
+    {
+        ArrayList<IWorldWrapper> worlds = new ArrayList<IWorldWrapper>();
+
+        Iterable<ServerLevel> serverWorlds = mc.getSingleplayerServer().getAllLevels();
+        for (ServerLevel world : serverWorlds)
+        {
+            worlds.add(WorldWrapper.getWorldWrapper(world));
+        }
+
+        return worlds;
+    }
+
+
+
+    @Override
+    public void sendChatMessage(String string)
+    {
+        #if PRE_MC_1_19
+        getPlayer().sendMessage(new TextComponent(string), getPlayer().getUUID());
+        #else
+        getPlayer().sendSystemMessage(Component.translatable(string));
+        #endif
+    }
+
+    /**
+     * Crashes Minecraft, displaying the given errorMessage <br> <br>
+     * In the following format: <br>
+     *
+     * The game crashed whilst <strong>errorMessage</strong>  <br>
+     * Error: <strong>ExceptionClass: exceptionErrorMessage</strong>  <br>
+     * Exit Code: -1  <br>
+     */
+    @Override
+    public void crashMinecraft(String errorMessage, Throwable exception)
+    {
+        ApiShared.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
+        CrashReport report = new CrashReport(errorMessage, exception);
+        Minecraft.crash(report);
+    }
+
+
+
+
+
+}

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -0,0 +1,302 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.minecraft;
+
+import java.awt.Color;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.stream.Collectors;
+
+import com.mojang.blaze3d.pipeline.RenderTarget;
+import com.mojang.blaze3d.platform.NativeImage;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
+import com.seibel.lod.core.api.ApiShared;
+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.LodUtil;
+
+import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
+import net.minecraft.client.renderer.LightTexture;
+
+import com.mojang.math.Vector3f;
+import com.seibel.lod.core.objects.math.Mat4f;
+import com.seibel.lod.core.objects.math.Vec3d;
+import com.seibel.lod.core.objects.math.Vec3f;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
+import com.seibel.lod.common.wrappers.McObjectConverter;
+import com.seibel.lod.common.wrappers.WrapperFactory;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
+
+import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+#if PRE_MC_1_17_1
+import net.minecraft.tags.FluidTags;
+import net.minecraft.world.level.material.FluidState;
+#else
+import net.minecraft.world.level.material.FogType;
+#endif
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
+import org.lwjgl.opengl.GL15;
+
+
+/**
+ * A singleton that contains everything
+ * related to rendering in Minecraft.
+ *
+ * @author James Seibel
+ * @version 12-12-2021
+ */
+public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
+{
+	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
+	
+	private static final Minecraft MC = Minecraft.getInstance();
+	private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
+	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
+
+	public LightMapWrapper lightmap = null;
+
+	@Override
+	public Vec3f getLookAtVector()
+	{
+		Camera camera = GAME_RENDERER.getMainCamera();
+		Vector3f cameraDir = camera.getLookVector();
+		return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
+	}
+	
+	@Override
+	public AbstractBlockPosWrapper getCameraBlockPosition()
+	{
+		Camera camera = GAME_RENDERER.getMainCamera();
+		BlockPos blockPos = camera.getBlockPosition();
+		return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
+	}
+	
+	@Override
+	public boolean playerHasBlindnessEffect()
+	{
+		return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
+	}
+	
+	@Override
+	public Vec3d getCameraExactPosition()
+	{
+		Camera camera = GAME_RENDERER.getMainCamera();
+		Vec3 projectedView = camera.getPosition();
+		
+		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
+	}
+	
+	@Override
+	public Mat4f getDefaultProjectionMatrix(float partialTicks)
+	{
+		#if PRE_MC_1_17_1
+		return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getMainCamera(), partialTicks, true));
+		#else
+		return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
+		#endif
+	}
+	
+	@Override
+	public double getGamma()
+	{
+		#if PRE_MC_1_19
+		return MC.options.gamma;
+		#else
+		return MC.options.gamma().get();
+		#endif
+	}
+	
+	@Override
+	public Color getFogColor(float partialTicks) {
+
+		#if PRE_MC_1_17_1
+		float[] colorValues = new float[4];
+		GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
+		#else
+		FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
+		float[] colorValues = RenderSystem.getShaderFogColor();
+		#endif
+		return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+	}
+	// getSpecialFogColor() is the same as getFogColor()
+	
+	@Override
+	public Color getSkyColor() {
+		if (MC.level.dimensionType().hasSkyLight()) {
+			#if PRE_MC_1_17_1
+			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime());
+			#else
+			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
+			#endif
+			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
+		} else
+			return new Color(0, 0, 0);
+	}
+	
+	@Override
+	public double getFov(float partialTicks)
+	{
+		return GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true);
+	}
+	
+	/** Measured in chunks */
+	@Override
+	public int getRenderDistance()
+	{
+		#if PRE_MC_1_18_1
+		//FIXME: How to resolve this?
+		return MC.options.renderDistance;
+		#else
+		return MC.options.getEffectiveRenderDistance();
+		#endif
+	}
+	
+	@Override
+	public int getScreenWidth()
+	{
+		return MC.getWindow().getWidth();
+	}
+	@Override
+	public int getScreenHeight()
+	{
+		return MC.getWindow().getHeight();
+	}
+	
+    private RenderTarget getRenderTarget() {
+        RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
+        return r!=null ? r : MC.getMainRenderTarget();
+    }
+
+    @Override
+    public int getTargetFrameBuffer() {
+        return getRenderTarget().frameBufferId;
+    }
+
+    @Override
+    public int getTargetFrameBufferViewportWidth() {
+        return getRenderTarget().viewWidth;
+    }
+
+    @Override
+    public int getTargetFrameBufferViewportHeight() {
+        return getRenderTarget().viewHeight;
+    }
+
+	/**
+	 * This method returns the ChunkPos of all chunks that Minecraft
+	 * is going to render this frame. <br><br>
+	 * <p>
+	 */
+	
+    public boolean usingBackupGetVanillaRenderedChunks = false;
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks() {
+		ISodiumAccessor sodium = ModAccessorHandler.get(ISodiumAccessor.class);
+		if (sodium != null) {
+			return sodium.getNormalRenderedChunks();
+		}
+		IOptifineAccessor optifine = ModAccessorHandler.get(IOptifineAccessor.class);
+		if (optifine != null) {
+			HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
+			if (pos == null)
+				pos = getMaximumRenderedChunks();
+			return pos;
+		}
+		if (!usingBackupGetVanillaRenderedChunks) {
+			try {
+				LevelRenderer levelRenderer = MC.levelRenderer;
+				Collection<LevelRenderer.RenderChunkInfo> chunks =
+					#if PRE_MC_1_18_1 levelRenderer.renderChunks;
+					#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
+
+				return (chunks.stream().map((chunk) -> {
+					AABB chunkBoundingBox =
+						#if PRE_MC_1_18_2 chunk.chunk.bb;
+						#else chunk.chunk.getBoundingBox(); #endif
+					return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
+							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
+				}).collect(Collectors.toCollection(HashSet::new)));
+			} catch (LinkageError e) {
+				try {
+					MinecraftClientWrapper.INSTANCE.sendChatMessage(
+							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
+									+ " Using Backup Method.");
+					MinecraftClientWrapper.INSTANCE.sendChatMessage(
+							"\u00A7eOverdraw prevention will be worse than normal.");
+				} catch (Exception e2) {
+				}
+				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: ", e);
+				usingBackupGetVanillaRenderedChunks = true;
+			}
+		}
+		return getMaximumRenderedChunks();
+	}
+
+	@Override
+	public ILightMapWrapper getLightmapWrapper() {
+		return lightmap;
+	}
+	
+	@Override
+	public boolean isFogStateSpecial() {
+		#if PRE_MC_1_17_1
+		Camera camera = GAME_RENDERER.getMainCamera();
+		FluidState fluidState = camera.getFluidInCamera();
+		Entity entity = camera.getEntity();
+		boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+			isUnderWater |= fluidState.is(FluidTags.WATER);
+			isUnderWater |= fluidState.is(FluidTags.LAVA);
+		return isUnderWater;
+		#else
+		Entity entity = GAME_RENDERER.getMainCamera().getEntity();
+		boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+		return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
+		#endif
+	}
+	
+	@Override
+	public boolean tryDisableVanillaFog() {
+		return true; // Handled via MixinFogRenderer in both forge and fabric
+	}
+
+    public void updateLightmap(NativeImage lightPixels) {
+		if (lightmap== null) {
+			lightmap = new LightMapWrapper();
+		}
+		lightmap.uploadLightmap(lightPixels);
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/ProfilerWrapper.java

@@ -0,0 +1,60 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.minecraft;
+
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
+
+import net.minecraft.util.profiling.ProfilerFiller;
+
+/**
+ * @author James Seibel
+ * @version 11-20-2021
+ */
+public class ProfilerWrapper implements IProfilerWrapper
+{
+    public ProfilerFiller profiler;
+
+    public ProfilerWrapper(ProfilerFiller newProfiler)
+    {
+        profiler = newProfiler;
+    }
+
+
+    /** starts a new section inside the currently running section */
+    @Override
+    public void push(String newSection)
+    {
+        profiler.push(newSection);
+    }
+
+    /** ends the currently running section and starts a new one */
+    @Override
+    public void popPush(String newSection)
+    {
+        profiler.popPush(newSection);
+    }
+
+    /** ends the currently running section */
+    @Override
+    public void pop()
+    {
+        profiler.pop();
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/misc/LightMapWrapper.java

@@ -0,0 +1,71 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.misc;
+
+import com.mojang.blaze3d.platform.NativeImage;
+import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
+import net.minecraft.client.renderer.LightTexture;
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GL32;
+
+import java.nio.ByteBuffer;
+
+/**
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+public class LightMapWrapper implements ILightMapWrapper
+{
+    private int textureId = 0;
+
+    public LightMapWrapper()
+    {
+    }
+
+    private void createLightmap(NativeImage image)
+    {
+        textureId = GL32.glGenTextures();
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
+        GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, image.format().glFormat(), image.getWidth(), image.getHeight(),
+                0, image.format().glFormat(), GL32.GL_UNSIGNED_BYTE, (ByteBuffer) null);
+    }
+
+    public void uploadLightmap(NativeImage image)
+    {
+        int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
+        if (textureId == 0) {
+            createLightmap(image);
+        }
+        // NativeImage::upload(int levelOfDetail, int xOffset, int yOffset, bool shouldCleanup?)
+        image.upload(0, 0, 0, false);
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
+    }
+
+    @Override
+    public void bind() {
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
+    }
+
+    @Override
+    public void unbind() {
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0);
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java

@@ -0,0 +1,308 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers.world;
+
+import java.awt.Color;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
+import com.seibel.lod.core.util.LodUtil;
+import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
+
+import net.minecraft.data.BuiltinRegistries;
+#if POST_MC_1_19
+import net.minecraft.data.worldgen.biome.EndBiomes;
+import net.minecraft.data.worldgen.biome.NetherBiomes;
+#endif
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.material.MaterialColor;
+
+//This class wraps the minecraft BlockPos.Mutable (and BlockPos) class
+public class BiomeWrapper implements IBiomeWrapper
+{
+
+    public static final ConcurrentMap<Biome, BiomeWrapper> biomeWrapperMap = new ConcurrentHashMap<>();
+    private final Biome biome;
+
+    public BiomeWrapper(Biome biome)
+    {
+        this.biome = biome;
+    }
+
+    static public IBiomeWrapper getBiomeWrapper(Biome biome)
+    {
+        //first we check if the biome has already been wrapped
+        if(biomeWrapperMap.containsKey(biome) && biomeWrapperMap.get(biome) != null)
+            return biomeWrapperMap.get(biome);
+
+
+        //if it hasn't been created yet, we create it and save it in the map
+        BiomeWrapper biomeWrapper = new BiomeWrapper(biome);
+        biomeWrapperMap.put(biome, biomeWrapper);
+
+        //we return the newly created wrapper
+        return biomeWrapper;
+    }
+
+    /** Returns a color int for the given biome. */
+    #if PRE_MC_1_19
+    @Override
+    public int getColorForBiome(int x, int z)
+    {
+        int colorInt;
+        switch (biome.biomeCategory)
+        {
+
+            case NETHER:
+                colorInt = Blocks.NETHERRACK.defaultBlockState().getMaterial().getColor().col;
+                break;
+
+            case THEEND:
+                colorInt = Blocks.END_STONE.defaultBlockState().getMaterial().getColor().col;
+                break;
+
+            case BEACH:
+            case DESERT:
+                colorInt = Blocks.SAND.defaultBlockState().getMaterial().getColor().col;
+                break;
+
+            case EXTREME_HILLS:
+                colorInt = Blocks.STONE.defaultMaterialColor().col;
+                break;
+
+            case MUSHROOM:
+                colorInt = MaterialColor.COLOR_LIGHT_GRAY.col;
+                break;
+
+            case ICY:
+                colorInt = Blocks.SNOW.defaultMaterialColor().col;
+                break;
+
+            case MESA:
+                colorInt = Blocks.RED_SAND.defaultMaterialColor().col;
+                break;
+
+            case OCEAN:
+            case RIVER:
+                colorInt = biome.getWaterColor();
+                break;
+
+            case NONE:
+            case FOREST:
+            case TAIGA:
+            case JUNGLE:
+            case PLAINS:
+            case SAVANNA:
+            case SWAMP:
+            default:
+                colorInt = biome.getGrassColor(x,z);
+                //FIXME: Repair what James did - LeeTom
+//                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
+//                tmp = tmp.darker();
+//                colorInt = LodUtil.colorToInt(tmp);
+                break;
+
+        }
+
+        return colorInt;
+    }
+    #else
+
+
+    private static int _colorEnd(Biome b) {
+        return Blocks.END_STONE.defaultMaterialColor().col;
+    }
+    private static int _colorNether(Biome b) {
+        return Blocks.NETHERRACK.defaultMaterialColor().col;
+    }
+    private static int _colorSand(Biome b) {
+        return Blocks.SAND.defaultMaterialColor().col;
+    }
+    private static int _colorStone(Biome b) {
+        return Blocks.STONE.defaultMaterialColor().col;
+    }
+    private static int _colorGravel(Biome b) {
+        return Blocks.GRAVEL.defaultMaterialColor().col;
+    }
+    private static int _colorDripStone(Biome b) {
+        return Blocks.DRIPSTONE_BLOCK.defaultMaterialColor().col;
+    }
+    private static int _colorMoss(Biome b) {
+        return Blocks.MOSS_BLOCK.defaultMaterialColor().col;
+    }
+    private static int _colorSculk(Biome b) {
+        return Blocks.SCULK.defaultMaterialColor().col;
+    }
+    private static int _colorMushoom(Biome b) {
+        return Blocks.MYCELIUM.defaultMaterialColor().col;
+    }
+    private static int _colorBamboo(Biome b) {
+        return Blocks.BAMBOO.defaultMaterialColor().col;
+    }
+    private static int _colorSnow(Biome b) {
+        return Blocks.SNOW.defaultMaterialColor().col;
+    }
+    private static int _colorIce(Biome b) {
+        return Blocks.ICE.defaultMaterialColor().col;
+    }
+    private static int _colorRedSand(Biome b) {
+        return Blocks.RED_SAND.defaultMaterialColor().col;
+    }
+    private static int _colorSoulSand(Biome b) {
+        return Blocks.SOUL_SAND.defaultMaterialColor().col;
+    }
+    private static int _colorBasalt(Biome b) {
+        return Blocks.BASALT.defaultMaterialColor().col;
+    }
+    private static int _colorWater(Biome b) {
+        return b.getWaterColor();
+    }
+    private static int _colorFoliage(Biome b) {
+        return b.getFoliageColor();
+    }
+
+    private static Biome _get(ResourceKey<Biome> r) {
+        return BuiltinRegistries.BIOME.getOrThrow(r);
+    }
+
+    //FIXME: THIS IS HELL!
+    private static final ImmutableBiMap<Biome, Function<Biome, Integer>> BIOME_COLOR_MAP =
+            ImmutableBiMap.<Biome, Function<Biome, Integer>>builder()
+                    .put(_get(Biomes.SNOWY_PLAINS), BiomeWrapper::_colorSnow)
+                    .put(_get(Biomes.ICE_SPIKES), BiomeWrapper::_colorIce)
+                    .put(_get(Biomes.DESERT), BiomeWrapper::_colorSand)
+                    .put(_get(Biomes.SWAMP), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.MANGROVE_SWAMP), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.FOREST), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.FLOWER_FOREST), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.BIRCH_FOREST), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.DARK_FOREST), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.OLD_GROWTH_BIRCH_FOREST), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.OLD_GROWTH_PINE_TAIGA), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.OLD_GROWTH_SPRUCE_TAIGA), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.TAIGA), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.SNOWY_TAIGA), BiomeWrapper::_colorSnow)
+                    .put(_get(Biomes.WINDSWEPT_GRAVELLY_HILLS), BiomeWrapper::_colorGravel)
+                    .put(_get(Biomes.WINDSWEPT_FOREST), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.JUNGLE), BiomeWrapper::_colorFoliage)
+                    .put(_get(Biomes.BAMBOO_JUNGLE), BiomeWrapper::_colorBamboo)
+                    .put(_get(Biomes.BADLANDS), BiomeWrapper::_colorRedSand)
+                    .put(_get(Biomes.ERODED_BADLANDS), BiomeWrapper::_colorRedSand)
+                    .put(_get(Biomes.WOODED_BADLANDS), BiomeWrapper::_colorStone)
+                    .put(_get(Biomes.GROVE), BiomeWrapper::_colorSnow)
+                    .put(_get(Biomes.SNOWY_SLOPES), BiomeWrapper::_colorSnow)
+                    .put(_get(Biomes.FROZEN_PEAKS), BiomeWrapper::_colorIce)
+                    .put(_get(Biomes.JAGGED_PEAKS), BiomeWrapper::_colorSnow)
+                    .put(_get(Biomes.STONY_PEAKS), BiomeWrapper::_colorStone)
+                    .put(_get(Biomes.RIVER), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.FROZEN_RIVER), BiomeWrapper::_colorIce)
+                    .put(_get(Biomes.BEACH), BiomeWrapper::_colorSand)
+                    .put(_get(Biomes.SNOWY_BEACH), BiomeWrapper::_colorSnow)
+                    .put(_get(Biomes.STONY_SHORE), BiomeWrapper::_colorStone)
+                    .put(_get(Biomes.WARM_OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.LUKEWARM_OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.DEEP_LUKEWARM_OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.DEEP_OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.COLD_OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.DEEP_COLD_OCEAN), BiomeWrapper::_colorWater)
+                    .put(_get(Biomes.FROZEN_OCEAN), BiomeWrapper::_colorIce)
+                    .put(_get(Biomes.DEEP_FROZEN_OCEAN), BiomeWrapper::_colorIce)
+                    .put(_get(Biomes.MUSHROOM_FIELDS), BiomeWrapper::_colorMushoom)
+                    .put(_get(Biomes.DRIPSTONE_CAVES), BiomeWrapper::_colorDripStone)
+                    .put(_get(Biomes.LUSH_CAVES), BiomeWrapper::_colorMoss)
+                    .put(_get(Biomes.DEEP_DARK), BiomeWrapper::_colorSculk)
+                    .put(_get(Biomes.NETHER_WASTES), BiomeWrapper::_colorNether)
+                    .put(_get(Biomes.WARPED_FOREST), BiomeWrapper::_colorNether)
+                    .put(_get(Biomes.CRIMSON_FOREST), BiomeWrapper::_colorNether)
+                    .put(_get(Biomes.SOUL_SAND_VALLEY), BiomeWrapper::_colorSoulSand)
+                    .put(_get(Biomes.BASALT_DELTAS), BiomeWrapper::_colorBasalt)
+                    .put(_get(Biomes.THE_END), BiomeWrapper::_colorEnd)
+                    .put(_get(Biomes.END_HIGHLANDS), BiomeWrapper::_colorEnd)
+                    .put(_get(Biomes.END_MIDLANDS), BiomeWrapper::_colorEnd)
+                    .put(_get(Biomes.SMALL_END_ISLANDS), BiomeWrapper::_colorEnd)
+                    .put(_get(Biomes.END_BARRENS), BiomeWrapper::_colorEnd)
+                    .build();
+
+    @Override
+    public int getColorForBiome(int x, int z)
+    {
+        int colorInt;
+        Function<Biome, Integer> colorFunction = BIOME_COLOR_MAP.get(biome);
+        if (colorFunction != null)
+        {
+            colorInt = colorFunction.apply(biome);
+        }
+        else
+        {
+            colorInt = biome.getGrassColor(x, z);
+        }
+        return colorInt;
+    }
+    #endif
+    @Override public String getName()
+    {
+        return biome.toString();
+    }
+    
+    @Override
+    public int getGrassTint(int x, int z)
+    {
+        return biome.getGrassColor(x, z);
+    }
+
+    @Override
+    public int getFolliageTint()
+    {
+        return biome.getFoliageColor();
+    }
+
+    @Override
+    public int getWaterTint()
+    {
+        return biome.getWaterColor();
+    }
+
+
+    @Override public boolean equals(Object obj)
+    {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof BiomeWrapper))
+            return false;
+        BiomeWrapper that = (BiomeWrapper) obj;
+        return Objects.equals(biome, that.biome);
+    }
+
+    @Override public int hashCode()
+    {
+        return Objects.hash(biome);
+    }
+
+}

common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java

@@ -0,0 +1,82 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers.world;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
+
+import net.minecraft.world.level.dimension.DimensionType;
+
+/**
+ *
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+public class DimensionTypeWrapper implements IDimensionTypeWrapper
+{
+    private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
+    private final DimensionType dimensionType;
+
+    public DimensionTypeWrapper(DimensionType dimensionType)
+    {
+        this.dimensionType = dimensionType;
+    }
+
+    public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
+    {
+        //first we check if the biome has already been wrapped
+        if(dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
+            return dimensionTypeWrapperMap.get(dimensionType);
+
+
+        //if it hasn't been created yet, we create it and save it in the map
+        DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
+        dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
+
+        //we return the newly created wrapper
+        return dimensionTypeWrapper;
+    }
+
+    public static void clearMap()
+    {
+        dimensionTypeWrapperMap.clear();
+    }
+
+
+    @Override
+    public String getDimensionName()
+    {
+        return dimensionType.effectsLocation().getPath();
+    }
+
+    @Override
+    public boolean hasCeiling()
+    {
+        return dimensionType.hasCeiling();
+    }
+
+    @Override
+    public boolean hasSkyLight()
+    {
+        return dimensionType.hasSkyLight();
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java

@@ -0,0 +1,189 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers.world;
+
+import java.io.File;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.seibel.lod.core.enums.WorldType;
+import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkSource;
+import net.minecraft.world.level.chunk.ChunkStatus;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author James Seibel
+ * @author ??
+ * @version 11-21-2021
+ */
+public class WorldWrapper implements IWorldWrapper
+{
+    private static final ConcurrentMap<LevelAccessor, WorldWrapper> worldWrapperMap = new ConcurrentHashMap<>();
+    private final LevelAccessor world;
+    public final WorldType worldType;
+    
+    
+    public WorldWrapper(LevelAccessor newWorld)
+    {
+        world = newWorld;
+        
+        if (world.getClass() == ServerLevel.class)
+            worldType = WorldType.ServerWorld;
+        else if (world.getClass() == ClientLevel.class)
+            worldType = WorldType.ClientWorld;
+        else
+            worldType = WorldType.Unknown;
+    }
+    
+    
+    @Nullable
+    public static WorldWrapper getWorldWrapper(LevelAccessor world)
+    {
+        if (world == null) return null;
+        //first we check if the biome has already been wrapped
+        if(worldWrapperMap.containsKey(world) && worldWrapperMap.get(world) != null)
+            return worldWrapperMap.get(world);
+        
+        
+        //if it hasn't been created yet, we create it and save it in the map
+        WorldWrapper worldWrapper = new WorldWrapper(world);
+        worldWrapperMap.put(world, worldWrapper);
+        
+        //we return the newly created wrapper
+        return worldWrapper;
+    }
+    
+    public static void clearMap()
+    {
+        worldWrapperMap.clear();
+    }
+    
+    @Override
+    public WorldType getWorldType()
+    {
+        return worldType;
+    }
+    
+    @Override
+    public DimensionTypeWrapper getDimensionType()
+    {
+        return DimensionTypeWrapper.getDimensionTypeWrapper(world.dimensionType());
+    }
+    
+    @Override
+    public int getBlockLight(int x, int y, int z)
+    {
+        return world.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
+    }
+    
+    @Override
+    public int getSkyLight(int x, int y, int z)
+    {
+        return world.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
+    }
+    
+    public LevelAccessor getWorld()
+    {
+        return world;
+    }
+    
+    @Override
+    public boolean hasCeiling()
+    {
+        return world.dimensionType().hasCeiling();
+    }
+    
+    @Override
+    public boolean hasSkyLight()
+    {
+        return world.dimensionType().hasSkyLight();
+    }
+    
+    @Override
+    public int getHeight()
+    {
+        return world.getHeight();
+    }
+    
+    @Override
+    public short getMinHeight()
+    {
+        #if PRE_MC_1_17_1
+        return (short) 0;
+        #else
+        return (short) world.getMinBuildHeight();
+        #endif
+    }
+    
+    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
+    @Override
+    public File getSaveFolder() throws UnsupportedOperationException
+    {
+        if (worldType != WorldType.ServerWorld)
+            throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds.");
+        
+        ServerChunkCache chunkSource = ((ServerLevel) world).getChunkSource();
+        return chunkSource.getDataStorage().dataFolder;
+    }
+    
+    
+    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
+    public ServerLevel getServerWorld() throws UnsupportedOperationException
+    {
+        if (worldType != WorldType.ServerWorld)
+            throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds.");
+        
+        return (ServerLevel) world;
+    }
+    
+    @Override
+    public int getSeaLevel()
+    {
+        // TODO this is depreciated, what should we use instead?
+        return world.getSeaLevel();
+    }
+    
+    @Override
+    public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
+        ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
+        if (chunk == null) return null;
+        return new ChunkWrapper(chunk, world);
+    }
+    
+    @Override
+    public boolean hasChunkLoaded(int chunkX, int chunkZ) {
+        // world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
+        ChunkSource source = world.getChunkSource();
+        return source.hasChunk(chunkX, chunkZ);
+    }
+}